diff options
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/Makefile.am | 4 | ||||
| -rw-r--r-- | wizards/egroupwaremain.cpp | 2 | ||||
| -rw-r--r-- | wizards/egroupwarewizard.cpp | 4 | ||||
| -rw-r--r-- | wizards/exchangemain.cpp | 4 | ||||
| -rw-r--r-- | wizards/exchangewizard.cpp | 2 | ||||
| -rw-r--r-- | wizards/groupwarewizard.cpp | 2 | ||||
| -rw-r--r-- | wizards/groupwisemain.cpp | 4 | ||||
| -rw-r--r-- | wizards/groupwisewizard.cpp | 2 | ||||
| -rw-r--r-- | wizards/kmailchanges.cpp | 4 | ||||
| -rw-r--r-- | wizards/kolabkmailchanges.cpp | 2 | ||||
| -rw-r--r-- | wizards/kolabmain.cpp | 4 | ||||
| -rw-r--r-- | wizards/kolabwizard.cpp | 6 | ||||
| -rw-r--r-- | wizards/main.cpp | 4 | ||||
| -rw-r--r-- | wizards/overviewpage.cpp | 4 | ||||
| -rw-r--r-- | wizards/scalixkmailchanges.cpp | 2 | ||||
| -rw-r--r-- | wizards/scalixmain.cpp | 4 | ||||
| -rw-r--r-- | wizards/scalixwizard.cpp | 8 | ||||
| -rw-r--r-- | wizards/sloxmain.cpp | 4 | ||||
| -rw-r--r-- | wizards/sloxwizard.cpp | 2 |
19 files changed, 34 insertions, 34 deletions
diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 5faa267ae..93cbeae69 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -29,7 +29,7 @@ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp # Kolab libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libkolabwizard_la_LIBADD = $(top_builddir)/tderesources/kolab/kcal/libkcalkolab.la \ - $(top_builddir)/tderesources/kolab/kabc/libkabckolab.la \ + $(top_builddir)/tderesources/kolab/tdeabc/libkabckolab.la \ $(top_builddir)/tderesources/kolab/knotes/libknoteskolab.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ @@ -97,7 +97,7 @@ exchangewizard_SOURCES = exchangemain.cpp # Scalix libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libscalixwizard_la_LIBADD = $(top_builddir)/tderesources/scalix/kcal/libkcalscalix.la \ - $(top_builddir)/tderesources/scalix/kabc/libkabcscalix.la \ + $(top_builddir)/tderesources/scalix/tdeabc/libkabcscalix.la \ $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkpimidentities/libkpimidentities.la diff --git a/wizards/egroupwaremain.cpp b/wizards/egroupwaremain.cpp index 657b8ad27..baff8afb8 100644 --- a/wizards/egroupwaremain.cpp +++ b/wizards/egroupwaremain.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> +#include <tdeglobal.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index 843a20596..80cab2c49 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -31,8 +31,8 @@ #include <libkcal/resourcecalendar.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/wizards/exchangemain.cpp b/wizards/exchangemain.cpp index fc50c0c04..923c575d5 100644 --- a/wizards/exchangemain.cpp +++ b/wizards/exchangemain.cpp @@ -24,8 +24,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index 258d0a54c..de61328fb 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -28,7 +28,7 @@ #include <libkcal/resourcecalendar.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqcheckbox.h> diff --git a/wizards/groupwarewizard.cpp b/wizards/groupwarewizard.cpp index dd2fa0364..231862b48 100644 --- a/wizards/groupwarewizard.cpp +++ b/wizards/groupwarewizard.cpp @@ -22,7 +22,7 @@ #include <tqapplication.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "overviewpage.h" diff --git a/wizards/groupwisemain.cpp b/wizards/groupwisemain.cpp index cf48bc436..9de56eb1c 100644 --- a/wizards/groupwisemain.cpp +++ b/wizards/groupwisemain.cpp @@ -24,8 +24,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 583615b3f..71e89f49c 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -32,7 +32,7 @@ #include <libemailfunctions/email.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/wizards/kmailchanges.cpp b/wizards/kmailchanges.cpp index 7d722a913..968a30b2a 100644 --- a/wizards/kmailchanges.cpp +++ b/wizards/kmailchanges.cpp @@ -23,9 +23,9 @@ #include "kmailchanges.h" #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <identitymanager.h> #include <identity.h> #include <kdebug.h> diff --git a/wizards/kolabkmailchanges.cpp b/wizards/kolabkmailchanges.cpp index 6227383fc..1223ea3bf 100644 --- a/wizards/kolabkmailchanges.cpp +++ b/wizards/kolabkmailchanges.cpp @@ -24,7 +24,7 @@ #include "kolabconfig.h" #include "kmailchanges.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/wizards/kolabmain.cpp b/wizards/kolabmain.cpp index 94340f247..388478ca1 100644 --- a/wizards/kolabmain.cpp +++ b/wizards/kolabmain.cpp @@ -25,8 +25,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index b0002a508..f781917fd 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -26,14 +26,14 @@ #include "kolabkmailchanges.h" #include "tderesources/kolab/kcal/resourcekolab.h" -#include "tderesources/kolab/kabc/resourcekolab.h" +#include "tderesources/kolab/tdeabc/resourcekolab.h" #include "tderesources/kolab/knotes/resourcekolab.h" #include <libkcal/resourcecalendar.h> -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqhbuttongroup.h> diff --git a/wizards/main.cpp b/wizards/main.cpp index 98ce36837..b6c2de25e 100644 --- a/wizards/main.cpp +++ b/wizards/main.cpp @@ -1,8 +1,8 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "groupwarewizard.h" diff --git a/wizards/overviewpage.cpp b/wizards/overviewpage.cpp index 893884ce5..e9f6596a3 100644 --- a/wizards/overviewpage.cpp +++ b/wizards/overviewpage.cpp @@ -26,9 +26,9 @@ #include <tdeaccelmanager.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/wizards/scalixkmailchanges.cpp b/wizards/scalixkmailchanges.cpp index 89ea65d54..f7f86053f 100644 --- a/wizards/scalixkmailchanges.cpp +++ b/wizards/scalixkmailchanges.cpp @@ -24,7 +24,7 @@ #include "scalixconfig.h" #include "kmailchanges.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/wizards/scalixmain.cpp b/wizards/scalixmain.cpp index a207d560c..16920c01b 100644 --- a/wizards/scalixmain.cpp +++ b/wizards/scalixmain.cpp @@ -25,8 +25,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index dc8c5e038..59c38766a 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -26,17 +26,17 @@ #include "scalixkmailchanges.h" #include "tderesources/scalix/kcal/resourcescalix.h" -#include "tderesources/scalix/kabc/resourcescalix.h" +#include "tderesources/scalix/tdeabc/resourcescalix.h" #include <libkcal/resourcecalendar.h> -#include <kabc/resource.h> +#include <tdeabc/resource.h> #include <dcopref.h> #include <kcombobox.h> #include <kdcopservicestarter.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <tqapplication.h> diff --git a/wizards/sloxmain.cpp b/wizards/sloxmain.cpp index 08be97d6b..20dbcb665 100644 --- a/wizards/sloxmain.cpp +++ b/wizards/sloxmain.cpp @@ -24,8 +24,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> static const TDECmdLineOptions options[] = { diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 250f76a45..646597269 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -29,7 +29,7 @@ #include <libkcal/resourcecalendar.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqcheckbox.h> |