diff options
Diffstat (limited to 'kicker/menuext')
-rw-r--r-- | kicker/menuext/find/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/kate/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/konq-profiles/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/konsole/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/prefmenu/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/recentdocs/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/remote/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/system/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/tdeprint/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/menuext/tdeprint/print_mnu.cpp | 6 | ||||
-rw-r--r-- | kicker/menuext/tom/Makefile.am | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/kicker/menuext/find/Makefile.am b/kicker/menuext/find/Makefile.am index 223781dcf..70905862a 100644 --- a/kicker/menuext/find/Makefile.am +++ b/kicker/menuext/find/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_find.la kickermenu_find_la_SOURCES = findmenu.cpp kickermenu_find_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_find_la_LIBADD = $(LIB_KDEUI) +kickermenu_find_la_LIBADD = $(LIB_TDEUI) kickermenu_find_la_METASOURCES = AUTO diff --git a/kicker/menuext/kate/Makefile.am b/kicker/menuext/kate/Makefile.am index bc629e0f9..aebea34a3 100644 --- a/kicker/menuext/kate/Makefile.am +++ b/kicker/menuext/kate/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_kate.la kickermenu_kate_la_SOURCES = katesessionmenu.cpp kickermenu_kate_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_kate_la_LIBADD = $(LIB_KDEUI) +kickermenu_kate_la_LIBADD = $(LIB_TDEUI) kickermenu_kate_la_METASOURCES = AUTO diff --git a/kicker/menuext/konq-profiles/Makefile.am b/kicker/menuext/konq-profiles/Makefile.am index 07df8f9ab..a5b95da38 100644 --- a/kicker/menuext/konq-profiles/Makefile.am +++ b/kicker/menuext/konq-profiles/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konqueror.la kickermenu_konqueror_la_SOURCES = konqy_menu.cpp kickermenu_konqueror_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_konqueror_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kickermenu_konqueror_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) kickermenu_konqueror_la_METASOURCES = AUTO diff --git a/kicker/menuext/konsole/Makefile.am b/kicker/menuext/konsole/Makefile.am index 907e79769..5abdf5a24 100644 --- a/kicker/menuext/konsole/Makefile.am +++ b/kicker/menuext/konsole/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_konsole.la kickermenu_konsole_la_SOURCES = konsole_mnu.cpp konsolebookmarkhandler.cpp konsolebookmarkmenu.cpp kickermenu_konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_konsole_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kickermenu_konsole_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) kickermenu_konsole_la_METASOURCES = AUTO diff --git a/kicker/menuext/prefmenu/Makefile.am b/kicker/menuext/prefmenu/Makefile.am index 2ccbb4ba2..e11ad0cdd 100644 --- a/kicker/menuext/prefmenu/Makefile.am +++ b/kicker/menuext/prefmenu/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_prefmenu.la kickermenu_prefmenu_la_SOURCES = prefmenu.cpp kickermenu_prefmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_prefmenu_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la +kickermenu_prefmenu_la_LIBADD = $(LIB_TDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la kickermenu_prefmenu_la_METASOURCES = AUTO diff --git a/kicker/menuext/recentdocs/Makefile.am b/kicker/menuext/recentdocs/Makefile.am index 38f95814b..7bd91542a 100644 --- a/kicker/menuext/recentdocs/Makefile.am +++ b/kicker/menuext/recentdocs/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_recentdocs.la kickermenu_recentdocs_la_SOURCES = recentdocsmenu.cpp kickermenu_recentdocs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kickermenu_recentdocs_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +kickermenu_recentdocs_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) kickermenu_recentdocs_la_METASOURCES = AUTO diff --git a/kicker/menuext/remote/Makefile.am b/kicker/menuext/remote/Makefile.am index 85736d0a2..bfe778eca 100644 --- a/kicker/menuext/remote/Makefile.am +++ b/kicker/menuext/remote/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_remotemenu.la kickermenu_remotemenu_la_SOURCES = remotemenu.cpp remotemenu.skel kickermenu_remotemenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_remotemenu_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la +kickermenu_remotemenu_la_LIBADD = $(LIB_TDEUI) $(top_builddir)/kicker/libkicker/libkickermain.la kickermenu_remotemenu_la_METASOURCES = AUTO diff --git a/kicker/menuext/system/Makefile.am b/kicker/menuext/system/Makefile.am index aa5d3d33f..a629970b6 100644 --- a/kicker/menuext/system/Makefile.am +++ b/kicker/menuext/system/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_systemmenu.la kickermenu_systemmenu_la_SOURCES = systemmenu.cpp kickermenu_systemmenu_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kickermenu_systemmenu_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kicker/libkicker/libkickermain.la +kickermenu_systemmenu_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kicker/libkicker/libkickermain.la kickermenu_systemmenu_la_METASOURCES = AUTO diff --git a/kicker/menuext/tdeprint/Makefile.am b/kicker/menuext/tdeprint/Makefile.am index c8ad7858a..cd1032016 100644 --- a/kicker/menuext/tdeprint/Makefile.am +++ b/kicker/menuext/tdeprint/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_tdeprint.la 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_tdeprint_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) -ltdeprint kickermenu_tdeprint_la_METASOURCES = AUTO diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index dee220d80..8fd1c1c7f 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/kicker/menuext/tdeprint/print_mnu.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. K_EXPORT_KICKER_MENUEXT(tdeprint, PrintMenu) #define ADD_PRINTER_ID 0 -#define KDEPRINT_SETTINGS_ID 1 +#define TDEPRINT_SETTINGS_ID 1 #define CONFIG_SERVER_ID 2 #define PRINT_MANAGER_ID 3 #define PRINT_BROWSER_ID 4 @@ -65,7 +65,7 @@ void PrintMenu::initialize() if ((KMManager::self()->printerOperationMask() & KMManager::PrinterCreation) && KMManager::self()->hasManagement()) insertItem(SmallIconSet("wizard"), i18n("Add Printer..."), ADD_PRINTER_ID); - insertItem(SmallIconSet("tdeprint_configmgr"), i18n("KDE Print Settings"), KDEPRINT_SETTINGS_ID); + insertItem(SmallIconSet("tdeprint_configmgr"), i18n("KDE Print Settings"), TDEPRINT_SETTINGS_ID); if (KMManager::self()->serverOperationMask() & KMManager::ServerConfigure) insertItem(SmallIconSet("tdeprint_configsrv"), i18n("Configure Server"), CONFIG_SERVER_ID); insertSeparator(); @@ -105,7 +105,7 @@ void PrintMenu::slotExec(int ID) case ADD_PRINTER_ID: kapp->tdeinitExec("kaddprinterwizard"); break; - case KDEPRINT_SETTINGS_ID: + case TDEPRINT_SETTINGS_ID: kapp->tdeinitExec("kaddprinterwizard", TQStringList("--kdeconfig")); break; case CONFIG_SERVER_ID: diff --git a/kicker/menuext/tom/Makefile.am b/kicker/menuext/tom/Makefile.am index 4947ef77b..0f9f7c081 100644 --- a/kicker/menuext/tom/Makefile.am +++ b/kicker/menuext/tom/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kickermenu_tom.la kickermenu_tom_la_SOURCES = tom.cc kickermenu_tom_la_LDFLAGS = $(all_libraries) -module -avoid-version -kickermenu_tom_la_LIBADD = $(LIB_KDEUI) +kickermenu_tom_la_LIBADD = $(LIB_TDEUI) #$(top_builddir)/kicker/ui/libkicker_ui.la kickermenu_tom_la_METASOURCES = AUTO |