diff options
Diffstat (limited to 'kicker')
32 files changed, 38 insertions, 38 deletions
diff --git a/kicker/applets/clock/Makefile.am b/kicker/applets/clock/Makefile.am index aab460112..15bde61cf 100644 --- a/kicker/applets/clock/Makefile.am +++ b/kicker/applets/clock/Makefile.am @@ -16,7 +16,7 @@ lnk_DATA = clockapplet.desktop EXTRA_DIST = $(lnk_DATA) $(pic_DATA) clock_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) +clock_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) srcdoc: kdoc -a -p -H -d $$HOME/web/src/clockapplet clockapplet *.h -lqt -ltdecore -ltdeui -lkfile diff --git a/kicker/applets/launcher/Makefile.am b/kicker/applets/launcher/Makefile.am index cc06542b5..a0384df4f 100644 --- a/kicker/applets/launcher/Makefile.am +++ b/kicker/applets/launcher/Makefile.am @@ -16,7 +16,7 @@ EXTRA_DIST = $(lnk_DATA) launcher_panelapplet_la_LDFLAGS = -module $(KDE_RPATH) $(all_libraries) -avoid-version -no-undefined launcher_panelapplet_la_LIBADD = ../../kicker/core/libkicker_core.la ../../kicker/buttons/libkicker_buttons.la \ ../../kicker/ui/libkicker_ui.la ../../libkicker/libkickermain.la $(LIB_KIO) \ - $(LIB_KSYCOCA) $(LIB_KDEUI) $(LIB_KUTILS) + $(LIB_KSYCOCA) $(LIB_TDEUI) $(LIB_KUTILS) kde_kcfg_DATA = launcherapplet.kcfg diff --git a/kicker/applets/media/Makefile.am b/kicker/applets/media/Makefile.am index 0b971aef2..f7d5dbee4 100644 --- a/kicker/applets/media/Makefile.am +++ b/kicker/applets/media/Makefile.am @@ -13,7 +13,7 @@ lnk_DATA = mediaapplet.desktop EXTRA_DIST = $(lnk_DATA) media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) +media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/mediaapplet.pot diff --git a/kicker/applets/menu/Makefile.am b/kicker/applets/menu/Makefile.am index 5bfaeee18..933fc4010 100644 --- a/kicker/applets/menu/Makefile.am +++ b/kicker/applets/menu/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = menuapplet.desktop EXTRA_DIST = $(lnk_DATA) menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -menu_panelapplet_la_LIBADD = $(LIB_KDEUI) +menu_panelapplet_la_LIBADD = $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot diff --git a/kicker/applets/minipager/Makefile.am b/kicker/applets/minipager/Makefile.am index d84f1993c..9320c30f5 100644 --- a/kicker/applets/minipager/Makefile.am +++ b/kicker/applets/minipager/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = minipagerapplet.desktop EXTRA_DIST = $(lnk_DATA) minipager_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -minipager_panelapplet_la_LIBADD = $(LIB_KDEUI) \ +minipager_panelapplet_la_LIBADD = $(LIB_TDEUI) \ ../../taskmanager/libtaskmanager.la \ ../../libkicker/libkickermain.la diff --git a/kicker/applets/naughty/Makefile.am b/kicker/applets/naughty/Makefile.am index 533df19c3..d3f87ca2f 100644 --- a/kicker/applets/naughty/Makefile.am +++ b/kicker/applets/naughty/Makefile.am @@ -23,7 +23,7 @@ lnk_DATA = naughtyapplet.desktop EXTRA_DIST = $(lnk_DATA) naughty_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -naughty_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KVM) +naughty_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KVM) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/naughtyapplet.pot diff --git a/kicker/applets/run/Makefile.am b/kicker/applets/run/Makefile.am index ec4de4984..a14c2353a 100644 --- a/kicker/applets/run/Makefile.am +++ b/kicker/applets/run/Makefile.am @@ -13,7 +13,7 @@ lnk_DATA = runapplet.desktop EXTRA_DIST = $(lnk_DATA) run_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +run_panelapplet_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) messages: $(XGETTEXT) *.cpp *.h -o $(podir)/krunapplet.pot diff --git a/kicker/applets/swallow/Makefile.am b/kicker/applets/swallow/Makefile.am index 1b88a0c10..78d70c2d3 100644 --- a/kicker/applets/swallow/Makefile.am +++ b/kicker/applets/swallow/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = swallow_panelapplet.la swallow_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -swallow_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) +swallow_panelapplet_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) swallow_panelapplet_la_SOURCES = swallow.cpp prefwidgetbase.ui prefwidget.cpp diff --git a/kicker/applets/systemtray/Makefile.am b/kicker/applets/systemtray/Makefile.am index 33a0be11c..2749c7391 100644 --- a/kicker/applets/systemtray/Makefile.am +++ b/kicker/applets/systemtray/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = systemtrayapplet.desktop EXTRA_DIST = $(lnk_DATA) systemtray_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_KDEUI) $(LIB_KIO) +systemtray_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la $(LIB_TDEUI) $(LIB_KIO) messages: diff --git a/kicker/applets/taskbar/Makefile.am b/kicker/applets/taskbar/Makefile.am index 700cf27d8..9f6914f8e 100644 --- a/kicker/applets/taskbar/Makefile.am +++ b/kicker/applets/taskbar/Makefile.am @@ -6,7 +6,7 @@ taskbar_panelapplet_la_SOURCES = taskbarapplet.cpp taskbar_panelapplet_la_METASOURCES = AUTO taskbar_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -taskbar_panelapplet_la_LIBADD = $(LIB_KDEUI) ../../taskbar/libtaskbar.la ../../libkicker/libkickermain.la +taskbar_panelapplet_la_LIBADD = $(LIB_TDEUI) ../../taskbar/libtaskbar.la ../../libkicker/libkickermain.la noinst_HEADERS = taskbarapplet.h diff --git a/kicker/applets/trash/Makefile.am b/kicker/applets/trash/Makefile.am index a34f87d1c..2da7fec68 100644 --- a/kicker/applets/trash/Makefile.am +++ b/kicker/applets/trash/Makefile.am @@ -14,7 +14,7 @@ lnk_DATA = trashapplet.desktop EXTRA_DIST = $(lnk_DATA) trash_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_KDEUI) $(LIB_KIO) $(LIB_KUTILS) +trash_panelapplet_la_LIBADD = ../../libkicker/libkickermain.la ../../../libkonq/libkonq.la $(LIB_TDEUI) $(LIB_KIO) $(LIB_KUTILS) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/trashapplet.pot diff --git a/kicker/extensions/dockbar/Makefile.am b/kicker/extensions/dockbar/Makefile.am index 6d2f20546..a2c294862 100644 --- a/kicker/extensions/dockbar/Makefile.am +++ b/kicker/extensions/dockbar/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = dockbar_panelextension.la dockbar_panelextension_la_SOURCES = dockcontainer.cpp dockbarextension.cpp dockbar_panelextension_la_METASOURCES = AUTO dockbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -dockbar_panelextension_la_LIBADD = $(LIB_KDEUI) +dockbar_panelextension_la_LIBADD = $(LIB_TDEUI) noinst_HEADERS = dockcontainer.h dockbarextension.h diff --git a/kicker/extensions/kasbar/Makefile.am b/kicker/extensions/kasbar/Makefile.am index 2209e3335..314f71ff1 100644 --- a/kicker/extensions/kasbar/Makefile.am +++ b/kicker/extensions/kasbar/Makefile.am @@ -14,7 +14,7 @@ libkasbar_la_SOURCES = kasbar.cpp kasitem.cpp \ kasloaditem.cpp libkasbar_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libkasbar_la_LIBADD = $(LIB_KDEUI) ../../taskmanager/libtaskmanager.la +libkasbar_la_LIBADD = $(LIB_TDEUI) ../../taskmanager/libtaskmanager.la # # Panel Extension @@ -37,9 +37,9 @@ EXTRA_DIST = $(lnk_DATA) bin_PROGRAMS = kasbar kasbar_SOURCES = kasbarapp.cpp -kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kasbar_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kasbar_LDADD = libkasbar.la \ - $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) + $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) messages: diff --git a/kicker/extensions/sidebar/Makefile.am b/kicker/extensions/sidebar/Makefile.am index 18f0cfbc0..0da0a7052 100644 --- a/kicker/extensions/sidebar/Makefile.am +++ b/kicker/extensions/sidebar/Makefile.am @@ -6,7 +6,7 @@ sidebar_panelextension_la_SOURCES = sidebarextension.cpp sidebar_panelextension_la_METASOURCES = AUTO sidebar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -sidebar_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KPARTS) ../../../libkonq/libkonq.la +sidebar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) ../../../libkonq/libkonq.la lnkdir = $(kde_datadir)/kicker/extensions diff --git a/kicker/extensions/taskbar/Makefile.am b/kicker/extensions/taskbar/Makefile.am index 4dfa1b929..d4752e321 100644 --- a/kicker/extensions/taskbar/Makefile.am +++ b/kicker/extensions/taskbar/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = taskbar_panelextension.la taskbar_panelextension_la_SOURCES = taskbarextension.cpp taskbarextension.skel taskbar_panelextension_la_METASOURCES = AUTO taskbar_panelextension_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -taskbar_panelextension_la_LIBADD = $(LIB_KDEUI) $(LIB_KPARTS) \ +taskbar_panelextension_la_LIBADD = $(LIB_TDEUI) $(LIB_KPARTS) \ ../../libkicker/libkickermain.la \ ../../taskmanager/libtaskmanager.la \ ../../taskbar/libtaskbar.la diff --git a/kicker/kicker/Makefile.am b/kicker/kicker/Makefile.am index b1a037275..cf22b5c70 100644 --- a/kicker/kicker/Makefile.am +++ b/kicker/kicker/Makefile.am @@ -32,7 +32,7 @@ kconf_PROGRAMS = kicker-3.4-reverseLayout kconfdir = $(libdir)/kconf_update_bin kicker_3_4_reverseLayout_SOURCES = kicker-3.4-reverseLayout.cpp -kicker_3_4_reverseLayout_LDADD = $(LIB_QT) $(LIB_KDECORE) +kicker_3_4_reverseLayout_LDADD = $(LIB_QT) $(LIB_TDECORE) kicker_3_4_reverseLayout_LDFLAGS = $(all_libraries) updatedir = $(kde_datadir)/kconf_update diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am index 1ec3d42d6..4dcbbb165 100644 --- a/kicker/kicker/buttons/Makefile.am +++ b/kicker/kicker/buttons/Makefile.am @@ -10,7 +10,7 @@ libkicker_buttons_la_SOURCES = servicebutton.cpp bookmarksbutton.cpp \ windowlistbutton.cpp libkicker_buttons_la_LDFLAGS = $(all_libraries) -libkicker_buttons_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) $(XTESTLIB) +libkicker_buttons_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_TDEUI) $(XTESTLIB) libkicker_buttons_la_METASOURCES = AUTO desktopmenu_DATA = bookmarks.desktop browser.desktop desktop.desktop \ diff --git a/kicker/kicker/core/Makefile.am b/kicker/kicker/core/Makefile.am index 25e7e733a..6532157ec 100644 --- a/kicker/kicker/core/Makefile.am +++ b/kicker/kicker/core/Makefile.am @@ -17,7 +17,7 @@ libkicker_core_la_SOURCES = extensionSettings.kcfgc \ libkicker_core_la_LDFLAGS = $(all_libraries) -libkicker_core_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_KDEUI) +libkicker_core_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(LIB_TDEUI) libkicker_core_la_METASOURCES = AUTO libkicker_core_la_COMPILE_FIRST = ../../libkicker/kickerSettings.h 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 diff --git a/kicker/proxy/Makefile.am b/kicker/proxy/Makefile.am index 698a663c1..4a7cf1e4c 100644 --- a/kicker/proxy/Makefile.am +++ b/kicker/proxy/Makefile.am @@ -7,17 +7,17 @@ tdeinit_LTLIBRARIES = appletproxy.la extensionproxy.la METASOURCES = AUTO -appletproxy_la_LIBADD = $(LIB_KDEUI) ../libkicker/libkickermain.la +appletproxy_la_LIBADD = $(LIB_TDEUI) ../libkicker/libkickermain.la appletproxy_la_SOURCES = appletproxy.cpp appletproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -extensionproxy_la_LIBADD = $(LIB_KDEUI) ../libkicker/libkickermain.la +extensionproxy_la_LIBADD = $(LIB_TDEUI) ../libkicker/libkickermain.la extensionproxy_la_SOURCES = extensionproxy.cpp extensionproxy_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version extensiondebugger_SOURCES = extensiondebugger.cpp extensiondebugger_LDADD = ../libkicker/libkickermain.la -extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +extensiondebugger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) appletproxy.cpp -o $(podir)/appletproxy.pot diff --git a/kicker/taskbar/Makefile.am b/kicker/taskbar/Makefile.am index 01b3af162..6cf4b9e9c 100644 --- a/kicker/taskbar/Makefile.am +++ b/kicker/taskbar/Makefile.am @@ -9,7 +9,7 @@ libtaskbar_la_SOURCES = taskbarsettings.kcfgc taskcontainer.cpp taskbar.cpp \ libtaskbar_la_METASOURCES = AUTO libtaskbar_la_LDFLAGS = -version-info 3:0:2 $(all_libraries) -no-undefined -libtaskbar_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la +libtaskbar_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) ../libkicker/libkickermain.la ../taskmanager/libtaskmanager.la messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/libtaskbar.pot diff --git a/kicker/taskmanager/Makefile.am b/kicker/taskmanager/Makefile.am index ffe7912e7..d7a508412 100644 --- a/kicker/taskmanager/Makefile.am +++ b/kicker/taskmanager/Makefile.am @@ -5,7 +5,7 @@ libtaskmanager_la_SOURCES = tasklmbmenu.cpp taskrmbmenu.cpp taskmanager.cpp libtaskmanager_la_METASOURCES = AUTO libtaskmanager_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libtaskmanager_la_LIBADD = $(LIB_KDECORE) $(LIB_XFIXES) $(LIB_XRENDER) $(LIB_XCOMPOSITE) ../libkicker/libkickermain.la +libtaskmanager_la_LIBADD = $(LIB_TDECORE) $(LIB_XFIXES) $(LIB_XRENDER) $(LIB_XCOMPOSITE) ../libkicker/libkickermain.la messages: $(XGETTEXT) *.cpp *.h -o $(podir)/libtaskmanager.pot |