Rename a number of classes to enhance compatibility with KDE4

6 files changed, 28 insertions, 28 deletions

diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index 67c86995..fda1322b 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -37,7 +37,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char*
     :PropertyWidget(property, parent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
-    m_edit = new KFontRequester(this);
+    m_edit = new TDEFontRequester(this);
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 #ifndef PURE_QT
     m_edit->button()->setText(i18n("..."));
diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h
index 761cb003..3f7d54c6 100644
--- a/lib/widgets/propeditor/pfontbutton.h
+++ b/lib/widgets/propeditor/pfontbutton.h
@@ -22,7 +22,7 @@
 
 #include "propertywidget.h"
 
-class KFontRequester;
+class TDEFontRequester;
 
 namespace PropertyLib{
 
@@ -44,7 +44,7 @@ protected slots:
     void updateProperty(const TQFont& font);
 
 private:
-    KFontRequester *m_edit;
+    TDEFontRequester *m_edit;
 
 };
 
diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp
index 8b0ee7a7..0675a6e0 100644
--- a/lib/widgets/propeditor/pfontcombo.cpp
+++ b/lib/widgets/propeditor/pfontcombo.cpp
@@ -37,11 +37,11 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na
     :PropertyWidget(property, parent, name)
 {
     TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
-    m_edit = new KFontCombo(this);
+    m_edit = new TDEFontCombo(this);
     m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     l->addWidget(m_edit);
     
-    /*adymo: KFontCombo seems to have a bug: when it is not editable, the signals
+    /*adymo: TDEFontCombo seems to have a bug: when it is not editable, the signals
     activated(int) and textChanged(const TQString &) are not emitted*/
 #ifdef PURE_QT
     TQFontDatabase fonts;
diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h
index f3ede408..e1a90b69 100644
--- a/lib/widgets/propeditor/pfontcombo.h
+++ b/lib/widgets/propeditor/pfontcombo.h
@@ -23,10 +23,10 @@
 #include "propertywidget.h"
 
 #ifdef PURE_QT
-#define KFontCombo TQComboBox
+#define TDEFontCombo TQComboBox
 #endif
 
-class KFontCombo;
+class TDEFontCombo;
 
 namespace PropertyLib{
 
@@ -49,7 +49,7 @@ private slots:
     void updateProperty(const TQString &val);
     
 private:
-    KFontCombo *m_edit;
+    TDEFontCombo *m_edit;
 };
 
 }
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index c7eafd8f..1bf3adc9 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -40,16 +40,16 @@
 
 namespace PropertyLib{
 
-class PropertyItem: public KListViewItem{
+class PropertyItem: public TDEListViewItem{
 public:
     PropertyItem(PropertyEditor *parent, MultiProperty *property)
-        :KListViewItem(parent, property->description()), m_editor(parent), m_property(property),
+        :TDEListViewItem(parent, property->description()), m_editor(parent), m_property(property),
         m_changed(false)
     {
     }
 
-    PropertyItem(PropertyEditor *editor, KListViewItem *parent, MultiProperty *property)
-        :KListViewItem(parent, property->description()), m_editor(editor),
+    PropertyItem(PropertyEditor *editor, TDEListViewItem *parent, MultiProperty *property)
+        :TDEListViewItem(parent, property->description()), m_editor(editor),
         m_property(property), m_changed(false)
     {
     }
@@ -97,12 +97,12 @@ public:
             m_editor->machine(m_property)->propertyEditor->drawViewer(p, icg, r, valueToDraw);
             return;
         }
-        KListViewItem::paintCell(p, cg, column, width, align);
+        TDEListViewItem::paintCell(p, cg, column, width, align);
     }
 
     virtual void setup()
     {
-        KListViewItem::setup();
+        TDEListViewItem::setup();
         setHeight(static_cast<int>(height()*1.5));
     }
 
@@ -118,15 +118,15 @@ private:
 };
 
 
-class PropertyGroupItem: public KListViewItem{
+class PropertyGroupItem: public TDEListViewItem{
 public:
-    PropertyGroupItem(KListView *parent, const TQString &name)
-        :KListViewItem(parent, name)
+    PropertyGroupItem(TDEListView *parent, const TQString &name)
+        :TDEListViewItem(parent, name)
     {
         init();
     }
-    PropertyGroupItem(KListViewItem *parent, const TQString &name)
-        :KListViewItem(parent, name)
+    PropertyGroupItem(TDEListViewItem *parent, const TQString &name)
+        :TDEListViewItem(parent, name)
     {
         init();
     }
@@ -141,11 +141,11 @@ public:
             p->setBrush(cg.highlight());
             p->setPen(cg.highlightedText());
         }
-        KListViewItem::paintCell(p, cg, column, width, align);
+        TDEListViewItem::paintCell(p, cg, column, width, align);
     }
     virtual void setup()
     {
-        KListViewItem::setup();
+        TDEListViewItem::setup();
         setHeight(static_cast<int>(height()*1.4));
     }
 
@@ -156,16 +156,16 @@ private:
     }
 };
 
-class SeparatorItem: public KListViewItem{
+class SeparatorItem: public TDEListViewItem{
 public:
-    SeparatorItem(KListView *parent)
-        :KListViewItem(parent)
+    SeparatorItem(TDEListView *parent)
+        :TDEListViewItem(parent)
     {
         setSelectable(false);
     }
 };
 PropertyEditor::PropertyEditor(TQWidget *parent, const char *name)
-    :KListView(parent, name)
+    :TDEListView(parent, name)
 {
     setSorting(-1);
 
diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h
index 7cfa8521..3e683a58 100644
--- a/lib/widgets/propeditor/propertyeditor.h
+++ b/lib/widgets/propeditor/propertyeditor.h
@@ -24,8 +24,8 @@
 #include <klistview.h>
 #else
 #include <tqlistview.h>
-#define KListView TQListView
-#define KListViewItem TQListViewItem
+#define TDEListView TQListView
+#define TDEListViewItem TQListViewItem
 #endif
 
 #include "propertylist.h"
@@ -55,7 +55,7 @@ creation of property widgets from the machine factory.
 @see Machine
 @see PropertyMachineFactory
 */
-class PropertyEditor: public KListView{
+class PropertyEditor: public TDEListView{
    Q_OBJECT
   
 public: