summaryrefslogtreecommitdiffstats
path: root/kommander/widgets
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:23:27 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:23:27 -0600
commitc46f36d00839916c8b6cde8ed2ca54aeb40dba19 (patch)
tree990b3fd4f5a01a1a86b43d158686456eae2bdc44 /kommander/widgets
parent1e8f4c1ed6da13b851a7100e395d9243871c464d (diff)
downloadtdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.tar.gz
tdewebdev-c46f36d00839916c8b6cde8ed2ca54aeb40dba19.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kommander/widgets')
-rw-r--r--kommander/widgets/fontdialog.cpp4
-rw-r--r--kommander/widgets/listbox.h2
-rw-r--r--kommander/widgets/plugin.cpp2
-rw-r--r--kommander/widgets/popupmenu.cpp2
-rw-r--r--kommander/widgets/treewidget.cpp2
-rw-r--r--kommander/widgets/treewidget.h2
6 files changed, 7 insertions, 7 deletions
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 <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kiconloader.h>
#include <klocale.h>
@@ -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 <kommanderwidget.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kommander_export.h>
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 <kglobal.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kommanderplugin.h>
#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 <klocale.h>
#include <kglobal.h>
#include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
/* QT INCLUDES */
#include <tqstring.h>
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 <klistview.h>
+#include <tdelistview.h>
/* QT INCLUDES */
#include <tqstring.h>