diff options
Diffstat (limited to 'libkdepim')
71 files changed, 100 insertions, 100 deletions
diff --git a/libkdepim/CMakeLists.txt b/libkdepim/CMakeLists.txt index e5acc9dc..19ca1d52 100644 --- a/libkdepim/CMakeLists.txt +++ b/libkdepim/CMakeLists.txt @@ -39,7 +39,7 @@ link_directories( ##### headers ################################### install( FILES - kdepimmacros.h kpimprefs.h + tdepimmacros.h kpimprefs.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde ) @@ -48,30 +48,30 @@ install( FILES install( FILES pimemoticons.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -##### kdepimwidgets (module) #################### +##### tdepimwidgets (module) #################### -add_custom_command( OUTPUT kdepimwidgets.cpp +add_custom_command( OUTPUT tdepimwidgets.cpp COMMAND ${KDE3_MAKEKDEWIDGETS_EXECUTABLE} - -o kdepimwidgets.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/kdepim.widgets + -o tdepimwidgets.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tdepim.widgets DEPENDS - ${CMAKE_CURRENT_SOURCE_DIR}/kdepim.widgets ) + ${CMAKE_CURRENT_SOURCE_DIR}/tdepim.widgets ) -set_source_files_properties( kdepimwidgets.cpp PROPERTIES COMPILE_FLAGS "-DQT_PLUGIN" ) +set_source_files_properties( tdepimwidgets.cpp PROPERTIES COMPILE_FLAGS "-DQT_PLUGIN" ) -tde_add_kpart( kdepimwidgets - SOURCES kdepimwidgets.cpp - LINK kdepim-shared +tde_add_kpart( tdepimwidgets + SOURCES tdepimwidgets.cpp + LINK tdepim-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer ) -##### kdepim (shared) ########################### +##### tdepim (shared) ########################### set( KDE3_DCOPIDL_EXECUTABLE ${KDE3_DCOPIDLNG_EXECUTABLE} ) -tde_add_library( kdepim SHARED AUTOMOC +tde_add_library( tdepim SHARED AUTOMOC SOURCES ktimeedit.cpp alarmclient.cpp kprefsdialog.cpp kpimprefs.cpp categoryselectdialog_base.ui categoryselectdialog.cpp diff --git a/libkdepim/Makefile.am b/libkdepim/Makefile.am index 772cf2ab..b5db77f6 100644 --- a/libkdepim/Makefile.am +++ b/libkdepim/Makefile.am @@ -42,24 +42,24 @@ MailTransportServiceIface_DIR = $(srcdir)/interfaces AddressBookServiceIface_DIR = $(srcdir)/interfaces -libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -lkdecore +libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -ltdecore libtdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libemailfunctions/libemailfunctions.la \ $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) -lqui # $top_builddir)/libtdepim/resources/libkpimresources.la -include_HEADERS = kdepimmacros.h kpimprefs.h +include_HEADERS = tdepimmacros.h kpimprefs.h AM_CXXFLAGS = -DQT_PLUGIN -kde_widget_LTLIBRARIES = kdepimwidgets.la -kdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -lkdecore -kdepimwidgets_la_LIBADD = $(LIB_KIO) libtdepim.la -kdepimwidgets_la_SOURCES = kdepimwidgets.cpp +kde_widget_LTLIBRARIES = tdepimwidgets.la +tdepimwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore +tdepimwidgets_la_LIBADD = $(LIB_KIO) libtdepim.la +tdepimwidgets_la_SOURCES = tdepimwidgets.cpp -kdepimwidgets.cpp: $(srcdir)/kdepim.widgets - $(MAKEKDEWIDGETS) -o kdepimwidgets.cpp $(srcdir)/kdepim.widgets +tdepimwidgets.cpp: $(srcdir)/tdepim.widgets + $(MAKEKDEWIDGETS) -o tdepimwidgets.cpp $(srcdir)/tdepim.widgets -CLEANFILES = kdepimwidgets.cpp +CLEANFILES = tdepimwidgets.cpp kde_kcfg_DATA = pimemoticons.kcfg diff --git a/libkdepim/about/Makefile.am b/libkdepim/about/Makefile.am index a141dfbe..6481c5bc 100644 --- a/libkdepim/about/Makefile.am +++ b/libkdepim/about/Makefile.am @@ -1,6 +1,6 @@ -kdepim_infopage_datadir = $(kde_datadir)/libtdepim/about -kdepim_infopage_data_DATA = \ +tdepim_infopage_datadir = $(kde_datadir)/libtdepim/about +tdepim_infopage_data_DATA = \ bar-bottom-left.png bar-top-right.png bar-bottom-middle.png bottom-left.png \ box-middle-left.png top-left.png bar-bottom-right.png bottom-middle.png \ box-middle-right.png top-middle.png bar-middle-left.png bottom-right.png \ diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h index c4b92ad3..209151b6 100644 --- a/libkdepim/addresseelineedit.h +++ b/libkdepim/addresseelineedit.h @@ -37,7 +37,7 @@ #include "clicklineedit.h" #include "kmailcompletion.h" #include <dcopobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; diff --git a/libkdepim/addresseeselector.h b/libkdepim/addresseeselector.h index cabf0cf7..7ce70fb8 100644 --- a/libkdepim/addresseeselector.h +++ b/libkdepim/addresseeselector.h @@ -26,7 +26,7 @@ #include <kabc/distributionlist.h> #include <kabc/resource.h> #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqbitarray.h> #include <tqpixmap.h> diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp index 4d297ebb..15c7215e 100644 --- a/libkdepim/addresseeview.cpp +++ b/libkdepim/addresseeview.cpp @@ -633,7 +633,7 @@ void AddresseeView::faxNumberClicked( const TQString &number ) { KConfig config( "kaddressbookrc" ); config.setGroup( "General" ); - TQString commandLine = config.readEntry( "FaxHookApplication", "kdeprintfax --phone %N" ); + TQString commandLine = config.readEntry( "FaxHookApplication", "tdeprintfax --phone %N" ); if ( commandLine.isEmpty() ) { KMessageBox::sorry( this, i18n( "There is no application set which could be executed. Please go to the settings dialog and configure one." ) ); diff --git a/libkdepim/addresseeview.h b/libkdepim/addresseeview.h index f415358f..0b7c13b0 100644 --- a/libkdepim/addresseeview.h +++ b/libkdepim/addresseeview.h @@ -27,7 +27,7 @@ #include <kabc/addressee.h> #include <ktextbrowser.h> #include <kimproxy.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KIO { class Job; diff --git a/libkdepim/addressesdialog.h b/libkdepim/addressesdialog.h index cdb1eaf9..c553c642 100644 --- a/libkdepim/addressesdialog.h +++ b/libkdepim/addressesdialog.h @@ -31,7 +31,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqptrdict.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/broadcaststatus.h b/libkdepim/broadcaststatus.h index 93e78943..c29e0ff0 100644 --- a/libkdepim/broadcaststatus.h +++ b/libkdepim/broadcaststatus.h @@ -14,7 +14,7 @@ #include <tqobject.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #undef None diff --git a/libkdepim/categoryeditdialog.h b/libkdepim/categoryeditdialog.h index a9d15c5f..064f8b68 100644 --- a/libkdepim/categoryeditdialog.h +++ b/libkdepim/categoryeditdialog.h @@ -23,7 +23,7 @@ #define KPIM_CATEGORYEDITDIALOG_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KPimPrefs; diff --git a/libkdepim/categoryselectdialog.h b/libkdepim/categoryselectdialog.h index a530c701..3cff0313 100644 --- a/libkdepim/categoryselectdialog.h +++ b/libkdepim/categoryselectdialog.h @@ -23,7 +23,7 @@ #define KPIM_CATEGORYSELECTDIALOG_H #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KPimPrefs; class CategorySelectDialog_base; diff --git a/libkdepim/cfgc/Makefile.am b/libkdepim/cfgc/Makefile.am index d6e77392..ec9f505f 100644 --- a/libkdepim/cfgc/Makefile.am +++ b/libkdepim/cfgc/Makefile.am @@ -3,11 +3,11 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir) $(all_includes) check_PROGRAMS = example #autoexample -example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor example_LDADD = ../libtdepim.la $(LIB_KDECORE) example_SOURCES = example.cpp exampleprefs_base.kcfgc -#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#autoexample_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #autoexample_LDADD = ../libtdepim.la $(LIB_KDECORE) #autoexample_SOURCES = general_base.ui myoptions_base.ui autoexample.cpp diff --git a/libkdepim/clicklineedit.h b/libkdepim/clicklineedit.h index 3b9ffca4..28b771ff 100644 --- a/libkdepim/clicklineedit.h +++ b/libkdepim/clicklineedit.h @@ -22,7 +22,7 @@ #define CLICKLINEEDIT_H #include <klineedit.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/collectingprocess.h b/libkdepim/collectingprocess.h index 5c503663..ae737826 100644 --- a/libkdepim/collectingprocess.h +++ b/libkdepim/collectingprocess.h @@ -34,7 +34,7 @@ #define __KPIM_COLLECTINGPROCESS_H__ #include <kprocess.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/configmanager.h b/libkdepim/configmanager.h index b2612639..832a0f70 100644 --- a/libkdepim/configmanager.h +++ b/libkdepim/configmanager.h @@ -19,7 +19,7 @@ #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KMKernel; diff --git a/libkdepim/designerfields.h b/libkdepim/designerfields.h index 57e2203a..c7c2d22c 100644 --- a/libkdepim/designerfields.h +++ b/libkdepim/designerfields.h @@ -28,7 +28,7 @@ #include <tqpair.h> #include <tqstringlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/diffalgo.h b/libkdepim/diffalgo.h index eaa9459d..513db7e3 100644 --- a/libkdepim/diffalgo.h +++ b/libkdepim/diffalgo.h @@ -23,7 +23,7 @@ #define DIFFALGO_H #include <tqvaluelist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/embeddedurlpage.h b/libkdepim/embeddedurlpage.h index e3eb6d00..c306466c 100644 --- a/libkdepim/embeddedurlpage.h +++ b/libkdepim/embeddedurlpage.h @@ -22,7 +22,7 @@ #define KPIM_EMBEDDEDURLPAGE_H #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> namespace KParts { class ReadOnlyPart; } diff --git a/libkdepim/htmldiffalgodisplay.h b/libkdepim/htmldiffalgodisplay.h index dafb013d..35d95f5c 100644 --- a/libkdepim/htmldiffalgodisplay.h +++ b/libkdepim/htmldiffalgodisplay.h @@ -25,7 +25,7 @@ #include "diffalgo.h" #include <ktextbrowser.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/infoextension.h b/libkdepim/infoextension.h index 0f2c4889..b857dc4a 100644 --- a/libkdepim/infoextension.h +++ b/libkdepim/infoextension.h @@ -23,7 +23,7 @@ #define INFOEXTENSION_H #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQWidget; diff --git a/libkdepim/interfaces/AddressBookServiceIface.h b/libkdepim/interfaces/AddressBookServiceIface.h index ff0deb1d..e07ac3e7 100644 --- a/libkdepim/interfaces/AddressBookServiceIface.h +++ b/libkdepim/interfaces/AddressBookServiceIface.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <tqstring.h> #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/interfaces/MailTransportServiceIface.h b/libkdepim/interfaces/MailTransportServiceIface.h index 3b594979..d256775a 100644 --- a/libkdepim/interfaces/MailTransportServiceIface.h +++ b/libkdepim/interfaces/MailTransportServiceIface.h @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqcstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPim { diff --git a/libkdepim/kabcresourcecached.h b/libkdepim/kabcresourcecached.h index be71bb73..2cf0352e 100644 --- a/libkdepim/kabcresourcecached.h +++ b/libkdepim/kabcresourcecached.h @@ -22,7 +22,7 @@ #define KABC_RESOURCECACHED_H #include <kabc/resource.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <tqdatetime.h> #include <tqtimer.h> diff --git a/libkdepim/kaccount.h b/libkdepim/kaccount.h index 7da94462..d0a1b7f2 100644 --- a/libkdepim/kaccount.h +++ b/libkdepim/kaccount.h @@ -33,7 +33,7 @@ #define __KACCOUNT #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; diff --git a/libkdepim/kaddrbook.h b/libkdepim/kaddrbook.h index 374753e5..f2bab100 100644 --- a/libkdepim/kaddrbook.h +++ b/libkdepim/kaddrbook.h @@ -9,7 +9,7 @@ #include <kdeversion.h> #include <kabc/addressee.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KABC { class AddressBook; diff --git a/libkdepim/kcmdesignerfields.h b/libkdepim/kcmdesignerfields.h index e14f24f6..820506f9 100644 --- a/libkdepim/kcmdesignerfields.h +++ b/libkdepim/kcmdesignerfields.h @@ -23,7 +23,7 @@ #define KPIM_KCMDESIGNERFIELDS_H #include <kcmodule.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KListView; diff --git a/libkdepim/kconfigpropagator.h b/libkdepim/kconfigpropagator.h index 2a100024..3e52eb7c 100644 --- a/libkdepim/kconfigpropagator.h +++ b/libkdepim/kconfigpropagator.h @@ -26,7 +26,7 @@ #include <tqdom.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfigSkeleton; class KConfigSkeletonItem; diff --git a/libkdepim/kconfigwizard.h b/libkdepim/kconfigwizard.h index 84da3386..71455277 100644 --- a/libkdepim/kconfigwizard.h +++ b/libkdepim/kconfigwizard.h @@ -22,7 +22,7 @@ #define KCONFIGWIZARD_H #include <kconfigpropagator.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kdialogbase.h> class TQListView; diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h index d047b343..02a7701c 100644 --- a/libkdepim/kdateedit.h +++ b/libkdepim/kdateedit.h @@ -28,7 +28,7 @@ #include <tqdatetime.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "kdatepickerpopup.h" diff --git a/libkdepim/kdatepickerpopup.h b/libkdepim/kdatepickerpopup.h index 8a65cf5b..44dc7c66 100644 --- a/libkdepim/kdatepickerpopup.h +++ b/libkdepim/kdatepickerpopup.h @@ -24,7 +24,7 @@ #include <tqdatetime.h> #include <tqpopupmenu.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kdatepicker.h> /** diff --git a/libkdepim/kdepim.widgets b/libkdepim/kdepim.widgets index 02d1de28..765abc23 100644 --- a/libkdepim/kdepim.widgets +++ b/libkdepim/kdepim.widgets @@ -1,7 +1,7 @@ [Global] PluginName=KDEPimWidgets Includes=kinstance.h -Init=new KInstance("kdepimwidgets"); +Init=new KInstance("tdepimwidgets"); [KPIM::AddresseeLineEdit] ToolTip=Addressee Line Edit (KDE-PIM) diff --git a/libkdepim/kfileio.cpp b/libkdepim/kfileio.cpp index 8addb772..e167662b 100644 --- a/libkdepim/kfileio.cpp +++ b/libkdepim/kfileio.cpp @@ -21,7 +21,7 @@ #include <sys/stat.h> #include <sys/types.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/kfileio.h b/libkdepim/kfileio.h index 91552888..15db0933 100644 --- a/libkdepim/kfileio.h +++ b/libkdepim/kfileio.h @@ -11,7 +11,7 @@ #include <tqcstring.h> #include <tqwidget.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/libkdepim/kfoldertree.h b/libkdepim/kfoldertree.h index d54db75d..5ee25573 100644 --- a/libkdepim/kfoldertree.h +++ b/libkdepim/kfoldertree.h @@ -27,7 +27,7 @@ #include <tqdragobject.h> #include <tqcolor.h> #include <klistview.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KFolderTree; diff --git a/libkdepim/komposer/core/prefsmodule.cpp b/libkdepim/komposer/core/prefsmodule.cpp index af9df085..77e1c264 100644 --- a/libkdepim/komposer/core/prefsmodule.cpp +++ b/libkdepim/komposer/core/prefsmodule.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <tqbuttongroup.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> extern "C" { diff --git a/libkdepim/komposer/core/tests/Makefile.am b/libkdepim/komposer/core/tests/Makefile.am index f26c9ee7..fbf12795 100644 --- a/libkdepim/komposer/core/tests/Makefile.am +++ b/libkdepim/komposer/core/tests/Makefile.am @@ -5,15 +5,15 @@ check_PROGRAMS = testfactory testmanager testkomposer METASOURCES = AUTO testfactory_SOURCES = main.cpp managertest.cpp -testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testfactory_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testfactory_LDADD = ../libkomposer.la testmanager_SOURCES = testmanager.cpp -testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testmanager_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testmanager_LDADD = ../libkomposer.la testkomposer_SOURCES = testkomposer.cpp -testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +testkomposer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor testkomposer_LDADD = ../libkomposer.la check: testfactory diff --git a/libkdepim/komposer/test/Makefile.am b/libkdepim/komposer/test/Makefile.am index bec41061..af51004e 100644 --- a/libkdepim/komposer/test/Makefile.am +++ b/libkdepim/komposer/test/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I../core $(all_includes) LDADD = $(LIB_KPARTS) ../core/libkomposer.la -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor check_PROGRAMS = test diff --git a/libkdepim/kpartsdesignerplugin/Makefile.am b/libkdepim/kpartsdesignerplugin/Makefile.am index 75f6e89d..ebbfbfba 100644 --- a/libkdepim/kpartsdesignerplugin/Makefile.am +++ b/libkdepim/kpartsdesignerplugin/Makefile.am @@ -3,6 +3,6 @@ METASOURCES = AUTO INCLUDES = $(all_includes) kde_widget_LTLIBRARIES = kpartsdesignerplugin.la -kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -lkdecore -lkio +kpartsdesignerplugin_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) $(LIB_QT) -ltdecore -lkio kpartsdesignerplugin_la_LIBADD = $(LIB_KPARTS) kpartsdesignerplugin_la_SOURCES = kpartsdesignerplugin.cpp diff --git a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp index afe8bad6..c3eedc32 100644 --- a/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp +++ b/libkdepim/kpartsdesignerplugin/kpartsdesignerplugin.cpp @@ -24,7 +24,7 @@ #include <kmimetype.h> #include <tqlayout.h> #include <kapplication.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name ) : TQWidget( parentWidget, name ), m_part( 0 ) @@ -103,7 +103,7 @@ bool KPartsWidgetPlugin::isContainer( const TQString & /*key*/ ) const { return false; } -/// Duplicated from kdelibs/kdecore/kdemacros.h.in for those with kdelibs < 3.4 +/// Duplicated from kdelibs/tdecore/kdemacros.h.in for those with kdelibs < 3.4 #ifndef KDE_TQ_EXPORT_PLUGIN #define KDE_TQ_EXPORT_PLUGIN(PLUGIN) \ TQ_EXTERN_C KDE_EXPORT const char* qt_ucm_query_verification_data(); \ diff --git a/libkdepim/kpimprefs.h b/libkdepim/kpimprefs.h index 7f0f1f0e..1d88a8d8 100644 --- a/libkdepim/kpimprefs.h +++ b/libkdepim/kpimprefs.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <kconfigskeleton.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/libkdepim/kpimurlrequesterdlg.h b/libkdepim/kpimurlrequesterdlg.h index ccbccc88..6a00cf4e 100644 --- a/libkdepim/kpimurlrequesterdlg.h +++ b/libkdepim/kpimurlrequesterdlg.h @@ -20,7 +20,7 @@ #ifndef KPIMURLREQUESTDLG_H_INCLUDED #define KPIMURLREQUESTDLG_H_INCLUDED -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include <kurl.h> #include <tqstring.h> diff --git a/libkdepim/kpixmapregionselectordialog.h b/libkdepim/kpixmapregionselectordialog.h index 712ed8c9..ee864391 100644 --- a/libkdepim/kpixmapregionselectordialog.h +++ b/libkdepim/kpixmapregionselectordialog.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> #include <libtdepim/kpixmapregionselectorwidget.h> #include <tqimage.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/kpixmapregionselectorwidget.cpp b/libkdepim/kpixmapregionselectorwidget.cpp index 90952e74..d687ae8a 100644 --- a/libkdepim/kpixmapregionselectorwidget.cpp +++ b/libkdepim/kpixmapregionselectorwidget.cpp @@ -20,8 +20,8 @@ */ /* NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. */ diff --git a/libkdepim/kpixmapregionselectorwidget.h b/libkdepim/kpixmapregionselectorwidget.h index 353267f1..7b75c98b 100644 --- a/libkdepim/kpixmapregionselectorwidget.h +++ b/libkdepim/kpixmapregionselectorwidget.h @@ -37,8 +37,8 @@ namespace KPIM { * user with a friendly way to select a rectangular subregion of the pixmap. * * NOTE: There are two copies of this .h and the .cpp file, with subtle differences. - * One copy is in kdelibs/kdeui, and the other copy is in kdepim/libtdepim - * This is because kdepim has to remain backwards compatible. Any changes + * One copy is in kdelibs/tdeui, and the other copy is in tdepim/libtdepim + * This is because tdepim has to remain backwards compatible. Any changes * to either file should be made to the other. * * @author Antonio Larrosa <larrosa@kde.org> diff --git a/libkdepim/kprefsdialog.h b/libkdepim/kprefsdialog.h index 5e5dfcb8..b1fffcdd 100644 --- a/libkdepim/kprefsdialog.h +++ b/libkdepim/kprefsdialog.h @@ -32,7 +32,7 @@ #include <kcmodule.h> #include <kconfigskeleton.h> #include <kfile.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KColorButton; diff --git a/libkdepim/kregexp3.h b/libkdepim/kregexp3.h index c58feb9d..e5013366 100644 --- a/libkdepim/kregexp3.h +++ b/libkdepim/kregexp3.h @@ -34,7 +34,7 @@ #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** @short A TQRegExp (TQt3.x) with a replace() method. diff --git a/libkdepim/kresourceprefs.h b/libkdepim/kresourceprefs.h index 2941f629..6d96dead 100644 --- a/libkdepim/kresourceprefs.h +++ b/libkdepim/kresourceprefs.h @@ -23,7 +23,7 @@ #define KRESOURCEPREFS_H #include <kconfigskeleton.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQString; diff --git a/libkdepim/krsqueezedtextlabel.h b/libkdepim/krsqueezedtextlabel.h index f6a74527..36bd209b 100644 --- a/libkdepim/krsqueezedtextlabel.h +++ b/libkdepim/krsqueezedtextlabel.h @@ -22,7 +22,7 @@ #define KRSTQUEEZEDTEXTLABEL_H #include <tqlabel.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** * @short A replacement for TQLabel that squeezes its text diff --git a/libkdepim/kscoring.h b/libkdepim/kscoring.h index 766591ed..7225eb93 100644 --- a/libkdepim/kscoring.h +++ b/libkdepim/kscoring.h @@ -38,7 +38,7 @@ #include <klineedit.h> #include <knuminput.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQDomNode; class TQDomDocument; diff --git a/libkdepim/kscoringeditor.h b/libkdepim/kscoringeditor.h index fae5f21f..ba0ee190 100644 --- a/libkdepim/kscoringeditor.h +++ b/libkdepim/kscoringeditor.h @@ -25,7 +25,7 @@ #include "kwidgetlister.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KComboBox; class KLineEdit; diff --git a/libkdepim/ksubscription.h b/libkdepim/ksubscription.h index f3bd4eb5..c819701d 100644 --- a/libkdepim/ksubscription.h +++ b/libkdepim/ksubscription.h @@ -29,7 +29,7 @@ #include <tqcheckbox.h> #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> #include "kfoldertree.h" class KSubscription; diff --git a/libkdepim/ktimeedit.h b/libkdepim/ktimeedit.h index 1d4727e0..11190842 100644 --- a/libkdepim/ktimeedit.h +++ b/libkdepim/ktimeedit.h @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <kapplication.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** This is a class that provides an easy, user friendly way to edit times. diff --git a/libkdepim/kvcarddrag.h b/libkdepim/kvcarddrag.h index bb7ff4a2..31885f6a 100644 --- a/libkdepim/kvcarddrag.h +++ b/libkdepim/kvcarddrag.h @@ -27,7 +27,7 @@ #include <kabc/addressee.h> #include <kabc/vcardparser.h> // for KABC_VCARD_ENCODING_FIX define -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KVCardDragPrivate; diff --git a/libkdepim/kwidgetlister.h b/libkdepim/kwidgetlister.h index c350ed4b..db993297 100644 --- a/libkdepim/kwidgetlister.h +++ b/libkdepim/kwidgetlister.h @@ -34,7 +34,7 @@ #include <tqwidget.h> #include <tqptrlist.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQPushButton; class TQVBoxLayout; diff --git a/libkdepim/kxface.h b/libkdepim/kxface.h index a27219e7..77023230 100644 --- a/libkdepim/kxface.h +++ b/libkdepim/kxface.h @@ -30,7 +30,7 @@ #include <tqobject.h> #include <setjmp.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> // #define WIDTH 48 // #define HEIGHT WIDTH diff --git a/libkdepim/ldapclient.h b/libkdepim/ldapclient.h index d9b88955..a2a85f1e 100644 --- a/libkdepim/ldapclient.h +++ b/libkdepim/ldapclient.h @@ -35,7 +35,7 @@ #include <kabc/ldif.h> #include <kconfig.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/linklocator.h b/libkdepim/linklocator.h index 662202e4..4597d836 100644 --- a/libkdepim/linklocator.h +++ b/libkdepim/linklocator.h @@ -26,7 +26,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** * LinkLocator assists in identifying sections of text that can diff --git a/libkdepim/maillistdrag.h b/libkdepim/maillistdrag.h index ec2fe447..f13e59eb 100644 --- a/libkdepim/maillistdrag.h +++ b/libkdepim/maillistdrag.h @@ -27,7 +27,7 @@ #include "tqglobal.h" #include "time.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> /** * KDEPIM classes for drag and drop of mails diff --git a/libkdepim/pics/CMakeLists.txt b/libkdepim/pics/CMakeLists.txt index 04f64a51..7cbe71d0 100644 --- a/libkdepim/pics/CMakeLists.txt +++ b/libkdepim/pics/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES addresseelineedit.png clicklineedit.png kdateedit.png ktimeedit.png - DESTINATION ${DATA_INSTALL_DIR}/kdepimwidgets/pics ) + DESTINATION ${DATA_INSTALL_DIR}/tdepimwidgets/pics ) diff --git a/libkdepim/pics/Makefile.am b/libkdepim/pics/Makefile.am index 4fcd1dd8..c4c61196 100644 --- a/libkdepim/pics/Makefile.am +++ b/libkdepim/pics/Makefile.am @@ -1,6 +1,6 @@ -kdepimwidgetsdata_DATA = addresseelineedit.png \ +tdepimwidgetsdata_DATA = addresseelineedit.png \ clicklineedit.png kdateedit.png ktimeedit.png -kdepimwidgetsdatadir = $(kde_datadir)/kdepimwidgets/pics +tdepimwidgetsdatadir = $(kde_datadir)/tdepimwidgets/pics -EXTRA_DIST = $(kdepimwidgetsdata_DATA) +EXTRA_DIST = $(tdepimwidgetsdata_DATA) diff --git a/libkdepim/pluginloaderbase.h b/libkdepim/pluginloaderbase.h index 88e65405..76637278 100644 --- a/libkdepim/pluginloaderbase.h +++ b/libkdepim/pluginloaderbase.h @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KLibrary; class TQStringList; diff --git a/libkdepim/progressdialog.h b/libkdepim/progressdialog.h index 91fa771f..b2511624 100644 --- a/libkdepim/progressdialog.h +++ b/libkdepim/progressdialog.h @@ -38,7 +38,7 @@ #include <tqlabel.h> #include <tqvbox.h> #include "overlaywidget.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQProgressBar; class TQScrollView; diff --git a/libkdepim/progressmanager.h b/libkdepim/progressmanager.h index 7798162d..a447d49f 100644 --- a/libkdepim/progressmanager.h +++ b/libkdepim/progressmanager.h @@ -28,7 +28,7 @@ #include <tqdict.h> #include <tqstring.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { diff --git a/libkdepim/qutf7codec.h b/libkdepim/qutf7codec.h index 6bb5117e..4057d276 100644 --- a/libkdepim/qutf7codec.h +++ b/libkdepim/qutf7codec.h @@ -27,7 +27,7 @@ #include "tqtextcodec.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> #ifndef TQT_NO_TEXTCODEC diff --git a/libkdepim/recentaddresses.h b/libkdepim/recentaddresses.h index be763369..446f6c68 100644 --- a/libkdepim/recentaddresses.h +++ b/libkdepim/recentaddresses.h @@ -35,7 +35,7 @@ #include <kdialogbase.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KConfig; class KEditListBox; diff --git a/libkdepim/resourceabc.h b/libkdepim/resourceabc.h index af784841..b6ef3ec9 100644 --- a/libkdepim/resourceabc.h +++ b/libkdepim/resourceabc.h @@ -27,7 +27,7 @@ #include <kabc/resource.h> #include <tqmap.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> // This is here because it can't go to kdelibs/kabc yet, but ultimately // it should probably go there (maybe redesigned to have a real object diff --git a/libkdepim/sidebarextension.h b/libkdepim/sidebarextension.h index 02422ad0..fc39ef6c 100644 --- a/libkdepim/sidebarextension.h +++ b/libkdepim/sidebarextension.h @@ -22,7 +22,7 @@ #define SIDEBAREXTENSION_H #include <tqobject.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> class TQWidget; diff --git a/libkdepim/spellingfilter.h b/libkdepim/spellingfilter.h index ac0fe02d..4178a888 100644 --- a/libkdepim/spellingfilter.h +++ b/libkdepim/spellingfilter.h @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include "linklocator.h" -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KDE_EXPORT SpellingFilter { diff --git a/libkdepim/statusbarprogresswidget.h b/libkdepim/statusbarprogresswidget.h index 1c836542..8b08d2cf 100644 --- a/libkdepim/statusbarprogresswidget.h +++ b/libkdepim/statusbarprogresswidget.h @@ -36,7 +36,7 @@ * kio_littleprogress_dlg (it looks similar) */ -#include <kdepimmacros.h> +#include <tdepimmacros.h> class KMMainWidget; class KProgress; diff --git a/libkdepim/tests/Makefile.am b/libkdepim/tests/Makefile.am index 249d764e..217676ca 100644 --- a/libkdepim/tests/Makefile.am +++ b/libkdepim/tests/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_builddir)/libtdepim -I$(top_srcdir)/libtdepim -I$(top_srcdir)/libemailfunctions $(all_includes) -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor LDADD = ../libtdepim.la $(LIB_KDECORE) check_PROGRAMS = testwizard testaddresseelineedit \ @@ -29,7 +29,7 @@ testkincidencechooser_SOURCES = testkincidencechooser.cpp METASOURCES = AUTO -#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#example_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #example_LDADD = ../libtdepim.la $(LIB_KDECORE) #example_SOURCES = example.cpp exampleprefs_base.kcfgc diff --git a/libkdepim/weaver.h b/libkdepim/weaver.h index 33989e12..8e82b581 100644 --- a/libkdepim/weaver.h +++ b/libkdepim/weaver.h @@ -30,7 +30,7 @@ extern "C" #include <tqmutex.h> #include <tqevent.h> -#include <kdepimmacros.h> +#include <tdepimmacros.h> namespace KPIM { namespace ThreadWeaver { |