diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
| commit | 508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch) | |
| tree | 1df40da8f05d010a3e175c3d48e3529cccf2e067 /umbrello | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'umbrello')
105 files changed, 153 insertions, 153 deletions
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> |