Changeset 5888 for branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp

Timestamp:

11/28/07 09:26:58 (12 months ago)

Author:

eugene

Message:

• Rectified most paths;
• Moved gui config file into QTGUI_DIR and named config.ini in order to let advanced editors apply their syntax rules;
• Tiny CodingStyle update.

Files:

• branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp (modified) (8 diffs)

branches/qt-gui_qt4/src/dialogs/skinbrowser.cpp

@@ -208 +208 @@
 
   // Load up the available packs
-  QString szDir, szDirUser;
-  szDir.sprintf("%s%s", SHARE_DIR, QTGUI_DIR);
-  szDirUser.sprintf("%s%s", BASE_DIR, QTGUI_DIR);
+  QString szDir = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR;
+  QString szDirUser = QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR;
   QDir dSkins(szDir + SKINS_DIR);
   QDir dSkinsUser(szDirUser + SKINS_DIR);
@@ -239 +238 @@
       int num = cmbSkin->count();
       bool dup = false;
-      for (int i=0; i < num; i++)
+      for (int i = 0; i < num; i++)
         if (*it == cmbSkin->itemText(i))
           dup = true;
@@ -274 +273 @@
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        WarnUser(this,
+            tr("Unable to open icons file\n%1\nIconset '%2' has been disabled.")
+            .arg(iconsFile)
+            .arg(*it));
         dIcons.cdUp();
         continue;
@@ -306 +308 @@
       int num = cmbIcon->count();
       bool dup = false;
-      for (int i=0; i < num; i++)
+      for (int i = 0; i < num; i++)
       {
         if (*it == cmbIcon->itemText(i))
@@ -348 +350 @@
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open extended icons file\n%1\nExtended Iconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        WarnUser(this,
+            tr("Unable to open extended icons file\n%1\n"
+              "Extended Iconset '%2' has been disabled.")
+            .arg(iconsFile)
+            .arg(*it));
         dExtendedIcons.cdUp();
         continue;
@@ -370 +376 @@
       if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
       {
-        WarnUser(this, tr("Unable to open extended icons file\n%1\nExtended Iconset '%2' has been disabled.").arg(iconsFile).arg(*it));
+        WarnUser(this,
+            tr("Unable to open extended icons file\n%1\n"
+              "Extended Iconset '%2' has been disabled.")
+            .arg(iconsFile)
+            .arg(*it));
         dExtendedIconsUser.cdUp();
         continue;
@@ -517 +527 @@
   // force a sane state and then load all icons into the valuelist
   lstIcons->clear();
-  QString iconsFile = QString("%1%2%3%4/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(ICONS_DIR).arg(icon);
+  QString iconsFile = QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR + ICONS_DIR +
+    icon + "/" + icon + ".icons";
   char sFileName[MAX_FILENAME_LEN] = "";
   CIniFile fIconsConf;
   if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
   {
-    iconsFile = QString("%1%2%3%4/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(ICONS_DIR).arg(icon);
+    iconsFile = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR + ICONS_DIR +
+      icon + "/" + icon + ".icons";
     if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
     {
@@ -551 +563 @@
   // force a sane state and then load all icons into the valuelist
   lstExtIcons->clear();
-  QString iconsFile = QString("%1%2%3%4/%4.icons").arg(BASE_DIR).arg(QTGUI_DIR).arg(EXTICONS_DIR).arg(extIcon);
+  QString iconsFile = QString::fromLocal8Bit(BASE_DIR) + QTGUI_DIR +
+    EXTICONS_DIR + extIcon + "/" + extIcon + ".icons";
   char sFileName[MAX_FILENAME_LEN] = "";
   CIniFile fIconsConf;
   if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
   {
-    iconsFile = QString("%1%2%3%4/%4.icons").arg(SHARE_DIR).arg(QTGUI_DIR).arg(EXTICONS_DIR).arg(extIcon);
+    iconsFile = QString::fromLocal8Bit(SHARE_DIR) + QTGUI_DIR +
+      EXTICONS_DIR + extIcon + "/" + extIcon + ".icons";
     if (!fIconsConf.LoadFile(iconsFile.toLatin1()))
     {