diff options
Diffstat (limited to 'lib')
142 files changed, 215 insertions, 215 deletions
diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cc index c8169f24..feac37ce 100644 --- a/lib/kformula/MatrixDialog.cc +++ b/lib/kformula/MatrixDialog.cc @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> KFORMULA_NAMESPACE_BEGIN diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc index a3714e60..45aa5469 100644 --- a/lib/kformula/bracketelement.cc +++ b/lib/kformula/bracketelement.cc @@ -24,7 +24,7 @@ #include <tqpointarray.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "bracketelement.h" #include "elementvisitor.h" diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc index 8136965c..32479b0f 100644 --- a/lib/kformula/fontstyle.cc +++ b/lib/kformula/fontstyle.cc @@ -24,11 +24,11 @@ #include <tqapplication.h> #include <kstaticdeleter.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <tdeio/job.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "fontstyle.h" diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc index 77d93076..9f1125e1 100644 --- a/lib/kformula/fractionelement.cc +++ b/lib/kformula/fractionelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementvisitor.h" #include "formulaelement.h" diff --git a/lib/kformula/identifierelement.cc b/lib/kformula/identifierelement.cc index 41cd2600..63275e1c 100644 --- a/lib/kformula/identifierelement.cc +++ b/lib/kformula/identifierelement.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "kformuladefs.h" #include "textelement.h" diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc index a540a7e1..6f2f6d1d 100644 --- a/lib/kformula/indexelement.cc +++ b/lib/kformula/indexelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementvisitor.h" #include "indexelement.h" diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc index 65bfa6c3..4aa31161 100644 --- a/lib/kformula/kformulacommand.cc +++ b/lib/kformula/kformulacommand.cc @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> //This is for undo descriptions +#include <tdelocale.h> //This is for undo descriptions #include <tqvaluelist.h> diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index da930dba..ce95c40c 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -39,8 +39,8 @@ #include <kdialog.h> #include <tdefontdialog.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knuminput.h> #include <kpushbutton.h> diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc index 4d4aa96c..a6123154 100644 --- a/lib/kformula/kformulacontainer.cc +++ b/lib/kformula/kformulacontainer.cc @@ -28,7 +28,7 @@ #include <tqtextstream.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include "KoGlobal.h" diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 251893d1..5a84a47d 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -22,9 +22,9 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/lib/kformula/kformulamathmlread.cc b/lib/kformula/kformulamathmlread.cc index fd3e43d2..ff941d6f 100644 --- a/lib/kformula/kformulamathmlread.cc +++ b/lib/kformula/kformulamathmlread.cc @@ -22,8 +22,8 @@ #include <tqstring.h> #include <tqfontmetrics.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> //#include <KoUnit.h> diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc index 39aff864..68f941d9 100644 --- a/lib/kformula/kformulawidget.cc +++ b/lib/kformula/kformulawidget.cc @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> -//#include <klocale.h> +//#include <tdelocale.h> //#include <kstdaction.h> #include "basicelement.h" diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc index 7371113f..6b878380 100644 --- a/lib/kformula/matrixelement.cc +++ b/lib/kformula/matrixelement.cc @@ -23,7 +23,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "MatrixDialog.h" #include "elementvisitor.h" diff --git a/lib/kformula/numberelement.cc b/lib/kformula/numberelement.cc index 41ddc179..7705e3ab 100644 --- a/lib/kformula/numberelement.cc +++ b/lib/kformula/numberelement.cc @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "numberelement.h" #include "kformuladefs.h" diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc index 27dbbdd6..882eed01 100644 --- a/lib/kformula/operatorelement.cc +++ b/lib/kformula/operatorelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementtype.h" #include "sequenceelement.h" diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc index 82a5870c..5e511cbe 100644 --- a/lib/kformula/rootelement.cc +++ b/lib/kformula/rootelement.cc @@ -22,7 +22,7 @@ #include <tqpen.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "elementvisitor.h" #include "formulacursor.h" diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc index f01636e7..187bcd65 100644 --- a/lib/kformula/sequenceelement.cc +++ b/lib/kformula/sequenceelement.cc @@ -27,7 +27,7 @@ #include <kcommand.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> //#include <boost/spirit.hpp> diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index aee6f670..8fe3d8f8 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <kcombobox.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdetoolbar.h> #include <kdebug.h> diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc index a9ca0641..aca50b3a 100644 --- a/lib/kformula/symboltable.cc +++ b/lib/kformula/symboltable.cc @@ -28,8 +28,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include "symboltable.h" diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc index 6addc385..9970ac45 100644 --- a/lib/kformula/tokenelement.cc +++ b/lib/kformula/tokenelement.cc @@ -21,7 +21,7 @@ #include <tqpainter.h> -#include <klocale.h> +#include <tdelocale.h> #include "entities.h" #include "elementtype.h" diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index efa73850..a2107452 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -26,11 +26,11 @@ #include <KoQueryTrader.h> #include <KoDocument.h> #include <KoMainWindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <kdebug.h> #include <kdesktopfile.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <stdlib.h> diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc index 188a76d1..e8995ad6 100644 --- a/lib/kofficecore/KoApplicationIface.cc +++ b/lib/kofficecore/KoApplicationIface.cc @@ -20,8 +20,8 @@ #include <dcopclient.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "KoApplication.h" #include "KoApplicationIface.h" diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 9762f292..5611e873 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -31,7 +31,7 @@ #include <tqsplitter.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kpushbutton.h> #include <tdeconfig.h> diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 292e16e9..e1422800 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -42,8 +42,8 @@ #include <kiconloader.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 <tdeparts/partmanager.h> #include <kprinter.h> diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp index 882ccadf..00d6038b 100644 --- a/lib/kofficecore/KoDocumentChild.cpp +++ b/lib/kofficecore/KoDocumentChild.cpp @@ -31,8 +31,8 @@ #include <tdeparts/partmanager.h> #include <kmimetype.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqapplication.h> diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp index 7bdc34e3..d50c256d 100644 --- a/lib/kofficecore/KoDocumentInfo.cpp +++ b/lib/kofficecore/KoDocumentInfo.cpp @@ -29,8 +29,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqobjectlist.h> #include <tqdatetime.h> diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 61bbe0d4..44a79b14 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -40,14 +40,14 @@ #include <tqvbox.h> #include <tqdatetime.h> -#include <kabc/addressee.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/addressee.h> +#include <tdeabc/stdaddressbook.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <ktar.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <tqlayout.h> #include <tdelistview.h> @@ -58,7 +58,7 @@ #include <ktextedit.h> #include <kiconloader.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> class KoDocumentInfoDlg::KoDocumentInfoDlgPrivate { diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 1b1c98a8..84c5bde8 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -21,8 +21,8 @@ #include "KoFileDialog.h" #include "KoDocument.h" #include <tdefilefiltercombo.h> -#include <klocale.h> -#include <kdiroperator.h> +#include <tdelocale.h> +#include <tdediroperator.h> #include <kdebug.h> KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter, diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp index 1e5beb47..68953b40 100644 --- a/lib/kofficecore/KoFilter.cpp +++ b/lib/kofficecore/KoFilter.cpp @@ -23,7 +23,7 @@ #include <kurl.h> #include <kmimetype.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> #include <KoFilterManager.h> diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 2000a549..91123fd3 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -17,7 +17,7 @@ */ #include <tqmetaobject.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <KoFilterChain.h> #include <KoQueryTrader.h> diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index 2a894a0e..06c7cf10 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -29,8 +29,8 @@ #include <tqptrlist.h> #include <tqapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <KoDocument.h> #include <klibloader.h> #include <tdelistbox.h> diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 78c39540..94e7e7d9 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -23,9 +23,9 @@ #include <kdebug.h> #include <tqfont.h> #include <tqfontinfo.h> -#include <kglobalsettings.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 97905af4..18916b57 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -37,7 +37,7 @@ #include <tdeversion.h> #include <kstdaction.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <kkeydialog.h> @@ -45,14 +45,14 @@ #include <kprogress.h> #include <kpushbutton.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tderecentdocument.h> #include <tdeparts/partmanager.h> #include <tdeparts/plugin.h> #include <tdeparts/event.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstatusbar.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ksharedptr.h> #include <tqobjectlist.h> diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp index fa1642e7..62b6b0b1 100644 --- a/lib/kofficecore/KoOasisStore.cpp +++ b/lib/kofficecore/KoOasisStore.cpp @@ -25,9 +25,9 @@ #include <KoStoreDevice.h> #include <KoXmlWriter.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqxml.h> diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp index 0f173658..9560a559 100644 --- a/lib/kofficecore/KoOasisStyles.cpp +++ b/lib/kofficecore/KoOasisStyles.cpp @@ -24,8 +24,8 @@ #include "KoXmlNS.h" #include "KoGenStyles.h" #include <tqbuffer.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqbrush.h> #include <KoStyleStack.h> diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 16608406..ed3086ab 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -29,7 +29,7 @@ #include <tqpainter.h> #include <tqpen.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kinstance.h> #include <kpushbutton.h> diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp index 62d81b32..f21167cf 100644 --- a/lib/kofficecore/KoPageLayout.cpp +++ b/lib/kofficecore/KoPageLayout.cpp @@ -20,10 +20,10 @@ */ #include "KoPageLayout.h" #include <KoUnit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <KoDom.h> #include <KoXmlNS.h> #include <tqdom.h> diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp index ff30802e..101c946c 100644 --- a/lib/kofficecore/KoPictureBase.cpp +++ b/lib/kofficecore/KoPictureBase.cpp @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kmdcodec.h> #include <tqpainter.h> diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp index b6a05c8a..5f0718e1 100644 --- a/lib/kofficecore/KoPictureEps.cpp +++ b/lib/kofficecore/KoPictureEps.cpp @@ -32,13 +32,13 @@ #include <tqapplication.h> #include <tqdragobject.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeversion.h> #if ! KDE_IS_VERSION( 3,1,90 ) #include <kdebugclasses.h> #endif -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include "KoPictureKey.h" diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index 0ed86896..6bd950da 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -44,8 +44,8 @@ // KDE includes. #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <dcopclient.h> #include <tdeconfig.h> #include <ktrader.h> diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index dd8410e3..2d0ba529 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -32,7 +32,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <tdeio/netaccess.h> -#include <klocale.h> +#include <tdelocale.h> #include <stdlib.h> diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp index 9068fc94..51d1cb2f 100644 --- a/lib/kofficecore/KoUnit.cpp +++ b/lib/kofficecore/KoUnit.cpp @@ -22,8 +22,8 @@ #include "KoUnit.h" #include <KoXmlWriter.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 2964bcaf..1c8b88a4 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -24,8 +24,8 @@ #include <KoViewIface.h> #include <KoDocumentChild.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tdeparts/partmanager.h> #include <tdeparts/event.h> diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 57cd09e2..8759ef66 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -28,8 +28,8 @@ #include <kiconloader.h> #include <kbuttonbox.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kdebug.h> diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index b5baad99..0e216098 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -29,8 +29,8 @@ #include <tqtooltip.h> // KDE includes -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeapplication.h> #include <tdemainwindow.h> #include <tdeaction.h> diff --git a/lib/kofficecore/tests/kopointtest.cpp b/lib/kofficecore/tests/kopointtest.cpp index bf2ff843..c956466a 100644 --- a/lib/kofficecore/tests/kopointtest.cpp +++ b/lib/kofficecore/tests/kopointtest.cpp @@ -1,6 +1,6 @@ #include <KoPoint.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <stdlib.h> #include <math.h> diff --git a/lib/kofficecore/tests/korecttest.cpp b/lib/kofficecore/tests/korecttest.cpp index 8a2455bf..f9008b67 100644 --- a/lib/kofficecore/tests/korecttest.cpp +++ b/lib/kofficecore/tests/korecttest.cpp @@ -3,7 +3,7 @@ #include <tdeapplication.h> #include <stdlib.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> bool check(TQString txt, bool res, bool expected) { diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index 4095ae09..5a4a288d 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcharselect.h> #include <kdebug.h> /******************************************************************/ diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 0bcf454b..53eaba86 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <kcommand.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdeshortcutlist.h> #include <tdestdaccel.h> diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index f85e1937..d9d22278 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -27,7 +27,7 @@ #include <tqsimplerichtext.h> #include <kpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kcursor.h> diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index 1a2b2668..bb937a7f 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -18,7 +18,7 @@ */ #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqpushbutton.h> #include <tqlistbox.h> diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index 00664410..bbc2e9cf 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -28,7 +28,7 @@ #include <tqlayout.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 84f31ee3..a4e4ad12 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -25,7 +25,7 @@ #include <tqpainter.h> #include <tqpixmap.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <KoDocument.h> diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index eda24051..bb58686c 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -18,7 +18,7 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlayout.h> #include <tqvbox.h> diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 3150ab51..69a6326e 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -29,9 +29,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 73629862..c4e19fa8 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -22,9 +22,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index 144b8a08..897aba8d 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -20,7 +20,7 @@ #include <KoPartSelectDia.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlistview.h> /**************************************************** diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp index 7baed8f9..392309f3 100644 --- a/lib/kofficeui/KoPictureFilePreview.cpp +++ b/lib/kofficeui/KoPictureFilePreview.cpp @@ -21,7 +21,7 @@ #include "KoPictureFilePreview.h" #include "KoPictureFilePreview.moc" #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <tqbitmap.h> #include <tqlayout.h> diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index 74c617c5..fade3f71 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -22,8 +22,8 @@ /******************************************************************/ #include "KoRuler.h" -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <kdebug.h> #include <kiconloader.h> #include <tqcursor.h> diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 5960c2e6..95238764 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -30,7 +30,7 @@ #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> class KoSelectAction::KoSelectActionPrivate { diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index c38d0e62..325b9c00 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -26,7 +26,7 @@ #include <tqpopupmenu.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> class KoTabChooserPrivate { diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 047a701a..044df16a 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -26,7 +26,7 @@ #include "KoTemplateChooseDia.h" -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include <tdefiledialog.h> #include <kinstance.h> @@ -38,11 +38,11 @@ #include <kdebug.h> #include <kpushbutton.h> #include <kjanuswidget.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ktextedit.h> #include <tdefileiconview.h> #include <tdefileitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeaboutdata.h> diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index e3d6f9f7..0033ca2d 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -32,14 +32,14 @@ #include <tqcheckbox.h> #include <tqtooltip.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoTemplates.h> #include <kicondialog.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kimageio.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index 31c0dabf..222b206d 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <tdeparts/event.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbar.h> #include <kiconloader.h> #include <kseparator.h> diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index f44adfb9..1cd5e1c6 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -25,11 +25,11 @@ #include <tqstyle.h> #include <tqpopupmenu.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdetoolbar.h> #include <KoTooluButton.h> #include <kcolordrag.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcolordialog.h> #include <kdebug.h> diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 0b9f26e7..4c4a5c45 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -21,8 +21,8 @@ #include "KoUnitWidgets.h" #include "KoUnitWidgets.moc" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlayout.h> diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index 09f7d3e4..78a4fc20 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -23,7 +23,7 @@ #include <tqregexp.h> #include <tqvaluelist.h> -#include <klocale.h> +#include <tdelocale.h> KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut, TQObject* parent, const char* name ): diff --git a/lib/kofficeui/KoZoomMode.cpp b/lib/kofficeui/KoZoomMode.cpp index ae49a303..8c54d34e 100644 --- a/lib/kofficeui/KoZoomMode.cpp +++ b/lib/kofficeui/KoZoomMode.cpp @@ -18,7 +18,7 @@ */ #include "KoZoomMode.h" -#include <klocale.h> +#include <tdelocale.h> const char* KoZoomMode::modes[] = { diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index 41fcf794..08176d1b 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -25,7 +25,7 @@ #include <tdepopupmenu.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> class KoLineStyleAction::KoLineStyleActionPrivate { diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index 50566d5a..b9ff452a 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -33,7 +33,7 @@ #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoUnitWidgets.h> #include <KoGlobal.h> diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 89574bcf..d2476d62 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -28,7 +28,7 @@ #include <tqpainter.h> #include <tqtooltip.h> #include <tqwhatsthis.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqapplication.h> diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 9befb976..6fed1f48 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include <kiconeffect.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // Delay in ms before delayed popup pops up #define POPUP_DELAY 500 diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h index 9f5d9540..706a8c03 100644 --- a/lib/kofficeui/ttdetoolbarbutton.h +++ b/lib/kofficeui/ttdetoolbarbutton.h @@ -24,7 +24,7 @@ #include <tqpixmap.h> #include <tqtoolbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> class TDEToolBar; class TDEInstance; diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc index e2406a79..02439a8c 100644 --- a/lib/kopainter/koColorChooser.cc +++ b/lib/kopainter/koColorChooser.cc @@ -25,7 +25,7 @@ #include <tqspinbox.h> #include <tqtabwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kcolordialog.h> #include <ktabctl.h> diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc index 9fd7f877..e8647ffb 100644 --- a/lib/kopainter/koIconChooser.cc +++ b/lib/kopainter/koIconChooser.cc @@ -20,7 +20,7 @@ #include <kdebug.h> #include <koIconChooser.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqpainter.h> #include <tqcursor.h> diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc index e1230d80..af2136f9 100644 --- a/lib/kopainter/ko_cmyk_widget.cc +++ b/lib/kopainter/ko_cmyk_widget.cc @@ -30,8 +30,8 @@ #include <tqcolor.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <koFrameButton.h> #include <koColorSlider.h> diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc index 942215d5..8d77bedc 100644 --- a/lib/kopainter/ko_hsv_widget.cc +++ b/lib/kopainter/ko_hsv_widget.cc @@ -32,7 +32,7 @@ #include <kdualcolorbutton.h> #include <koColor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name) { diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc index 7e8b69f9..7680d50a 100644 --- a/lib/kopainter/ko_rgb_widget.cc +++ b/lib/kopainter/ko_rgb_widget.cc @@ -29,7 +29,7 @@ #include <tqcolor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koFrameButton.h> #include <koColorSlider.h> diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index 2202a86f..cd392205 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -29,9 +29,9 @@ #include <tqlayout.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> +#include <tdeglobalsettings.h> #include <tdeaccelmanager.h> #include <tdeconfig.h> diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index 2bb6a039..26f30992 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -29,8 +29,8 @@ #include <tdeaction.h> #include <tdeactionclasses.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <KoView.h> #include <KoMainWindow.h> diff --git a/lib/koproperty/customproperty.cpp b/lib/koproperty/customproperty.cpp index c5a33ef6..b51cc317 100644 --- a/lib/koproperty/customproperty.cpp +++ b/lib/koproperty/customproperty.cpp @@ -25,7 +25,7 @@ #include <tqsizepolicy.h> #include <tqpoint.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KoProperty; diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 22f81fe7..6ba0e295 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -40,7 +40,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include <tdeapplication.h> diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index 839d6d52..e34ee5d5 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -23,7 +23,7 @@ #include "../property.h" #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kdebug.h> diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp index 5ff0bb34..042256a0 100644 --- a/lib/koproperty/editors/cursoredit.cpp +++ b/lib/koproperty/editors/cursoredit.cpp @@ -24,7 +24,7 @@ #include <tqvariant.h> #include <tqcursor.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "property.h" diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index d26dbb30..4b61d80f 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -27,8 +27,8 @@ #include <tqvariant.h> #include <tqpainter.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 1ed2c9c6..74636c89 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -27,8 +27,8 @@ #include <tqpainter.h> #include <tqvariant.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 2de0468b..80a3d528 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -34,7 +34,7 @@ #include <tdeversion.h> #include <tdefontrequester.h> #include <tdeaccelmanager.h> -#include <klocale.h> +#include <tdelocale.h> //! @internal //! reimplemented to better button and label's positioning diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index a01248f2..cf7645bf 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -45,7 +45,7 @@ #ifndef PURE_QT #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #endif diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp index 7badc4de..c355c28b 100644 --- a/lib/koproperty/editors/pointedit.cpp +++ b/lib/koproperty/editors/pointedit.cpp @@ -27,7 +27,7 @@ #include <tqtooltip.h> #include <kactivelabel.h> -#include <klocale.h> +#include <tdelocale.h> //"[ %1, %2 ]" #define POINTEDIT_MASK "%1,%2" diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp index 2422eec8..f9a77314 100644 --- a/lib/koproperty/editors/rectedit.cpp +++ b/lib/koproperty/editors/rectedit.cpp @@ -26,7 +26,7 @@ #include <tqtooltip.h> #include <kactivelabel.h> -#include <klocale.h> +#include <tdelocale.h> // "[ %1, %2, %3, %4 ]" #define RECTEDIT_MASK "%1,%2 %3x%4" diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp index 3e0213d9..e5a37f6d 100644 --- a/lib/koproperty/editors/sizeedit.cpp +++ b/lib/koproperty/editors/sizeedit.cpp @@ -27,7 +27,7 @@ #include <tqtooltip.h> #include <kactivelabel.h> -#include <klocale.h> +#include <tdelocale.h> //"[ %1, %2 ]" #define SIZEEDIT_MASK "%1x%2" diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp index ba65a92f..c027d1dd 100644 --- a/lib/koproperty/editors/sizepolicyedit.cpp +++ b/lib/koproperty/editors/sizepolicyedit.cpp @@ -28,7 +28,7 @@ #include <tqmap.h> #include <tqtooltip.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 97a3177d..4743f570 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -28,8 +28,8 @@ #include <tqpainter.h> #include <tqlineedit.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KoProperty; diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index 54f986c5..dee5b335 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -30,7 +30,7 @@ #include <keditlistbox.h> #include <kdialogbase.h> #include <kstdguiitem.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "property.h" diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index faaefdb9..98882e58 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -25,7 +25,7 @@ #include <tqvariant.h> #include <kcharselect.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialogbase.h> #include "symbolcombo.h" diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 767ba83d..94692a47 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -28,8 +28,8 @@ #include <tqvariant.h> #include <tqdatetime.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> using namespace KoProperty; diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp index 5845365f..16fdacc8 100644 --- a/lib/koproperty/set.cpp +++ b/lib/koproperty/set.cpp @@ -28,7 +28,7 @@ //#include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> typedef TQMap<TQCString, TQValueList<TQCString> > StringListMap; typedef TQMapIterator<TQCString, TQStringList> StringListMapIterator; diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp index 4c21bff2..e6303948 100644 --- a/lib/koproperty/test/main.cpp +++ b/lib/koproperty/test/main.cpp @@ -21,7 +21,7 @@ #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char description[] = "A test application for the KoProperty library"; diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index 236936e2..59fee246 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -18,7 +18,7 @@ */ #include <tdemainwindow.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdecmdlineargs.h> #include <kiconloader.h> diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index 49749f91..f72bbbd3 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -7,8 +7,8 @@ #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <kdebug.h> #include <knuminput.h> diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp index b6268a76..b3d0c7aa 100644 --- a/lib/kotext/KoAutoFormat.cpp +++ b/lib/kotext/KoAutoFormat.cpp @@ -30,11 +30,11 @@ #include <tdeversion.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinstance.h> #include <tdeconfig.h> #include <kstandarddirs.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcommand.h> //#include <KoTextFormat.h> #include <kcompletion.h> @@ -169,7 +169,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti TDELocale klocale(m_doc->instance()->instanceName()); for (int i = 1; i <=7; i++) { - m_cacheNameOfDays.append(klocale.calendar()->weekDayName( i ).lower()); + m_cacheNameOfDays.append(tdelocale.calendar()->weekDayName( i ).lower()); } } @@ -392,7 +392,7 @@ void KoAutoFormat::readAutoCorrectConfig() { Q_ASSERT( m_entries.isEmpty() ); // readConfig is only called once... TDELocale klocale(m_doc->instance()->instanceName()); - TQString kdelang = klocale.languageList().front(); + TQString kdelang = tdelocale.languageList().front(); kdelang.remove( TQRegExp( "@.*" ) ); kdDebug(32500) << "KoAutoFormat: m_autoFormatLanguage=" << m_autoFormatLanguage << " kdelang=" << kdelang << endl; TQString fname; @@ -620,7 +620,7 @@ void KoAutoFormat::saveConfig() TDEConfigGroupSaver cgs( config, "AutoFormat" ); config->writeEntry( "ConvertUpperCase", m_convertUpperCase ); - config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage); + config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? tdelocale.languageList().front() : m_autoFormatLanguage); config->writeEntry( "ConvertUpperUpper", m_convertUpperUpper ); config->writeEntry( "includeTwoLetterException", m_includeTwoUpperLetterException ); @@ -733,7 +733,7 @@ void KoAutoFormat::saveConfig() begin.appendChild(simpleQuote); TQFile f; if ( m_autoFormatLanguage.isEmpty()) - f.setName(locateLocal("data", "koffice/autocorrect/"+klocale.languageList().front() + ".xml",m_doc->instance())); + f.setName(locateLocal("data", "koffice/autocorrect/"+tdelocale.languageList().front() + ".xml",m_doc->instance())); else f.setName(locateLocal("data", "koffice/autocorrect/"+m_autoFormatLanguage + ".xml",m_doc->instance())); if(!f.open(IO_WriteOnly)) { diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 60b74bb0..c4823687 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -23,8 +23,8 @@ #include "KoCharSelectDia.h" #include <KoSearchDia.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <kstandarddirs.h> diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 3df928a1..6546c51c 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -38,7 +38,7 @@ #include <tdespell2/filter.h> using namespace KSpell2; -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> #include <tqtimer.h> diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp index cde58f0a..a7cff7c2 100644 --- a/lib/kotext/KoChangeCaseDia.cpp +++ b/lib/kotext/KoChangeCaseDia.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqwhatsthis.h> diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index e313d5b2..727c6e5b 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqmultilineedit.h> #include "KoCommentDia.h" #include <tqlayout.h> #include <tqpushbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqdatetime.h> #include <tqlabel.h> #include <kdebug.h> diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 031a8122..c500cca4 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -19,8 +19,8 @@ #include "KoCompletionDia.h" #include "KoAutoFormat.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <kcompletion.h> #include <tdeconfig.h> diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index fb7d9b9d..93c3dafd 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -17,13 +17,13 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlabel.h> #include <tqlineedit.h> #include "KoCreateStyleDia.h" -#include <kmessagebox.h> +#include <tdemessagebox.h> KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name ) : KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true ) diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index dd32a80e..a331596a 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -20,7 +20,7 @@ #include "KoCustomVariablesDia.h" #include "KoCustomVariablesDia.moc" -#include <klocale.h> +#include <tdelocale.h> #include <kbuttonbox.h> #include <tqcombobox.h> diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp index 73e0789e..93b24a53 100644 --- a/lib/kotext/KoDecorationTab.cpp +++ b/lib/kotext/KoDecorationTab.cpp @@ -23,7 +23,7 @@ #include <kcolorbutton.h> #include <kpushbutton.h> #include <knuminput.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index 1d82214c..fbde5028 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -25,7 +25,7 @@ #include "KoRichText.h" #include <kcolordialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqgroupbox.h> diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp index f61306b0..adf7594d 100644 --- a/lib/kotext/KoFontDiaPreview.cpp +++ b/lib/kotext/KoFontDiaPreview.cpp @@ -21,7 +21,7 @@ #include "KoGlobal.h" #include "KoTextFormat.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqfontmetrics.h> #include <tqrect.h> diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 6d9d57d6..1e048939 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <tqvbox.h> #include <tqlayout.h> #include <tqlineedit.h> diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 200b1f32..b62a148f 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -33,7 +33,7 @@ #include <kcolorbutton.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <knumvalidator.h> #include <KoGlobal.h> #include <tqgroupbox.h> diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp index 7fd214be..1978d88c 100644 --- a/lib/kotext/KoParagLayout.cpp +++ b/lib/kotext/KoParagLayout.cpp @@ -27,8 +27,8 @@ #include <KoDom.h> #include <KoGenStyles.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqdom.h> #include <tqbuffer.h> diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp index fcae882c..2af7cecb 100644 --- a/lib/kotext/KoParagStyle.cpp +++ b/lib/kotext/KoParagStyle.cpp @@ -25,7 +25,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp index d9d6c1df..9121c59f 100644 --- a/lib/kotext/KoRichText.cpp +++ b/lib/kotext/KoRichText.cpp @@ -45,8 +45,8 @@ #include "KoTextDocument.h" #include <kdebug.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqtextengine_p.h> //#define DEBUG_COLLECTION diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 52aba237..55a4c56b 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -30,7 +30,7 @@ #include <kcommand.h> #include <kdebug.h> #include <tdefontcombo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> #include <tqbuttongroup.h> diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index 2a9e5476..8e96a44f 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -29,8 +29,8 @@ #include <tdespell2/broker.h> #include <tdespell2/filter.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqtimer.h> diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp index fa0818d8..a29dbd84 100644 --- a/lib/kotext/KoStyleCollection.cpp +++ b/lib/kotext/KoStyleCollection.cpp @@ -27,7 +27,7 @@ #include <KoXmlNS.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdom.h> diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 0738f0e3..0a77bb42 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -24,7 +24,7 @@ #include <KoFontDia.h> #include <KoGlobal.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp index 875c1e71..c624514c 100644 --- a/lib/kotext/KoTextCommand.cpp +++ b/lib/kotext/KoTextCommand.cpp @@ -22,7 +22,7 @@ #include "KoTextParag.h" #include "KoVariable.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // This is automatically called by KCommandHistory's redo action when redo is activated void KoTextCommand::execute() diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp index 0f3d48d2..4648898d 100644 --- a/lib/kotext/KoTextFormat.cpp +++ b/lib/kotext/KoTextFormat.cpp @@ -25,9 +25,9 @@ #include <KoGenStyles.h> #include <KoXmlNS.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> #include <tqregexp.h> diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index 0b8d9ab5..cae6e9e4 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -31,7 +31,7 @@ #include <KoXmlNS.h> #include <KoDom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp index c9f0a831..c4042779 100644 --- a/lib/kotext/KoTextParag.cpp +++ b/lib/kotext/KoTextParag.cpp @@ -29,10 +29,10 @@ #include <KoGenStyles.h> #include <KoDom.h> #include <KoXmlNS.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <assert.h> //#define DEBUG_PAINT diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index a261d59f..f6cdf4c4 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -26,14 +26,14 @@ #include "KoBgSpellCheck.h" #include "KoVariable.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdestdaccel.h> #include <kdebug.h> #include <kinstance.h> #include <kdatatool.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kcommand.h> #include <kbookmarkmanager.h> #include <kbookmark.h> diff --git a/lib/kotext/KoUserStyle.cpp b/lib/kotext/KoUserStyle.cpp index 33de3421..4584735f 100644 --- a/lib/kotext/KoUserStyle.cpp +++ b/lib/kotext/KoUserStyle.cpp @@ -17,7 +17,7 @@ */ #include "KoUserStyle.h" -#include <klocale.h> +#include <tdelocale.h> KoUserStyle::KoUserStyle( const TQString & name ) : m_name( name ), m_displayName( i18n( "Style name", name.utf8() ) ) diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 089b09d1..fb1b6c1c 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -36,9 +36,9 @@ #include <KoXmlNS.h> #include <KoDom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdialogbase.h> #include <tdeconfig.h> #include <tdeversion.h> diff --git a/lib/kotext/TDEFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp index fdf7c568..a5db6523 100644 --- a/lib/kotext/TDEFontDialog_local.cpp +++ b/lib/kotext/TDEFontDialog_local.cpp @@ -45,11 +45,11 @@ #include <kcharsets.h> #include <tdeconfig.h> #include <kdialog.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tqlineedit.h> #include <tdelistbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kdebug.h> #include <knuminput.h> diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 06603969..5bbd3d1f 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -7,8 +7,8 @@ #include <tqlabel.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlineedit.h> #include <knuminput.h> diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp index bbb3ebb9..ddc09dc2 100644 --- a/lib/kotext/kohyphen/kohyphen.cpp +++ b/lib/kotext/kohyphen/kohyphen.cpp @@ -24,7 +24,7 @@ #include <tqtextcodec.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui index 646bc795..cddc4798 100644 --- a/lib/kotext/kolayouttabbase.ui +++ b/lib/kotext/kolayouttabbase.ui @@ -286,7 +286,7 @@ </connections> <includes> <include location="global" impldecl="in declaration">knuminput.h</include> - <include location="global" impldecl="in declaration">klocale.h</include> + <include location="global" impldecl="in declaration">tdelocale.h</include> </includes> <layoutdefaults spacing="6" margin="11"/> <includehints> diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp index 72e5081c..6a0360aa 100644 --- a/lib/kotext/tests/KoUserStyleTester.cpp +++ b/lib/kotext/tests/KoUserStyleTester.cpp @@ -24,7 +24,7 @@ #include <KoUserStyleCollection.h> #include <KoUserStyle.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "KoUserStyleTester.h" #include "KoUserStyleTester.moc" diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp index a0286646..74014c2d 100644 --- a/lib/kotext/tests/kotextformattertest.cpp +++ b/lib/kotext/tests/kotextformattertest.cpp @@ -2,8 +2,8 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "KoTextFormatter.h" #include "KoTextFormat.h" diff --git a/lib/kross/api/variant.cpp b/lib/kross/api/variant.cpp index 54e8ed7e..a8823a41 100644 --- a/lib/kross/api/variant.cpp +++ b/lib/kross/api/variant.cpp @@ -20,7 +20,7 @@ #include "variant.h" #include "list.h" -#include <klocale.h> +#include <tdelocale.h> using namespace Kross::Api; diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp index 21ee1eca..4ee5490d 100644 --- a/lib/kross/main/manager.cpp +++ b/lib/kross/main/manager.cpp @@ -33,7 +33,7 @@ #include <tqregexp.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> extern "C" diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp index 7f7f980e..809d3b83 100644 --- a/lib/kross/main/scriptcontainer.cpp +++ b/lib/kross/main/scriptcontainer.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> -#include <klocale.h> +#include <tdelocale.h> using namespace Kross::Api; diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index 7b8fe2af..e96c4a90 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -26,9 +26,9 @@ #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kmimetype.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurl.h> #include <ktar.h> #include <kstandarddirs.h> diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index ea870f95..8347c767 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -29,8 +29,8 @@ #include <tdefiledialog.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstandarddirs.h> #include <tdetoolbar.h> diff --git a/lib/kross/python/pythoninterpreter.cpp b/lib/kross/python/pythoninterpreter.cpp index 3b956fe0..4128a301 100644 --- a/lib/kross/python/pythoninterpreter.cpp +++ b/lib/kross/python/pythoninterpreter.cpp @@ -24,7 +24,7 @@ //#include "pythonextension.h" #include "../api/variant.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #if defined(TQ_WS_WIN) diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index 4175bc9e..4d9c90e3 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -31,7 +31,7 @@ #include <ktextedit.h> #include <kpushbutton.h> #include <tdepopupmenu.h> -#include <kmenubar.h> +#include <tdemenubar.h> #include <kstandarddirs.h> TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptcode) diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp index 64b01a44..c45f3946 100644 --- a/lib/store/KoStore.cpp +++ b/lib/store/KoStore.cpp @@ -35,8 +35,8 @@ #include <kurl.h> #include <kdebug.h> #include <tdeversion.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> //#define DefaultFormat KoStore::Tar diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp index 6c3459f4..05b242e1 100644 --- a/lib/store/KoXmlWriter.cpp +++ b/lib/store/KoXmlWriter.cpp @@ -19,7 +19,7 @@ #include "KoXmlWriter.h" -#include <kglobal.h> // kMin +#include <tdeglobal.h> // kMin #include <kdebug.h> #include <tqiodevice.h> #include <float.h> |