Rename KInstance and KAboutData to avoid conflicts with KDE4

7 files changed, 12 insertions, 12 deletions

diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index e082d55..7ca5a55 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -63,7 +63,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
 
     apm = laptop_portable::has_power_management();
     config =  new KConfig("kcmlaptoprc");
-    instance = new KInstance("klaptopdaemon");
+    instance = new TDEInstance("klaptopdaemon");
 
     TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(),
 					       KDialog::spacingHint() );
diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h
index ad6c851..66fb555 100644
--- a/klaptopdaemon/battery.h
+++ b/klaptopdaemon/battery.h
@@ -94,7 +94,7 @@ private:
 	TQPtrList<TQLabel> batt_label_1, batt_label_2, batt_label_3;
 	TQPixmap battery_pm, battery_nopm;
 
-    	KInstance *instance;
+    	TDEInstance *instance;
 };
 
 #endif
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index d907ef2..32d1dfd 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -57,7 +57,7 @@ laptop_dock::laptop_dock( laptop_daemon* parent )
     pdaemon = parent;
     current_code = -1;
     brightness_widget = 0;
-    instance = new KInstance("klaptopdaemon");
+    instance = new TDEInstance("klaptopdaemon");
       // popup menu for right mouse button
     rightPopup = contextMenu();
     SetupPopup();
diff --git a/klaptopdaemon/daemondock.h b/klaptopdaemon/daemondock.h
index 70b878d..3297bb6 100644
--- a/klaptopdaemon/daemondock.h
+++ b/klaptopdaemon/daemondock.h
@@ -101,7 +101,7 @@ private:
                           _displayActions,
                           _insertActions;
 
-  KInstance 	*instance; 	// handle so we get our pretty icons right
+  TDEInstance 	*instance; 	// handle so we get our pretty icons right
   KPopupMenu 	*rightPopup;
 
 }; 
diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp
index 5839720..b3432cb 100644
--- a/klaptopdaemon/laptop_check.cpp
+++ b/klaptopdaemon/laptop_check.cpp
@@ -38,8 +38,8 @@ extern void wake_laptop_daemon();
 int
 main(int argc, char **argv)
 {
-    KAboutData aboutData( "klaptop_check", I18N_NOOP("KLaptop"),
-		            version, description, KAboutData::License_GPL,
+    TDEAboutData aboutData( "klaptop_check", I18N_NOOP("KLaptop"),
+		            version, description, TDEAboutData::License_GPL,
 			            "(c) 2003, Paul Campbell");
     aboutData.addAuthor("Paul Campbell",0, "paul@taniwha.com");
     TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 6d30933..9d0f648 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -223,10 +223,10 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *)
         sony = 0;
   }
   
-  KAboutData* about = 
-  new KAboutData("kcmlaptop", I18N_NOOP("Laptop Battery Configuration"), LAPTOP_VERSION,
+  TDEAboutData* about = 
+  new TDEAboutData("kcmlaptop", I18N_NOOP("Laptop Battery Configuration"), LAPTOP_VERSION,
        I18N_NOOP("Battery Control Panel Module"),
-      KAboutData::License_GPL,
+      TDEAboutData::License_GPL,
        I18N_NOOP("(c) 1999 Paul Campbell"), 0, 0);
   //about->addAuthor("NAME", 0, "e-mail addy");
   setAboutData( about );
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index 7cde9f0..60d1fc0 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -40,10 +40,10 @@
 PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
   : KCModule(parent, name)
 {
-       KAboutData *about =
-       new KAboutData(I18N_NOOP("kcmlaptop"),
+       TDEAboutData *about =
+       new TDEAboutData(I18N_NOOP("kcmlaptop"),
 		   I18N_NOOP("TDE Panel System Information Control Module"),
-		   0, 0, KAboutData::License_GPL,
+		   0, 0, TDEAboutData::License_GPL,
 		   I18N_NOOP("(c) 1999 - 2002 Paul Campbell"));
        about->addAuthor("Paul Campbell", 0, "paul@taniwha.com");
        setAboutData( about );