diff options
334 files changed, 509 insertions, 509 deletions
diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp index d3f38640..f4803d1e 100644 --- a/cervisia/addremovedlg.cpp +++ b/cervisia/addremovedlg.cpp @@ -27,7 +27,7 @@ #include <tqstringlist.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char* name) diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp index 32a38c77..7784f1d5 100644 --- a/cervisia/addrepositorydlg.cpp +++ b/cervisia/addrepositorydlg.cpp @@ -28,7 +28,7 @@ #include <tdeconfig.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp index 1f220342..d374eaed 100644 --- a/cervisia/annotatectl.cpp +++ b/cervisia/annotatectl.cpp @@ -23,7 +23,7 @@ #include <tqmap.h> #include <dcopref.h> -#include <klocale.h> +#include <tdelocale.h> #include <krfcdate.h> #include "annotatedlg.h" diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp index a46e52b1..567c6616 100644 --- a/cervisia/annotateview.cpp +++ b/cervisia/annotateview.cpp @@ -22,7 +22,7 @@ #include <tqheader.h> #include <tqpainter.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "loginfo.h" #include "tooltip.h" diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index b67225df..ef6f42ee 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -30,7 +30,7 @@ #include <tdefiledialog.h> #include <kinputdialog.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> #include <kprocess.h> #include <kpropertiesdialog.h> @@ -39,8 +39,8 @@ #include <kxmlguifactory.h> #include <krun.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> #include <tdeio/netaccess.h> #include "progressdlg.h" diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp index ff4cec23..ec59499b 100644 --- a/cervisia/cervisiashell.cpp +++ b/cervisia/cervisiashell.cpp @@ -27,8 +27,8 @@ #include <khelpmenu.h> #include <kkeydialog.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstatusbar.h> #include <kstdaction.h> #include <kurl.h> diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp index 80a3c729..94c06423 100644 --- a/cervisia/changelogdlg.cpp +++ b/cervisia/changelogdlg.cpp @@ -24,9 +24,9 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tdeconfig.h> -#include <kglobalsettings.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktextedit.h> #include "misc.h" diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp index 2f63dcd5..9519c0a9 100644 --- a/cervisia/checkoutdlg.cpp +++ b/cervisia/checkoutdlg.cpp @@ -30,8 +30,8 @@ #include <kprocess.h> #include <tdefiledialog.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurlcompletion.h> #include "progressdlg.h" diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp index dd62a770..792a4195 100644 --- a/cervisia/commitdlg.cpp +++ b/cervisia/commitdlg.cpp @@ -29,7 +29,7 @@ #include <tqheader.h> #include <tdelistview.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "cvsservice_stub.h" #include "logmessageedit.h" diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp index e29f0615..db39be24 100644 --- a/cervisia/cvsinitdlg.cpp +++ b/cervisia/cvsinitdlg.cpp @@ -25,7 +25,7 @@ #include <tdefiledialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlcompletion.h> diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index 9196b9c6..810c906c 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -22,7 +22,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <iostream> diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp index ad6f9176..5eb1d9fc 100644 --- a/cervisia/cvsservice/cvsloginjob.cpp +++ b/cervisia/cvsservice/cvsloginjob.cpp @@ -21,7 +21,7 @@ #include "cvsloginjob.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <sys/types.h> diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp index 9efbd86e..9eabda4c 100644 --- a/cervisia/cvsservice/cvsservice.cpp +++ b/cervisia/cvsservice/cvsservice.cpp @@ -27,8 +27,8 @@ #include <dcopclient.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include "cvsjob.h" diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp index d0180b6f..6e11f605 100644 --- a/cervisia/cvsservice/main.cpp +++ b/cervisia/cvsservice/main.cpp @@ -21,7 +21,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "cvsservice.h" diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp index 35615507..8a932cb7 100644 --- a/cervisia/diffdlg.cpp +++ b/cervisia/diffdlg.cpp @@ -29,9 +29,9 @@ #include <tqregexp.h> #include <tdeconfig.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kprocess.h> #include "cvsservice_stub.h" diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp index 83f5a1cf..481edf19 100644 --- a/cervisia/diffview.cpp +++ b/cervisia/diffview.cpp @@ -29,8 +29,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> class DiffViewItem diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp index 00ff3b32..d3ba4638 100644 --- a/cervisia/entry_status.cpp +++ b/cervisia/entry_status.cpp @@ -21,7 +21,7 @@ #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> namespace Cervisia diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp index b3834a42..d3633ee1 100644 --- a/cervisia/globalignorelist.cpp +++ b/cervisia/globalignorelist.cpp @@ -21,7 +21,7 @@ using namespace Cervisia; #include <tqdir.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <stdlib.h> // for getenv() #include "cvsservice_stub.h" diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp index 1913153c..0b21e8d7 100644 --- a/cervisia/historydlg.cpp +++ b/cervisia/historydlg.cpp @@ -28,7 +28,7 @@ #include <tdeconfig.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <krfcdate.h> #include "misc.h" diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp index a2571197..e924672b 100644 --- a/cervisia/logdlg.cpp +++ b/cervisia/logdlg.cpp @@ -34,11 +34,11 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kfinddialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelistviewsearchline.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <krfcdate.h> #include <krun.h> diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp index 07468ae7..a7daa7a5 100644 --- a/cervisia/loginfo.cpp +++ b/cervisia/loginfo.cpp @@ -21,8 +21,8 @@ #include <tqstylesheet.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> namespace Cervisia diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp index 68d07d9a..4bc4ff1e 100644 --- a/cervisia/loglist.cpp +++ b/cervisia/loglist.cpp @@ -22,7 +22,7 @@ #include <tqapplication.h> #include <tqkeycode.h> -#include <klocale.h> +#include <tdelocale.h> #include "loginfo.h" #include "misc.h" diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp index 413180af..4cf78061 100644 --- a/cervisia/logplainview.cpp +++ b/cervisia/logplainview.cpp @@ -24,7 +24,7 @@ #include <tqstylesheet.h> #include <kfind.h> #include <kfinddialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "loginfo.h" diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp index 57d635ca..ede6d30d 100644 --- a/cervisia/logtree.cpp +++ b/cervisia/logtree.cpp @@ -22,8 +22,8 @@ #include <tqpainter.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include "loginfo.h" #include "tooltip.h" diff --git a/cervisia/main.cpp b/cervisia/main.cpp index 6c13ba95..5fe4028c 100644 --- a/cervisia/main.cpp +++ b/cervisia/main.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include "misc.h" diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp index e2b770c6..1cbecfd7 100644 --- a/cervisia/mergedlg.cpp +++ b/cervisia/mergedlg.cpp @@ -27,7 +27,7 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqstyle.h> -#include <klocale.h> +#include <tdelocale.h> #include "misc.h" #include "cvsservice_stub.h" diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp index 11e60e5e..090861ca 100644 --- a/cervisia/misc.cpp +++ b/cervisia/misc.cpp @@ -30,11 +30,11 @@ #include <tqregexp.h> #include <tqstringlist.h> #include <tdeconfig.h> -#include <kemailsettings.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeemailsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kuser.h> #include <kdebug.h> diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp index 6516528f..43ba7fdf 100644 --- a/cervisia/patchoptiondlg.cpp +++ b/cervisia/patchoptiondlg.cpp @@ -25,7 +25,7 @@ using Cervisia::PatchOptionDialog; #include <tqradiobutton.h> #include <tqvbuttongroup.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name) diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp index a94be9f5..7e2cb3a3 100644 --- a/cervisia/protocolview.cpp +++ b/cervisia/protocolview.cpp @@ -25,8 +25,8 @@ #include <tqpopupmenu.h> #include <dcopref.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "cervisiapart.h" #include "cvsjob_stub.h" diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp index 24fcf608..5b348303 100644 --- a/cervisia/repositorydlg.cpp +++ b/cervisia/repositorydlg.cpp @@ -26,8 +26,8 @@ #include <kbuttonbox.h> #include <tdeconfig.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "addrepositorydlg.h" diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp index 93c915fc..cd12c757 100644 --- a/cervisia/resolvedlg.cpp +++ b/cervisia/resolvedlg.cpp @@ -30,8 +30,8 @@ #include <tqtextstream.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqregexp.h> #include "misc.h" #include "resolvedlg_p.h" diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp index 98a3e012..b55d310c 100644 --- a/cervisia/settingsdlg.cpp +++ b/cervisia/settingsdlg.cpp @@ -34,10 +34,10 @@ #include <kcolorbutton.h> #include <tdeconfig.h> #include <tdefontdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include <kurlrequester.h> diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp index b2bd1506..0ad161d9 100644 --- a/cervisia/tagdlg.cpp +++ b/cervisia/tagdlg.cpp @@ -26,8 +26,8 @@ #include <tqlayout.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "misc.h" #include "cvsservice_stub.h" diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp index 5cd34b89..2f92823e 100644 --- a/cervisia/tooltip.cpp +++ b/cervisia/tooltip.cpp @@ -19,8 +19,8 @@ #include "tooltip.h" -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tqsimplerichtext.h> diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp index 4cd4367c..d48d625c 100644 --- a/cervisia/updatedlg.cpp +++ b/cervisia/updatedlg.cpp @@ -27,7 +27,7 @@ #include <tqradiobutton.h> #include <tqstyle.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "misc.h" #include "cvsservice_stub.h" diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp index 4aa5a44e..ef3f1703 100644 --- a/cervisia/updateview.cpp +++ b/cervisia/updateview.cpp @@ -26,7 +26,7 @@ #include <tqfileinfo.h> #include <tqptrstack.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "cervisiasettings.h" #include "entry.h" diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp index 34204ca8..ce74fd2a 100644 --- a/cervisia/updateview_items.cpp +++ b/cervisia/updateview_items.cpp @@ -27,9 +27,9 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include "cvsdir.h" diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp index 7be45e32..e4579d78 100644 --- a/cervisia/watchdlg.cpp +++ b/cervisia/watchdlg.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name) diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp index a3ca17ed..f3c18238 100644 --- a/cervisia/watchersdlg.cpp +++ b/cervisia/watchersdlg.cpp @@ -23,7 +23,7 @@ #include <tqtable.h> #include <tdeconfig.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include "misc.h" #include "cvsservice_stub.h" diff --git a/doc/kbabel/using.docbook b/doc/kbabel/using.docbook index ce67d1a9..2e293aa3 100644 --- a/doc/kbabel/using.docbook +++ b/doc/kbabel/using.docbook @@ -742,7 +742,7 @@ number of plural forms. This is done by translating a specific entry in <filenam The number is set by selecting the name of a language, which uses the same number and <emphasis>rules</emphasis> for finding the right plural form. The up-to-date list of possible values can be found in the -tdelibs source code, in the file <filename>tdecore/klocale.cpp</filename>. +tdelibs source code, in the file <filename>tdecore/tdelocale.cpp</filename>. </para> <note><para> diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index 5785102e..e3280254 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -14,10 +14,10 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include <tqpaintdevicemetrics.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstatusbar.h> #include <tdeaccel.h> #include <tdeio/netaccess.h> diff --git a/kapptemplate/kapp/apppref.cpp b/kapptemplate/kapp/apppref.cpp index 6a479b83..59b46b4a 100644 --- a/kapptemplate/kapp/apppref.cpp +++ b/kapptemplate/kapp/apppref.cpp @@ -2,7 +2,7 @@ echo "Creating $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}pref.cpp..."; cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}pref.cpp #include "${APP_NAME_LC}pref.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlabel.h> diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp index 28b5bac0..d2299c22 100644 --- a/kapptemplate/kapp/appview.cpp +++ b/kapptemplate/kapp/appview.cpp @@ -9,7 +9,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}view.cpp #include <ktrader.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> ${APP_NAME}View::${APP_NAME}View(TQWidget *parent) diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp index 8f030437..c1c04ec5 100644 --- a/kapptemplate/kapp/main.cpp +++ b/kapptemplate/kapp/main.cpp @@ -5,7 +5,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/main.cpp #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("A TDE Application"); diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index e2610d96..85fb8dc5 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -18,7 +18,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp #include <kstdaction.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kstatusbar.h> diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp index c6b61d1d..f83359ec 100644 --- a/kapptemplate/kpartapp/main.cpp +++ b/kapptemplate/kpartapp/main.cpp @@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/main.cpp #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = I18N_NOOP("A TDE KPart Application"); diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index ccc7fecc..0bebbb39 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -5,8 +5,8 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp #include <tdehtml_part.h> #include <tdeaction.h> #include <kinstance.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kgenericfactory.h> typedef KGenericFactory<Plugin${APP_NAME}> ${APP_NAME}Factory; diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp index 7853a25e..8efd135f 100644 --- a/kbabel/addons/preview/pothumbcreator.cpp +++ b/kbabel/addons/preview/pothumbcreator.cpp @@ -38,7 +38,7 @@ #include <tqimage.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kstandarddirs.h> #include <kpixmapsplitter.h> diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index b9ff166b..c38dc427 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -58,11 +58,11 @@ #include <kdialogbase.h> //#include <kedittoolbar.h> #include <tdefiledialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kprogress.h> #include <tdestdaccel.h> diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index daba1fc8..9dc0691c 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -57,13 +57,13 @@ #include <kcmenumngr.h> #include <kcursor.h> -#include <klocale.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tdeconfig.h> #include <kdatatool.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeaction.h> #include <tdefiledialog.h> @@ -71,7 +71,7 @@ #include <kprogress.h> #include <twin.h> #include <tdeversion.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqfileinfo.h> #include <tqdir.h> diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp index 52f248e2..c2d03d53 100644 --- a/kbabel/catalogmanager/catmanlistitem.cpp +++ b/kbabel/catalogmanager/catmanlistitem.cpp @@ -40,7 +40,7 @@ #include "resources.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqfileinfo.h> #include <tqdir.h> diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp index be293012..66926de2 100644 --- a/kbabel/catalogmanager/findinfilesdialog.cpp +++ b/kbabel/catalogmanager/findinfilesdialog.cpp @@ -39,8 +39,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KBabel; diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index ce4c4985..9568eff3 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -48,11 +48,11 @@ // KDE include files #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprocess.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <kstringhandler.h> #include <kcombobox.h> #include <kcharsets.h> diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index 45131583..0d6be57a 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -45,9 +45,9 @@ #include <tqstringlist.h> // KDE include files #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> // project specific include files #include "cvshandler.h" diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp index cd859d21..c0b82771 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.cpp +++ b/kbabel/catalogmanager/libsvn/svndialog.cpp @@ -47,11 +47,11 @@ // KDE include files #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprocess.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <kstringhandler.h> // Project specific include files #include "svndialog.h" diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index b7e0fd4e..4587f0ed 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -46,9 +46,9 @@ #include <tqdom.h> // KDE include files #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <kdebug.h> #include <kprocess.h> // project specific include files diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index 306fecec..ef64c451 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -46,9 +46,9 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <twin.h> #include <tdemainwindow.h> diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index ee86ead5..d4ff458d 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -39,8 +39,8 @@ #include <kcombobox.h> #include <kcompletion.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp index 6f3b750c..841f8bbc 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.cpp +++ b/kbabel/catalogmanager/multiroughtransdlg.cpp @@ -39,9 +39,9 @@ #include <tqlayout.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kurl.h> diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp index 76728e04..02c97738 100644 --- a/kbabel/catalogmanager/validateprogress.cpp +++ b/kbabel/catalogmanager/validateprogress.cpp @@ -37,8 +37,8 @@ #include <kdebug.h> #include <kdatatool.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kprogress.h> #include <ksqueezedtextlabel.h> diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index e58ffd87..aaf844ae 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -42,10 +42,10 @@ #include <tdeconfig.h> #include <kdatatool.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> @@ -67,7 +67,7 @@ #include "version.h" #include "stringdistance.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> using namespace KBabel; Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile) diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp index b217d9c2..d7236b80 100644 --- a/kbabel/common/catalogsettings.cpp +++ b/kbabel/common/catalogsettings.cpp @@ -35,11 +35,11 @@ #include "kbprojectsettings.h" #include <tdeconfig.h> #include <kdebug.h> -#include <kemailsettings.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeemailsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <stdlib.h> diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index 418c1dea..a85fb990 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -41,8 +41,8 @@ #include <tdeapplication.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktar.h> #include <kurl.h> #include <kdebug.h> diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp index 9700c08f..35ce08a5 100644 --- a/kbabel/common/kbproject.cpp +++ b/kbabel/common/kbproject.cpp @@ -39,8 +39,8 @@ #include <tqfileinfo.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <tdespell.h> diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp index 98df4924..8ac63cd4 100644 --- a/kbabel/common/projectsettings.cpp +++ b/kbabel/common/projectsettings.cpp @@ -36,8 +36,8 @@ #include "resources.h" #include <tqstring.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdespell.h> diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp index bbf9ee1d..ef89fa3e 100644 --- a/kbabel/common/tagextractor.cpp +++ b/kbabel/common/tagextractor.cpp @@ -35,7 +35,7 @@ #include "catalogsettings.h" #include "tagextractor.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> using namespace KBabel; diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp index 8d3658f4..e6db0b5b 100644 --- a/kbabel/commonui/cmdedit.cpp +++ b/kbabel/commonui/cmdedit.cpp @@ -38,7 +38,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqtoolbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 0ae00003..bd05078b 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -49,8 +49,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeversion.h> #include <tdeio/netaccess.h> diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 0fe463fd..b58cf7bf 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -45,8 +45,8 @@ #include <kcombobox.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeparts/componentfactory.h> #include <kregexpeditorinterface.h> diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index 34f5223b..e2d3ced0 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.cpp @@ -42,7 +42,7 @@ #include <tqvbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index f07ba99f..8ecc12db 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -43,11 +43,11 @@ #include <kcombobox.h> #include <kdatatool.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdefiledialog.h> #include <knuminput.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <kurlcompletion.h> #include <tdefontdialog.h> diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index 8365d038..79266489 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -40,9 +40,9 @@ #include <tqcombobox.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> using namespace KBabel; diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index 7ed5d604..677b68ee 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -53,9 +53,9 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kprogress.h> diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp index fd497a4b..8b56ae47 100644 --- a/kbabel/commonui/tdeactionselector.cpp +++ b/kbabel/commonui/tdeactionselector.cpp @@ -30,7 +30,7 @@ #include "tdeactionselector.h" #include <resources.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdialog.h> // for spacingHint() #include <kdebug.h> diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cc index 275a6289..0c7cae3a 100644 --- a/kbabel/datatools/accelerators/main.cc +++ b/kbabel/datatools/accelerators/main.cc @@ -39,7 +39,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> /*************************************************** * diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc index e125d792..b6c3fa5a 100644 --- a/kbabel/datatools/arguments/main.cc +++ b/kbabel/datatools/arguments/main.cc @@ -38,8 +38,8 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cc index 3288aa96..0fb989d2 100644 --- a/kbabel/datatools/context/main.cc +++ b/kbabel/datatools/context/main.cc @@ -39,8 +39,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cc index a5c9688c..c0dbbba2 100644 --- a/kbabel/datatools/equations/main.cc +++ b/kbabel/datatools/equations/main.cc @@ -39,8 +39,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cc index ec4bab17..f1c295eb 100644 --- a/kbabel/datatools/length/main.cc +++ b/kbabel/datatools/length/main.cc @@ -42,8 +42,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc index 4bcdd416..68093191 100644 --- a/kbabel/datatools/not-translated/main.cc +++ b/kbabel/datatools/not-translated/main.cc @@ -41,8 +41,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cc index cdc6e990..693a843b 100644 --- a/kbabel/datatools/pluralforms/main.cc +++ b/kbabel/datatools/pluralforms/main.cc @@ -40,8 +40,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cc index 7a05aabe..6d779518 100644 --- a/kbabel/datatools/punctuation/main.cc +++ b/kbabel/datatools/punctuation/main.cc @@ -39,7 +39,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> /*************************************************** * diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc index 9f948e03..e500728e 100644 --- a/kbabel/datatools/regexp/main.cc +++ b/kbabel/datatools/regexp/main.cc @@ -36,8 +36,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/setfuzzy/main.cc b/kbabel/datatools/setfuzzy/main.cc index 86dc332d..7bc0ed16 100644 --- a/kbabel/datatools/setfuzzy/main.cc +++ b/kbabel/datatools/setfuzzy/main.cc @@ -37,7 +37,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> /*************************************************** * diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cc index e838770f..06558211 100644 --- a/kbabel/datatools/whitespace/main.cc +++ b/kbabel/datatools/whitespace/main.cc @@ -41,8 +41,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cc index 2f32db9a..59342c0d 100644 --- a/kbabel/datatools/xml/main.cc +++ b/kbabel/datatools/xml/main.cc @@ -41,8 +41,8 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> /*************************************************** * diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp index 4adf1eb2..6678306b 100644 --- a/kbabel/filters/gettext/gettextimport.cpp +++ b/kbabel/filters/gettext/gettextimport.cpp @@ -47,7 +47,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> K_EXPORT_COMPONENT_FACTORY( kbabel_gettextimport, KGenericFactory<GettextImportPlugin> ( "kbabelgettextimportfilter" ) ) diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index d4a7c473..4522201e 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.cpp @@ -42,7 +42,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharselect.h> #include "kbcatalog.h" diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index e003ff57..0ca858d3 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -45,7 +45,7 @@ #include <tdeconfig.h> #include <kcursor.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kurldrag.h> diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp index 0eba0506..de5263a9 100644 --- a/kbabel/kbabel/contextview.cpp +++ b/kbabel/kbabel/contextview.cpp @@ -40,7 +40,7 @@ #include <tqwhatsthis.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include "resources.h" #include "kbcatalog.h" diff --git a/kbabel/kbabel/editorpreferences.ui.h b/kbabel/kbabel/editorpreferences.ui.h index 99819cde..ab2bbc31 100644 --- a/kbabel/kbabel/editorpreferences.ui.h +++ b/kbabel/kbabel/editorpreferences.ui.h @@ -7,7 +7,7 @@ ** place of a destructor. *****************************************************************************/ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "toolselectionwidget.h" void EditorPreferences::ledWarning( bool show ) diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp index 044b1078..cd1cc6c6 100644 --- a/kbabel/kbabel/errorlistview.cpp +++ b/kbabel/kbabel/errorlistview.cpp @@ -40,7 +40,7 @@ #include <tqwhatsthis.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include "resources.h" #include "kbcatalog.h" diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp index a6fca91e..ff5d1df5 100644 --- a/kbabel/kbabel/gotodialog.cpp +++ b/kbabel/kbabel/gotodialog.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <knuminput.h> #include "gotodialog.h" diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 38b11920..4a7624cb 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -33,11 +33,11 @@ **************************************************************************** */ #include <kcursor.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktextedit.h> #include <kurl.h> diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp index a3dcb3c3..11bf219c 100644 --- a/kbabel/kbabel/hidingmsgedit.cpp +++ b/kbabel/kbabel/hidingmsgedit.cpp @@ -37,7 +37,7 @@ #include <tqtabwidget.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KBabel; diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 9be4ec13..2f6cd4e9 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -64,9 +64,9 @@ #include <kstatusbar.h> #include <tdestdaccel.h> #include <kedittoolbar.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kled.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdetoolbar.h> #include <tdefiledialog.h> @@ -75,7 +75,7 @@ #include <kdialogbase.h> #include <kprogress.h> #include <kpushbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <twin.h> #include <tdeaction.h> #include <kstdaction.h> diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index a3841c81..a3f3abb7 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -44,7 +44,7 @@ #include "toolselectionwidget.h" #include "tqcombobox.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> using namespace KBabel; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index e415f06a..001b1489 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -61,9 +61,9 @@ #include <kcmenumngr.h> #include <tdeconfigdialog.h> #include <kdatatool.h> -#include <kglobal.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kcursor.h> #include <tdefiledialog.h> #include <tdeconfig.h> @@ -72,12 +72,12 @@ #include <tdelistbox.h> #include <tdeio/netaccess.h> #include <knotifyclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdespell.h> #include <twin.h> #include <tdestdaccel.h> #include <kurldrag.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "resources.h" diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 02462e19..5089f563 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -37,8 +37,8 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kurl.h> #include <tdeio/netaccess.h> diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index 9b7d7538..40822862 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -26,11 +26,11 @@ #include "kbabel.h" #include "editcmd.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <tqcolor.h> #include <tqlayout.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> using namespace KBabel; diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 0f50f630..70977aaa 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.cpp @@ -35,7 +35,7 @@ #include <tdeconfig.h> #include <kcharselect.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqspinbox.h> diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index d75de27f..3f9df538 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -41,8 +41,8 @@ #include "tdeapplication.h" #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kbabelsettings.h> #include <tdespell.h> diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 15dd9320..a6282e83 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -44,8 +44,8 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kcursor.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kuniqueapplication.h> #include <twin.h> diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 1e75f78b..ea46b9ac 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -53,9 +53,9 @@ #include <tqpopupmenu.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <tdestdaccel.h> #include "kbhighlighting.h" diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp index d60bf351..58013eac 100644 --- a/kbabel/kbabel/sourceview.cpp +++ b/kbabel/kbabel/sourceview.cpp @@ -38,7 +38,7 @@ #include <tqwhatsthis.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include "resources.h" #include "kbcatalog.h" diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp index 7bb43851..62a88c8c 100644 --- a/kbabel/kbabel/spelldlg.cpp +++ b/kbabel/kbabel/spelldlg.cpp @@ -37,8 +37,8 @@ #include <tqradiobutton.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name) : KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling") diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index d1adb648..3233ab57 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -38,7 +38,7 @@ #include <kcursor.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include "kbcatalog.h" diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp index 693a3ac6..bb34fc25 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.cpp +++ b/kbabel/kbabeldict/aboutmoduledlg.cpp @@ -33,7 +33,7 @@ #include "aboutmoduledlg.h" #include <kbugreport.h> -#include <klocale.h> +#include <tdelocale.h> AboutModuleDlg::AboutModuleDlg(const TDEAboutData *aboutData, TQWidget *parent) : TDEAboutApplication(aboutData, parent) diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index 796cf51f..ae3f506a 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -40,9 +40,9 @@ #include <tqpushbutton.h> #include <tdeconfig.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <ktempfile.h> +#include <tdetempfile.h> DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected , TQWidget *parent, const char *name) diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index 09a98fb6..03d08e38 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.cpp @@ -34,8 +34,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "kbabeldict.h" #include "kbabeldictview.h" diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index e0e631a3..4b158ef8 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -50,10 +50,10 @@ #include <kdialogbase.h> #include <klibloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <ktrader.h> #include <twin.h> diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp index 7ed294c9..7964c65a 100644 --- a/kbabel/kbabeldict/kbabeldictview.cpp +++ b/kbabel/kbabeldict/kbabeldictview.cpp @@ -52,9 +52,9 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprogress.h> #include <kseparator.h> #include <kdebug.h> diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index f863a4c5..98d00d05 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -37,7 +37,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <twin.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index a560ae45..5423bca9 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -33,10 +33,10 @@ #include <tqinputdialog.h> #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <kurlrequester.h> #include <kstandarddirs.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 8d48df58..50880dcc 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -38,7 +38,7 @@ #include <tqfile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> WordItem::WordItem (char *data, TQString w) diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp index 71b8e1a8..2273a9c4 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp @@ -1,5 +1,5 @@ -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index 7833bef3..e1f1db77 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -1029,7 +1029,7 @@ Finally you can set the maximum number of entries in the list.</string> </connection> </connections> <includes> - <include location="local" impldecl="in declaration">klocale.h</include> + <include location="local" impldecl="in declaration">tdelocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index ed2c5065..e87294e4 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -4,7 +4,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kurlrequester.h> #include <tqtoolbutton.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index a3309a26..2d564267 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -40,7 +40,7 @@ #include <tqcheckbox.h> #include <knuminput.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqmap.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index b880cd50..0abd3dc5 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -12,7 +12,7 @@ License: GPLv2 #include <tqdict.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #define i18n (const char*) diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp index c4091e41..ad2aa0dd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp @@ -1,5 +1,5 @@ -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index e3ef3776..5bf22ced 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -1032,7 +1032,7 @@ Finally you can set the maximum number of entries in the list.</string> </connection> </connections> <includes> - <include location="local" impldecl="in declaration">klocale.h</include> + <include location="local" impldecl="in declaration">tdelocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp index d70ae697..0b332eef 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp @@ -4,7 +4,7 @@ #include <tqcheckbox.h> #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kurlrequester.h> #include <tqtoolbutton.h> diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp index 436dced6..8d706b99 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 7972b0b5..815e025f 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -30,11 +30,11 @@ your version. **************************************************************************** */ -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <tqregexp.h> diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp index 116d3c69..378b1830 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp @@ -37,7 +37,7 @@ #include <tdefiledialog.h> #include <tqpushbutton.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include "preferenceswidget.h" diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index eaa0a93b..22598cbf 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -38,7 +38,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KBabel; diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp index 0d604c85..936a5a5a 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 3c202429..10e92cad 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -32,12 +32,12 @@ your version. **************************************************************************** */ -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kstaticdeleter.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <tdeio/netaccess.h> diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp index 893a1f1b..a33270df 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp @@ -38,7 +38,7 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include "preferenceswidget.h" diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp index 3e3a0d9c..6a522d4c 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp index eeeb53c0..163f48e2 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp @@ -40,7 +40,7 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include "preferenceswidget.h" diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 46232e43..1a056c55 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -32,12 +32,12 @@ your version. **************************************************************************** */ -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kstaticdeleter.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <tdeio/netaccess.h> diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 11596183..17a9ec15 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -42,7 +42,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/netaccess.h> using namespace KBabel; diff --git a/kbugbuster/backend/bugcommand.cpp b/kbugbuster/backend/bugcommand.cpp index 399eab55..30507e70 100644 --- a/kbugbuster/backend/bugcommand.cpp +++ b/kbugbuster/backend/bugcommand.cpp @@ -1,6 +1,6 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "bugcommand.h" diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp index 0cc7fb7d..75159d0e 100644 --- a/kbugbuster/backend/bugdetails.cpp +++ b/kbugbuster/backend/bugdetails.cpp @@ -5,7 +5,7 @@ #include <tqstringlist.h> #include <kdebug.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqregexp.h> BugDetails::BugDetails() diff --git a/kbugbuster/backend/bugjob.cpp b/kbugbuster/backend/bugjob.cpp index dbc21e5d..3d3c776b 100644 --- a/kbugbuster/backend/bugjob.cpp +++ b/kbugbuster/backend/bugjob.cpp @@ -6,7 +6,7 @@ #include <tdeio/job.h> #include <string.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> BugJob::BugJob( BugServer *server ) diff --git a/kbugbuster/backend/bugsystem.cpp b/kbugbuster/backend/bugsystem.cpp index 699a7204..9d962435 100644 --- a/kbugbuster/backend/bugsystem.cpp +++ b/kbugbuster/backend/bugsystem.cpp @@ -8,8 +8,8 @@ #include <kstaticdeleter.h> #include <kdebug.h> -#include <klocale.h> -#include <kemailsettings.h> +#include <tdelocale.h> +#include <tdeemailsettings.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> #include <tdeconfig.h> diff --git a/kbugbuster/backend/kbbprefs.cpp b/kbugbuster/backend/kbbprefs.cpp index 393f1ac2..73a6be54 100644 --- a/kbugbuster/backend/kbbprefs.cpp +++ b/kbugbuster/backend/kbbprefs.cpp @@ -25,7 +25,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 239b9dab..8420cbf9 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -7,10 +7,10 @@ #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdeapplication.h> #include <dcopclient.h> diff --git a/kbugbuster/backend/person.h b/kbugbuster/backend/person.h index 7f6da633..9d4a84a5 100644 --- a/kbugbuster/backend/person.h +++ b/kbugbuster/backend/person.h @@ -2,7 +2,7 @@ #define __person_h__ #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> struct Person { diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp index 438a03e5..2b5f58e9 100644 --- a/kbugbuster/backend/smtp.cpp +++ b/kbugbuster/backend/smtp.cpp @@ -13,8 +13,8 @@ #include <tqsocket.h> #include <tqtimer.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> Smtp::Smtp( const TQString &from, const TQStringList &to, const TQString &aMessage, diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp index a8b87fc4..524bab74 100644 --- a/kbugbuster/gui/centralwidget.cpp +++ b/kbugbuster/gui/centralwidget.cpp @@ -41,7 +41,7 @@ #include "centralwidget.h" #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "loadallbugsdlg.h" using namespace KBugBusterMainWindow; diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp index 1c6fa6c5..d5902f4b 100644 --- a/kbugbuster/gui/cwbugdetails.cpp +++ b/kbugbuster/gui/cwbugdetails.cpp @@ -27,7 +27,7 @@ #include <tdehtml_part.h> #include <tdehtmlview.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <krun.h> #include <tqlayout.h> diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index 6ad503cc..b045c964 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -20,7 +20,7 @@ #include <tqtooltip.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kactivelabel.h> #include <kdialog.h> diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 199b01d5..ce3ab2b2 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #if KDE_IS_VERSION( 3, 2, 90 ) #include <tdelistviewsearchline.h> diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index c60bb3e0..038dac89 100644 --- a/kbugbuster/gui/cwloadingwidget.cpp +++ b/kbugbuster/gui/cwloadingwidget.cpp @@ -22,8 +22,8 @@ #include <kpixmapeffect.h> #include <kstandarddirs.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> using namespace KBugBusterMainWindow; diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp index c51b7ea0..8274ee95 100644 --- a/kbugbuster/gui/cwsearchwidget.cpp +++ b/kbugbuster/gui/cwsearchwidget.cpp @@ -15,7 +15,7 @@ */ #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tqlineedit.h> #include <tqlayout.h> diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index cfbde061..87cb809a 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -33,9 +33,9 @@ #include <kinputdialog.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <kstatusbar.h> #include <kstdaction.h> #include <kstdguiitem.h> diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp index 29da4b12..e77c6598 100644 --- a/kbugbuster/gui/messageeditor.cpp +++ b/kbugbuster/gui/messageeditor.cpp @@ -4,8 +4,8 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "kbbprefs.h" diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index 4bd8437a..5bea95be 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -4,7 +4,7 @@ #include <ktextedit.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqcombobox.h> #include <tqsplitter.h> diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp index 5151be02..e14d8e78 100644 --- a/kbugbuster/gui/preferencesdialog.cpp +++ b/kbugbuster/gui/preferencesdialog.cpp @@ -10,7 +10,7 @@ #include <knuminput.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp index feaab83d..090e4790 100644 --- a/kbugbuster/gui/serverconfigdialog.cpp +++ b/kbugbuster/gui/serverconfigdialog.cpp @@ -4,7 +4,7 @@ #include <kpassdlg.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqlineedit.h> diff --git a/kbugbuster/main.cpp b/kbugbuster/main.cpp index 0c1182b4..219253f0 100644 --- a/kbugbuster/main.cpp +++ b/kbugbuster/main.cpp @@ -21,7 +21,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "gui/kbbmainwindow.h" diff --git a/kbugbuster/tderesources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp index 1eb04c9c..0e59e55e 100644 --- a/kbugbuster/tderesources/kcalresource.cpp +++ b/kbugbuster/tderesources/kcalresource.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <vcaldrag.h> @@ -42,7 +42,7 @@ #include <journal.h> #include <filestorage.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tderesources/configwidget.h> diff --git a/kbugbuster/tderesources/kcalresource_plugin.cpp b/kbugbuster/tderesources/kcalresource_plugin.cpp index 7cf81289..d9f33ec9 100644 --- a/kbugbuster/tderesources/kcalresource_plugin.cpp +++ b/kbugbuster/tderesources/kcalresource_plugin.cpp @@ -22,8 +22,8 @@ #include "kcalresourceconfig.h" #include "kcalresource.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/kbugbuster/tderesources/kcalresourceconfig.cpp b/kbugbuster/tderesources/kcalresourceconfig.cpp index 58466642..d3f37a55 100644 --- a/kbugbuster/tderesources/kcalresourceconfig.cpp +++ b/kbugbuster/tderesources/kcalresourceconfig.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kdialog.h> diff --git a/kdeaccounts-plugin/CMakeLists.txt b/kdeaccounts-plugin/CMakeLists.txt index 2a144863..04fc43e8 100644 --- a/kdeaccounts-plugin/CMakeLists.txt +++ b/kdeaccounts-plugin/CMakeLists.txt @@ -22,13 +22,13 @@ link_directories( ##### other data ################################ install( FILES kdeaccountsplugin.desktop - DESTINATION ${DATA_INSTALL_DIR}/kabc/formats ) + DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats ) ##### kabcformat_kdeaccounts (module) ########### tde_add_kpart( kabcformat_kdeaccounts SOURCES kdeaccountsformat.cpp - LINK kabc-shared + LINK tdeabc-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kdeaccounts-plugin/Makefile.am b/kdeaccounts-plugin/Makefile.am index 7be8cea3..9c412ffa 100644 --- a/kdeaccounts-plugin/Makefile.am +++ b/kdeaccounts-plugin/Makefile.am @@ -12,6 +12,6 @@ METASOURCES = AUTO messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kabcformat_kdeaccounts.pot -linkdir = $(kde_datadir)/kabc/formats +linkdir = $(kde_datadir)/tdeabc/formats link_DATA = kdeaccountsplugin.desktop EXTRA_DIST = $(link_DATA) README diff --git a/kdeaccounts-plugin/kdeaccountsformat.cpp b/kdeaccounts-plugin/kdeaccountsformat.cpp index fc9f2cb3..97a07d4d 100644 --- a/kdeaccounts-plugin/kdeaccountsformat.cpp +++ b/kdeaccounts-plugin/kdeaccountsformat.cpp @@ -3,9 +3,9 @@ #include <tqcstring.h> #include <tqfile.h> -#include <kabc/addressbook.h> -#include <kabc/addressee.h> -#include <kabc/resourcefile.h> +#include <tdeabc/addressbook.h> +#include <tdeabc/addressee.h> +#include <tdeabc/resourcefile.h> extern "C" { diff --git a/kdeaccounts-plugin/kdeaccountsformat.h b/kdeaccounts-plugin/kdeaccountsformat.h index db132fef..ea763c38 100644 --- a/kdeaccounts-plugin/kdeaccountsformat.h +++ b/kdeaccounts-plugin/kdeaccountsformat.h @@ -10,7 +10,7 @@ #ifndef KDEACCOUNTSPARSER_H #define KDEACCOUNTSPARSER_H -#include <kabc/formatplugin.h> +#include <tdeabc/formatplugin.h> namespace KABC { class AddressBook; diff --git a/kmtrace/demangle.cpp b/kmtrace/demangle.cpp index 509eceed..52d71863 100644 --- a/kmtrace/demangle.cpp +++ b/kmtrace/demangle.cpp @@ -8,7 +8,7 @@ #include <tqtl.h> #include <tqvaluelist.h> #include <stdlib.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kinstance.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index 60e63b94..eaa9668f 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -8,7 +8,7 @@ #include <tqtl.h> #include <tqvaluelist.h> #include <stdlib.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kinstance.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp index cc6e330f..ac04f290 100644 --- a/kmtrace/match.cpp +++ b/kmtrace/match.cpp @@ -8,7 +8,7 @@ #include <tqtl.h> #include <tqvaluelist.h> #include <stdlib.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kinstance.h> #include <kstandarddirs.h> #include <tdecmdlineargs.h> diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 6ec2a171..2236b0a6 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -26,8 +26,8 @@ #include <kiconloader.h> #include <kkeydialog.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <ksqueezedtextlabel.h> #include <kstatusbar.h> diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index d02644d7..daa3a511 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -18,7 +18,7 @@ ***************************************************************************/ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kmimetype.h> #include <tdelistview.h> diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 8443a37a..7cc62ef8 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -29,11 +29,11 @@ #include <kdebug.h> #include <tdefiletreeview.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstdaction.h> #include <kinstance.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeparts/genericfactory.h> //#include <ktempdir.h> diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 77158e9f..31b946bd 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -25,8 +25,8 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include "diffmodel.h" #include "diffhunk.h" diff --git a/kompare/komparepart/kompareprefdlg.cpp b/kompare/komparepart/kompareprefdlg.cpp index f920d03d..399f7e3f 100644 --- a/kompare/komparepart/kompareprefdlg.cpp +++ b/kompare/komparepart/kompareprefdlg.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "diffpage.h" #include "viewpage.h" diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 0f4e1a7b..09e670b2 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "diffmodel.h" #include "difference.h" diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp index 5c541c7c..363179ee 100644 --- a/kompare/kompareurldialog.cpp +++ b/kompare/kompareurldialog.cpp @@ -20,7 +20,7 @@ #include <tqvbox.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include "diffpage.h" diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index b5f4f2df..5111346e 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -30,7 +30,7 @@ #include <kdialog.h> #include <keditlistbox.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <kurlcombobox.h> #include <kurlrequester.h> diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index 041cff46..b855a52f 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -24,7 +24,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlcombobox.h> #include <kurlrequester.h> diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index cf8ef75f..b09f6b3d 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -28,7 +28,7 @@ #include <kcolorbutton.h> #include <kdialog.h> #include <tdefontcombo.h> -#include <klocale.h> +#include <tdelocale.h> #include "viewpage.h" #include "viewsettings.h" diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp index 902f4091..02d158cb 100644 --- a/kompare/libdialogpages/viewsettings.cpp +++ b/kompare/libdialogpages/viewsettings.cpp @@ -20,7 +20,7 @@ #include <tqfont.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include "viewsettings.h" diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index 1b3822b0..82c3625d 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -21,7 +21,7 @@ #include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "difference.h" #include "diffhunk.h" diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 8bb6cf83..2a701b24 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -30,9 +30,9 @@ #include <kdebug.h> #include <kdirwatch.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "difference.h" #include "diffhunk.h" diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp index f66b4e0d..08913d7c 100644 --- a/kompare/libdiff2/kompareprocess.cpp +++ b/kompare/libdiff2/kompareprocess.cpp @@ -25,7 +25,7 @@ #include <kcharsets.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "diffsettings.h" #include "kompareprocess.h" diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp index 7e4ddbbe..2a78e719 100644 --- a/kompare/libdiff2/levenshteintable.cpp +++ b/kompare/libdiff2/levenshteintable.cpp @@ -21,7 +21,7 @@ #include <tqstring.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "levenshteintable.h" diff --git a/kompare/main.cpp b/kompare/main.cpp index a866fd3b..7c93e16c 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -22,8 +22,8 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdefile.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kompare_part.h" #include "kompare_shell.h" diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp index 5326aeae..b5e34731 100644 --- a/kspy/classinfoview.cpp +++ b/kspy/classinfoview.cpp @@ -21,7 +21,7 @@ #include <tqstrlist.h> #include <tqvariant.h> -#include <klocale.h> +#include <tdelocale.h> #include "classinfoview.h" diff --git a/kspy/main.cpp b/kspy/main.cpp index 9a1515bb..c31b6785 100644 --- a/kspy/main.cpp +++ b/kspy/main.cpp @@ -17,7 +17,7 @@ #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "spy.h" diff --git a/kspy/navview.cpp b/kspy/navview.cpp index 871792e4..43ba8407 100644 --- a/kspy/navview.cpp +++ b/kspy/navview.cpp @@ -18,7 +18,7 @@ #include <tqobjectlist.h> #include <tqobjectdict.h> -#include <klocale.h> +#include <tdelocale.h> #include "navview.h" #include "navviewitem.h" diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp index 1ac94759..2b625c6a 100644 --- a/kspy/propsview.cpp +++ b/kspy/propsview.cpp @@ -22,7 +22,7 @@ #include <tqvariant.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include "propsview.h" diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp index 98132b52..bb5505e5 100644 --- a/kspy/receiversview.cpp +++ b/kspy/receiversview.cpp @@ -22,7 +22,7 @@ #include <tqvariant.h> #include <tqsignalslotimp.h> -#include <klocale.h> +#include <tdelocale.h> #include "receiversview.h" diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp index a381a2fd..c74df012 100644 --- a/kspy/sigslotview.cpp +++ b/kspy/sigslotview.cpp @@ -21,7 +21,7 @@ #include <tqstrlist.h> #include <tqvariant.h> -#include <klocale.h> +#include <tdelocale.h> #include "sigslotview.h" diff --git a/kspy/spy.cpp b/kspy/spy.cpp index 9d61989e..24ebaf4f 100644 --- a/kspy/spy.cpp +++ b/kspy/spy.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <tdelistviewsearchline.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp index f54a45c9..1c6a8aa9 100644 --- a/kstartperf/kstartperf.cpp +++ b/kstartperf/kstartperf.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp index 196293dd..430afaa0 100644 --- a/kuiviewer/kuiviewer.cpp +++ b/kuiviewer/kuiviewer.cpp @@ -37,8 +37,8 @@ #include <kiconloader.h> #include <klibloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> KUIViewer::KUIViewer() diff --git a/kuiviewer/main.cpp b/kuiviewer/main.cpp index d0895276..bcd68039 100644 --- a/kuiviewer/main.cpp +++ b/kuiviewer/main.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static TDECmdLineOptions options[] = { diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 9ae11612..d59069ed 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -244,7 +244,7 @@ function! MapIdentHeader( ident ) return '<tdeapplication.h>' elseif a:ident == 'i18n' || \a:ident == 'I18N_NOOP' - return '<klocale.h>' + return '<tdelocale.h>' elseif a:ident == 'locate' || \a:ident == 'locateLocal' return '<kstandarddirs.h>' diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index 6bfdd858..b4d7c6c8 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -174,7 +174,7 @@ ; Useful fake entries (qapplication.h tqApp) (tdeapplication.h kapp) - (klocale.h i18n I18N_NOOP) + (tdelocale.h i18n I18N_NOOP) (kstandarddirs.h locate locateLocal) (stdlib.h getenv) (unistd.h unlink sleep usleep) diff --git a/tdecachegrind/tdecachegrind/cachegrindloader.cpp b/tdecachegrind/tdecachegrind/cachegrindloader.cpp index 4fe57d34..9434ee36 100644 --- a/tdecachegrind/tdecachegrind/cachegrindloader.cpp +++ b/tdecachegrind/tdecachegrind/cachegrindloader.cpp @@ -21,7 +21,7 @@ #include <tqfile.h> #include <tqcstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "loader.h" diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp index 32ee92b5..9f1df421 100644 --- a/tdecachegrind/tdecachegrind/callgraphview.cpp +++ b/tdecachegrind/tdecachegrind/callgraphview.cpp @@ -36,9 +36,9 @@ #include <tqprocess.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeapplication.h> #include <kiconloader.h> #include <tdefiledialog.h> diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp index 6d984ca6..77bbc885 100644 --- a/tdecachegrind/tdecachegrind/callitem.cpp +++ b/tdecachegrind/tdecachegrind/callitem.cpp @@ -21,7 +21,7 @@ */ #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp index 8f3d9bff..550eb8a4 100644 --- a/tdecachegrind/tdecachegrind/callmapview.cpp +++ b/tdecachegrind/tdecachegrind/callmapview.cpp @@ -23,7 +23,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdeconfig.h> diff --git a/tdecachegrind/tdecachegrind/callview.cpp b/tdecachegrind/tdecachegrind/callview.cpp index 317d137b..f4be7ae7 100644 --- a/tdecachegrind/tdecachegrind/callview.cpp +++ b/tdecachegrind/tdecachegrind/callview.cpp @@ -22,7 +22,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include "configuration.h" #include "callitem.h" diff --git a/tdecachegrind/tdecachegrind/configdlg.cpp b/tdecachegrind/tdecachegrind/configdlg.cpp index 0523d976..47a3c782 100644 --- a/tdecachegrind/tdecachegrind/configdlg.cpp +++ b/tdecachegrind/tdecachegrind/configdlg.cpp @@ -29,7 +29,7 @@ #include <kcolorbutton.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <knumvalidator.h> #include "configdlg.h" diff --git a/tdecachegrind/tdecachegrind/configuration.cpp b/tdecachegrind/tdecachegrind/configuration.cpp index 78736b66..d02e79e3 100644 --- a/tdecachegrind/tdecachegrind/configuration.cpp +++ b/tdecachegrind/tdecachegrind/configuration.cpp @@ -21,7 +21,7 @@ */ #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "configuration.h" diff --git a/tdecachegrind/tdecachegrind/costlistitem.cpp b/tdecachegrind/tdecachegrind/costlistitem.cpp index d461d0d3..8d9c92d9 100644 --- a/tdecachegrind/tdecachegrind/costlistitem.cpp +++ b/tdecachegrind/tdecachegrind/costlistitem.cpp @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/tdecachegrind/tdecachegrind/costtypeitem.cpp b/tdecachegrind/tdecachegrind/costtypeitem.cpp index dc35cb2b..ef5921d9 100644 --- a/tdecachegrind/tdecachegrind/costtypeitem.cpp +++ b/tdecachegrind/tdecachegrind/costtypeitem.cpp @@ -21,7 +21,7 @@ */ #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include "configuration.h" #include "listutils.h" diff --git a/tdecachegrind/tdecachegrind/costtypeview.cpp b/tdecachegrind/tdecachegrind/costtypeview.cpp index 3f5417e9..3f8780ac 100644 --- a/tdecachegrind/tdecachegrind/costtypeview.cpp +++ b/tdecachegrind/tdecachegrind/costtypeview.cpp @@ -22,7 +22,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include "configuration.h" #include "costtypeitem.h" diff --git a/tdecachegrind/tdecachegrind/coverageitem.cpp b/tdecachegrind/tdecachegrind/coverageitem.cpp index 26e5b36e..eadafc6d 100644 --- a/tdecachegrind/tdecachegrind/coverageitem.cpp +++ b/tdecachegrind/tdecachegrind/coverageitem.cpp @@ -21,7 +21,7 @@ */ #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include "configuration.h" #include "listutils.h" diff --git a/tdecachegrind/tdecachegrind/coverageview.cpp b/tdecachegrind/tdecachegrind/coverageview.cpp index 6657e923..b1ead5eb 100644 --- a/tdecachegrind/tdecachegrind/coverageview.cpp +++ b/tdecachegrind/tdecachegrind/coverageview.cpp @@ -22,7 +22,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include "configuration.h" #include "coverageitem.h" diff --git a/tdecachegrind/tdecachegrind/functionitem.cpp b/tdecachegrind/tdecachegrind/functionitem.cpp index 17716e14..7ac20943 100644 --- a/tdecachegrind/tdecachegrind/functionitem.cpp +++ b/tdecachegrind/tdecachegrind/functionitem.cpp @@ -26,7 +26,7 @@ //#include <tqpainter.h> //#include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/tdecachegrind/tdecachegrind/functionselection.cpp b/tdecachegrind/tdecachegrind/functionselection.cpp index da243fdd..84bdeabd 100644 --- a/tdecachegrind/tdecachegrind/functionselection.cpp +++ b/tdecachegrind/tdecachegrind/functionselection.cpp @@ -29,7 +29,7 @@ #include <tqregexp.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include "traceitemview.h" #include "stackbrowser.h" diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp index 3051b171..2b7258d7 100644 --- a/tdecachegrind/tdecachegrind/instritem.cpp +++ b/tdecachegrind/tdecachegrind/instritem.cpp @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp index 9413508f..bfeaccd0 100644 --- a/tdecachegrind/tdecachegrind/instrview.cpp +++ b/tdecachegrind/tdecachegrind/instrview.cpp @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp index 75ca0b50..95b02ea4 100644 --- a/tdecachegrind/tdecachegrind/main.cpp +++ b/tdecachegrind/tdecachegrind/main.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include "toplevel.h" #include "tracedata.h" diff --git a/tdecachegrind/tdecachegrind/partgraph.cpp b/tdecachegrind/tdecachegrind/partgraph.cpp index 9b5ecbc7..284bc4a7 100644 --- a/tdecachegrind/tdecachegrind/partgraph.cpp +++ b/tdecachegrind/tdecachegrind/partgraph.cpp @@ -20,7 +20,7 @@ * TracePart as Nested Area */ -#include <klocale.h> +#include <tdelocale.h> #include "partgraph.h" #include "configuration.h" diff --git a/tdecachegrind/tdecachegrind/partlistitem.cpp b/tdecachegrind/tdecachegrind/partlistitem.cpp index 339189d7..7e5f60b5 100644 --- a/tdecachegrind/tdecachegrind/partlistitem.cpp +++ b/tdecachegrind/tdecachegrind/partlistitem.cpp @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp index 1b6ff153..9c8140f3 100644 --- a/tdecachegrind/tdecachegrind/partselection.cpp +++ b/tdecachegrind/tdecachegrind/partselection.cpp @@ -29,7 +29,7 @@ #include <tqpopupmenu.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tdecachegrind/tdecachegrind/partview.cpp b/tdecachegrind/tdecachegrind/partview.cpp index 3f344bbc..e2dc707e 100644 --- a/tdecachegrind/tdecachegrind/partview.cpp +++ b/tdecachegrind/tdecachegrind/partview.cpp @@ -23,7 +23,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> #include <tqheader.h> -#include <klocale.h> +#include <tdelocale.h> #include "configuration.h" #include "partlistitem.h" diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp index b8703e89..d6e1c1a9 100644 --- a/tdecachegrind/tdecachegrind/sourceitem.cpp +++ b/tdecachegrind/tdecachegrind/sourceitem.cpp @@ -24,7 +24,7 @@ #include <tqregexp.h> #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/tdecachegrind/tdecachegrind/sourceview.cpp b/tdecachegrind/tdecachegrind/sourceview.cpp index 52de5209..22e83453 100644 --- a/tdecachegrind/tdecachegrind/sourceview.cpp +++ b/tdecachegrind/tdecachegrind/sourceview.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "configuration.h" diff --git a/tdecachegrind/tdecachegrind/stackitem.cpp b/tdecachegrind/tdecachegrind/stackitem.cpp index 412781de..69494f3b 100644 --- a/tdecachegrind/tdecachegrind/stackitem.cpp +++ b/tdecachegrind/tdecachegrind/stackitem.cpp @@ -21,7 +21,7 @@ */ #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include "configuration.h" #include "listutils.h" diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp index 5a360110..f809e921 100644 --- a/tdecachegrind/tdecachegrind/tabview.cpp +++ b/tdecachegrind/tdecachegrind/tabview.cpp @@ -28,7 +28,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include "tabview.h" diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp index 75598f02..8bb8d45d 100644 --- a/tdecachegrind/tdecachegrind/toplevel.cpp +++ b/tdecachegrind/tdecachegrind/toplevel.cpp @@ -36,7 +36,7 @@ #include <tqeventloop.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstatusbar.h> #include <tdestdaccel.h> #include <kstdaction.h> diff --git a/tdecachegrind/tdecachegrind/tracedata.cpp b/tdecachegrind/tdecachegrind/tracedata.cpp index 70a8bd05..da0726bb 100644 --- a/tdecachegrind/tdecachegrind/tracedata.cpp +++ b/tdecachegrind/tdecachegrind/tracedata.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "tracedata.h" diff --git a/tdecachegrind/tdecachegrind/traceitemview.cpp b/tdecachegrind/tdecachegrind/traceitemview.cpp index 82f4e11f..672b0954 100644 --- a/tdecachegrind/tdecachegrind/traceitemview.cpp +++ b/tdecachegrind/tdecachegrind/traceitemview.cpp @@ -22,7 +22,7 @@ #include <tqwidget.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "traceitemview.h" diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp index 46e661f6..be85ce08 100644 --- a/tdecachegrind/tdecachegrind/treemap.cpp +++ b/tdecachegrind/tdecachegrind/treemap.cpp @@ -29,7 +29,7 @@ #include <tqstyle.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/tdefile-plugins/c++/tdefile_cpp.cpp b/tdefile-plugins/c++/tdefile_cpp.cpp index 31f777df..9adf3f89 100644 --- a/tdefile-plugins/c++/tdefile_cpp.cpp +++ b/tdefile-plugins/c++/tdefile_cpp.cpp @@ -20,7 +20,7 @@ #include "tdefile_cpp.h" #include <kurl.h> -#include <klocale.h> +#include <tdelocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/tdefile-plugins/diff/tdefile_diff.cpp b/tdefile-plugins/diff/tdefile_diff.cpp index 2edee0a7..51807ee2 100644 --- a/tdefile-plugins/diff/tdefile_diff.cpp +++ b/tdefile-plugins/diff/tdefile_diff.cpp @@ -36,7 +36,7 @@ #include <kdebug.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <kurl.h> diff --git a/tdeioslave/svn/ksvnd/ksvnd.cpp b/tdeioslave/svn/ksvnd/ksvnd.cpp index e4c2454e..82e51bbb 100644 --- a/tdeioslave/svn/ksvnd/ksvnd.cpp +++ b/tdeioslave/svn/ksvnd/ksvnd.cpp @@ -19,9 +19,9 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqdir.h> #include <tqfile.h> diff --git a/tdeioslave/svn/svn.cpp b/tdeioslave/svn/svn.cpp index be3e1160..755541c4 100644 --- a/tdeioslave/svn/svn.cpp +++ b/tdeioslave/svn/svn.cpp @@ -31,11 +31,11 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinstance.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <ksock.h> #include <dcopclient.h> diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp index 6c939441..26098adb 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp @@ -18,19 +18,19 @@ */ #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <dcopclient.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqtimer.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> #include <tdeio/netaccess.h> #include <tqpixmap.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "tdeio_svn_helper.h" #include "subversioncheckout.h" @@ -39,7 +39,7 @@ #include <kurlrequester.h> #include <tqspinbox.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqtextstream.h> #include <tqtextedit.h> #include <kstandarddirs.h> diff --git a/tdeunittest/example/simple/maingui.cpp b/tdeunittest/example/simple/maingui.cpp index 183d7492..985276cb 100644 --- a/tdeunittest/example/simple/maingui.cpp +++ b/tdeunittest/example/simple/maingui.cpp @@ -26,7 +26,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdeunittest/runnergui.h" diff --git a/tdeunittest/guimodrunner.cpp b/tdeunittest/guimodrunner.cpp index 0a9377e7..d719069b 100644 --- a/tdeunittest/guimodrunner.cpp +++ b/tdeunittest/guimodrunner.cpp @@ -25,11 +25,11 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinstance.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "runnergui.h" diff --git a/tdeunittest/runnergui.cpp b/tdeunittest/runnergui.cpp index 8e31dac2..2e9ca350 100644 --- a/tdeunittest/runnergui.cpp +++ b/tdeunittest/runnergui.cpp @@ -35,7 +35,7 @@ #include <dcopobject.h> #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeunittest/tester.h> diff --git a/umbrello/umbrello/activitywidget.cpp b/umbrello/umbrello/activitywidget.cpp index 3f9355f7..07923250 100644 --- a/umbrello/umbrello/activitywidget.cpp +++ b/umbrello/umbrello/activitywidget.cpp @@ -16,7 +16,7 @@ #include <tqpainter.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index 21748d48..a0e3db81 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -20,8 +20,8 @@ #include <tqmainwindow.h> // kde includes -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> // app includes diff --git a/umbrello/umbrello/artifact.cpp b/umbrello/umbrello/artifact.cpp index 8576ca8b..b5d1361b 100644 --- a/umbrello/umbrello/artifact.cpp +++ b/umbrello/umbrello/artifact.cpp @@ -13,7 +13,7 @@ #include "association.h" #include "clipboard/idchangelog.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> UMLArtifact::UMLArtifact(const TQString & name, Uml::IDType id) : UMLCanvasObject(name, id) { diff --git a/umbrello/umbrello/association.cpp b/umbrello/umbrello/association.cpp index 62f47a43..38001b9d 100644 --- a/umbrello/umbrello/association.cpp +++ b/umbrello/umbrello/association.cpp @@ -13,7 +13,7 @@ #include "association.h" // qt/kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> // app includes #include "classifier.h" diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 187368ce..9c5f7ba4 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -18,7 +18,7 @@ #include <tqcanvas.h> #include <tqvalidator.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <kcolordialog.h> #include <tdeapplication.h> diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp index 4b8e0bc0..7aa94806 100644 --- a/umbrello/umbrello/classifier.cpp +++ b/umbrello/umbrello/classifier.cpp @@ -12,8 +12,8 @@ #include "classifier.h" // qt/kde includes #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // app includes #include "association.h" #include "umlassociationlist.h" diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp index 60e5b7bf..4fa2d92c 100644 --- a/umbrello/umbrello/classifierlistitem.cpp +++ b/umbrello/umbrello/classifierlistitem.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "classifier.h" diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp index 069ba84b..9e309519 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.cpp +++ b/umbrello/umbrello/clipboard/umlclipboard.cpp @@ -14,8 +14,8 @@ // qt/kde includes #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> // local includes #include "umldrag.h" diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index 41ca5d12..ea9bea43 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -28,8 +28,8 @@ // kde includes #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialogbase.h> #include <tdeapplication.h> diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp index ec2bf59a..61ae797c 100644 --- a/umbrello/umbrello/codegenerators/adawriter.cpp +++ b/umbrello/umbrello/codegenerators/adawriter.cpp @@ -16,8 +16,8 @@ #include "adawriter.h" #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqregexp.h> #include <tqtextstream.h> diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp index 609b7eb2..136f57bc 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp @@ -23,9 +23,9 @@ #include <tqlistview.h> #include <tdefiledialog.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name ) diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp index 60d37bac..f576e82f 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp @@ -18,7 +18,7 @@ #include "cppcodegenerationpolicypage.h" // qt/kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <kcombobox.h> #include <tqcheckbox.h> diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp index efb49dc9..89d54c6e 100644 --- a/umbrello/umbrello/codegenerators/idlwriter.cpp +++ b/umbrello/umbrello/codegenerators/idlwriter.cpp @@ -12,7 +12,7 @@ #include "idlwriter.h" #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqregexp.h> #include <tqtextstream.h> diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp index c7bfbf0b..391a34a2 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp @@ -21,7 +21,7 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "javacodegenerationformbase.h" #include "../uml.h" diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp index 8e204695..3a64b7bf 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp @@ -21,8 +21,8 @@ #include <tqregexp.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // local includes #include "javacodecomment.h" diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp index 0f3c32ef..a57e272a 100644 --- a/umbrello/umbrello/codegenerators/pascalwriter.cpp +++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp @@ -12,8 +12,8 @@ #include "pascalwriter.h" #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqregexp.h> #include <tqtextstream.h> diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp index f243ab2c..5ef17a41 100644 --- a/umbrello/umbrello/codegenerators/pythonwriter.cpp +++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp @@ -19,8 +19,8 @@ #include "pythonwriter.h" #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqtextstream.h> #include <tqregexp.h> diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp index 5c890b4f..ed8afbf4 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp @@ -24,7 +24,7 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "rubycodegenerationformbase.h" #include "../codegenerationpolicy.h" diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp index 6305537d..05fe6482 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp @@ -24,8 +24,8 @@ #include <tqregexp.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // local includes #include "rubycodecomment.h" diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp index e736641f..9eedaba7 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.cpp +++ b/umbrello/umbrello/codegenerators/rubywriter.cpp @@ -19,8 +19,8 @@ #include "rubywriter.h" #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqtextstream.h> #include <tqregexp.h> diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index 8463babc..f403c166 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -23,9 +23,9 @@ #include <tqregexp.h> #include <tqdir.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdeapplication.h> // app includes diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp index 8582ec93..ae2abdaa 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.cpp +++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp @@ -18,8 +18,8 @@ #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqtextstream.h> #include <tqregexp.h> diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp index 8c043a3e..90201a9a 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp @@ -16,8 +16,8 @@ #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqfile.h> #include <tqtextstream.h> #include <tqregexp.h> diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp index e32758dd..2b20bed4 100644 --- a/umbrello/umbrello/codeimport/classimport.cpp +++ b/umbrello/umbrello/codeimport/classimport.cpp @@ -13,7 +13,7 @@ #include "classimport.h" // qt/kde includes #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "../umldoc.h" #include "../uml.h" diff --git a/umbrello/umbrello/codeimport/cppimport.cpp b/umbrello/umbrello/codeimport/cppimport.cpp index f97a5359..06f68b38 100644 --- a/umbrello/umbrello/codeimport/cppimport.cpp +++ b/umbrello/umbrello/codeimport/cppimport.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include <tqmap.h> #include <tqregexp.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> // app includes #include "import_utils.h" diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp index 6b87f493..1ac2d74a 100644 --- a/umbrello/umbrello/codeimport/import_utils.cpp +++ b/umbrello/umbrello/codeimport/import_utils.cpp @@ -14,9 +14,9 @@ // qt/kde includes #include <tqmap.h> #include <tqregexp.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "../uml.h" #include "../umldoc.h" diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index d610520b..d892eafc 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp @@ -15,7 +15,7 @@ #include <tqstringlist.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp index e3cb19e5..133b3117 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp @@ -18,7 +18,7 @@ */ #include "errors.h" -#include <klocale.h> +#include <tdelocale.h> QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") ); QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index b67378ef..e313052e 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -22,7 +22,7 @@ #include "keywords.lut.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> #include <tqmap.h> diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index d765a602..653376a0 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -29,7 +29,7 @@ #include <tqasciidict.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace std; diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp index b2f7dac3..94cd6df7 100644 --- a/umbrello/umbrello/codeimport/nativeimportbase.cpp +++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp @@ -16,7 +16,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // app includes #include "import_utils.h" diff --git a/umbrello/umbrello/component.cpp b/umbrello/umbrello/component.cpp index eb69ccd1..43384e6c 100644 --- a/umbrello/umbrello/component.cpp +++ b/umbrello/umbrello/component.cpp @@ -13,7 +13,7 @@ #include "component.h" // qt/kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "association.h" #include "object_factory.h" diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp index c128e027..ba9e4bf1 100644 --- a/umbrello/umbrello/dialogs/activitydialog.cpp +++ b/umbrello/umbrello/dialogs/activitydialog.cpp @@ -17,7 +17,7 @@ //kde includes #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> //local includes #include "../umlview.h" diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index 7eac7f69..71cef4e0 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -15,7 +15,7 @@ #include "../uml.h" #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include <kdebug.h> #include <tqlayout.h> diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp index 5a84a3ec..7d0b14cc 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.cpp +++ b/umbrello/umbrello/dialogs/assocgenpage.cpp @@ -17,8 +17,8 @@ #include <kcombobox.h> // kde includes -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> // local includes diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp index feb193eb..63617a7d 100644 --- a/umbrello/umbrello/dialogs/assocpage.cpp +++ b/umbrello/umbrello/dialogs/assocpage.cpp @@ -11,7 +11,7 @@ #include "assocpage.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "assocpropdlg.h" AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) { diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp index 331e3e45..94511794 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.cpp +++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp @@ -16,8 +16,8 @@ #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp index adb7dcc3..4cf11a74 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.cpp +++ b/umbrello/umbrello/dialogs/assocrolepage.cpp @@ -16,8 +16,8 @@ #include <tqlayout.h> // kde includes -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> // local includes diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp index 0e923cdf..145148a5 100644 --- a/umbrello/umbrello/dialogs/classgenpage.cpp +++ b/umbrello/umbrello/dialogs/classgenpage.cpp @@ -23,9 +23,9 @@ #include <tqcheckbox.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcombobox.h> // my class includes diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index e991d1e0..4d44b44d 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kbuttonbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> using namespace Uml; diff --git a/umbrello/umbrello/dialogs/classoptionspage.cpp b/umbrello/umbrello/dialogs/classoptionspage.cpp index 670d86f1..3d6fd664 100644 --- a/umbrello/umbrello/dialogs/classoptionspage.cpp +++ b/umbrello/umbrello/dialogs/classoptionspage.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // local includes diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp index ccd09bba..0a95bfcf 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.cpp +++ b/umbrello/umbrello/dialogs/classpropdlg.cpp @@ -15,7 +15,7 @@ // qt/kde includes #include <tqlayout.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp index c49e418f..8b38c47d 100644 --- a/umbrello/umbrello/dialogs/classwizard.cpp +++ b/umbrello/umbrello/dialogs/classwizard.cpp @@ -14,7 +14,7 @@ // system includes #include <khelpmenu.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "classifierlistpage.h" diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index 33fb743b..2bae53d0 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -30,7 +30,7 @@ #include <tqlayout.h> #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "../attribute.h" diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index d8e94856..d0cb73f2 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -30,7 +30,7 @@ //kde include #include <knuminput.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> //qt include #include <tqlineedit.h> diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp index 0e488e75..968e8ae3 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp @@ -20,7 +20,7 @@ // qt/kde includes #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "../codegenerationpolicy.h" diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index b64e30dc..11130864 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -26,8 +26,8 @@ #include <tqfileinfo.h> #include <tqapplication.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // local includes #include "codegenerationoptionspage.h" diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp index 04784752..37f8f53e 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp +++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp @@ -23,7 +23,7 @@ #include <tqtabwidget.h> #include <tqcheckbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "../codedocument.h" diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp index 3da163b7..a5725316 100644 --- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp +++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp @@ -23,7 +23,7 @@ // qt/kde includes #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> /** This is the page which comes up IF there is no special options for the diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index 8374def4..c6e34b15 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -20,7 +20,7 @@ #include <tqcombobox.h> #include <tqbuttongroup.h> #include <tqgroupbox.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "../uml.h" diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp index 12836f0b..4f3bc56f 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp @@ -19,7 +19,7 @@ // kde include files #include <tdefilefiltercombo.h> -#include <klocale.h> +#include <tdelocale.h> // application specific includes #include "../umlviewimageexportermodel.h" diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp index effb585d..2472f520 100644 --- a/umbrello/umbrello/dialogs/notedialog.cpp +++ b/umbrello/umbrello/dialogs/notedialog.cpp @@ -18,8 +18,8 @@ #include <tqtextedit.h> #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) { diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp index c9cb8b92..687993d8 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.cpp +++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp @@ -16,7 +16,7 @@ #include <tqcheckbox.h> #include <tqlayout.h> #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp index 05140934..2809b6bf 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.cpp +++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp @@ -17,7 +17,7 @@ #include <tqtooltip.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // local includes diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp index dce7c98b..84bb95b6 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp +++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp @@ -11,7 +11,7 @@ #include "pkgcontentspage.h" #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "../umlobjectlist.h" #include "../uml.h" #include "../umldoc.h" diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp index 63673e01..03aaed56 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.cpp +++ b/umbrello/umbrello/dialogs/selectopdlg.cpp @@ -16,7 +16,7 @@ #include <tqlayout.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // local includes diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 234f67bc..1bcb4769 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -19,7 +19,7 @@ // kde includes #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> // app includes #include "codegenerationoptionspage.h" diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp index da3c28d1..5ac44dc1 100644 --- a/umbrello/umbrello/dialogs/statedialog.cpp +++ b/umbrello/umbrello/dialogs/statedialog.cpp @@ -21,7 +21,7 @@ //kde includes #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> //local includes diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp index c45241e2..9adb17a4 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp @@ -24,8 +24,8 @@ // kde includes #include <kcombobox.h> #include <kcompletion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index b0531457..39ba3c6e 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -24,8 +24,8 @@ // kde includes #include <kcombobox.h> #include <kcompletion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kdebug.h> diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index e8113763..4ac471a8 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -26,8 +26,8 @@ //kde includes #include <kcombobox.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kbuttonbox.h> #include <karrowbutton.h> diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp index 255f4010..19fb27be 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.cpp +++ b/umbrello/umbrello/dialogs/umlroledialog.cpp @@ -15,7 +15,7 @@ // qt/kde includes #include <tqlayout.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "../umlrole.h" diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp index fe2e2f5f..cfad502f 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.cpp +++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp @@ -16,8 +16,8 @@ #include <tqradiobutton.h> #include <tqtextedit.h> #include <tqlineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp index 57b5824e..53bf61ae 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp +++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp @@ -21,8 +21,8 @@ // kde includes #include <kcombobox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 91586098..f5b5f1e8 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -22,8 +22,8 @@ #include <tqtextedit.h> #include <tqspinbox.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdefontdialog.h> #include <kdebug.h> #include <knuminput.h> diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp index 824d708f..7c1df12d 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp @@ -13,7 +13,7 @@ #include "../optionstate.h" #include "../umlview.h" #include "../umlwidget.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqgroupbox.h> #include <tqlabel.h> diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp index 41c43e60..bc7107f8 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp +++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp @@ -26,9 +26,9 @@ #include <libxslt/xsltutils.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tdeio/job.h> #include <kstandarddirs.h> #include <tqfile.h> diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp index b6d70ef9..62c47b6b 100644 --- a/umbrello/umbrello/docgenerators/main.cpp +++ b/umbrello/umbrello/docgenerators/main.cpp @@ -28,7 +28,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktip.h> #include <kdebug.h> #include <twin.h> diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp index 1a9bab5c..c57dad97 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp @@ -26,9 +26,9 @@ #include <libxslt/xsltutils.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tdeio/job.h> #include <kstandarddirs.h> #include <tqfile.h> diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp index ab935d00..f4f3dd10 100644 --- a/umbrello/umbrello/docwindow.cpp +++ b/umbrello/umbrello/docwindow.cpp @@ -16,7 +16,7 @@ #include <tqgroupbox.h> #include <tqlayout.h> #include <tqmultilineedit.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "associationwidget.h" diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp index 31ef1513..2df53283 100644 --- a/umbrello/umbrello/entity.cpp +++ b/umbrello/umbrello/entity.cpp @@ -13,8 +13,8 @@ #include "entity.h" // qt/kde includes #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // app includes #include "entityattribute.h" #include "umldoc.h" diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp index 93ee1bdd..90682d51 100644 --- a/umbrello/umbrello/enum.cpp +++ b/umbrello/umbrello/enum.cpp @@ -13,8 +13,8 @@ #include "enum.h" // qt/kde includes #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // app includes #include "enumliteral.h" #include "umldoc.h" diff --git a/umbrello/umbrello/enumliteral.cpp b/umbrello/umbrello/enumliteral.cpp index 8158e40e..95060e74 100644 --- a/umbrello/umbrello/enumliteral.cpp +++ b/umbrello/umbrello/enumliteral.cpp @@ -13,7 +13,7 @@ #include <kinputdialog.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent, const TQString& name, Uml::IDType id) diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp index f9e25f3d..10ebba4d 100644 --- a/umbrello/umbrello/floatingtextwidget.cpp +++ b/umbrello/umbrello/floatingtextwidget.cpp @@ -17,7 +17,7 @@ #include <tqpainter.h> #include <tqevent.h> #include <tqvalidator.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp index 1c608d8f..9b05aefe 100644 --- a/umbrello/umbrello/folder.cpp +++ b/umbrello/umbrello/folder.cpp @@ -14,8 +14,8 @@ // qt/kde includes #include <tqfile.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // app includes #include "uml.h" #include "umldoc.h" diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index ff26e653..fb9d5a71 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -19,7 +19,7 @@ #include <tqstringlist.h> #include <tqregexp.h> #include <tqmessagebox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp index 6e8f3d9a..62799646 100644 --- a/umbrello/umbrello/listpopupmenu.cpp +++ b/umbrello/umbrello/listpopupmenu.cpp @@ -15,7 +15,7 @@ // qt/kde includes #include <kstandarddirs.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index ffbf3e9f..24f12f0c 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -16,7 +16,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktip.h> #include <kdebug.h> #include <twin.h> diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp index 1c7a1add..94abf511 100644 --- a/umbrello/umbrello/model_utils.cpp +++ b/umbrello/umbrello/model_utils.cpp @@ -15,7 +15,7 @@ // qt/kde includes #include <tqregexp.h> #include <tqstringlist.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/node.cpp b/umbrello/umbrello/node.cpp index f035f32a..08d5bc7f 100644 --- a/umbrello/umbrello/node.cpp +++ b/umbrello/umbrello/node.cpp @@ -11,7 +11,7 @@ #include "node.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> UMLNode::UMLNode(const TQString & name, Uml::IDType id) : UMLCanvasObject(name, id) { diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp index 925909f2..5fc80b1a 100644 --- a/umbrello/umbrello/object_factory.cpp +++ b/umbrello/umbrello/object_factory.cpp @@ -16,8 +16,8 @@ #include <tqregexp.h> #include <tqstringlist.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/objectwidget.cpp b/umbrello/umbrello/objectwidget.cpp index 504c8650..4a9c4cab 100644 --- a/umbrello/umbrello/objectwidget.cpp +++ b/umbrello/umbrello/objectwidget.cpp @@ -16,7 +16,7 @@ #include <tqpainter.h> #include <tqvalidator.h> #include <tqevent.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp index dce9b41e..18b1b3ba 100644 --- a/umbrello/umbrello/operation.cpp +++ b/umbrello/umbrello/operation.cpp @@ -15,7 +15,7 @@ // qt/kde includes #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "attribute.h" diff --git a/umbrello/umbrello/package.cpp b/umbrello/umbrello/package.cpp index 04e8c14d..6321fdb4 100644 --- a/umbrello/umbrello/package.cpp +++ b/umbrello/umbrello/package.cpp @@ -14,7 +14,7 @@ // system includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "uml.h" diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index 3c9f3043..bd55cf5d 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -28,8 +28,8 @@ #include <typeinfo> #include <kstandarddirs.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> using std::type_info; diff --git a/umbrello/umbrello/statewidget.cpp b/umbrello/umbrello/statewidget.cpp index 942ae0ab..ee12f27a 100644 --- a/umbrello/umbrello/statewidget.cpp +++ b/umbrello/umbrello/statewidget.cpp @@ -16,7 +16,7 @@ #include <tqevent.h> // kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/stereotype.cpp b/umbrello/umbrello/stereotype.cpp index c3b912f4..688dbd38 100644 --- a/umbrello/umbrello/stereotype.cpp +++ b/umbrello/umbrello/stereotype.cpp @@ -13,7 +13,7 @@ #include "stereotype.h" // qt/kde includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp index 005e5def..36017912 100644 --- a/umbrello/umbrello/toolbarstateassociation.cpp +++ b/umbrello/umbrello/toolbarstateassociation.cpp @@ -14,8 +14,8 @@ // kde includes #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> // app includes #include "assocrules.h" diff --git a/umbrello/umbrello/toolbarstateother.cpp b/umbrello/umbrello/toolbarstateother.cpp index f6161dbd..718ac456 100644 --- a/umbrello/umbrello/toolbarstateother.cpp +++ b/umbrello/umbrello/toolbarstateother.cpp @@ -14,7 +14,7 @@ // kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> // app includes diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 778b6d31..a472cbff 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -29,10 +29,10 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> -#include <kmenubar.h> -#include <kmessagebox.h> +#include <tdemenubar.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kstatusbar.h> #include <ktip.h> diff --git a/umbrello/umbrello/umlattributelist.cpp b/umbrello/umbrello/umlattributelist.cpp index f335b7e7..f3ef56b1 100644 --- a/umbrello/umbrello/umlattributelist.cpp +++ b/umbrello/umbrello/umlattributelist.cpp @@ -12,7 +12,7 @@ #include "umlattributelist.h" #include "attribute.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> void UMLAttributeList::copyInto(UMLAttributeList *rhs) const { // Don't copy yourself. diff --git a/umbrello/umbrello/umlcanvasobject.cpp b/umbrello/umbrello/umlcanvasobject.cpp index 800336e3..db5fdf28 100644 --- a/umbrello/umbrello/umlcanvasobject.cpp +++ b/umbrello/umbrello/umlcanvasobject.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // local includes #include "uml.h" diff --git a/umbrello/umbrello/umlclassifierlistitemlist.cpp b/umbrello/umbrello/umlclassifierlistitemlist.cpp index 1672c0cb..c54eed12 100644 --- a/umbrello/umbrello/umlclassifierlistitemlist.cpp +++ b/umbrello/umbrello/umlclassifierlistitemlist.cpp @@ -12,7 +12,7 @@ #include "umlclassifierlistitemlist.h" #include "classifierlistitem.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> void UMLClassifierListItemList::copyInto(UMLClassifierListItemList *rhs) const { // Prevent copying to yourself. (Can cause serious injuries) diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index 2ed3aae8..ad0a7d18 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -27,13 +27,13 @@ #include <kdebug.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kmimetype.h> #include <kprinter.h> #include <ktar.h> #include <ktempdir.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kiconloader.h> #include <kinputdialog.h> #include <ktabwidget.h> diff --git a/umbrello/umbrello/umlentityattributelist.cpp b/umbrello/umbrello/umlentityattributelist.cpp index 5855859a..c941ad1d 100644 --- a/umbrello/umbrello/umlentityattributelist.cpp +++ b/umbrello/umbrello/umlentityattributelist.cpp @@ -12,7 +12,7 @@ #include "umlentityattributelist.h" #include "entityattribute.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> void UMLEntityAttributeList::copyInto(UMLEntityAttributeList* rhs) const { // Don't copy yourself. diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index b7a81796..8e0279fe 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -23,8 +23,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <kinputdialog.h> diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index 8e451294..f5408e14 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -19,8 +19,8 @@ #include <tqfile.h> #include <tqregexp.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/umlobjectlist.cpp b/umbrello/umbrello/umlobjectlist.cpp index f2850ebd..f238c3c5 100644 --- a/umbrello/umbrello/umlobjectlist.cpp +++ b/umbrello/umbrello/umlobjectlist.cpp @@ -12,7 +12,7 @@ #include "umlobjectlist.h" #include "umlobject.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> void UMLObjectList::copyInto(UMLObjectList *rhs) const { // Don't copy yourself. diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp index 2cdeefae..effbcf04 100644 --- a/umbrello/umbrello/umlview.cpp +++ b/umbrello/umbrello/umlview.cpp @@ -34,14 +34,14 @@ #include <tqregexp.h> //kde include files -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprinter.h> #include <kcursor.h> #include <tdefiledialog.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> // application specific includes diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp index 9411fae6..33492129 100644 --- a/umbrello/umbrello/umlviewimageexporter.cpp +++ b/umbrello/umbrello/umlviewimageexporter.cpp @@ -17,10 +17,10 @@ #include <tqstringlist.h> //kde include files -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kurl.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> // application specific includes diff --git a/umbrello/umbrello/umlviewimageexporterall.cpp b/umbrello/umbrello/umlviewimageexporterall.cpp index cb256ca1..aeb53301 100644 --- a/umbrello/umbrello/umlviewimageexporterall.cpp +++ b/umbrello/umbrello/umlviewimageexporterall.cpp @@ -18,11 +18,11 @@ #include <tqcheckbox.h> // kde include files -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <kurlrequester.h> #include <tdefilefiltercombo.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // application specific includes #include "dialogs/exportallviewsdialog.h" diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp index 379e5f77..2c45bb04 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umbrello/umlviewimageexportermodel.cpp @@ -27,8 +27,8 @@ // kde include files #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <tdeapplication.h> #include <tdeio/netaccess.h> diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp index a51a5ae1..6d69fb1d 100644 --- a/umbrello/umbrello/umlwidget.cpp +++ b/umbrello/umbrello/umlwidget.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <kcolordialog.h> #include <tdefontdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> // local includes #include "umlwidgetcontroller.h" #include "umlobject.h" diff --git a/umbrello/umbrello/umlwidgetcontroller.cpp b/umbrello/umbrello/umlwidgetcontroller.cpp index c7b9ce94..efd0e4a3 100644 --- a/umbrello/umbrello/umlwidgetcontroller.cpp +++ b/umbrello/umbrello/umlwidgetcontroller.cpp @@ -19,7 +19,7 @@ // kde includes #include <kcursor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // app includes #include "umlwidget.h" diff --git a/umbrello/umbrello/wortdetoolbar.cpp b/umbrello/umbrello/wortdetoolbar.cpp index 03fe2b18..c3aa3be4 100644 --- a/umbrello/umbrello/wortdetoolbar.cpp +++ b/umbrello/umbrello/wortdetoolbar.cpp @@ -15,7 +15,7 @@ // qt/kde include files #include <tqmainwindow.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdetoolbarbutton.h> |