summaryrefslogtreecommitdiffstats
path: root/kicker/menuext
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/menuext')
-rw-r--r--kicker/menuext/CMakeLists.txt2
-rw-r--r--kicker/menuext/Makefile.am2
-rw-r--r--kicker/menuext/find/CMakeLists.txt2
-rw-r--r--kicker/menuext/kate/CMakeLists.txt2
-rw-r--r--kicker/menuext/kate/katesessionmenu.cpp2
-rw-r--r--kicker/menuext/kdeprint/CMakeLists.txt6
-rw-r--r--kicker/menuext/kdeprint/Makefile.am12
-rw-r--r--kicker/menuext/kdeprint/print_mnu.cpp26
-rw-r--r--kicker/menuext/kdeprint/print_mnu.h2
-rw-r--r--kicker/menuext/kdeprint/printmenu.desktop2
-rw-r--r--kicker/menuext/konq-profiles/konqy_menu.cpp10
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp8
-rw-r--r--kicker/menuext/prefmenu/CMakeLists.txt2
-rw-r--r--kicker/menuext/remote/CMakeLists.txt2
14 files changed, 40 insertions, 40 deletions
diff --git a/kicker/menuext/CMakeLists.txt b/kicker/menuext/CMakeLists.txt
index 2d214e656..ca6eb3766 100644
--- a/kicker/menuext/CMakeLists.txt
+++ b/kicker/menuext/CMakeLists.txt
@@ -10,7 +10,7 @@
#################################################
add_subdirectory( find )
-add_subdirectory( kdeprint )
+add_subdirectory( tdeprint )
add_subdirectory( prefmenu )
add_subdirectory( recentdocs )
add_subdirectory( konsole )
diff --git a/kicker/menuext/Makefile.am b/kicker/menuext/Makefile.am
index 6d672d29a..31254dff7 100644
--- a/kicker/menuext/Makefile.am
+++ b/kicker/menuext/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = find kdeprint prefmenu recentdocs konsole konq-profiles remote system kate
+SUBDIRS = find tdeprint prefmenu recentdocs konsole konq-profiles remote system kate
diff --git a/kicker/menuext/find/CMakeLists.txt b/kicker/menuext/find/CMakeLists.txt
index 5769dfc09..d4cf03be0 100644
--- a/kicker/menuext/find/CMakeLists.txt
+++ b/kicker/menuext/find/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES kfind.desktop websearch.desktop DESTINATION ${DATA_INSTALL_DIR}/k
tde_add_kpart( kickermenu_find AUTOMOC
SOURCES findmenu.cpp
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kicker/menuext/kate/CMakeLists.txt b/kicker/menuext/kate/CMakeLists.txt
index fee34696e..4afbc89c8 100644
--- a/kicker/menuext/kate/CMakeLists.txt
+++ b/kicker/menuext/kate/CMakeLists.txt
@@ -28,6 +28,6 @@ install( FILES katesessionmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/me
tde_add_kpart( kickermenu_kate AUTOMOC
SOURCES katesessionmenu.cpp
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp
index 7326d8fb0..9b237a703 100644
--- a/kicker/menuext/kate/katesessionmenu.cpp
+++ b/kicker/menuext/kate/katesessionmenu.cpp
@@ -143,7 +143,7 @@ void KateSessionMenu::slotExec( int id )
else if ( id > 2 )
args << m_sessions[ id-3 ];
- kapp->kdeinitExec("kate", args);
+ kapp->tdeinitExec("kate", args);
}
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
diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp
index 4010bace7..cb340caf9 100644
--- a/kicker/menuext/konq-profiles/konqy_menu.cpp
+++ b/kicker/menuext/konq-profiles/konqy_menu.cpp
@@ -39,10 +39,10 @@ K_EXPORT_KICKER_MENUEXT(konqueror, KonquerorProfilesMenu)
KonquerorProfilesMenu::KonquerorProfilesMenu(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;
}
}
@@ -83,7 +83,7 @@ void KonquerorProfilesMenu::slotExec(int id)
{
TQStringList args;
args<<"--profile"<<m_profiles[id-1];
- kapp->kdeinitExec("konqueror", args);
+ kapp->tdeinitExec("konqueror", args);
}
void KonquerorProfilesMenu::reload()
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index be060b75c..e9f1cede1 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -258,7 +258,7 @@ void KonsoleMenu::slotExec(int id)
args << "-r";
args << screenList[id - sessionList.count()];
}
- KApplication::kdeinitExec("konsole", args);
+ KApplication::tdeinitExec("konsole", args);
return;
}
@@ -273,7 +273,7 @@ void KonsoleMenu::launchProfile(int id)
// this is a session, not a bookmark, so execute that instead
TQStringList args;
args << "--profile" << m_profiles[id];
- kapp->kdeinitExec("konsole", args);
+ kapp->tdeinitExec("konsole", args);
}
KURL KonsoleMenu::baseURL() const
@@ -292,7 +292,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
{
args << "-T" << title;
args << "--workdir" << url.path();
- KApplication::kdeinitExec("konsole", args);
+ KApplication::tdeinitExec("konsole", args);
return;
}
else if ((!url.protocol().isEmpty()) && (url.hasHost()))
@@ -305,7 +305,7 @@ void KonsoleMenu::newSession(const TQString& sURL, const TQString& title)
args << "-l" << url.user().latin1();
}
args << host.latin1();
- KApplication::kdeinitExec("konsole", args);
+ KApplication::tdeinitExec("konsole", args);
return;
}
/*
diff --git a/kicker/menuext/prefmenu/CMakeLists.txt b/kicker/menuext/prefmenu/CMakeLists.txt
index 24b947d54..448e03d74 100644
--- a/kicker/menuext/prefmenu/CMakeLists.txt
+++ b/kicker/menuext/prefmenu/CMakeLists.txt
@@ -30,6 +30,6 @@ install( FILES prefmenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext )
tde_add_kpart( kickermenu_prefmenu AUTOMOC
SOURCES prefmenu.cpp
- LINK kickermain-shared kdeui-shared
+ LINK kickermain-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kicker/menuext/remote/CMakeLists.txt b/kicker/menuext/remote/CMakeLists.txt
index eae12847b..247b5f01d 100644
--- a/kicker/menuext/remote/CMakeLists.txt
+++ b/kicker/menuext/remote/CMakeLists.txt
@@ -29,6 +29,6 @@ install( FILES remotemenu.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/menuext
tde_add_kpart( kickermenu_remotemenu AUTOMOC
SOURCES remotemenu.cpp remotemenu.skel
- LINK kickermain-shared kdeui-shared
+ LINK kickermain-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-13 04:40:19 +0000