diff options
author | Slávek Banko <[email protected]> | 2013-09-03 20:02:30 +0200 |
---|---|---|
committer | Slávek Banko <[email protected]> | 2013-09-03 21:00:39 +0200 |
commit | c6cb3f27942501d24b0ded69c90ebbf7c43c755e (patch) | |
tree | 08aa592dea84d77931478751d69b47cb4d6b50ee /interfaces | |
parent | f41d2ce0f1929574f3b65eef2675ac65177608f1 (diff) | |
download | tdelibs-c6cb3f27942501d24b0ded69c90ebbf7c43c755e.tar.gz tdelibs-c6cb3f27942501d24b0ded69c90ebbf7c43c755e.zip |
Additional k => tde renaming and fixes
Diffstat (limited to 'interfaces')
-rw-r--r-- | interfaces/Makefile.am | 2 | ||||
-rw-r--r-- | interfaces/kspeech/Makefile.am | 2 | ||||
-rw-r--r-- | interfaces/tdeimproxy/interface/Makefile.am | 2 | ||||
-rw-r--r-- | interfaces/tdeimproxy/library/Makefile.am | 4 | ||||
-rw-r--r-- | interfaces/tdeimproxy/library/tdeimproxy.h | 6 | ||||
-rw-r--r-- | interfaces/tdeimproxy/library/tdeimproxyiface.h | 4 | ||||
-rw-r--r-- | interfaces/tdemediaplayer/Makefile.am | 2 | ||||
-rw-r--r-- | interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am | 2 | ||||
-rw-r--r-- | interfaces/tdescript/Makefile.am | 6 | ||||
-rw-r--r-- | interfaces/tdetexteditor/Makefile.am | 4 | ||||
-rw-r--r-- | interfaces/tdetexteditor/templateinterface.h | 8 |
11 files changed, 21 insertions, 21 deletions
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am index e5eedaf90..0cb10278c 100644 --- a/interfaces/Makefile.am +++ b/interfaces/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer kio terminal khexedit tdeimproxy kspeech +SUBDIRS = tdetexteditor tdescript kregexpeditor tdemediaplayer tdeio terminal khexedit tdeimproxy kspeech DOXYGEN_REFERENCES = tdecore tdefx tdeui tdeparts dcop DOXYGEN_SET_RECURSIVE = YES diff --git a/interfaces/kspeech/Makefile.am b/interfaces/kspeech/Makefile.am index dc183251d..8bd030168 100644 --- a/interfaces/kspeech/Makefile.am +++ b/interfaces/kspeech/Makefile.am @@ -6,5 +6,5 @@ include_HEADERS = kspeech.h kspeechsink.h # Define DCOP/Text-to-Speech Service Type. kde_servicetypes_DATA = dcoptexttospeech.desktop -DOXYGEN_REFERENCES = tdecore dcop kio tdeui tdeparts +DOXYGEN_REFERENCES = tdecore dcop tdeio tdeui tdeparts include ../../admin/Doxyfile.am diff --git a/interfaces/tdeimproxy/interface/Makefile.am b/interfaces/tdeimproxy/interface/Makefile.am index 348130e46..0ebfbcd10 100644 --- a/interfaces/tdeimproxy/interface/Makefile.am +++ b/interfaces/tdeimproxy/interface/Makefile.am @@ -10,4 +10,4 @@ kcm_instantmessenger_DATA = kcm_instantmessenger.desktop kcm_instantmessengerdir = $(kde_datadir)/kcm_componentchooser include $(top_srcdir)/admin/Doxyfile.am -DOXYGEN_REFERENCES = kabc +DOXYGEN_REFERENCES = tdeabc diff --git a/interfaces/tdeimproxy/library/Makefile.am b/interfaces/tdeimproxy/library/Makefile.am index 743b76424..bae476b1e 100644 --- a/interfaces/tdeimproxy/library/Makefile.am +++ b/interfaces/tdeimproxy/library/Makefile.am @@ -16,11 +16,11 @@ tdeimproxyinclude_HEADERS = tdeimproxy.h tdeimproxyiface.h lib_LTLIBRARIES = libtdeimproxy.la libtdeimproxy_la_LDFLAGS = -no-undefined $(all_libraries) -libtdeimproxy_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) +libtdeimproxy_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) libtdeimproxy_la_SOURCES = tdeimproxy.cpp kimiface.stub tdeimproxyiface.skel kimiface_DIR = $(top_srcdir)/interfaces/tdeimproxy/interface include $(top_srcdir)/admin/Doxyfile.am -DOXYGEN_REFERENCES = kabc dcop +DOXYGEN_REFERENCES = tdeabc dcop diff --git a/interfaces/tdeimproxy/library/tdeimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h index 84b7d37dd..293d1f723 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.h +++ b/interfaces/tdeimproxy/library/tdeimproxy.h @@ -21,8 +21,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KIMPROXY_H -#define KIMPROXY_H +#ifndef TDEIMPROXY_H +#define TDEIMPROXY_H #include <tqdict.h> #include <tqmap.h> @@ -104,7 +104,7 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap; * @since 3.3 * @author Will Stephenson <[email protected]> */ -class KIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface +class TDEIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface { Q_OBJECT struct Private; diff --git a/interfaces/tdeimproxy/library/tdeimproxyiface.h b/interfaces/tdeimproxy/library/tdeimproxyiface.h index a7d416371..9902b5969 100644 --- a/interfaces/tdeimproxy/library/tdeimproxyiface.h +++ b/interfaces/tdeimproxy/library/tdeimproxyiface.h @@ -23,8 +23,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef KIMPROXYIFACE_H -#define KIMPROXYIFACE_H +#ifndef TDEIMPROXYIFACE_H +#define TDEIMPROXYIFACE_H #include <dcopobject.h> diff --git a/interfaces/tdemediaplayer/Makefile.am b/interfaces/tdemediaplayer/Makefile.am index 91ed342bd..289668b2c 100644 --- a/interfaces/tdemediaplayer/Makefile.am +++ b/interfaces/tdemediaplayer/Makefile.am @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libtdemediaplayer.la libtdemediaplayer_la_SOURCES = player.cpp playerdcopobject.skel view.cpp libtdemediaplayer_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -libtdemediaplayer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) +libtdemediaplayer_la_LIBADD = $(LIB_TDEPARTS) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEUI) $(LIB_TDECORE) libtdemediaplayer_la_METASOURCES = AUTO tdemediaplayerinclude_HEADERS = player.h playerdcopobject.h view.h diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am index d73cf545f..cefc9e200 100644 --- a/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = tdefileaudiopreview.la tdefileaudiopreview_la_SOURCES = tdefileaudiopreview.cpp tdefileaudiopreview_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) +tdefileaudiopreview_la_LIBADD = $(top_builddir)/interfaces/tdemediaplayer/libtdemediaplayer.la $(top_builddir)/arts/kde/libartskde.la $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) noinst_HEADERS = tdefileaudiopreview.h diff --git a/interfaces/tdescript/Makefile.am b/interfaces/tdescript/Makefile.am index 03c7efc87..97ff6c9b3 100644 --- a/interfaces/tdescript/Makefile.am +++ b/interfaces/tdescript/Makefile.am @@ -5,12 +5,12 @@ INCLUDES = -I$(top_srcdir)/tdeio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(al #lib_LTLIBRARIES = libtdescriptloader.la libtdescript.la lib_LTLIBRARIES = libtdescript.la #libtdescriptloader_la_SOURCES = scriptloader.cpp -#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -#libtdescriptloader_la_LIBADD = $(LIB_KPARTS) +#libtdescriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +#libtdescriptloader_la_LIBADD = $(LIB_TDEPARTS) libtdescript_la_SOURCES = scriptmanager.cpp libtdescript_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -libtdescript_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +libtdescript_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) tdescriptinclude_HEADERS = scriptinterface.h scriptclientinterface.h scriptmanager.h tdescriptincludedir = $(includedir) diff --git a/interfaces/tdetexteditor/Makefile.am b/interfaces/tdetexteditor/Makefile.am index 7588019e2..ac0717321 100644 --- a/interfaces/tdetexteditor/Makefile.am +++ b/interfaces/tdetexteditor/Makefile.am @@ -22,8 +22,8 @@ libtdetexteditor_la_SOURCES = tdetexteditor.cpp \ texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp -libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -libtdetexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI) +libtdetexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libtdetexteditor_la_LIBADD = $(LIB_TDEPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_QT) $(LIB_TDEFILE) $(LIB_TDEUI) tdetexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \ selectioninterface.h cursorinterface.h \ diff --git a/interfaces/tdetexteditor/templateinterface.h b/interfaces/tdetexteditor/templateinterface.h index 6ffc40e73..966955735 100644 --- a/interfaces/tdetexteditor/templateinterface.h +++ b/interfaces/tdetexteditor/templateinterface.h @@ -82,10 +82,10 @@ class KTEXTEDITOR_EXPORT TemplateInterface //should be named AbstractTemplateInt * * - index: "i" * - loginname: The current users's loginname - * - firstname: The current user's first name retrieved from kabc - * - lastname: The current user's last name retrieved from kabc - * - fullname: The current user's first and last name retrieved from kabc - * - email: The current user's primary email adress retrieved from kabc + * - firstname: The current user's first name retrieved from tdeabc + * - lastname: The current user's last name retrieved from tdeabc + * - fullname: The current user's first and last name retrieved from tdeabc + * - email: The current user's primary email adress retrieved from tdeabc * - date: current date * - time: current time * - year: current year |