Rename KInstance and KAboutData to avoid conflicts with KDE4

2 files changed, 4 insertions, 4 deletions

diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 1608b45..4d773f9 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -139,11 +139,11 @@ void CharSelectApplet::preferences()
 void CharSelectApplet::about()
 {
     if(!_aboutData) {
-	_aboutData = new KAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0",
+	_aboutData = new TDEAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0",
                                     I18N_NOOP("A character picker applet.\n"
                                         "Used to copy single characters to the X11 clipboard.\n"
                                         "You can paste them to an application with the middle mouse button."),
-                                    KAboutData::License_BSD, "(c) 2001, Matthias Elter");
+                                    TDEAboutData::License_BSD, "(c) 2001, Matthias Elter");
 	_aboutData->addAuthor("Matthias Elter", 0, "[email protected]");
     }
 
diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h
index 4343660..aa23ed3 100644
--- a/charselectapplet/charselectapplet.h
+++ b/charselectapplet/charselectapplet.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class TQSpinBox;
 class KLineEdit;
-class KAboutData;
+class TDEAboutData;
 
 class ConfigDialog : public KDialogBase
 {
@@ -111,7 +111,7 @@ public:
 
 private:
     CharTable    *_table;
-    KAboutData   *_aboutData;
+    TDEAboutData   *_aboutData;
     ConfigDialog *_configDialog;
 };