Switch to cmake building system

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

4 files changed, 67 insertions, 16 deletions

diff --git a/src/ksquirrelpart/CMakeLists.txt b/src/ksquirrelpart/CMakeLists.txt
new file mode 100644
index 0000000..5a22b94
--- /dev/null
+++ b/src/ksquirrelpart/CMakeLists.txt
@@ -0,0 +1,51 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${KSQUIRREL_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+  ${GL_LIBRARY_DIRS}
+  ${KEXIF_LIBRARY_DIRS}
+  ${KIPI_LIBRARY_DIRS}
+  ${KSQUIRREL_LIBRARY_DIRS}
+)
+
+add_definitions( -DKSQUIRREL_PART )
+
+
+##### ksquirrelpart (shared)
+
+tde_import( libkonq )
+
+tde_add_kpart( libksquirrelpart AUTOMOC
+  SOURCES
+    ksquirrelpart.cpp sq_glparts.cpp sq_glu.cpp sq_glwidget.cpp sq_glwidget_stuff.cpp
+    sq_libraryhandler.cpp sq_downloader.cpp sq_iconloader.cpp fmt_filters.cpp sq_externaltool.cpp
+    sq_config.cpp sq_filedialog.cpp sq_imagefilter.ui sq_imagebcg.ui sq_glselectionpainter.cpp
+    sq_glwidget_helpers.cpp sq_label.cpp sq_bcglabel.cpp sq_popupmenu.cpp sq_errorstring.cpp
+    sq_codecsettingsskeleton.ui sq_codecsettings.cpp sq_imageproperties.ui sq_utils.cpp
+    sq_helpwidget.ui sq_utils_asm_scale.S sq_utils_scale.cpp sq_diroperator.cpp sq_glview.cpp
+  LINK
+    tdecore-shared tdeio-shared tdeui-shared tdeprint-shared tdefx-shared tdeutils-shared
+    konq-shared tqui ${GL_LIBRARIES} ${KEXIF_LIBRARIES} ${KSQUIRREL_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}/trinity
+)
+
+
+##### other files
+
+tde_create_translated_desktop(
+  SOURCE ksquirrelpart.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+  FILES ksquirrelpart.rc
+  DESTINATION ${DATA_INSTALL_DIR}/ksquirrelpart
+)
diff --git a/src/ksquirrelpart/ksquirrelpart.cpp b/src/ksquirrelpart/ksquirrelpart.cpp
index 4498a82..29da931 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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Plus).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Minus).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_P).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_R).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_D).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_U).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Left+CTRL).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_Right+CTRL).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F5).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F7).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F6).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_F8).utf8());
     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).local8Bit());
+    a = gl->actionCollection()->action(TQString("action_%1").arg(TQt::Key_S).utf8());
     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_glwidget_stuff.cpp b/src/ksquirrelpart/sq_glwidget_stuff.cpp
index 1101d60..630329a 100644
--- a/src/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/src/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -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).local8Bit()))
+    (new TDEAction(TQString(), b, this, TQ_SLOT(slotAccelActivated()), ac, TQString::fromLatin1("action_%1").arg(b).utf8()))
 
     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 56165b9..ecc4a83 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").local8Bit());
-        libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve(TQString::fromLatin1("codec_destroy").local8Bit());
+        libtmp.codec_create = (fmt_codec_base*(*)())(libtmp.lib)->resolve("codec_create");
+        libtmp.codec_destroy = (void (*)(fmt_codec_base*))(libtmp.lib)->resolve("codec_destroy");
 
         // couldn't resolve - corrupted library ?
         if(!libtmp.codec_create || !libtmp.codec_destroy)