summaryrefslogtreecommitdiffstats
path: root/kommander/editor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:37 -0600
commit279764bab1514a051db18e14241e9bae62be14d6 (patch)
treec587a443a0a228897e395535e2791dbde757bb3d /kommander/editor
parentee38b2862bfd887e95cf62fdf244edad40ece7b2 (diff)
downloadtdewebdev-279764bab1514a051db18e14241e9bae62be14d6.tar.gz
tdewebdev-279764bab1514a051db18e14241e9bae62be14d6.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kommander/editor')
-rw-r--r--kommander/editor/actiondnd.cpp2
-rw-r--r--kommander/editor/actioneditorimpl.cpp2
-rw-r--r--kommander/editor/actionlistview.cpp2
-rw-r--r--kommander/editor/assoctexteditorimpl.cpp8
-rw-r--r--kommander/editor/choosewidgetimpl.cpp2
-rw-r--r--kommander/editor/command.cpp2
-rw-r--r--kommander/editor/connectioneditorimpl.cpp2
-rw-r--r--kommander/editor/formfile.cpp4
-rw-r--r--kommander/editor/formwindow.cpp4
-rw-r--r--kommander/editor/functionsimpl.cpp4
-rw-r--r--kommander/editor/hierarchyview.cpp2
-rw-r--r--kommander/editor/iconvieweditorimpl.cpp2
-rw-r--r--kommander/editor/listboxeditorimpl.cpp2
-rw-r--r--kommander/editor/listvieweditorimpl.cpp2
-rw-r--r--kommander/editor/main.cpp2
-rw-r--r--kommander/editor/mainwindow.cpp6
-rw-r--r--kommander/editor/mainwindowactions.cpp8
-rw-r--r--kommander/editor/messagelog.cpp2
-rw-r--r--kommander/editor/messagelog.h2
-rw-r--r--kommander/editor/multilineeditorimpl.cpp2
-rw-r--r--kommander/editor/newformimpl.cpp4
-rw-r--r--kommander/editor/pixmapchooser.cpp2
-rw-r--r--kommander/editor/propertyeditor.cpp2
-rw-r--r--kommander/editor/resource.cpp2
-rw-r--r--kommander/editor/sizehandle.cpp2
-rw-r--r--kommander/editor/tableeditorimpl.cpp2
-rw-r--r--kommander/editor/widgetdatabase.cpp2
-rw-r--r--kommander/editor/widgetfactory.cpp2
-rw-r--r--kommander/editor/wizardeditorimpl.cpp2
-rw-r--r--kommander/editor/workspace.cpp2
30 files changed, 42 insertions, 42 deletions
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index ae25449c..d07bfebf 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -40,7 +40,7 @@
#include "metadatabase.h"
#include "widgetfactory.h"
-#include <klocale.h>
+#include <tdelocale.h>
bool QDesignerAction::addTo( TQWidget *w )
{
diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp
index fdb75ea7..8dea07ad 100644
--- a/kommander/editor/actioneditorimpl.cpp
+++ b/kommander/editor/actioneditorimpl.cpp
@@ -34,7 +34,7 @@
#include <tqpopupmenu.h>
#include <tqobjectlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl )
: ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 )
diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp
index 3193d24c..80d4d94c 100644
--- a/kommander/editor/actionlistview.cpp
+++ b/kommander/editor/actionlistview.cpp
@@ -22,7 +22,7 @@
#include <tqdragobject.h>
#include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
ActionListView::ActionListView( TQWidget *parent, const char *name )
: TQListView( parent, name )
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index f034f4a7..4652c400 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -15,11 +15,11 @@
* *
***************************************************************************/
/* KDE INCLUDES */
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kpushbutton.h>
#include <ktextedit.h>
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index 3debb9ba..05738567 100644
--- a/kommander/editor/choosewidgetimpl.cpp
+++ b/kommander/editor/choosewidgetimpl.cpp
@@ -16,7 +16,7 @@
/** KDE INCLUDES */
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
/** QT INCLUDES */
#include <tqptrstack.h>
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index 02da2f52..63343b35 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -48,7 +48,7 @@
#endif
#include <tqaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
CommandHistory::CommandHistory( int s )
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 78560f8f..6ff3ef01 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -31,7 +31,7 @@
#include <tdelistview.h>
#include <kpushbutton.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char *const ignore_slots[] = {
"destroyed()",
diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index 97a636ef..1efb1fca 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -35,8 +35,8 @@
// KDE includes
#include <kdebug.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
#include <kstdguiitem.h>
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index e88dccd0..4e14134c 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -42,8 +42,8 @@
#include <tqwhatsthis.h>
// KDE includes
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
// Other includes
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index ab56089a..9bdb03c5 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -22,11 +22,11 @@
/* KDE INCLUDES */
#include <kcombobox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdelistbox.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <ktextedit.h>
#include <ktextbrowser.h>
diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index 89aed9fb..df8beeb5 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -43,7 +43,7 @@
#include <tqworkspace.h>
#include <tqaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp
index 7ca5b989..2fe8eed4 100644
--- a/kommander/editor/iconvieweditorimpl.cpp
+++ b/kommander/editor/iconvieweditorimpl.cpp
@@ -29,7 +29,7 @@
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
: IconViewEditorBase( parent, 0, true ), formwindow( fw )
diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp
index 22c07cea..047bc4f8 100644
--- a/kommander/editor/listboxeditorimpl.cpp
+++ b/kommander/editor/listboxeditorimpl.cpp
@@ -30,7 +30,7 @@
#include <tqpushbutton.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
: ListBoxEditorBase( parent, 0, true ), formwindow( fw )
diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp
index c07e8334..83422997 100644
--- a/kommander/editor/listvieweditorimpl.cpp
+++ b/kommander/editor/listvieweditorimpl.cpp
@@ -35,7 +35,7 @@
#include <tqpushbutton.h>
#include <tqptrstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
: ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw )
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index 62db8930..e5dc2739 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -19,7 +19,7 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksplashscreen.h>
// Other includes
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 05a0e1c1..de578537 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -76,9 +76,9 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <kommanderversion.h>
#include <kommanderwidget.h>
#include <kprocess.h>
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index b7fb6b72..4b5c99cd 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -61,12 +61,12 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kkeydialog.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
#include <kstandarddirs.h>
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 9c3b3c1b..3163016a 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -20,7 +20,7 @@
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h
index f0c1edbc..ea1c2aa0 100644
--- a/kommander/editor/messagelog.h
+++ b/kommander/editor/messagelog.h
@@ -19,7 +19,7 @@
#include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
class TDEListBox;
class TDEProcess;
diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp
index 5a9c4f1b..2dab19a1 100644
--- a/kommander/editor/multilineeditorimpl.cpp
+++ b/kommander/editor/multilineeditorimpl.cpp
@@ -26,7 +26,7 @@
#include <tqmultilineedit.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
: MultiLineEditorBase( parent, 0, true ), formwindow( fw )
diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index 810bdf62..832257f9 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -39,8 +39,8 @@
#include <tqworkspace.h>
#include <tqmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include "dialog.h"
diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp
index 04a60857..224bbe72 100644
--- a/kommander/editor/pixmapchooser.cpp
+++ b/kommander/editor/pixmapchooser.cpp
@@ -45,7 +45,7 @@
#include <tqpushbutton.h>
#include <tqiconview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#if defined(DESIGNER)
#include "pics/images.h"
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 8e4df0ca..6bdbb12e 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -88,7 +88,7 @@
#include "pics/hand.xbm"
#include "pics/no.xbm"
-#include <klocale.h>
+#include <tdelocale.h>
static TQFontDatabase *fontDataBase = 0;
TQString assistantPath();
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index e9e67a08..d9d3fa7d 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -72,7 +72,7 @@
#include <tqtable.h>
#endif
-#include <klocale.h>
+#include <tdelocale.h>
static TQString makeIndent( int indent )
{
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index 7b0d4a97..8aa6fdc7 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -28,7 +28,7 @@
#include <tqapplication.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
: TQWidget( parent )
diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp
index f54094b3..25883793 100644
--- a/kommander/editor/tableeditorimpl.cpp
+++ b/kommander/editor/tableeditorimpl.cpp
@@ -19,7 +19,7 @@
#include "metadatabase.h"
#include "mainwindow.h"
-#include <klocale.h>
+#include <tdelocale.h>
TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
: TableEditorBase( parent, name, modal, fl ),
diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index 7dbe2704..e3ab6de0 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -40,7 +40,7 @@
#include <stdlib.h>
#include <kommanderfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
const int dbsize = 300;
const int dbcustom = 200;
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index f5243910..15f9ad1d 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -18,7 +18,7 @@
**
**********************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kommanderfactory.h>
#include "kmdrmainwindow.h"
diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp
index 129760d1..3dbdec9b 100644
--- a/kommander/editor/wizardeditorimpl.cpp
+++ b/kommander/editor/wizardeditorimpl.cpp
@@ -29,7 +29,7 @@
#include <tqpushbutton.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
: WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w )
diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp
index 506b603e..b7e2943a 100644
--- a/kommander/editor/workspace.cpp
+++ b/kommander/editor/workspace.cpp
@@ -46,7 +46,7 @@
#include "qcompletionedit.h"
#include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char * const folderxpm[]={
"16 16 6 1",