summaryrefslogtreecommitdiffstats
path: root/korganizer
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer')
-rw-r--r--korganizer/CMakeLists.txt2
-rw-r--r--korganizer/Makefile.am12
-rw-r--r--korganizer/aboutdata.h2
-rw-r--r--korganizer/actionmanager.h2
-rw-r--r--korganizer/calendarview.h2
-rw-r--r--korganizer/interfaces/korganizer/baseview.h2
-rw-r--r--korganizer/kocore.h2
-rw-r--r--korganizer/koeditorattachments.cpp4
-rw-r--r--korganizer/koeventviewer.h2
-rw-r--r--korganizer/koeventviewerdialog.h2
-rw-r--r--korganizer/koglobals.cpp4
-rw-r--r--korganizer/koglobals.h2
-rw-r--r--korganizer/kogroupwareprefspage.ui2
-rw-r--r--korganizer/kohelper.h2
-rw-r--r--korganizer/koprefs.h2
-rw-r--r--korganizer/koprefsdialog.cpp2
-rw-r--r--korganizer/korgac/Makefile.am4
-rw-r--r--korganizer/korgac/alarmdialog.cpp2
-rw-r--r--korganizer/korganizerifaceimpl.h2
-rw-r--r--korganizer/kowhatsnextview.cpp4
-rw-r--r--korganizer/plugins/hebrew/CMakeLists.txt2
-rw-r--r--korganizer/plugins/printing/journal/Makefile.am2
-rw-r--r--korganizer/printing/CMakeLists.txt4
-rw-r--r--korganizer/printing/Makefile.am2
-rw-r--r--korganizer/printing/calprinter.h2
-rw-r--r--korganizer/printing/calprintpluginbase.h2
-rw-r--r--korganizer/printing/cellitem.h2
-rw-r--r--korganizer/urihandler.h2
28 files changed, 38 insertions, 38 deletions
diff --git a/korganizer/CMakeLists.txt b/korganizer/CMakeLists.txt
index cf09ee458..85f49c577 100644
--- a/korganizer/CMakeLists.txt
+++ b/korganizer/CMakeLists.txt
@@ -133,7 +133,7 @@ tde_add_kpart( libkorganizerpart AUTOMOC
tde_add_library( korganizer_calendar SHARED
SOURCES stdcalendar.cpp
VERSION 1.0.0
- LINK kdepim-shared kcal-shared
+ LINK tdepim-shared kcal-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am
index b33321285..0d79f4c0a 100644
--- a/korganizer/Makefile.am
+++ b/korganizer/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = \
bin_PROGRAMS = korganizer
-korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+korganizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korganizer_LDADD = libkorganizer.la
korganizer_SOURCES = main.cpp korganizer.cpp koapp.cpp
korganizer_COMPILE_FIRST = koprefs_base.h
@@ -29,19 +29,19 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libtdepim/libtdepim.
kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h kogroupwareprefspage.h
libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libtdepim/ -lkdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
+libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libtdepim/ -ltdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar
libkorganizerpart_la_SOURCES = korganizer_part.cpp
libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h
check_PROGRAMS = korgplugins timezone
-korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+korgplugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korgplugins_LDADD = libkorganizer.la $(LIB_KSYCOCA)
korgplugins_SOURCES = korgplugins.cpp
korgplugins_COMPILE_FIRST = koprefs_base.h
-timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+timezone_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
timezone_LDADD = libkorganizer.la $(LIB_KSYCOCA)
timezone_SOURCES = timezone.cpp
timezone_COMPILE_FIRST = koprefs_base.h
@@ -63,7 +63,7 @@ libkorganizer_la_LIBADD = \
$(top_builddir)/libkholidays/libkholidays.la \
$(top_builddir)/libkmime/libkmime.la \
$(LIB_KPARTS) $(LIB_KFILE) $(LIB_KNEWSTUFF) \
- -lkdeprint -lkabc -lkutils
+ -ltdeprint -lkabc -lkutils
libkorganizer_la_COMPILE_FIRST = \
kogroupwareprefspage.ui \
@@ -198,7 +198,7 @@ kde_services_DATA = korganizer_configmain.desktop \
update_DATA = korganizer.upd
updatedir = $(kde_datadir)/kconf_update
-DOXYGEN_REFERENCES=libkcal kdeui
+DOXYGEN_REFERENCES=libkcal tdeui
include $(top_srcdir)/admin/Doxyfile.am
install-data-local:
diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h
index 73a9b98ee..ef3f19de3 100644
--- a/korganizer/aboutdata.h
+++ b/korganizer/aboutdata.h
@@ -25,7 +25,7 @@
#define KORG_ABOUTDATA_H
#include <kaboutdata.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KOrg {
diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 6ee1727fa..66f66bcab 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -30,7 +30,7 @@
#include <tqobject.h>
#include <kurl.h>
#include <korganizer/part.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "kcalendariface.h"
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 9a180bb02..c10d92414 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -31,7 +31,7 @@
#include <kfile.h>
#include <korganizer/koeventviewer.h>
#include <libkcal/scheduler.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "koglobals.h"
#include "interfaces/korganizer/calendarviewbase.h"
diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h
index f14ecf490..b1f6afa1d 100644
--- a/korganizer/interfaces/korganizer/baseview.h
+++ b/korganizer/interfaces/korganizer/baseview.h
@@ -29,7 +29,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "korganizer/incidencechangerbase.h"
#include "printplugin.h"
diff --git a/korganizer/kocore.h b/korganizer/kocore.h
index 3b1a756fc..5ce1843dd 100644
--- a/korganizer/kocore.h
+++ b/korganizer/kocore.h
@@ -29,7 +29,7 @@
#include <korganizer/part.h>
#include <korganizer/printplugin.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <ktrader.h>
namespace KPIM { class IdentityManager; }
diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp
index 8a2c47c2b..812b499f9 100644
--- a/korganizer/koeditorattachments.cpp
+++ b/korganizer/koeditorattachments.cpp
@@ -29,10 +29,10 @@
#include <libkcal/incidence.h>
#include <libtdepim/kpimurlrequesterdlg.h>
#include <libtdepim/kfileio.h>
-#include <libtdepim/kdepimprotocols.h>
+#include <libtdepim/tdepimprotocols.h>
#include <libtdepim/maillistdrag.h>
#include <libtdepim/kvcarddrag.h>
-#include <libtdepim/kdepimprotocols.h>
+#include <libtdepim/tdepimprotocols.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h
index e8cceb1ff..bebbb4ed2 100644
--- a/korganizer/koeventviewer.h
+++ b/korganizer/koeventviewer.h
@@ -24,7 +24,7 @@
#ifndef KOEVENTVIEWER_H
#define KOEVENTVIEWER_H
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <kconfig.h>
#include <tqtextbrowser.h>
diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h
index cf1bd5caa..346471dff 100644
--- a/korganizer/koeventviewerdialog.h
+++ b/korganizer/koeventviewerdialog.h
@@ -25,7 +25,7 @@
#define KOEVENTVIEWERDIALOG_H
#include <kdialogbase.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "koeventviewer.h"
namespace KCal {
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index dd22ade4b..e4caf058f 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -71,8 +71,8 @@ KOGlobals::KOGlobals()
// in case we are a KPart
mOwnInstance = new KInstance( "korganizer" );
mOwnInstance->config()->setGroup( "General" );
- mOwnInstance->iconLoader()->addAppDir( "kdepim" );
- KGlobal::iconLoader()->addAppDir( "kdepim" );
+ mOwnInstance->iconLoader()->addAppDir( "tdepim" );
+ KGlobal::iconLoader()->addAppDir( "tdepim" );
mAlarmClient = new AlarmClient;
}
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 74a2006c3..f32488628 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -23,7 +23,7 @@
#ifndef KORG_GLOBALS_H
#define KORG_GLOBALS_H
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <tqwidget.h>
class TQDate;
diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui
index c8bcfbcec..feec8d710 100644
--- a/korganizer/kogroupwareprefspage.ui
+++ b/korganizer/kogroupwareprefspage.ui
@@ -617,7 +617,7 @@ For security reasons, it is not recommended to store your password in the config
<tabstop>retrieveSavePassword</tabstop>
</tabstops>
<includes>
- <include location="global" impldecl="in declaration">kdepimmacros.h</include>
+ <include location="global" impldecl="in declaration">tdepimmacros.h</include>
<include location="local" impldecl="in implementation">kogroupwareprefspage.ui.h</include>
</includes>
<Q_SIGNALS>
diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h
index 049459b4f..329de2a60 100644
--- a/korganizer/kohelper.h
+++ b/korganizer/kohelper.h
@@ -25,7 +25,7 @@
#ifndef KOHELPER_H
#define KOHELPER_H
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KCal {
class Calendar;
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 013407e38..4d96b5b3b 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -26,7 +26,7 @@
#include <tqdict.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include "koprefs_base.h"
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 6ceadd8f5..1f3ede91a 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -77,7 +77,7 @@
#include "ktimeedit.h"
#include "koglobals.h"
#include "stdcalendar.h"
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name )
diff --git a/korganizer/korgac/Makefile.am b/korganizer/korgac/Makefile.am
index 844af647e..49d32fd63 100644
--- a/korganizer/korgac/Makefile.am
+++ b/korganizer/korgac/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/korganizer $(all_includes)
bin_PROGRAMS = korgac
-korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+korgac_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
korgac_LDADD = $(LIB_KDEUI) \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
@@ -11,7 +11,7 @@ korgac_SOURCES = korgacmain.cpp alarmdialog.cpp \
check_PROGRAMS = testalarmdlg
-testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+testalarmdlg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
testalarmdlg_LDADD = $(LIB_KDEUI) $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/korganizer/libkorganizer_eventviewer.la
testalarmdlg_SOURCES = testalarmdlg.cpp alarmdialog.cpp
diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp
index d539d6676..43370a039 100644
--- a/korganizer/korgac/alarmdialog.cpp
+++ b/korganizer/korgac/alarmdialog.cpp
@@ -112,7 +112,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c
connect( calendar, TQT_SIGNAL(calendarChanged()),
this, TQT_SLOT(slotCalendarChanged()) );
- KGlobal::iconLoader()->addAppDir( "kdepim" );
+ KGlobal::iconLoader()->addAppDir( "tdepim" );
setButtonOK( i18n( "Suspend" ) );
TQWidget *topBox = plainPage();
diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h
index 1d81ac0d5..4873ef631 100644
--- a/korganizer/korganizerifaceimpl.h
+++ b/korganizer/korganizerifaceimpl.h
@@ -34,7 +34,7 @@
#include "korganizeriface.h"
#include <tqobject.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class ActionManager;
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index a698edfe1..c98c6c31d 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -88,9 +88,9 @@ int KOWhatsNextView::tqcurrentDateCount()
void KOWhatsNextView::updateView()
{
- KIconLoader kil("kdepim");
+ KIconLoader kil("tdepim");
TQString *ipath = new TQString();
- kil.loadIcon("kdepim",KIcon::NoGroup,32,KIcon::DefaultState,ipath);
+ kil.loadIcon("tdepim",KIcon::NoGroup,32,KIcon::DefaultState,ipath);
mText = "<table width=\"100%\">\n";
mText += "<tr bgcolor=\"#3679AD\"><td><h1>";
diff --git a/korganizer/plugins/hebrew/CMakeLists.txt b/korganizer/plugins/hebrew/CMakeLists.txt
index 02f98faaf..1f397d7b6 100644
--- a/korganizer/plugins/hebrew/CMakeLists.txt
+++ b/korganizer/plugins/hebrew/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES hebrew.desktop DESTINATION ${SERVICES_INSTALL_DIR}/korganizer )
tde_add_kpart( libkorg_hebrew AUTOMOC
SOURCES
hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp
- LINK kdeui-shared
+ LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am
index 6574222fd..29189bacf 100644
--- a/korganizer/plugins/printing/journal/Makefile.am
+++ b/korganizer/plugins/printing/journal/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la
libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui journalprint.cpp
libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
-libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -lkdepim
+libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libtdepim/ -ltdepim
noinst_HEADERS =
diff --git a/korganizer/printing/CMakeLists.txt b/korganizer/printing/CMakeLists.txt
index 22948aec9..67ff04850 100644
--- a/korganizer/printing/CMakeLists.txt
+++ b/korganizer/printing/CMakeLists.txt
@@ -35,7 +35,7 @@ install( FILES
tde_add_library( kocorehelper SHARED
SOURCES cellitem.cpp
VERSION 1.0.0
- LINK kdepim-shared
+ LINK tdepim-shared
DESTINATION ${LIB_INSTALL_DIR}
)
@@ -49,6 +49,6 @@ tde_add_library( korg_stdprinting SHARED AUTOMOC
calprinttodoconfig_base.ui calprintweekconfig_base.ui
calprintincidenceconfig_base.ui
VERSION 1.0.0
- LINK kocorehelper-shared kdeprint-shared
+ LINK kocorehelper-shared tdeprint-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/korganizer/printing/Makefile.am b/korganizer/printing/Makefile.am
index 4303579bf..40d17e1c7 100644
--- a/korganizer/printing/Makefile.am
+++ b/korganizer/printing/Makefile.am
@@ -25,7 +25,7 @@ libkorg_stdprinting_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \
libkorg_stdprinting_la_LIBADD = $(LIB_KDEUI) libkocorehelper.la \
$(top_builddir)/libtdepim/libtdepim.la \
$(top_builddir)/libkcal/libkcal.la \
- -lkdeprint
+ -ltdeprint
calprintdir = $(includedir)/korganizer
diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h
index 7a0f257ba..edb83bd3e 100644
--- a/korganizer/printing/calprinter.h
+++ b/korganizer/printing/calprinter.h
@@ -31,7 +31,7 @@
#include <kdialogbase.h>
#include <korganizer/baseview.h>
#include <korganizer/printplugin.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KOrg {
class CoreHelper;
diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h
index 592151946..3684e2f12 100644
--- a/korganizer/printing/calprintpluginbase.h
+++ b/korganizer/printing/calprintpluginbase.h
@@ -30,7 +30,7 @@
#include <tqdatetime.h>
#include <kprinter.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
#include <libkcal/calendar.h>
#include <libkcal/event.h>
#include <libkcal/todo.h>
diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h
index 4217e8b9e..9e1beb6ca 100644
--- a/korganizer/printing/cellitem.h
+++ b/korganizer/printing/cellitem.h
@@ -27,7 +27,7 @@
#include <tqstring.h>
#include <tqptrlist.h>
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
namespace KOrg {
diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h
index aa3c6de28..572a67a55 100644
--- a/korganizer/urihandler.h
+++ b/korganizer/urihandler.h
@@ -24,7 +24,7 @@
#ifndef URIHANDLER_H
#define URIHANDLER_H
-#include <kdepimmacros.h>
+#include <tdepimmacros.h>
class TQString;
class TQWidget;