KDE3->TDE conversion

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/src/komposeglobal.cpp b/src/komposeglobal.cpp
index f2a1a35..7d7dbe3 100644
--- a/src/komposeglobal.cpp
+++ b/src/komposeglobal.cpp
@@ -19,17 +19,17 @@
 
 #include <tqtimer.h>
 
-#include <kapplication.h>
-#include <kpopupmenu.h>
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <klocale.h>
+#include <tdeapplication.h>
+#include <tdepopupmenu.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <kkeydialog.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <ksharedpixmap.h>
-#include <kwinmodule.h>
+#include <twinmodule.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <dcopref.h>
@@ -78,10 +78,10 @@ KomposeGlobal::KomposeGlobal(TQObject *parent, const char *name)
     damageEvent(0)
 {
   globalInstance = this;
-  kwin_module = new KWinModule(); //FIXME: only needed for sharedpixmap :(
-  currentDesktop = kwin_module->currentDesktop();
+  twin_module = new KWinModule(); //FIXME: only needed for sharedpixmap :(
+  currentDesktop = twin_module->currentDesktop();
 
-  desktopBgPixmap = new KSharedPixmap;
+  desktopBgPixmap = new TDESharedPixmap;
   connect(desktopBgPixmap, SIGNAL(done(bool)), SLOT(slotDone(bool)));
   initSharedPixmaps();
   initCompositeExt();
@@ -151,19 +151,19 @@ void KomposeGlobal::initGui()
  */
 void KomposeGlobal::initActions()
 {
-  actionCollection = new KActionCollection( (TQWidget*)0 );
+  actionCollection = new TDEActionCollection( (TQWidget*)0 );
 
   // Actions
   actQuit = KStdAction::quit( kapp, SLOT(quit()), actionCollection );
-  actShowWorldView = new KAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped",
+  actShowWorldView = new TDEAction(i18n("Komposé (ungrouped)"), "kompose_ungrouped",
                                  0,
                                  KomposeViewManager::instance(), SLOT(createWorldView()),
                                  actionCollection, "showWorldView");
-  actShowVirtualDesktopView = new KAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop",
+  actShowVirtualDesktopView = new TDEAction(i18n("Komposé (grouped by virtual desktops)"), "kompose_grouped_by_virtual_desktop",
                                           0,
                                           KomposeViewManager::instance(), SLOT(createVirtualDesktopView()),
                                           actionCollection, "showVirtualDesktopView");
-  actShowCurrentDesktopView = new KAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop",
+  actShowCurrentDesktopView = new TDEAction(i18n("Komposé (current virtual desktop)"), "kompose_current_virtual_desktop",
                                           0,
                                           KomposeViewManager::instance(), SLOT(createCurrentDesktopView()),
                                           actionCollection, "showCurrentDesktopView");
@@ -173,7 +173,7 @@ void KomposeGlobal::initActions()
   actConfigGlobalShortcuts  = KStdAction::keyBindings(this, SLOT(showGlobalShortcutsSettingsDialog()),
                               actionCollection, "options_configure_global_keybinding");
   actConfigGlobalShortcuts->setText(i18n("Configure &Global Shortcuts..."));
-  actAboutDlg      = new KAction(i18n("About Komposé"), "kompose",
+  actAboutDlg      = new TDEAction(i18n("About Komposé"), "kompose",
                                  0,
                                  this, SLOT(showAboutDlg()),
                                  actionCollection, "showAboutDlg");
@@ -182,8 +182,8 @@ void KomposeGlobal::initActions()
 void KomposeGlobal::initSharedPixmaps()
 {
   // Whenever the background pixmap changes we'll have to reload it:
-  //connect(kwin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int)));
-  connect(kwin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int)));
+  //connect(twin_module, SIGNAL(windowChanged(WId, unsigned int)), SLOT(desktopChanged(WId, unsigned int)));
+  connect(twin_module, SIGNAL(currentDesktopChanged(int)), SLOT(slotDesktopChanged(int)));
   connect(kapp, SIGNAL(backgroundChanged(int)), SLOT(slotBackgroundChanged(int)));
 
   enablePixmapExports();
@@ -215,7 +215,7 @@ void KomposeGlobal::slotDesktopChanged(int desktop)
       return;
   }
 
-  currentDesktop = kwin_module->currentDesktop();
+  currentDesktop = twin_module->currentDesktop();
   refreshSharedPixmaps();
 }
 
@@ -285,7 +285,7 @@ void KomposeGlobal::showGlobalShortcutsSettingsDialog()
 void KomposeGlobal::showAboutDlg()
 {
   aboutDialogOpen = true;
-  KAboutApplication* kabout = new KAboutApplication();
+  TDEAboutApplication* kabout = new TDEAboutApplication();
   kabout->exec();
   delete kabout;
   aboutDialogOpen = false;