Added cmake build files

Signed-off-by: Michele Calgaro <[email protected]>

19 files changed, 130 insertions, 51 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..340ab7b
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,74 @@
+include_directories(
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+
+##### autostart file #####
+
+#tde_create_translated_desktop(
+#  SOURCE polkit-agent-tde.desktop
+#  DESTINATION ${AUTOSTART_INSTALL_DIR} )
+
+
+##### kommando (shared)
+tde_add_library( kommando SHARED AUTOMOC
+  SOURCES
+	  menulistviewitem.cpp configuration.cpp menu.cpp
+	  commandobutton.cpp roundbutton.cpp kommandoview.cpp
+  VERSION 1.0.0
+	LINK tdecore-shared tdeio-shared
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### kommandod (kded module)
+tde_add_kpart( kded_kommandod AUTOMOC
+  SOURCES kommandod.cpp kommandod.skel kommando.cpp
+  LINK tdeinit_kded-shared Xmu kommando-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+##### kcm_kommando (kpart)
+
+tde_add_kpart( kcm_kommando MODULE AUTOMOC
+  SOURCES configdialogimpl.cpp configdialog.ui kcmkommando.cpp servicemenu.cpp
+  LINK
+	  tdeinit_kded-shared tdecore-shared tdeui-shared Xmu kommando-shared
+		tdeio-shared
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data ################################
+
+#tde_create_translated_desktop(
+#  SOURCE mediamanager.desktop
+#  DESTINATION ${SERVICES_INSTALL_DIR}/kded
+#  PO_DIR tdeioslave-desktops
+#)
+#
+#tde_create_translated_desktop(
+#  SOURCE mediabackend.desktop
+#  DESTINATION ${AUTOSTART_INSTALL_DIR}
+#  PO_DIR tdeioslave-desktops
+#)
+
+install(
+	FILES kommandod.desktop
+  DESTINATION ${SERVICES_INSTALL_DIR}/kded
+)
+
+install(
+	FILES kommando.desktop
+	DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
+
diff --git a/src/commandobutton.h b/src/commandobutton.h
index 0c03ba5..ea74c4e 100644
--- a/src/commandobutton.h
+++ b/src/commandobutton.h
@@ -25,7 +25,7 @@
 
 class CommandoButton : public RoundButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		CommandoButton(TQWidget* parent,unsigned short rad= 32);
 
@@ -40,7 +40,7 @@ class CommandoButton : public RoundButton
 
 class SubmenuButton : public RoundButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		SubmenuButton(TQWidget* parent, unsigned short rad= 32);
 		SubmenuButton(TQWidget* parent, Menu* submenu, unsigned short rad= 32);
diff --git a/src/configdialogimpl.cpp b/src/configdialogimpl.cpp
index 9252f9b..f2aa77a 100644
--- a/src/configdialogimpl.cpp
+++ b/src/configdialogimpl.cpp
@@ -30,14 +30,14 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 
-#include <ntqslider.h>
-#include <ntqcombobox.h>
-#include <ntqregexp.h>
-#include <ntqspinbox.h>
-#include <ntqlineedit.h>
-#include <ntqmessagebox.h>
-#include <ntqcheckbox.h>
-#include <ntqwidgetstack.h>
+#include <tqslider.h>
+#include <tqcombobox.h>
+#include <tqregexp.h>
+#include <tqspinbox.h>
+#include <tqlineedit.h>
+#include <tqmessagebox.h>
+#include <tqcheckbox.h>
+#include <tqwidgetstack.h>
 
 #include "menulistviewitem.h"
 #include "servicemenu.h"
diff --git a/src/configdialogimpl.h b/src/configdialogimpl.h
index c35b975..bdddcb5 100644
--- a/src/configdialogimpl.h
+++ b/src/configdialogimpl.h
@@ -27,7 +27,7 @@
 
 #include "configdialog.h"
 
-#include <ntqptrlist.h>
+#include <tqptrlist.h>
 
 #include "kommandoview.h"
 
@@ -43,7 +43,7 @@ class TDEShortcut;
 
 class ConfigDialogImpl : public ConfigDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         ConfigDialogImpl(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0);
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 4d47965..c533297 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 #include "configuration.h"
 
-#include <ntqfile.h>
-#include <ntqwidgetstack.h>
-#include <ntqobjectlist.h>
-#include <ntqdir.h>
+#include <tqfile.h>
+#include <tqwidgetstack.h>
+#include <tqobjectlist.h>
+#include <tqdir.h>
 
 #include <kstandarddirs.h>
 #include <kshell.h>
diff --git a/src/configuration.h b/src/configuration.h
index 7b763c0..c445920 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -20,7 +20,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include <ntqdom.h>
+#include <tqdom.h>
 #include <menulistviewitem.h>
 
 #include "kommando.h"
@@ -29,7 +29,7 @@
 
 class TQWidgetStack;
 
-class Config{
+class KDE_EXPORT Config{
     public:
         static Config& getSingleton(){
             static Config instance;
diff --git a/src/kcmkommando.cpp b/src/kcmkommando.cpp
index 2e31374..6decdb5 100644
--- a/src/kcmkommando.cpp
+++ b/src/kcmkommando.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 
-#include <ntqlayout.h>
+#include <tqlayout.h>
 
 #include <tdelocale.h>
 #include <tdeglobal.h>
@@ -36,10 +36,10 @@ static const char description[] =
 static const char version[] = "0.5.2";
 
 typedef KGenericFactory<KCMKommando, TQWidget> kommandoFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kommando, kommandoFactory("kcmkommando"))
+K_EXPORT_COMPONENT_FACTORY( kcm_kommando, kommandoFactory("kommando"))
 
 KCMKommando::KCMKommando(TQWidget *parent, const char *name, const TQStringList&)
-	: TDECModule(parent, name), about(0), configDialog(0)
+	: TDECModule(kommandoFactory::instance(), parent, name), about(0), configDialog(0)
 {
 	about = new TDEAboutData("kommando", I18N_NOOP("Kommando"), version, description,
 					 TDEAboutData::License_GPL, "(C) 2005 Daniel Stöckel", 0, 0, "[email protected]");
diff --git a/src/kcmkommando.h b/src/kcmkommando.h
index 48273d4..ce76ce2 100644
--- a/src/kcmkommando.h
+++ b/src/kcmkommando.h
@@ -29,7 +29,7 @@ class TDEAboutData;
 
 class KCMKommando: public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCMKommando( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() );
diff --git a/src/kommando.desktop b/src/kommando.desktop
index f20d2c3..3baf169 100644
--- a/src/kommando.desktop
+++ b/src/kommando.desktop
@@ -1,14 +1,17 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=Kommando
 Exec=tdecmshell kommando
 Icon=kommando
 Type=Application
-Categories=Qt;TDE;X-TDE-settings-desktop;
-Keywords=Kommando;wheel;menu
-X-TDE-ModuleType=Library
+Encoding=UTF-8
+
 X-TDE-Library=kommando
 X-TDE-ParentApp=kcontrol
-Comment=A WheelMenu for KDE
-Comment[de]=Ein Kreismenü für KDE
 
+Name=Kommando
+
+Comment=A WheelMenu for TDE
+Comment[de]=Ein Kreismenü für TDE
+Comment[it]=Un menu circolare per TDE
+
+Categories=Qt;TDE;X-TDE-settings-desktop;
+Keywords=Kommando;wheel;menu
diff --git a/src/kommando.h b/src/kommando.h
index 73cab7f..f96fe02 100644
--- a/src/kommando.h
+++ b/src/kommando.h
@@ -22,8 +22,8 @@
 #ifndef _KOMMANDO_H_
 #define _KOMMANDO_H_
 
-#include <ntqwidget.h>
-#include <ntqptrlist.h>
+#include <tqwidget.h>
+#include <tqptrlist.h>
 
 #include <kpixmap.h>
 
@@ -31,7 +31,7 @@
 
 class Kommando : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         Kommando();
diff --git a/src/kommandod.cpp b/src/kommandod.cpp
index 0bcafac..d8031ac 100644
--- a/src/kommandod.cpp
+++ b/src/kommandod.cpp
@@ -18,10 +18,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <ntqmessagebox.h>
-#include <ntqdir.h>
+#include <tqmessagebox.h>
+#include <tqdir.h>
 #include <tdelocale.h>
-#include <ntqmessagebox.h>
+#include <tqmessagebox.h>
 #include <kdebug.h>
 
 #include "kommandod.h"
diff --git a/src/kommandod.h b/src/kommandod.h
index 803ac7f..1fc978e 100644
--- a/src/kommandod.h
+++ b/src/kommandod.h
@@ -29,7 +29,7 @@
 
 class KommandoDaemon : public KDEDModule
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
     public:
diff --git a/src/kommandoview.h b/src/kommandoview.h
index 9384e22..2c2f60b 100644
--- a/src/kommandoview.h
+++ b/src/kommandoview.h
@@ -20,12 +20,13 @@
 #ifndef KOMMANDOVIEW_H
 #define KOMMANDOVIEW_H
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
+#include <kdemacros.h>
 
 /**
 	@author Daniel Stöckel <[email protected]>
 */
-class KommandoView : public TQListView
+class KDE_EXPORT KommandoView : public TQListView
 {
     public:
         KommandoView(TQWidget* parent, const TQString& name);
@@ -37,7 +38,7 @@ class KommandoView : public TQListView
         TQString m_AppName;
 };
 
-class KommandoViewList : public TQPtrList<KommandoView>
+class KDE_EXPORT KommandoViewList : public TQPtrList<KommandoView>
 {
     public:
         KommandoViewList(bool autoDelete = false);
diff --git a/src/menu.h b/src/menu.h
index 3f64d7a..951c4a5 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -20,8 +20,8 @@
 #ifndef MENU_H
 #define MENU_H
 
-#include <ntqbuttongroup.h>
-#include <ntqptrlist.h>
+#include <tqbuttongroup.h>
+#include <tqptrlist.h>
 
 #include "roundbutton.h"
 
@@ -31,7 +31,7 @@ class RoundButton;
 
 class Menu : public TQButtonGroup
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         Menu(Menu* parentMenu=NULL, const TQString& appName="");
         virtual ~Menu();
diff --git a/src/menulistviewitem.h b/src/menulistviewitem.h
index 350116b..2b469a4 100644
--- a/src/menulistviewitem.h
+++ b/src/menulistviewitem.h
@@ -20,9 +20,10 @@
 #ifndef MENULISTVIEWITEM_H
 #define MENULISTVIEWITEM_H
 
-#include <ntqlistview.h>
+#include <tqlistview.h>
+#include <kdemacros.h>
 
-class MenuListViewItem : public TQListViewItem
+class KDE_EXPORT MenuListViewItem : public TQListViewItem
 {
     public:
         enum ItemType{Menu,Button};
diff --git a/src/roundbutton.cpp b/src/roundbutton.cpp
index f22e3ec..3df847e 100644
--- a/src/roundbutton.cpp
+++ b/src/roundbutton.cpp
@@ -22,7 +22,7 @@
 
 #include <kiconloader.h>
 #include <kpixmapeffect.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
 
 #include "kommando.h"
 
diff --git a/src/roundbutton.h b/src/roundbutton.h
index 6a7ad26..4b31172 100644
--- a/src/roundbutton.h
+++ b/src/roundbutton.h
@@ -20,17 +20,17 @@
 #ifndef ROUNDBUTTON_H
 #define ROUNDBUTTON_H
 
-#include <ntqbutton.h>
-#include <ntqpainter.h>
+#include <tqbutton.h>
+#include <tqpainter.h>
 #include <kiconeffect.h>
 #include <kpixmap.h>
 #include <cassert>
 
 class Menu;
 
-class RoundButton : public TQButton  //well, there were round buttons in the begining at least *g*
+class KDE_EXPORT RoundButton : public TQButton  //well, there were round buttons in the begining at least *g*
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
         enum Type {Round, Commando, Submenu};
         RoundButton( TQWidget* parent=0, unsigned short rad= 32, const char* name= 0, WFlags f = 0);
diff --git a/src/servicemenu.cpp b/src/servicemenu.cpp
index dab7473..3e65ffe 100644
--- a/src/servicemenu.cpp
+++ b/src/servicemenu.cpp
@@ -21,7 +21,7 @@
 
 #include <tdeglobal.h>
 #include <tdelocale.h>
-#include <ntqimage.h>
+#include <tqimage.h>
 #include <kiconloader.h>
 #include <kservicegroup.h>
 #include <tdesycoca.h>
diff --git a/src/servicemenu.h b/src/servicemenu.h
index 687bdee..4d660f1 100644
--- a/src/servicemenu.h
+++ b/src/servicemenu.h
@@ -32,7 +32,7 @@ class KServiceGroup;
  */
 class ServiceMenu : public TDEPopupMenu
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     ServiceMenu(TQObject *receiver, const char *slotActivatedItem,
                 const char *slotActivatedGroup, TQWidget *parent = 0, const char *name = 0);