diff options
Diffstat (limited to 'kcontrol')
26 files changed, 28 insertions, 28 deletions
diff --git a/kcontrol/access/Makefile.am b/kcontrol/access/Makefile.am index dcbfab2eb..6ea38b8b9 100644 --- a/kcontrol/access/Makefile.am +++ b/kcontrol/access/Makefile.am @@ -9,7 +9,7 @@ tdeinit_LTLIBRARIES = kaccess.la kaccess_la_SOURCES = kaccess.cpp main.cpp kaccess_la_LDFLAGS = $(all_libraries) -module -avoid-version -kaccess_la_LIBADD = $(LIB_KDEUI) +kaccess_la_LIBADD = $(LIB_TDEUI) kcm_access_la_SOURCES = kcmaccess.cpp kcm_access_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 6f6ef1343..9c9971a69 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -32,7 +32,7 @@ /* * QLabel */ -class KDEUI_EXPORT KRichTextLabel : public TQLabel { +class TDEUI_EXPORT KRichTextLabel : public TQLabel { Q_OBJECT public: diff --git a/kcontrol/colors/Makefile.am b/kcontrol/colors/Makefile.am index 87f4048ef..c5d813d65 100644 --- a/kcontrol/colors/Makefile.am +++ b/kcontrol/colors/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_colors.la kcm_colors_la_SOURCES = colorscm.cpp widgetcanvas.cpp kcm_colors_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version $(all_libraries) -no-undefined -kcm_colors_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la +kcm_colors_la_LIBADD = $(LIB_TDEUI) $(LIB_KIO) $(top_builddir)/kcontrol/krdb/libkrdb.la METASOURCES = colorscm.moc widgetcanvas.moc noinst_HEADERS = colorscm.h widgetcanvas.h diff --git a/kcontrol/dnssd/Makefile.am b/kcontrol/dnssd/Makefile.am index 892244300..ef6292a94 100644 --- a/kcontrol/dnssd/Makefile.am +++ b/kcontrol/dnssd/Makefile.am @@ -5,7 +5,7 @@ kcm_kdnssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h xdg_apps_DATA = kcm_kdnssd.desktop -kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_KDEUI) +kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI) messages: rc.cpp $(EXTRACTRC) *.ui *.rc >> rc.cpp diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 3b3f85f96..4c0689f81 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -62,7 +62,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) setQuickHelp(i18n("Setup services browsing with ZeroConf")); if (geteuid()!=0) tabs->removePage(tab_2); // normal user cannot change wide-area settings // show only global things in 'administrator mode' to prevent confusion - else if (getenv("KDESU_USER")!=0) tabs->removePage(tab); + else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" )); diff --git a/kcontrol/ebrowsing/plugins/ikws/Makefile.am b/kcontrol/ebrowsing/plugins/ikws/Makefile.am index 9fbde1ecb..ac7c4b7ef 100644 --- a/kcontrol/ebrowsing/plugins/ikws/Makefile.am +++ b/kcontrol/ebrowsing/plugins/ikws/Makefile.am @@ -9,10 +9,10 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libkuriikwsfilter.la libkurisearchfilter.la libkuriikwsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +libkuriikwsfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) libkurisearchfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +libkurisearchfilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) libkuriikwsfilter_la_SOURCES = kuriikwsfiltereng.cpp kuriikwsfilter.skel \ kuriikwsfilter.cpp searchprovider.cpp diff --git a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am index cb524dd4b..164a9ce35 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/Makefile.am +++ b/kcontrol/ebrowsing/plugins/localdomain/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = liblocaldomainurifilter.la liblocaldomainurifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) +liblocaldomainurifilter_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) liblocaldomainurifilter_la_SOURCES = localdomainurifilter.cpp localdomainurifilter.skel diff --git a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am index 134881987..8eb895dee 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/Makefile.am +++ b/kcontrol/ebrowsing/plugins/shorturi/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(all_includes) -DQT_NO_CAST_ASCII kde_module_LTLIBRARIES = libkshorturifilter.la libkshorturifilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI) +libkshorturifilter_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEUI) libkshorturifilter_la_SOURCES = kshorturifilter.cpp kshorturifilter.skel diff --git a/kcontrol/energy/Makefile.am b/kcontrol/energy/Makefile.am index ea6578582..e7a9b24b9 100644 --- a/kcontrol/energy/Makefile.am +++ b/kcontrol/energy/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_energy.la kcm_energy_la_SOURCES = energy.cpp kcm_energy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_KDEUI) $(LIB_KIO) +kcm_energy_la_LIBADD = $(DPMSLIB) $(LIB_TDEUI) $(LIB_KIO) METASOURCES = energy.moc noinst_HEADERS = energy.h diff --git a/kcontrol/filetypes/Makefile.am b/kcontrol/filetypes/Makefile.am index 4f25b9def..21752d05c 100644 --- a/kcontrol/filetypes/Makefile.am +++ b/kcontrol/filetypes/Makefile.am @@ -21,7 +21,7 @@ libfiletypes_la_SOURCES = filetypesview.cpp filetypedetails.cpp filegroupdetails keditfiletype_SOURCES = keditfiletype.cpp keditfiletype_LDADD = libfiletypes.la $(LIB_KIO) -keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +keditfiletype_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor messages: $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot diff --git a/kcontrol/fonts/Makefile.am b/kcontrol/fonts/Makefile.am index 5fe7aa2cf..de96e0721 100644 --- a/kcontrol/fonts/Makefile.am +++ b/kcontrol/fonts/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = kcm_fonts.la kcm_fonts_la_SOURCES = fonts.cpp kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(FREETYPE2_LDFLAGS) -module -avoid-version $(all_libraries) -no-undefined -kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS) +kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_TDEUI) $(LIBFONTCONFIG_LIBS) METASOURCES = AUTO noinst_HEADERS = fonts.h kxftconfig.h diff --git a/kcontrol/icons/Makefile.am b/kcontrol/icons/Makefile.am index 4e00a730c..6de8b72cf 100644 --- a/kcontrol/icons/Makefile.am +++ b/kcontrol/icons/Makefile.am @@ -13,7 +13,7 @@ noinst_HEADERS = icons.h iconthemes.h main.h check_PROGRAMS = testicons testicons_SOURCES = testicons.cpp testicons_LDFLAGS = $(all_libraries) -testicons_LDADD = $(LIB_KDEUI) icons.lo +testicons_LDADD = $(LIB_TDEUI) icons.lo messages: $(XGETTEXT) *.cpp -o $(podir)/kcmicons.pot diff --git a/kcontrol/info/Makefile.am b/kcontrol/info/Makefile.am index 4b65dc07f..30eb5ebe8 100644 --- a/kcontrol/info/Makefile.am +++ b/kcontrol/info/Makefile.am @@ -7,7 +7,7 @@ endif kcm_info_la_SOURCES = main.cpp memory.cpp opengl.cpp kcm_info_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(FRAMEWORK_COREAUDIO) -kcm_info_la_LIBADD = $(LIBALIB) $(LIB_KDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) +kcm_info_la_LIBADD = $(LIBALIB) $(LIB_TDEUI) $(LIB_TRU64_MACH) $(LIBCFG) $(LIBODM) $(LIBKSTAT) $(LIBDEVINFO) $(GLLIB) METASOURCES = AUTO AM_CPPFLAGS= $(all_includes) $(GLINC) diff --git a/kcontrol/joystick/Makefile.am b/kcontrol/joystick/Makefile.am index 269dec101..377b85517 100644 --- a/kcontrol/joystick/Makefile.am +++ b/kcontrol/joystick/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = kcm_joystick.la kcm_joystick_la_SOURCES = joystick.cpp joywidget.cpp poswidget.cpp joydevice.cpp caldialog.cpp -kcm_joystick_la_LIBADD = $(LIB_KDEUI) +kcm_joystick_la_LIBADD = $(LIB_TDEUI) kcm_joystick_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined xdg_apps_DATA = joystick.desktop diff --git a/kcontrol/kcontrol/Makefile.am b/kcontrol/kcontrol/Makefile.am index dd20b9224..90b56fa71 100644 --- a/kcontrol/kcontrol/Makefile.am +++ b/kcontrol/kcontrol/Makefile.am @@ -32,7 +32,7 @@ kcontrol_la_SOURCES = main.cpp toplevel.cpp indexwidget.cpp \ moduleIface.cpp moduleIface.skel global.cpp modules.cpp \ proxywidget.cpp kcrootonly.cpp searchwidget.cpp -kcontrol_la_LIBADD = $(LIB_KDEUI) $(LIB_KUTILS) $(LIB_KHTML) +kcontrol_la_LIBADD = $(LIB_TDEUI) $(LIB_KUTILS) $(LIB_KHTML) kcontrol_la_LDFLAGS = $(all_libraries) -module -avoid-version rccontroldir = $(kde_datadir)/kcontrol diff --git a/kcontrol/kfontinst/lib/Makefile.am b/kcontrol/kfontinst/lib/Makefile.am index 55349b149..59b85e0a3 100644 --- a/kcontrol/kfontinst/lib/Makefile.am +++ b/kcontrol/kfontinst/lib/Makefile.am @@ -9,6 +9,6 @@ Misc.h \ FcEngine.h \ KfiConstants.h -libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) +libkfontinst_la_LIBADD = $(LIB_TDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE diff --git a/kcontrol/kfontinst/thumbnail/Makefile.am b/kcontrol/kfontinst/thumbnail/Makefile.am index c7608e843..49213a019 100644 --- a/kcontrol/kfontinst/thumbnail/Makefile.am +++ b/kcontrol/kfontinst/thumbnail/Makefile.am @@ -1,7 +1,7 @@ kde_module_LTLIBRARIES = fontthumbnail.la fontthumbnail_la_SOURCES = FontThumbnail.cpp -fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) ../lib/libkfontinst.la +fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_TDECORE) $(LIB_KIO) ../lib/libkfontinst.la fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/kcontrol/kfontinst/viewpart/Makefile.am b/kcontrol/kfontinst/viewpart/Makefile.am index 4379ab4f1..011f057ec 100644 --- a/kcontrol/kfontinst/viewpart/Makefile.am +++ b/kcontrol/kfontinst/viewpart/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libkfontinstprint.la libkfontinstprint_la_SOURCES = KfiPrint.cpp libkfontinstprint_la_LDFLAGS = $(all_libraries) -libkfontinstprint_la_LIBADD = $(LIB_KDEPRINT) ../lib/libkfontinst.la +libkfontinstprint_la_LIBADD = $(LIB_TDEPRINT) ../lib/libkfontinst.la kde_module_LTLIBRARIES = libkfontviewpart.la @@ -17,7 +17,7 @@ AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFR METASOURCES = AUTO kfontview_LDADD = $(LIB_KPARTS) -kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor bin_PROGRAMS = kfontview xdg_apps_DATA = kfontview.desktop diff --git a/kcontrol/konq/Makefile.am b/kcontrol/konq/Makefile.am index 80bd7591d..f9ef60055 100644 --- a/kcontrol/konq/Makefile.am +++ b/kcontrol/konq/Makefile.am @@ -11,7 +11,7 @@ kcm_konq_la_SOURCES = behaviour.cpp desktop.cpp rootopts.cpp \ desktopbehavior.ui kcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS) +kcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) $(LIB_KSYCOCA) $(LIB_KUTILS) kcm_konq_la_DATA = overlapping.png onlyone.png kcm_konq_ladir = $(kde_datadir)/kcontrol/pics diff --git a/kcontrol/krdb/Makefile.am b/kcontrol/krdb/Makefile.am index 6bd22e322..a478f2f83 100644 --- a/kcontrol/krdb/Makefile.am +++ b/kcontrol/krdb/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = . themes kcs ad pics noinst_LTLIBRARIES = libkrdb.la libkrdb_la_SOURCES = krdb.cpp -libkrdb_la_LIBADD = $(LIB_KDECORE) +libkrdb_la_LIBADD = $(LIB_TDECORE) libkrdb_la_LDFLAGS = -no-undefined $(all_libraries) messages: diff --git a/kcontrol/launch/Makefile.am b/kcontrol/launch/Makefile.am index ce246f3d2..ed9d14cf1 100644 --- a/kcontrol/launch/Makefile.am +++ b/kcontrol/launch/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_launch.la AM_CPPFLAGS = $(all_includes) kcm_launch_la_SOURCES = kcmlaunch.cpp kcm_launch_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kcm_launch_la_LIBADD = $(LIB_KDEUI) +kcm_launch_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = kcmlaunch.h xdg_apps_DATA = kcmlaunch.desktop diff --git a/kcontrol/privacy/Makefile.am b/kcontrol/privacy/Makefile.am index 82ac0d2a6..cff96f5e7 100644 --- a/kcontrol/privacy/Makefile.am +++ b/kcontrol/privacy/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_privacy.la kcm_privacy_la_SOURCES = privacy.cpp kprivacysettings.ui kcmprivacydialog.ui kprivacymanager.cpp kcm_privacy_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_privacy_la_LIBADD = $(LIB_KDEUI) -lkio +kcm_privacy_la_LIBADD = $(LIB_TDEUI) -lkio METASOURCES = AUTO diff --git a/kcontrol/randr/Makefile.am b/kcontrol/randr/Makefile.am index cfb533eb7..fb55f8da7 100644 --- a/kcontrol/randr/Makefile.am +++ b/kcontrol/randr/Makefile.am @@ -7,7 +7,7 @@ METASOURCES = AUTO kcm_randr_la_SOURCES = krandrmodule.cpp kcm_randr_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_randr_la_LIBADD = $(LIB_KDEUI) $(LIB_XRANDR) +kcm_randr_la_LIBADD = $(LIB_TDEUI) $(LIB_XRANDR) noinst_HEADERS = krandrmodule.h krandrtray.h krandrapp.h \ krandrpassivepopup.h configdialog.h diff --git a/kcontrol/style/keramik/Makefile.am b/kcontrol/style/keramik/Makefile.am index 028585373..56fbefa6b 100644 --- a/kcontrol/style/keramik/Makefile.am +++ b/kcontrol/style/keramik/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) noinst_HEADERS = keramikconf.h kde_module_LTLIBRARIES = kstyle_keramik_config.la kstyle_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kstyle_keramik_config_la_LIBADD = $(LIB_KDEUI) +kstyle_keramik_config_la_LIBADD = $(LIB_TDEUI) kstyle_keramik_config_la_SOURCES = keramikconf.cpp METASOURCES = AUTO diff --git a/kcontrol/usbview/Makefile.am b/kcontrol/usbview/Makefile.am index e43934b70..4bc09f635 100644 --- a/kcontrol/usbview/Makefile.am +++ b/kcontrol/usbview/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_usb.la kcm_usb_la_SOURCES = kcmusb.cpp usbdevices.cpp usbdb.cpp kcm_usb_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_usb_la_LIBADD = $(LIB_KDEUI) +kcm_usb_la_LIBADD = $(LIB_TDEUI) AM_CPPFLAGS= $(all_includes) diff --git a/kcontrol/view1394/Makefile.am b/kcontrol/view1394/Makefile.am index 88f2b37c7..0a82271db 100644 --- a/kcontrol/view1394/Makefile.am +++ b/kcontrol/view1394/Makefile.am @@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = kcm_view1394.la kcm_view1394_la_SOURCES = view1394widget.ui view1394.cpp kcm_view1394_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -kcm_view1394_la_LIBADD = $(LIB_KDEUI) -lraw1394 +kcm_view1394_la_LIBADD = $(LIB_TDEUI) -lraw1394 AM_CPPFLAGS= $(all_includes) |