Fix bad code, this was highlighted when building with cmake and ninja

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 591ce28f0128f324165b19f6ff653d158711614b)

4 files changed, 31 insertions, 31 deletions

diff --git a/src/ksquirrelpart/ksquirrelpart.cpp b/src/ksquirrelpart/ksquirrelpart.cpp
index 7021e54..4498a82 100644
--- a/src/ksquirrelpart/ksquirrelpart.cpp
+++ b/src/ksquirrelpart/ksquirrelpart.cpp
@@ -80,46 +80,46 @@ KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *,
 
     TDEAction *a;
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus).local8Bit());
     new TDEAction(i18n("Zoom +"), "zoom-in", 0, a,  TQ_SLOT(activate()), actionCollection(), "ksquirrelpart zoom in");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus).local8Bit());
     new TDEAction(i18n("Zoom -"), "zoom-out", 0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart zoom out");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P).local8Bit());
     new TDEAction(i18n("Properties"), "image-x-generic",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart properties");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R).local8Bit());
     new TDEAction(i18n("Normalize"), "rebuild",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart normalize");
 
     // colorize & filters
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D).local8Bit());
     new TDEAction(i18n("Color balance..."), "colorize",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart colorbalance");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U).local8Bit());
     new TDEAction(i18n("Apply filter..."), "effect",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart filter");
 
     // rotate
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL).local8Bit());
     new TDEAction(i18n("Rotate left"), "object-rotate-left",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart rotateleft");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL).local8Bit());
     new TDEAction(i18n("Rotate right"), "object-rotate-right",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart rotateright");
 
     // copy/move
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5).local8Bit());
     new TDEAction(i18n("Copy to..."), "edit-copy",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart copyto");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7).local8Bit());
     new TDEAction(i18n("Move to..."), "edit-cut",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart moveto");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6).local8Bit());
     new TDEAction(i18n("Copy to last folder"), "",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart copy");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8).local8Bit());
     new TDEAction(i18n("Move to last folder"), "",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart move");
 
-    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S));
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S).local8Bit());
     new TDEAction(i18n("Save As..."), "document-save-as",  0, a, TQ_SLOT(activate()), actionCollection(), "ksquirrelpart saveas");
 
     sa = new TDESelectAction(i18n("Zoom"), 0, actionCollection(), "ksquirrelpart zoom");
diff --git a/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h b/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h
index d976149..2cbbf93 100644
--- a/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h
+++ b/src/ksquirrelpart/sq_codecsettingsskeleton.ui.h
@@ -94,7 +94,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 	    if(u && t != settings.end())
 	    {
 		if(r)
-		    u->setURL((*t).second.sVal);
+		    u->setURL((*t).second.sVal.c_str());
 		else
 		{
                     KURL url = u->url(); // get rid of "file://" if present
@@ -134,7 +134,7 @@ void SQ_CodecSettingsSkeleton::recursivelyReadWrite(fmt_settings &settings, bool
 	    if(c && t != settings.end())
 	    {
 		if(r)
-		    c->setColor(TQColor(TQString((*t).second.sVal)));
+		    c->setColor(TQColor(TQString((*t).second.sVal.c_str())));
 		else
 		    (*t).second.sVal = TQString(c->color().name()).ascii();
 	    }
diff --git a/src/ksquirrelpart/sq_glwidget_stuff.cpp b/src/ksquirrelpart/sq_glwidget_stuff.cpp
index bde87c4..1101d60 100644
--- a/src/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/src/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -229,7 +229,7 @@ void SQ_GLWidget::slotProperties()
     {
         for(std::vector<fmt_metaentry>::iterator it = tab->finfo.meta.begin();it != tab->finfo.meta.end();++it)
         {
-            meta.append(TQPair<TQString,TQString>((*it).group, (*it).data));
+            meta.append(TQPair<TQString,TQString>((*it).group.c_str(), (*it).data.c_str()));
         }
     }
 
@@ -238,8 +238,8 @@ void SQ_GLWidget::slotProperties()
     list    << tab->quickImageInfo
             << TQString::fromLatin1("%1x%2").arg(tab->finfo.image[tab->current].w).arg(tab->finfo.image[tab->current].h)
             << TQString::fromLatin1("%1").arg(tab->finfo.image[tab->current].bpp)
-            << tab->finfo.image[tab->current].colorspace
-            << tab->finfo.image[tab->current].compression
+            << tab->finfo.image[tab->current].colorspace.c_str()
+            << tab->finfo.image[tab->current].compression.c_str()
             << sz
             << TQString::fromLatin1("%1").arg((double)real_size / tab->fmt_size, 0, 'f', 2)
             << ((tab->finfo.image[tab->current].interlaced) ? i18n("yes") : i18n("no"))
@@ -871,7 +871,7 @@ void SQ_GLWidget::initAccelsAndMenu()
     menu->insertItem(i18n("Image"), menuImage);
 
 #define SQ_ADD_KACTION(b) \
-    (new TDEAction(TQString(), b, this, TQ_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b)))
+    (new TDEAction(TQString(), b, this, TQ_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b).local8Bit()))
 
     id_saveas = menuFile->insertItem(SQ_IconLoader::instance()->loadIcon("document-save-as", TDEIcon::Desktop, TDEIcon::SizeSmall), i18n("Save As...") + "\tS", SQ_ADD_KACTION(TQt::Key_S), TQ_SLOT(activate()));
 
diff --git a/src/ksquirrelpart/sq_libraryhandler.cpp b/src/ksquirrelpart/sq_libraryhandler.cpp
index 3b6cf2c..56165b9 100644
--- a/src/ksquirrelpart/sq_libraryhandler.cpp
+++ b/src/ksquirrelpart/sq_libraryhandler.cpp
@@ -257,8 +257,8 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries)
         libtmp.lib->load();
 
         // resolve create() and destroy() functions
-        libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create"));
-        libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy"));
+        libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve(TQString::fromLatin1("codec_create").local8Bit());
+        libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy").local8Bit());
 
         // couldn't resolve - corrupted library ?
         if(!libtmp.codec_create || !libtmp.codec_destroy)
@@ -274,19 +274,19 @@ void SQ_LibraryHandler::add(TQStringList &foundLibraries)
             // read options
             codeK->options(&o);
 
-            TQString q = o.name;
+            TQString q = o.name.c_str();
 
             // Yet unknown library ?
             if(!alreadyInMap(q))
             {
                 libtmp.mime = TQPixmap(reinterpret_cast<const char **>(o.pixmap));
-                libtmp.mimetype = o.mimetype;
+                libtmp.mimetype = o.mimetype.c_str();
                 libtmp.mime_multi = libtmp.mimetype.find(';') != -1;
                 libtmp.quickinfo = q;
-                libtmp.filter = o.filter;
-                libtmp.version = o.version;
-                libtmp.regexp_str = o.mime;
-                libtmp.config = o.config;
+                libtmp.filter = o.filter.c_str();
+                libtmp.version = o.version.c_str();
+                libtmp.regexp_str = o.mime.c_str();
+                libtmp.config = o.config.c_str();
                 libtmp.regexp.setPattern(libtmp.regexp_str);
                 libtmp.regexp.setCaseSensitive(true);
                 libtmp.writestatic = o.writestatic;
@@ -366,10 +366,10 @@ void SQ_LibraryHandler::dump() const
     for(const_iterator it = begin();it != itEnd;++it)
     {
         std::cerr << std::setw(30)
-                  << KStringHandler::csqueeze(TQFileInfo((*it).libpath).fileName(), 30)
+                  << KStringHandler::csqueeze(TQFileInfo((*it).libpath).fileName(), 30).local8Bit()
                   << std::setw(0)
                   << "  [" 
-                  << KStringHandler::rsqueeze((*it).quickinfo, 45)
+                  << KStringHandler::rsqueeze((*it).quickinfo, 45).local8Bit()
                   << "]"
                   << endl;
     }
@@ -430,7 +430,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
 
     for(fmt_settings::iterator it = lib->settings.begin();it != itEnd;++it)
     {
-        k = (*it).first;
+        k = TQString::fromLocal8Bit((*it).first.c_str());
 
         if((*it).second.type == settings_value::v_bool) // boolean
         {
@@ -450,7 +450,7 @@ void SQ_LibraryHandler::writeSettings(SQ_LIBRARY *lib)
         else // string
         {
             k.prepend("s");
-            tdeconf->writeEntry(k, (*it).second.sVal);
+            tdeconf->writeEntry(k, (*it).second.sVal.c_str());
         }
     }
 }