fixed path issue

preferencesAboutTextFull
-f 11 years ago
parent 0e2424a419
commit 5d686fff46
  1. 4
      src/core/UBApplication.cpp
  2. 8
      src/core/UBSettings.cpp
  3. 1
      src/core/UBSettings.h

@ -120,9 +120,7 @@ UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSing
staticMemoryCleaner = new QObject(0); // deleted in UBApplication destructor staticMemoryCleaner = new QObject(0); // deleted in UBApplication destructor
setOrganizationName(UBSettings::organizationName()); setOrganizationName("Open Education Foundation");
qDebug() << "organization name" << organizationName();
qDebug() << "application" << this;
setOrganizationDomain("oe-f.org"); setOrganizationDomain("oe-f.org");
setApplicationName("OpenBoard"); setApplicationName("OpenBoard");

@ -787,7 +787,7 @@ QString UBSettings::userDataDirectory()
} }
dataDirPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); dataDirPath = UBFileSystemUtils::normalizeFilePath(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
dataDirPath.replace(UBSettings::organizationName() + "/", "OpenBoard"); dataDirPath.replace(qApp->organizationName() + "/", "");
} }
return dataDirPath; return dataDirPath;
} }
@ -881,12 +881,6 @@ QString UBSettings::userPodcastRecordingDirectory()
return dirPath; return dirPath;
} }
QString UBSettings::organizationName()
{
return "Open Education Foundation";
}
QString UBSettings::userDocumentDirectory() QString UBSettings::userDocumentDirectory()
{ {
static QString documentDirectory = ""; static QString documentDirectory = "";

@ -137,7 +137,6 @@ class UBSettings : public QObject
static QString userInteractiveDirectory(); static QString userInteractiveDirectory();
static QString userInteractiveFavoritesDirectory(); static QString userInteractiveFavoritesDirectory();
static QString userPodcastRecordingDirectory(); static QString userPodcastRecordingDirectory();
static QString organizationName();
QString userGipLibraryDirectory(); QString userGipLibraryDirectory();

Loading…
Cancel
Save