more incremental changes, nothing works yet

(I just want to change branches)

core.cpp

@@ -732,6 +732,7 @@ QString Core::sanitize(QString name)
 void Core::loadConfiguration(QString path)
 { // note to self: this really needs refactoring into the GUI, making the path mandatory here
   // but for now it's bedtime
+  // also loadFriends/clearFriends is borked as fuck
     if (path == "")
     {
         // read from settings whose profile?
@@ -784,27 +785,34 @@ void Core::loadConfiguration(QString path)
     loadFriends();
 }
 
-void Core::saveConfiguration(QString path)
+void Core::saveConfiguration()
 {
-    if (!tox)
+    QString dir = Settings::getSettingsDirPath();
-    {
+    QDir directory(dir);
-        qWarning() << "Core::saveConfiguration: Tox not started, aborting!";
+    if (!directory.exists() && !directory.mkpath(directory.absolutePath())) {
+        qCritical() << "Error while creating directory " << dir;
         return;
     }
     
-    if (path == "")
+    QString profile = Settings::getInstance().getCurrentProfile();
-    {
+    if (profile == "")
-        QString dir = Settings::getSettingsDirPath();
+    { // no profile active; this should only happen on startup, if at all
-        QDir directory(dir);
+        profile = sanitize(getUsername());
-        if (!directory.exists() && !directory.mkpath(directory.absolutePath())) {
+        Settings::getInstance().setCurrentProfile(profile);
-            qCritical() << "Error while creating directory " << dir;
+    }
-            return;
+    
-        }
+    QString path = dir + profile + TOX_EXT;
+    QFileInfo info(path);
+    if (!info.exists()) // fall back to old school 'data'
+        path = dir + '/' + CONFIG_FILE_NAME;
+}
 
-        path = dir + Settings::getInstance().getCurrentProfile() + TOX_EXT;
+void Core::saveConfiguration(const QString& path)
-        QFileInfo info(dir);
+{
-        if (!info.exists()) // fall back to old school 'data'
+    if (!tox)
-            path = dir + '/' + CONFIG_FILE_NAME;
+    {
+        qWarning() << "Core::saveConfiguration: Tox not started, aborting!";
+        return;
     }
     
     QSaveFile configurationFile(path);

core.h

@@ -124,8 +124,10 @@ public:
     void quitGroupChat(int groupId) const;
     void dispatchVideoFrame(vpx_image img) const;
 
-    void saveConfiguration(QString path = "");
+    void saveConfiguration();
-    void loadConfiguration(QString path = "");
+    void saveConfiguration(const QString& path);
+    void loadConfiguration(QString path);
+    
     static QString sanitize(QString name);
     
     QString getUsername();

settings.cpp

@@ -81,7 +81,7 @@ void Settings::load()
         enableIPv6 = s.value("enableIPv6", true).toBool();
         useTranslations = s.value("useTranslations", true).toBool();
         makeToxPortable = s.value("makeToxPortable", false).toBool();
-        currentProfile = s.value("currentProfile", ".data").toString();
+        currentProfile = s.value("currentProfile", "").toString();
     s.endGroup();
 
     s.beginGroup("Widgets");