Additional kde to tde renaming

5 files changed, 24 insertions, 24 deletions

diff --git a/kicker/menuext/kdeprint/CMakeLists.txt b/kicker/menuext/kdeprint/CMakeLists.txt
index b6cc714eb..a013bcf82 100644
--- a/kicker/menuext/kdeprint/CMakeLists.txt
+++ b/kicker/menuext/kdeprint/CMakeLists.txt
@@ -24,10 +24,10 @@ link_directories(
 install( FILES printmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext )
 
 
-##### kickermenu_kdeprint (module) ##############
+##### kickermenu_tdeprint (module) ##############
 
-tde_add_kpart( kickermenu_kdeprint AUTOMOC
+tde_add_kpart( kickermenu_tdeprint AUTOMOC
   SOURCES print_mnu.cpp
-  LINK kdeprint-shared
+  LINK tdeprint-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kicker/menuext/kdeprint/Makefile.am b/kicker/menuext/kdeprint/Makefile.am
index 051c087fb..c8ad7858a 100644
--- a/kicker/menuext/kdeprint/Makefile.am
+++ b/kicker/menuext/kdeprint/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kickermenu_kdeprint.la
+kde_module_LTLIBRARIES = kickermenu_tdeprint.la
 
-kickermenu_kdeprint_la_SOURCES = print_mnu.cpp
-kickermenu_kdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kickermenu_kdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -lkdeprint
+kickermenu_tdeprint_la_SOURCES = print_mnu.cpp
+kickermenu_tdeprint_la_LDFLAGS = $(all_libraries) -module -avoid-version
+kickermenu_tdeprint_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) -ltdeprint
 
-kickermenu_kdeprint_la_METASOURCES = AUTO
+kickermenu_tdeprint_la_METASOURCES = AUTO
 
 desktopmenu_DATA = printmenu.desktop
 desktopmenudir = $(kde_datadir)/kicker/menuext
 
 messages:
-	$(XGETTEXT) *.cpp -o $(podir)/libkickermenu_kdeprint.pot
+	$(XGETTEXT) *.cpp -o $(podir)/libkickermenu_tdeprint.pot
diff --git a/kicker/menuext/kdeprint/print_mnu.cpp b/kicker/menuext/kdeprint/print_mnu.cpp
index eb2dbd8ab..dee220d80 100644
--- a/kicker/menuext/kdeprint/print_mnu.cpp
+++ b/kicker/menuext/kdeprint/print_mnu.cpp
@@ -27,10 +27,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobal.h>
 #include <kapplication.h>
 #include <krun.h>
-#include <kdeprint/kmmanager.h>
+#include <tdeprint/kmmanager.h>
 #include <tqregexp.h>
 
-K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu)
+K_EXPORT_KICKER_MENUEXT(tdeprint, PrintMenu)
 
 #define ADD_PRINTER_ID		0
 #define KDEPRINT_SETTINGS_ID	1
@@ -43,10 +43,10 @@ K_EXPORT_KICKER_MENUEXT(kdeprint, PrintMenu)
 PrintMenu::PrintMenu(TQWidget *parent, const char *name, const TQStringList & /*args*/)
 : KPanelMenu("", parent, name)
 {
-    static bool kdeprintIconsInitialized = false;
-    if ( !kdeprintIconsInitialized ) {
-        KGlobal::iconLoader()->addAppDir("kdeprint");
-        kdeprintIconsInitialized = true;
+    static bool tdeprintIconsInitialized = false;
+    if ( !tdeprintIconsInitialized ) {
+        KGlobal::iconLoader()->addAppDir("tdeprint");
+        tdeprintIconsInitialized = true;
     }
 }
 
@@ -65,9 +65,9 @@ void PrintMenu::initialize()
 
     if ((KMManager::self()->printerOperationMask() & KMManager::PrinterCreation) && KMManager::self()->hasManagement())
         insertItem(SmallIconSet("wizard"), i18n("Add Printer..."), ADD_PRINTER_ID);
-    insertItem(SmallIconSet("kdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID);
+    insertItem(SmallIconSet("tdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID);
     if (KMManager::self()->serverOperationMask() & KMManager::ServerConfigure)
-        insertItem(SmallIconSet("kdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID);
+        insertItem(SmallIconSet("tdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID);
     insertSeparator();
     insertItem(SmallIconSet("kcontrol"), i18n("Print Manager"), PRINT_MANAGER_ID);
     insertItem(SmallIconSet("konqueror"), i18n("Print Browser (Konqueror)"), PRINT_BROWSER_ID);
@@ -103,13 +103,13 @@ void PrintMenu::slotExec(int ID)
     switch (ID)
     {
         case ADD_PRINTER_ID:
-            kapp->kdeinitExec("kaddprinterwizard");
+            kapp->tdeinitExec("kaddprinterwizard");
             break;
         case KDEPRINT_SETTINGS_ID:
-	    kapp->kdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig"));
+	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig"));
             break;
 	case CONFIG_SERVER_ID:
-	    kapp->kdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
+	    kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
 	    break;
         case PRINT_MANAGER_ID:
             KRun::runCommand("kcmshell kde-printers.desktop");
@@ -118,14 +118,14 @@ void PrintMenu::slotExec(int ID)
             KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");
             break;
 	case KPRINTER_ID:
-	    kapp->kdeinitExec("kprinter");
+	    kapp->tdeinitExec("kprinter");
 	    break;
         default:
             {
                 // start kjobviewer
                 TQStringList args;
                 args << "--show" << "-d" << text(ID).remove('&');
-                kapp->kdeinitExec("kjobviewer", args);
+                kapp->tdeinitExec("kjobviewer", args);
             }
             break;
     }
diff --git a/kicker/menuext/kdeprint/print_mnu.h b/kicker/menuext/kdeprint/print_mnu.h
index da795c039..47c9e609e 100644
--- a/kicker/menuext/kdeprint/print_mnu.h
+++ b/kicker/menuext/kdeprint/print_mnu.h
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define _print_mnu_h_
 
 #include <kpanelmenu.h>
-#include <kdeprint/kpreloadobject.h>
+#include <tdeprint/kpreloadobject.h>
 
 class PrintMenu : public KPanelMenu, public KPReloadObject
 {
diff --git a/kicker/menuext/kdeprint/printmenu.desktop b/kicker/menuext/kdeprint/printmenu.desktop
index 2bc90f1b8..447d62c8f 100644
--- a/kicker/menuext/kdeprint/printmenu.desktop
+++ b/kicker/menuext/kdeprint/printmenu.desktop
@@ -141,4 +141,4 @@ Comment[zh_CN]=打印系统菜单
 Comment[zh_TW]=用於列印系統的選單
 Icon=fileprint
 
-X-KDE-Library=kickermenu_kdeprint
+X-KDE-Library=kickermenu_tdeprint