diff options
Diffstat (limited to 'tderesources/scalix')
22 files changed, 35 insertions, 35 deletions
diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am index ca3230486..6ba71e205 100644 --- a/tderesources/scalix/Makefile.am +++ b/tderesources/scalix/Makefile.am @@ -1,4 +1,4 @@ SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin messages: rc.cpp - $(XGETTEXT) shared/*.cpp kabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot + $(XGETTEXT) shared/*.cpp tdeabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot diff --git a/tderesources/scalix/kabc/contact.h b/tderesources/scalix/kabc/contact.h index ad095a8d0..33ea1a9cb 100644 --- a/tderesources/scalix/kabc/contact.h +++ b/tderesources/scalix/kabc/contact.h @@ -21,7 +21,7 @@ #ifndef SCALIX_CONTACT_H #define SCALIX_CONTACT_H -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> namespace Scalix { diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp index 0629b5169..d7826e17c 100644 --- a/tderesources/scalix/kabc/resourcescalix.cpp +++ b/tderesources/scalix/kabc/resourcescalix.cpp @@ -34,10 +34,10 @@ #include "resourcescalix.h" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/observer.h> #include <tdeio/uiserver_stub.h> #include <tdemainwindow.h> diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp index b75fd6c9d..a58a85957 100644 --- a/tderesources/scalix/kcal/resourcescalix.cpp +++ b/tderesources/scalix/kcal/resourcescalix.cpp @@ -39,9 +39,9 @@ #include <dcopclient.h> #include <libkcal/icalformat.h> #include <libtdepim/kincidencechooser.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tdemainwindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqobject.h> #include <tqtimer.h> diff --git a/tderesources/scalix/knotes/resourcescalix.cpp b/tderesources/scalix/knotes/resourcescalix.cpp index 62b0daf48..c227d6546 100644 --- a/tderesources/scalix/knotes/resourcescalix.cpp +++ b/tderesources/scalix/knotes/resourcescalix.cpp @@ -38,7 +38,7 @@ #include <libkcal/icalformat.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> using namespace Scalix; diff --git a/tderesources/scalix/scalixadmin/CMakeLists.txt b/tderesources/scalix/scalixadmin/CMakeLists.txt index f13d11a83..b2e1be91c 100644 --- a/tderesources/scalix/scalixadmin/CMakeLists.txt +++ b/tderesources/scalix/scalixadmin/CMakeLists.txt @@ -28,6 +28,6 @@ tde_add_executable( scalixadmin AUTOMOC otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp delegatemanager.cpp delegateview.cpp delegatepage.cpp delegatedialog.cpp outofofficepage.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tderesources/scalix/scalixadmin/delegatedialog.cpp b/tderesources/scalix/scalixadmin/delegatedialog.cpp index 661f57430..8674ce70c 100644 --- a/tderesources/scalix/scalixadmin/delegatedialog.cpp +++ b/tderesources/scalix/scalixadmin/delegatedialog.cpp @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqtoolbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "jobs.h" #include "ldapdialog.h" diff --git a/tderesources/scalix/scalixadmin/delegatepage.cpp b/tderesources/scalix/scalixadmin/delegatepage.cpp index 169ff0853..b4368f7d1 100644 --- a/tderesources/scalix/scalixadmin/delegatepage.cpp +++ b/tderesources/scalix/scalixadmin/delegatepage.cpp @@ -22,8 +22,8 @@ #include <tqpushbutton.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <unistd.h> diff --git a/tderesources/scalix/scalixadmin/delegateview.cpp b/tderesources/scalix/scalixadmin/delegateview.cpp index 440fb66fa..79b8cf335 100644 --- a/tderesources/scalix/scalixadmin/delegateview.cpp +++ b/tderesources/scalix/scalixadmin/delegateview.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "delegatemanager.h" diff --git a/tderesources/scalix/scalixadmin/jobs.cpp b/tderesources/scalix/scalixadmin/jobs.cpp index e7dd94457..e07b17cad 100644 --- a/tderesources/scalix/scalixadmin/jobs.cpp +++ b/tderesources/scalix/scalixadmin/jobs.cpp @@ -19,7 +19,7 @@ */ #include <tdeio/scheduler.h> -#include <klocale.h> +#include <tdelocale.h> #include "jobs.h" diff --git a/tderesources/scalix/scalixadmin/ldapdialog.cpp b/tderesources/scalix/scalixadmin/ldapdialog.cpp index 6af08c4d7..609c472b0 100644 --- a/tderesources/scalix/scalixadmin/ldapdialog.cpp +++ b/tderesources/scalix/scalixadmin/ldapdialog.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "ldapview.h" diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp index 0cdca1819..bc3059984 100644 --- a/tderesources/scalix/scalixadmin/ldapview.cpp +++ b/tderesources/scalix/scalixadmin/ldapview.cpp @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kabc/ldapclient.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeabc/ldapclient.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/main.cpp b/tderesources/scalix/scalixadmin/main.cpp index caaabcf41..6f162df9d 100644 --- a/tderesources/scalix/scalixadmin/main.cpp +++ b/tderesources/scalix/scalixadmin/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "mainwindow.h" diff --git a/tderesources/scalix/scalixadmin/mainwindow.cpp b/tderesources/scalix/scalixadmin/mainwindow.cpp index 5eb3d2a5c..1759076a3 100644 --- a/tderesources/scalix/scalixadmin/mainwindow.cpp +++ b/tderesources/scalix/scalixadmin/mainwindow.cpp @@ -20,10 +20,10 @@ #include <tqvbox.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kjanuswidget.h> -#include <klocale.h> +#include <tdelocale.h> #include "delegatepage.h" #include "otheruserpage.h" diff --git a/tderesources/scalix/scalixadmin/otheruserpage.cpp b/tderesources/scalix/scalixadmin/otheruserpage.cpp index 3aac47c9e..3cc220eab 100644 --- a/tderesources/scalix/scalixadmin/otheruserpage.cpp +++ b/tderesources/scalix/scalixadmin/otheruserpage.cpp @@ -25,8 +25,8 @@ #include <dcopref.h> #include <kdcopservicestarter.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <unistd.h> diff --git a/tderesources/scalix/scalixadmin/otheruserview.cpp b/tderesources/scalix/scalixadmin/otheruserview.cpp index 06e69d41c..e8aa13bc4 100644 --- a/tderesources/scalix/scalixadmin/otheruserview.cpp +++ b/tderesources/scalix/scalixadmin/otheruserview.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "otherusermanager.h" diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index 4e34a9144..e807379ab 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -25,8 +25,8 @@ #include <tqradiobutton.h> #include <tqtextedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "jobs.h" #include "settings.h" diff --git a/tderesources/scalix/scalixadmin/passwordpage.cpp b/tderesources/scalix/scalixadmin/passwordpage.cpp index 9bdc13776..4a13b700f 100644 --- a/tderesources/scalix/scalixadmin/passwordpage.cpp +++ b/tderesources/scalix/scalixadmin/passwordpage.cpp @@ -25,8 +25,8 @@ #include <tqpushbutton.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <tdewallet.h> diff --git a/tderesources/scalix/shared/kmailconnection.cpp b/tderesources/scalix/shared/kmailconnection.cpp index 57f2f4489..147b9822a 100644 --- a/tderesources/scalix/shared/kmailconnection.cpp +++ b/tderesources/scalix/shared/kmailconnection.cpp @@ -37,7 +37,7 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <kdcopservicestarter.h> -#include <klocale.h> +#include <tdelocale.h> #include "kmailicalIface_stub.h" diff --git a/tderesources/scalix/shared/resourcescalixbase.cpp b/tderesources/scalix/shared/resourcescalixbase.cpp index 1f829a79d..6108230c0 100644 --- a/tderesources/scalix/shared/resourcescalixbase.cpp +++ b/tderesources/scalix/shared/resourcescalixbase.cpp @@ -35,12 +35,12 @@ #include <folderselectdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kinputdialog.h> #include <kurl.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tqtextstream.h> #include <kdebug.h> diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index d40bdb03f..3cdf16c0b 100644 --- a/tderesources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp @@ -32,7 +32,7 @@ #include "scalixbase.h" -#include <kabc/addressee.h> +#include <tdeabc/addressee.h> #include <libkcal/journal.h> #include <libtdepim/kpimprefs.h> #include <kdebug.h> diff --git a/tderesources/scalix/tdeioslave/scalix.cpp b/tderesources/scalix/tdeioslave/scalix.cpp index b4f662fdb..268b164bf 100644 --- a/tderesources/scalix/tdeioslave/scalix.cpp +++ b/tderesources/scalix/tdeioslave/scalix.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeversion.h> #include <tdeio/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepimmacros.h> |