Initial TDE conversion

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 35 insertions, 35 deletions

diff --git a/src/kooldock.cpp b/src/kooldock.cpp
index 1a362ef..5f0a9fc 100644
--- a/src/kooldock.cpp
+++ b/src/kooldock.cpp
@@ -35,17 +35,17 @@
 #include <ntqfont.h>
 #include <ntqdatetime.h>
 
-#include <kwin.h>
+#include <twin.h>
 #include <kprocess.h>
 #include <netwm_def.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdecmdlineargs.h>
 #include <krun.h>
 #include <kurifilter.h>
 #include <kpixmapio.h>
 #include <kstandarddirs.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <ntqlistbox.h>
 #include <keditlistbox.h>
 
@@ -56,7 +56,7 @@
 
 #include "kooldock.h"
 
-#include <kconfig.h> 
+#include <tdeconfig.h> 
 #include <kdebug.h>
 #include "setupdialogprg.h"
 
@@ -90,12 +90,12 @@ KoolDock::KoolDock(TQWidget *parent, const char *name) : TQWidget(parent, name,
   reloadIcons=TRUE;
   
   //Menu definitions
-  deskpopup=new KPopupMenu();
-  appMenu=new KPopupMenu();
-  godesk=new KPopupMenu;
-  tasklist=new KPopupMenu;
-  popup=new KPopupMenu;
-  advMenu=new KPopupMenu;
+  deskpopup=new TDEPopupMenu();
+  appMenu=new TDEPopupMenu();
+  godesk=new TDEPopupMenu;
+  tasklist=new TDEPopupMenu;
+  popup=new TDEPopupMenu;
+  advMenu=new TDEPopupMenu;
 
   connect(popup, SIGNAL(aboutToShow()), SLOT(aboutToShow()));
   connect(popup, SIGNAL(aboutToHide()), SLOT(aboutToHide()));
@@ -736,7 +736,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
           {
                   // run the application with KDE feedback (loading icon)
                   // we need to run the .desktop file, since the command
-                  // may be a url or another KIO stuff like 'system:/'
+                  // may be a url or another TDEIO stuff like 'system:/'
             if (items.at(i)->getFilename()!="")
             {
               run(items.at(i)->getFilename());
@@ -841,20 +841,20 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
       // Right button.
     i = iClicked;
     advMenu->clear();
-    advMenu->insertItem(SmallIconSet("up"), i18n("Keep &Above Others"), this, SLOT(toggleAlwaysOnTop()),0,1);
-    advMenu->insertItem(SmallIconSet("down"), i18n("Keep &Below Others"), this, SLOT(toggleKeptBelowOthers()),0,2);
-    advMenu->insertItem(SmallIconSet("window_fullscreen"), i18n("&Fullscreen"), this, SLOT(toggleFullScreen()),0,3);
+    advMenu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), this, SLOT(toggleAlwaysOnTop()),0,1);
+    advMenu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), this, SLOT(toggleKeptBelowOthers()),0,2);
+    advMenu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), this, SLOT(toggleFullScreen()),0,3);
     
       // Main KoolDock popup menu
     popup->clear();
     popup->insertTitle(i18n("Main Menu"));
     popup->insertItem(SmallIcon("configure"), i18n("Edit Quick Launch &Menu"), this, SLOT(edit()));
     popup->insertItem(SmallIcon("pencil"), i18n("Edit &Preferences"), this, SLOT(editPref()));
-    popup->insertItem(SmallIcon("redo"), i18n("&Reload configuration"), this, SLOT(restart()));
+    popup->insertItem(SmallIcon("edit-redo"), i18n("&Reload configuration"), this, SLOT(restart()));
     popup->insertSeparator();
     popup->insertItem(SmallIcon("about_kde"), i18n("&About"), this, SLOT(about()));
     popup->insertSeparator();
-    popup->insertItem(SmallIcon("exit"), i18n("E&xit"), this, SLOT(endProg()));
+    popup->insertItem(SmallIcon("system-log-out"), i18n("E&xit"), this, SLOT(endProg()));
       // End Main KoolDock Menu
 
     if(fShowNav==1)
@@ -903,7 +903,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
               appMenu->insertTitle(i18n("Item menu"));
               iFilename = items.at(i)->getFilename();
               appMenu->insertItem(SmallIcon("configure"), i18n("&Edit item"), this, SLOT(editItem()));
-              appMenu->insertItem(SmallIcon("fileclose"), i18n("&Delete item"), this, SLOT(removeItem()));
+              appMenu->insertItem(SmallIcon("window-close"), i18n("&Delete item"), this, SLOT(removeItem()));
               appMenu->insertSeparator();
               appMenu->insertItem(SmallIcon("forward"), "&KoolDock", popup);
               appMenu->exec(TQCursor::pos());
