From baa3e6e8838922d0e849222b389a325a181bca7b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:48:24 -0600 Subject: [PATCH] Rename additional instances of KDE to TDE --- klinkstatus/src/Makefile.am | 4 ++-- kommander/editor/Makefile.am | 2 +- kommander/executor/Makefile.am | 4 ++-- kommander/plugin/Makefile.am | 2 +- kommander/pluginmanager/Makefile.am | 2 +- kommander/widget/Makefile.am | 2 +- kommander/widgets/Makefile.am | 2 +- .../working/plugintemplate/src-Makefile.am | 2 +- kxsldbg/Makefile.am | 8 ++++---- .../kmdi/qextmdi/kdelibs_export.h | 18 +++++++++--------- lib/compatibility/kmdi/qextmdi/kdockwidget.h | 16 ++++++++-------- lib/compatibility/kmdi/qextmdi/kdockwidget_p.h | 2 +- .../kmdi/qextmdi/kdockwidget_private.h | 8 ++++---- lib/compatibility/kmdi/qextmdi/ktabbar.h | 2 +- lib/compatibility/kmdi/qextmdi/ktabwidget.h | 2 +- quanta/src/Makefile.am | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/klinkstatus/src/Makefile.am b/klinkstatus/src/Makefile.am index 06c14b60..65304c03 100644 --- a/klinkstatus/src/Makefile.am +++ b/klinkstatus/src/Makefile.am @@ -17,7 +17,7 @@ bin_PROGRAMS = klinkstatus # the application source, library search path, and link libraries -klinkstatus_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP +klinkstatus_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP klinkstatus_LDADD = $(LIB_KPARTS) xdg_apps_DATA = klinkstatus.desktop @@ -34,7 +34,7 @@ kde_module_LTLIBRARIES = libklinkstatuspart.la # the Part's source, library search path, and link libraries -libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP +libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lDCOP libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la \ ui/libui.la engine/libengine.la \ parser/libparser.la utils/libutils.la $(LIB_KPARTS) $(LIB_KFILE) diff --git a/kommander/editor/Makefile.am b/kommander/editor/Makefile.am index 530d4ab6..65ea192b 100644 --- a/kommander/editor/Makefile.am +++ b/kommander/editor/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = kmdr-editor AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes) # the library search path. -kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) # the libraries to link against. kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \ diff --git a/kommander/executor/Makefile.am b/kommander/executor/Makefile.am index 64048f4c..5e12cf0d 100644 --- a/kommander/executor/Makefile.am +++ b/kommander/executor/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = kmdr-executor noinst_LTLIBRARIES = libinstance.la libinstance_la_SOURCES = instance.cpp dcopkommanderif.skel -libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor kmdr_executor_SOURCES = main.cpp @@ -20,6 +20,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/widgets METASOURCES = AUTO # the library search path. -kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = dcopkommanderif.h diff --git a/kommander/plugin/Makefile.am b/kommander/plugin/Makefile.am index be1bb9f4..1979b46c 100644 --- a/kommander/plugin/Makefile.am +++ b/kommander/plugin/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/kommander/widget $(all_includes) libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined # the libraries to link against. -libkommanderplugin_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) +libkommanderplugin_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) libkommanderplugin_la_SOURCES = kommanderplugin.cpp specialinformation.cpp diff --git a/kommander/pluginmanager/Makefile.am b/kommander/pluginmanager/Makefile.am index 0882358d..18ec698a 100644 --- a/kommander/pluginmanager/Makefile.am +++ b/kommander/pluginmanager/Makefile.am @@ -13,6 +13,6 @@ INCLUDES = -I$(top_srcdir)/kommander/factory $(all_includes) METASOURCES = AUTO # the library search path. -kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor noinst_HEADERS = mainwindow.h pluginmanager.h diff --git a/kommander/widget/Makefile.am b/kommander/widget/Makefile.am index 410d57c9..31843701 100644 --- a/kommander/widget/Makefile.am +++ b/kommander/widget/Makefile.am @@ -7,7 +7,7 @@ INCLUDES = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory $ libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined # the libraries to link against. -libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) +libkommanderwidget_la_LIBADD = $(top_builddir)/kommander/factory/libkommanderfactory.la $(LIB_KIO) $(LIB_TDEUI) $(LIB_QT) libkommanderwidget_la_SOURCES = expression.cpp function.cpp functionlib.cpp \ invokeclass.cpp kmdrmainwindow.cpp kommanderfunctions.cpp kommanderwidget.cpp \ diff --git a/kommander/widgets/Makefile.am b/kommander/widgets/Makefile.am index 60759960..b07890f7 100644 --- a/kommander/widgets/Makefile.am +++ b/kommander/widgets/Makefile.am @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkommanderwidgets.la INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes) # the library search path. -#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined # the libraries to link against. diff --git a/kommander/working/plugintemplate/src-Makefile.am b/kommander/working/plugintemplate/src-Makefile.am index a7b2ee01..f5dc15f9 100644 --- a/kommander/working/plugintemplate/src-Makefile.am +++ b/kommander/working/plugintemplate/src-Makefile.am @@ -6,7 +6,7 @@ libkmdr%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) \ # the libraries to link against. libkmdr%{APPNAMELC}_la_LIBADD = -lkommanderwidget -lkommanderplugin \ - $(LIB_KPARTS) $(LIB_KDEUI) + $(LIB_KPARTS) $(LIB_TDEUI) # which sources should be compiled for widgets libkmdr%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp %{APPNAMELC}plugin.cpp diff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am index 4959adc7..edc91957 100644 --- a/kxsldbg/Makefile.am +++ b/kxsldbg/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = kxsldbg xsldbg kxsldbg_SOURCES = kxsldbg.cpp main.cpp kxsldbgif.skel noinst_HEADERS = kxsldbg.h kxsldbg_DEPENDENCIES = ./kxsldbgpart/libqtnotfier/libqtnotfier.la ./kxsldbgpart/libkxsldbgcommon.la ./kxsldbgpart/libxsldbg/libxsldbg.la -kxsldbg_LDADD = ./kxsldbgpart/libqtnotfier/libqtnotfier.la ./kxsldbgpart/libkxsldbgcommon.la ./kxsldbgpart/libxsldbg/libxsldbg.la $(LIB_KDEUI) $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KPARTS) +kxsldbg_LDADD = ./kxsldbgpart/libqtnotfier/libqtnotfier.la ./kxsldbgpart/libkxsldbgcommon.la ./kxsldbgpart/libxsldbg/libxsldbg.la $(LIB_TDEUI) $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KPARTS) SUBDIRS = kxsldbgpart @@ -18,10 +18,10 @@ xsldbg_CFLAGS = $(XSLDBG_CFLAGS) $(all_includes) xsldbg_DEPENDENCIES = kxsldbgpart/libxsldbg/libxsldbg.la # use of configure defined libraries -xsldbg_LDADD = kxsldbgpart/libxsldbg/libxsldbg.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KDEUI) +xsldbg_LDADD = kxsldbgpart/libxsldbg/libxsldbg.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_TDEUI) # # the library search path. -xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # These paths are KDE specific. Use them: # kde_appsdir Where your application's menu entry (.desktop) should go to. @@ -50,7 +50,7 @@ INCLUDES= $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS) $(all_includes) METASOURCES = AUTO # the application source, library search path, and link libraries -kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # this is where the shell's XML-GUI resource file goes shellrcdir = $(kde_datadir)/kxsldbg diff --git a/lib/compatibility/kmdi/qextmdi/kdelibs_export.h b/lib/compatibility/kmdi/qextmdi/kdelibs_export.h index f93d852e..79291f62 100644 --- a/lib/compatibility/kmdi/qextmdi/kdelibs_export.h +++ b/lib/compatibility/kmdi/qextmdi/kdelibs_export.h @@ -35,17 +35,17 @@ #define KDE_EXPORT /* export statements for unix */ -#define KDECORE_EXPORT KDE_EXPORT -#define KDEUI_EXPORT KDE_EXPORT -#define KDEFX_EXPORT KDE_EXPORT -#define KDEPRINT_EXPORT KDE_EXPORT +#define TDECORE_EXPORT KDE_EXPORT +#define TDEUI_EXPORT KDE_EXPORT +#define TDEFX_EXPORT KDE_EXPORT +#define TDEPRINT_EXPORT KDE_EXPORT #define KDNSSD_EXPORT KDE_EXPORT #define KIO_EXPORT KDE_EXPORT #define DCOP_EXPORT KDE_EXPORT #define KPARTS_EXPORT KDE_EXPORT #define KTEXTEDITOR_EXPORT KDE_EXPORT #define KABC_EXPORT KDE_EXPORT -#define KDESU_EXPORT KDE_EXPORT +#define TDESU_EXPORT KDE_EXPORT #define KVCARD_EXPORT KDE_EXPORT #define KRESOURCES_EXPORT KDE_EXPORT #define KSTYLE_EXPORT KDE_EXPORT @@ -71,14 +71,14 @@ /* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros between 'class' keyword and : */ #ifdef KDE_DEPRECATED -# ifndef KDECORE_EXPORT_DEPRECATED -# define KDECORE_EXPORT_DEPRECATED KDE_DEPRECATED KDECORE_EXPORT +# ifndef TDECORE_EXPORT_DEPRECATED +# define TDECORE_EXPORT_DEPRECATED KDE_DEPRECATED TDECORE_EXPORT # endif # ifndef KIO_EXPORT_DEPRECATED # define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT # endif -# ifndef KDEUI_EXPORT_DEPRECATED -# define KDEUI_EXPORT_DEPRECATED KDE_DEPRECATED KDEUI_EXPORT +# ifndef TDEUI_EXPORT_DEPRECATED +# define TDEUI_EXPORT_DEPRECATED KDE_DEPRECATED TDEUI_EXPORT # endif # ifndef KABC_EXPORT_DEPRECATED # define KABC_EXPORT_DEPRECATED KDE_DEPRECATED KABC_EXPORT diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget.h b/lib/compatibility/kmdi/qextmdi/kdockwidget.h index 9e0e43d5..76028094 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget.h @@ -152,7 +152,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame +class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame { Q_OBJECT TQ_OBJECT @@ -198,7 +198,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag +class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag { Q_OBJECT TQ_OBJECT @@ -240,7 +240,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader +class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader { Q_OBJECT TQ_OBJECT @@ -366,7 +366,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockTabGroup : public TQTabWidget +class TDEUI_EXPORT KDockTabGroup : public TQTabWidget { Q_OBJECT TQ_OBJECT @@ -427,7 +427,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockWidget: public TQWidget +class TDEUI_EXPORT KDockWidget: public TQWidget { Q_OBJECT TQ_OBJECT @@ -909,7 +909,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockManager: public TQObject +class TDEUI_EXPORT KDockManager: public TQObject { Q_OBJECT TQ_OBJECT @@ -1306,7 +1306,7 @@ private: * * @author Max Judin (documentation: Falk Brettschneider). */ -class KDEUI_EXPORT KDockMainWindow : public KMainWindow +class TDEUI_EXPORT KDockMainWindow : public KMainWindow { Q_OBJECT TQ_OBJECT @@ -1473,7 +1473,7 @@ private: KDockMainWindowPrivate *d; }; -class KDEUI_EXPORT KDockArea : public TQWidget +class TDEUI_EXPORT KDockArea : public TQWidget { Q_OBJECT TQ_OBJECT diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h index 637831f3..1ac686d9 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_p.h @@ -40,7 +40,7 @@ COMPATIBLE. THIS HEADER IS ONLY INSTALLED, BECAUSE IT IS NEEDED IN #include // Add some describing comment !! -class KDEUI_EXPORT KDockContainer +class TDEUI_EXPORT KDockContainer { public: KDockContainer(); diff --git a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h index 7d131111..fe7db8ef 100644 --- a/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h +++ b/lib/compatibility/kmdi/qextmdi/kdockwidget_private.h @@ -40,7 +40,7 @@ class KDockContainer; * * @author Max Judin. */ -class KDEUI_EXPORT KDockSplitter : public TQWidget +class TDEUI_EXPORT KDockSplitter : public TQWidget { Q_OBJECT TQ_OBJECT @@ -115,7 +115,7 @@ private: * * @author Max Judin. */ -class KDEUI_EXPORT KDockButton_Private : public TQPushButton +class TDEUI_EXPORT KDockButton_Private : public TQPushButton { Q_OBJECT TQ_OBJECT @@ -141,7 +141,7 @@ private: /** * additional KDockWidget stuff (private) */ -class KDEUI_EXPORT KDockWidgetPrivate : public TQObject +class TDEUI_EXPORT KDockWidgetPrivate : public TQObject { Q_OBJECT TQ_OBJECT @@ -182,7 +182,7 @@ public: KDockWidgetResize resizeMode; }; -class KDEUI_EXPORT KDockWidgetHeaderPrivate +class TDEUI_EXPORT KDockWidgetHeaderPrivate : public TQObject { public: diff --git a/lib/compatibility/kmdi/qextmdi/ktabbar.h b/lib/compatibility/kmdi/qextmdi/ktabbar.h index c2167a86..d98f6511 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabbar.h +++ b/lib/compatibility/kmdi/qextmdi/ktabbar.h @@ -32,7 +32,7 @@ class KTabBarPrivate; /** * @since 3.2 */ -class KDEUI_EXPORT KTabBar: public TQTabBar +class TDEUI_EXPORT KTabBar: public TQTabBar { Q_OBJECT TQ_OBJECT diff --git a/lib/compatibility/kmdi/qextmdi/ktabwidget.h b/lib/compatibility/kmdi/qextmdi/ktabwidget.h index cd3c5c86..15da2e0d 100644 --- a/lib/compatibility/kmdi/qextmdi/ktabwidget.h +++ b/lib/compatibility/kmdi/qextmdi/ktabwidget.h @@ -33,7 +33,7 @@ class KTabWidgetPrivate; * * @since 3.2 */ -class KDEUI_EXPORT KTabWidget : public TQTabWidget +class TDEUI_EXPORT KTabWidget : public TQTabWidget { Q_OBJECT TQ_OBJECT diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am index c8773aad..ec40ded9 100644 --- a/quanta/src/Makefile.am +++ b/quanta/src/Makefile.am @@ -64,7 +64,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \ quanta_METASOURCES = AUTO # the library search path. -quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lX11 +quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lX11 # this is where the kdelnk file will go xdg_apps_DATA = quanta.desktop