From 9e5c87c89567a98c3344c90e392a27715437334c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 15:14:58 -0600
Subject: Rename a number of classes to enhance compatibility with KDE4

---
 kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp | 2 +-
 kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h   | 2 +-
 kregexpeditor/KMultiFormListBox/widgetwindow.cpp                 | 6 +++---
 kregexpeditor/KMultiFormListBox/widgetwindow.h                   | 8 ++++----
 kregexpeditor/qt-only/compat.h                                   | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'kregexpeditor')

diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
index 35627d6..29f2ea3 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
@@ -37,7 +37,7 @@ KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *f
 	TQHBoxLayout *innerLayout = new TQHBoxLayout();
 	_layout->addLayout(innerLayout);
 
-  _listbox = new KListBox(this,"listbox");
+  _listbox = new TDEListBox(this,"listbox");
   _listbox->setSelectionMode(TQListBox::Single);
   innerLayout->addWidget(_listbox);
 
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
index b2c0484..9e7c38d 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.h
@@ -56,7 +56,7 @@ private:
 	TQVBoxLayout* _layout;
   KMultiFormListBoxFactory* _factory;
 	TQPtrList<TQPushButton> _buttonList;
-  KListBox* _listbox;
+  TDEListBox* _listbox;
 	virtual void delElement(TQWidget *); // Deletes the given element
 	virtual void delAnElement();
   void addElement();
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
index 73bfcd6..9b055a3 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.cpp
@@ -19,19 +19,19 @@
 #include "windowlistboxitem.h"
 #include <iostream>
 
-WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, KListBox *lb)
+WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, TDEListBox *lb)
   :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false)
 {
   init(factory, lb);
 }
 
-WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, KMultiFormListBoxEntry *widget, KListBox *lb)
+WidgetWindow::WidgetWindow(KMultiFormListBoxFactory *factory, KMultiFormListBoxEntry *widget, TDEListBox *lb)
   :KDialogBase(Plain, i18n("Widget Configuration"), Ok | Cancel, Ok, 0, "ConfigWindow", false)
 {
   init(factory, lb, widget);
 }
 
-void WidgetWindow::init(KMultiFormListBoxFactory *factory, KListBox *lb, KMultiFormListBoxEntry *widget)
+void WidgetWindow::init(KMultiFormListBoxFactory *factory, TDEListBox *lb, KMultiFormListBoxEntry *widget)
 {
   listbox = lb;
   myFact = factory;
diff --git a/kregexpeditor/KMultiFormListBox/widgetwindow.h b/kregexpeditor/KMultiFormListBox/widgetwindow.h
index 2312653..e8998ec 100644
--- a/kregexpeditor/KMultiFormListBox/widgetwindow.h
+++ b/kregexpeditor/KMultiFormListBox/widgetwindow.h
@@ -36,9 +36,9 @@ class WidgetWindow :public KDialogBase
   friend class KMultiFormListBoxWindowed;
   friend class WindowListboxItem;
 
-  WidgetWindow(KMultiFormListBoxFactory *, KListBox *);
-  WidgetWindow(KMultiFormListBoxFactory *, KMultiFormListBoxEntry *widget, KListBox *);
-  void init(KMultiFormListBoxFactory *, KListBox *, KMultiFormListBoxEntry *widget = 0);
+  WidgetWindow(KMultiFormListBoxFactory *, TDEListBox *);
+  WidgetWindow(KMultiFormListBoxFactory *, KMultiFormListBoxEntry *widget, TDEListBox *);
+  void init(KMultiFormListBoxFactory *, TDEListBox *, KMultiFormListBoxEntry *widget = 0);
   void display();
   KMultiFormListBoxEntry *entry();
   WidgetWindow *clone();
@@ -52,7 +52,7 @@ private:
   KMultiFormListBoxFactory *myFact;
   KMultiFormListBoxEntry *myWidget;
   TQByteArray _backup;
-  KListBox *listbox;
+  TDEListBox *listbox;
   WindowListboxItem *myListboxItem;
   bool initialShow;
 };
diff --git a/kregexpeditor/qt-only/compat.h b/kregexpeditor/qt-only/compat.h
index 7812073..bf8e9ee 100644
--- a/kregexpeditor/qt-only/compat.h
+++ b/kregexpeditor/qt-only/compat.h
@@ -30,7 +30,7 @@ TQString i18n( const TQString& a, const TQString& b);
 #define isatty(x) 0
 
 #define KTextBrowser TQTextBrowser
-#define KListBox TQListBox
+#define TDEListBox TQListBox
 #define KFileDialog TQFileDialog
 #define KPushButton TQPushButton
 
-- 
cgit v1.2.3