@@ -967,7 +967,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
                 winfo = item->info;
                 if ((fMinimizedOnly==0 || winfo.isMinimized()) && (fCurrent==0 || winfo.isOnDesktop(KWin::currentDesktop())))
                 {
-                  KPopupMenu *tmpMenu = new KPopupMenu;
+                  TDEPopupMenu *tmpMenu = new TDEPopupMenu;
                   createMenu(tmpMenu, &winfo);
                   connect(tmpMenu, SIGNAL(aboutToShow()), SLOT(menuShow()));
                   popups.append (tmpMenu);
@@ -980,7 +980,7 @@ void KoolDock::mPress(int mx, int my, ButtonState srcButton)
             appMenu->insertItem(i18n("Mi&nimize all"), this, SLOT(minAllApps()));
             appMenu->insertItem(i18n("Ma&ximize all"), this, SLOT(maxAllApps()));
             appMenu->insertItem(i18n("&Restore all"), this, SLOT(restAllApps()));
-            appMenu->insertItem(SmallIcon("fileclose"), i18n("&Close all"), this, SLOT(closeAllApps()));
+            appMenu->insertItem(SmallIcon("window-close"), i18n("&Close all"), this, SLOT(closeAllApps()));
           }
           else
           {
@@ -1416,7 +1416,7 @@ void KoolDock::run(const TQString& command)
 
   _filterData->setData( command.stripWhiteSpace() );
   TQStringList filters;
-  filters << "kurisearchfilter" << "kshorturifilter";
+  filters << "kurisearchfilter" << "tdeshorturifilter";
   KURIFilter::self()->filterURI( *(_filterData), filters );
 
   TQString cmd = (_filterData->uri().isLocalFile() ? _filterData->uri().path():_filterData->uri().url());
@@ -1437,7 +1437,7 @@ void KoolDock::run(const TQString& command)
       {
         if (useList)
         {
-          KApplication::startServiceByDesktopPath (command, lstDrop, &TQString(0) ,&TQCString(0) ,0 , "" ,true);
+          TDEApplication::startServiceByDesktopPath (command, lstDrop, &TQString(0) ,&TQCString(0) ,0 , "" ,true);
         }
         else
         {
@@ -2051,7 +2051,7 @@ bool KoolDock::addwTask(WId id)
 
 void KoolDock::loadConf()
 {
-  KConfig *config = KGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   
   config->setGroup("kooldock");
   fShowTaskbar = config->readNumEntry("ShowTaskbar", 0);
@@ -2205,7 +2205,7 @@ void KoolDock::loadIgnore()
 
 void KoolDock::saveConf()
 {
-  KConfig *config = KGlobal::config();
+  TDEConfig *config = TDEGlobal::config();
   
   config->setGroup("kooldock");
   config->writeEntry("ShowTaskbar", fShowTaskbar);
@@ -2464,7 +2464,7 @@ void KoolDock::loadMenu()
 
 void KoolDock::about()
 {
-  KAboutApplication about(this, 0, false);
+  TDEAboutApplication about(this, 0, false);
   about.exec();
 }
 
@@ -2914,21 +2914,21 @@ void KoolDock::addFile(const TQString& filename,
     out_s << "Type=Application" << endl;
     if(notify == true)
     {
-      out_s << "X-KDE-StartupNotify=true" << endl;
+      out_s << "X-TDE-StartupNotify=true" << endl;
     }
     else
     {
-      out_s << "X-KDE-StartupNotify=false" << endl;
+      out_s << "X-TDE-StartupNotify=false" << endl;
     }
     if(cuser==true)
     {
-      out_s << "X-KDE-SubstituteUID=true" << endl;
-      out_s << "X-KDE-Username=" << puser << endl;
+      out_s << "X-TDE-SubstituteUID=true" << endl;
+      out_s << "X-TDE-Username=" << puser << endl;
     }
     else
     {
-      out_s << "X-KDE-SubstituteUID=false" << endl;
-      out_s << "X-KDE-Username=" << endl;
+      out_s << "X-TDE-SubstituteUID=false" << endl;
+      out_s << "X-TDE-Username=" << endl;
     }
     if(terminal==true)
     {
@@ -3165,7 +3165,7 @@ void KoolDock::getTopBG()
 void KoolDock::setDesktopIconsArea(int left, int top, int width, int height)
 {
   if (fClipIcons==0) return;
-  DCOPClient* client = KApplication::dcopClient();
+  DCOPClient* client = TDEApplication::dcopClient();
   if (!client->isAttached()) {
     client->attach();
     client->registerAs("KoolDock");
@@ -3667,7 +3667,7 @@ void KoolDock::aboutToHide()
   menuCount--;
 }
 
-void KoolDock::createMenu(KPopupMenu* tmpMenu, KWin::WindowInfo * info)
+void KoolDock::createMenu(TDEPopupMenu* tmpMenu, KWin::WindowInfo * info)
 {
   TQString appTitle;
   int menustate;
@@ -3701,7 +3701,7 @@ void KoolDock::createMenu(KPopupMenu* tmpMenu, KWin::WindowInfo * info)
 
   tmpMenu->insertItem(SmallIcon("forward"), i18n("&Move to Desktop"), deskpopup);
   tmpMenu->insertSeparator();
-  tmpMenu->insertItem(SmallIcon("fileclose"), i18n("&Close"), this, SLOT(closeApp()));
+  tmpMenu->insertItem(SmallIcon("window-close"), i18n("&Close"), this, SLOT(closeApp()));
 }
 
 void KoolDock::updTaskList()