diff --git a/doc/kommander/widgets.docbook b/doc/kommander/widgets.docbook
index 1596d25e..45504ee4 100644
--- a/doc/kommander/widgets.docbook
+++ b/doc/kommander/widgets.docbook
@@ -548,7 +548,7 @@ when the execute function is called.
-
+
FontDialog
diff --git a/kimagemapeditor/arealistview.cpp b/kimagemapeditor/arealistview.cpp
index 3739114a..4dceda41 100644
--- a/kimagemapeditor/arealistview.cpp
+++ b/kimagemapeditor/arealistview.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
// QT
-#include
+#include
#include
#include
#include
diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h
index 1a118d2f..24bac7a0 100644
--- a/kimagemapeditor/imageslistview.h
+++ b/kimagemapeditor/imageslistview.h
@@ -18,7 +18,7 @@
#ifndef _IMAGESLISTVIEW_H_
#define _IMAGESLISTVIEW_H_
-#include
+#include
#include
#include "kimagemapeditor.h"
diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp
index bccccc7c..84756747 100644
--- a/kimagemapeditor/kimagemapeditor.cpp
+++ b/kimagemapeditor/kimagemapeditor.cpp
@@ -42,8 +42,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
#include
diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp
index 3914ac50..f27b475c 100644
--- a/kimagemapeditor/kimeshell.cpp
+++ b/kimagemapeditor/kimeshell.cpp
@@ -18,7 +18,7 @@
#include
-#include
+#include
#include
#include
#include
diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp
index 399ad2b5..fee8f147 100644
--- a/kimagemapeditor/mapslistview.cpp
+++ b/kimagemapeditor/mapslistview.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
// KDE
-#include
+#include
#include
#include
diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp
index 7034c840..e60f2503 100644
--- a/klinkstatus/src/actionmanager.cpp
+++ b/klinkstatus/src/actionmanager.cpp
@@ -19,10 +19,10 @@
***************************************************************************/
#include "actionmanager.h"
-#include
+#include
#include
#include
-#include
+#include
#include
#include
diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp
index b344e95d..cf8abf2b 100644
--- a/klinkstatus/src/klinkstatus.cpp
+++ b/klinkstatus/src/klinkstatus.cpp
@@ -25,14 +25,14 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
#include
#include
#include
-#include
+#include
KLinkStatus::KLinkStatus()
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index be6f9f76..2d233666 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -21,7 +21,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -31,8 +31,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index d1bbf780..3a4c7787 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -16,7 +16,7 @@
#include
#include
#include
-#include
+#include
#include
#include
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 6567b7db..49fa9759 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp
index bc7f1492..7c369d4d 100644
--- a/klinkstatus/src/ui/tabwidgetsession.cpp
+++ b/klinkstatus/src/ui/tabwidgetsession.cpp
@@ -38,7 +38,7 @@
#include
#include
#include
-#include
+#include
#include
diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h
index 3481108d..55366e0d 100644
--- a/klinkstatus/src/ui/treeview.h
+++ b/klinkstatus/src/ui/treeview.h
@@ -12,7 +12,7 @@
#ifndef TREEVIEW_H
#define TREEVIEW_H
-#include
+#include
#include "resultview.h"
class TreeViewItem;
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index f02b779c..4ee27476 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -24,8 +24,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index 782a2b22..60b4ff69 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -145,6 +145,6 @@
- klistview.h
+ tdelistview.h
diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp
index c5b1bbb7..3debb9ba 100644
--- a/kommander/editor/choosewidgetimpl.cpp
+++ b/kommander/editor/choosewidgetimpl.cpp
@@ -15,7 +15,7 @@
***************************************************************************/
/** KDE INCLUDES */
-#include
+#include
#include
/** QT INCLUDES */
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 29a33a56..90824b2d 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -405,9 +405,9 @@
- klistview.h
- klistbox.h
- klistbox.h
+ tdelistview.h
+ tdelistbox.h
+ tdelistbox.h
kcombobox.h
kcombobox.h
kpushbutton.h
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 7dc7978d..78560f8f 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -27,8 +27,8 @@
#include
#include
-#include
-#include
+#include
+#include
#include
#include
#include
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index 5e9686ff..005d2261 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -699,7 +699,7 @@
ktextbrowser.h
kcombobox.h
- klistbox.h
+ tdelistbox.h
kpushbutton.h
kcombobox.h
klineedit.h
diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp
index f4dc7f38..c37116c5 100644
--- a/kommander/editor/functionsimpl.cpp
+++ b/kommander/editor/functionsimpl.cpp
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index dcd1b393..fe9be401 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -71,7 +71,7 @@
#include "assistproc.h"
#include
-#include
+#include
#include
#include
#include
@@ -83,7 +83,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 9f4a0ca8..be1d1590 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -58,7 +58,7 @@
#include "command.h"
-#include
+#include
#include
#include
#include
@@ -67,7 +67,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index e89e04f3..c180c61c 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -19,9 +19,9 @@
#include
#include
#include
-#include
+#include
#include
-#include
+#include
#include
#include
diff --git a/kommander/editor/pics/Makefile.am b/kommander/editor/pics/Makefile.am
index 2306b047..463e1f05 100644
--- a/kommander/editor/pics/Makefile.am
+++ b/kommander/editor/pics/Makefile.am
@@ -1,5 +1,5 @@
kmdr_editordir = ${kde_datadir}/kommander/pics
-kmdr_editor_DATA = kommandersplash.png toolbox.png kfontcombo.png
+kmdr_editor_DATA = kommandersplash.png toolbox.png tdefontcombo.png
diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp
index d4a17ea4..bc85f2ff 100644
--- a/kommander/pluginmanager/mainwindow.cpp
+++ b/kommander/pluginmanager/mainwindow.cpp
@@ -18,8 +18,8 @@
#include "mainwindow.h"
#include "pluginmanager.h"
-#include
-#include
+#include
+#include
#include
#include
#include
diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h
index 9f891d2c..b49c4e21 100644
--- a/kommander/pluginmanager/mainwindow.h
+++ b/kommander/pluginmanager/mainwindow.h
@@ -18,7 +18,7 @@
#ifndef HAVE_MAINWINDOW_H
#define HAVE_MAINWINDOW_H
-#include
+#include
class TDEListBox;
class PluginManager;
diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h
index f768552d..35ba1c85 100644
--- a/kommander/widget/kmdrmainwindow.h
+++ b/kommander/widget/kmdrmainwindow.h
@@ -12,7 +12,7 @@
#ifndef KmdrMainWindow_H
#define KmdrMainWindow_H
-#include
+#include
/**
@author Andras Mantia
diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp
index 739fb0e0..ba5b23ac 100644
--- a/kommander/widgets/fontdialog.cpp
+++ b/kommander/widgets/fontdialog.cpp
@@ -14,7 +14,7 @@
#include "kommanderplugin.h"
#include "specials.h"
-#include
+#include
#include
#include
@@ -37,7 +37,7 @@ FontDialog::FontDialog(TQWidget *parent, const char *name)
setDisplayStates(states);
if (KommanderWidget::inEditor)
{
- setPixmap(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(TQFrame::Box | TQFrame::Plain);
setLineWidth(1);
setFixedSize(pixmap()->size());
diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h
index b970c280..8f8c2a39 100644
--- a/kommander/widgets/listbox.h
+++ b/kommander/widgets/listbox.h
@@ -26,7 +26,7 @@
/* OTHER INCLUDES */
#include
-#include
+#include
#include
class TQWidget;
diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp
index aef6821e..721ad120 100644
--- a/kommander/widgets/plugin.cpp
+++ b/kommander/widgets/plugin.cpp
@@ -93,7 +93,7 @@ KomStdPlugin::KomStdPlugin()
addWidget("Table", group, "", 0);
addWidget("DatePicker", group, "", 0);
addWidget("PopupMenu", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)));
- addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
+ addWidget("FontDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("tdefontcombo", KIcon::NoGroup, KIcon::SizeMedium)));
addWidget("AboutDialog", group, "", new TQIconSet(TDEGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)));
}
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp
index ba6c3781..1320ce8b 100644
--- a/kommander/widgets/popupmenu.cpp
+++ b/kommander/widgets/popupmenu.cpp
@@ -17,7 +17,7 @@
#include
#include
#include
-#include
+#include
#include
#define INSERTMENUITEM 100
diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp
index 7c1c989a..e54077dd 100644
--- a/kommander/widgets/treewidget.cpp
+++ b/kommander/widgets/treewidget.cpp
@@ -20,7 +20,7 @@
#include
#include
#include
-#include
+#include
/* QT INCLUDES */
#include
diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h
index 19cbcea6..173866d6 100644
--- a/kommander/widgets/treewidget.h
+++ b/kommander/widgets/treewidget.h
@@ -18,7 +18,7 @@
#define _HAVE_TREEWIDGET_H_
/* KDE INCLUDES */
-#include
+#include
/* QT INCLUDES */
#include
diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index 34a82b28..f0f7c4d8 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -11,7 +11,7 @@
#include
-#include
+#include
#include
#include
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index edac344b..7e8244e2 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -3,7 +3,7 @@
#include "libxsldbg/xsldbg.h"
#include
-#include
+#include
#include
#include
#include
@@ -17,7 +17,7 @@
#include
#include "../kxsldbg.h"
-#include
+#include
#include
#include
#include
diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index 670d989e..54d82d6e 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index d36a1ef1..7727783b 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -18,7 +18,7 @@
Boston, MA 02110-1301, USA.
*/
-#include
+#include
#include
#include
#include
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index 23aa9438..ddc0b2ef 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -22,7 +22,7 @@
#include
#include
-#include
+#include
#include
#include
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 08940d0a..998e9a72 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -26,7 +26,7 @@
#include
#include
-#include
+#include
#include
#include
#include
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index 64f5848f..f6bed90c 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -36,8 +36,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include
#include
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
index 69e5f7dc..bf54a5c0 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h
@@ -55,13 +55,13 @@
#include
#ifndef NO_KDE2
-#include
+#include
#include
#else
#include
#include "exportdockclass.h"
-#include "dummykmainwindow.h"
+#include "dummytdemainwindow.h"
#endif
#include
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
index 575fa2b2..fe60b25f 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp
@@ -8,7 +8,7 @@
//----------------------------------------------------------------------------
#include
-#include
+#include
#include "tdemdidocumentviewtabwidget.h"
KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const char* name ) : KTabWidget( parent, name )
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index 4c9930be..142213ad 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -1,6 +1,6 @@
/* This file is part of the KDE libraries
Copyright (C) 2003 Joseph Wenninger