Sophie

Sophie

distrib > Arklinux > devel > i586 > by-pkgid > 9f58d856ef5d81c50a666d82a9ecfc21 > files > 1

kradio-4.0.2-2ark.src.rpm

--- kradio4-4.0.2/plugins/gui-docking-menu/docking.cpp.ark	2011-06-22 22:44:38.735839762 +0200
+++ kradio4-4.0.2/plugins/gui-docking-menu/docking.cpp	2011-06-22 22:46:24.049170531 +0200
@@ -520,7 +520,7 @@ bool RadioDocking::noticeStationChanged
         s = rs.longName();
 
     const QString &rt = queryRDSRadioText();
-    setToolTip(s + (rt.length() ? "\n" + rt : ""));
+    setToolTip(QString(s + (rt.length() ? QString("\n" + rt) : QString::null)));
 
     bool r = false;
     SoundFormat sf;
@@ -989,7 +989,7 @@ void RadioDocking::dropEvent(QDropEvent*
 bool RadioDocking::noticeRDSRadioTextChanged(const QString &s)
 {
     const RadioStation &rs = queryCurrentStation();
-    setToolTip(rs.longName() + (s.length() ? "\n" + s : ""));
+    setToolTip(QString(rs.longName() + (s.length() ? QString("\n" + s) : QString::null)));
     return true;
 }
 
--- kradio4-4.0.2/plugins/radio/radio-configuration.cpp.ark	2011-06-22 22:41:57.219177032 +0200
+++ kradio4-4.0.2/plugins/radio/radio-configuration.cpp	2011-06-22 22:42:24.352509702 +0200
@@ -551,8 +551,8 @@ void RadioConfiguration::slotAddPresets(
 
 void RadioConfiguration::loadPresets(bool add)
 {
-    KFileDialog fd(KStandardDirs::installPath ("data") + "kradio4/presets",
-                   "*.krp|" + i18n("KRadio Preset Files"),
+    KFileDialog fd(QString(KStandardDirs::installPath ("data") + "kradio4/presets"),
+                   QString("*.krp|" + i18n("KRadio Preset Files")),
                    this);
     fd.setModal(true);
     fd.setMode(KFile::Files | KFile::ExistingOnly);
--- kradio4-4.0.2/src/debug-profiler.cpp.ark	2011-06-22 22:40:45.995845433 +0200
+++ kradio4-4.0.2/src/debug-profiler.cpp	2011-06-22 22:40:55.992511855 +0200
@@ -93,7 +93,7 @@ void Profiler::printData ()
         l = (((l-1) / 25) + 1) * 25;
         if (l < 50) l = 50;
         const profile_data &d = m_ProfileData[*it];
-        printf(("%-"+QString::number(l)+"s: total: %3.8f (%9lli)  avg: %3.8f  min: %3.8f  max: %3.8f\n").toLocal8Bit().constData(),
+        printf(QString("%-"+QString::number(l)+"s: total: %3.8f (%9lli)  avg: %3.8f  min: %3.8f  max: %3.8f\n").toLocal8Bit().constData(),
                (*it).toLocal8Bit().constData(),
                (double)d.accumulatedCounter / 1.666e9,
                d.callCounter,
--- kradio4-4.0.2/src/pluginmanager.cpp.ark	2011-06-22 22:39:55.615846659 +0200
+++ kradio4-4.0.2/src/pluginmanager.cpp	2011-06-22 22:40:10.705846292 +0200
@@ -185,9 +185,9 @@ void PluginManager::setConfigPageNameEtc
             tmp_name    .replace(" ", "");
             tmp_itemName.replace(" ", "");
             if ((tmp_itemName        == tmp_name) ||
-                (tmp_itemName + "1"  == tmp_name) ||
+                (QString(tmp_itemName + "1")  == tmp_name) ||
                 (tmp_class           == tmp_name) ||
-                (tmp_class    + "1"  == tmp_name)
+                (QString(tmp_class    + "1")  == tmp_name)
             ) {
                 itemName   = info.itemName;
                 pageHeader = info.pageHeader;
--- kradio4-4.0.2/src/widgetpluginbase.cpp.ark	2011-06-22 22:41:21.135844576 +0200
+++ kradio4-4.0.2/src/widgetpluginbase.cpp	2011-06-22 22:41:28.075844407 +0200
@@ -285,7 +285,7 @@ void WidgetPluginBase::updateHideShowAct
     tmp_class.replace(" ", "");
     tmp_name .replace(" ", "");
     if ((tmp_class           == tmp_name) ||
-        (tmp_class    + "1"  == tmp_name)
+        (QString(tmp_class    + "1")  == tmp_name)
     ) {
         menuitem   = description();
     }