Rename KIcon to enhance compatibility with KDE4

7 files changed, 27 insertions, 27 deletions

diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h
index 5d6891f..68adb46 100644
--- a/klaptopdaemon/acpi.h
+++ b/klaptopdaemon/acpi.h
@@ -32,8 +32,8 @@ class TQWidget;
 class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 
 
diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h
index 0972fce..74510ee 100644
--- a/klaptopdaemon/apm.h
+++ b/klaptopdaemon/apm.h
@@ -32,8 +32,8 @@ class TQWidget;
 class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 
 
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 12edee7..31ad563 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -93,7 +93,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
     if (!apm) {
       top_layout->addWidget( laptop_portable::no_power_management_explanation(this) );
     } else {
-      iconloader = new KIconLoader("klaptopdaemon");
+      iconloader = new TDEIconLoader("klaptopdaemon");
 
       // the poll time (in seconds)
       TQHBox *hb = new TQHBox( this );
@@ -119,15 +119,15 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name)
       TQGrid *icon_grid = new TQGrid( 3 /*cols*/, icons_groupbox );
       icon_grid->setSpacing( KDialog::spacingHint() );
 
-      buttonNoBattery = new KIconButton( iconloader, icon_grid );
-      buttonNoCharge  = new KIconButton( iconloader, icon_grid );
-      buttonCharge    = new KIconButton( iconloader, icon_grid );
+      buttonNoBattery = new TDEIconButton( iconloader, icon_grid );
+      buttonNoCharge  = new TDEIconButton( iconloader, icon_grid );
+      buttonCharge    = new TDEIconButton( iconloader, icon_grid );
       (void)new TQLabel( buttonNoBattery, i18n("No &battery"), icon_grid);
       (void)new TQLabel( buttonNoCharge, i18n("&Not charging"), icon_grid);
       (void)new TQLabel( buttonCharge, i18n("Char&ging"), icon_grid);
-      buttonNoBattery->setIconType( KIcon::NoGroup, KIcon::Any, 1);
-      buttonNoCharge->setIconType( KIcon::NoGroup, KIcon::Any, 1);
-      buttonCharge->setIconType( KIcon::NoGroup, KIcon::Any, 1);
+      buttonNoBattery->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
+      buttonNoCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
+      buttonCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1);
       connect(buttonNoBattery, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged()));
       connect(buttonNoCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged()));
       connect(buttonCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(configChanged()));
@@ -249,8 +249,8 @@ void BatteryConfig::load(bool useDefaults)
                 buttonCharge->setIcon(chargebattery);
 	        buttonNoBattery->setIcon(nobattery);
         }
-        battery_pm = SmallIcon(nochargebattery, 20, KIcon::DefaultState, instance);
-        battery_nopm = SmallIcon(nobattery, 20, KIcon::DefaultState, instance);
+        battery_pm = SmallIcon(nochargebattery, 20, TDEIcon::DefaultState, instance);
+        battery_nopm = SmallIcon(nobattery, 20, TDEIcon::DefaultState, instance);
         emit changed(useDefaults);
 	BatteryStateUpdate();
 }
@@ -374,8 +374,8 @@ void BatteryConfig::iconChanged()
 {
     nobattery =  buttonNoBattery->icon();
     nochargebattery =  buttonNoCharge->icon();
-    battery_pm = SmallIcon(nochargebattery, 20, KIcon::DefaultState, instance);
-    battery_nopm = SmallIcon(nobattery, 20, KIcon::DefaultState, instance);
+    battery_pm = SmallIcon(nochargebattery, 20, TDEIcon::DefaultState, instance);
+    battery_nopm = SmallIcon(nobattery, 20, TDEIcon::DefaultState, instance);
     emit changed(true);
     BatteryStateUpdate();
 }
diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h
index d830740..b93be4b 100644
--- a/klaptopdaemon/battery.h
+++ b/klaptopdaemon/battery.h
@@ -36,8 +36,8 @@ class TQWidget;
 class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 class TQLabel;
 
@@ -81,11 +81,11 @@ private:
 	bool		useblanksaver;
 	bool		notifyme;
 
-	KIconLoader *iconloader;
+	TDEIconLoader *iconloader;
 
-        KIconButton *buttonNoBattery;
-        KIconButton *buttonNoCharge;
-        KIconButton *buttonCharge;
+        TDEIconButton *buttonNoBattery;
+        TDEIconButton *buttonNoCharge;
+        TDEIconButton *buttonCharge;
         TQString nobattery, nochargebattery, chargebattery;
 	TQPushButton *startMonitor;
         bool    apm;
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index d18702e..f734de0 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -715,7 +715,7 @@ quit:
             // "This function is slow because it involves transformation to a TQImage,
             // non-trivial computations and a transformation back to a TQBitmap."). Then
             // I have to convert the resulting TQPixmap to a TQImage in order to overlay
-            // the light KMail icon with the number (because KIconEffect::overlay only
+            // the light KMail icon with the number (because TDEIconEffect::overlay only
             // works with TQImage). Finally the resulting TQImage has to be converted
             // back to a TQPixmap.
             // That's a lot of work for overlaying the KMail icon with the number of
@@ -732,7 +732,7 @@ quit:
         
             // Overlay the light KMail icon with the number image
             TQImage iconWithPercentageImage = image.copy();
-            KIconEffect::overlay( iconWithPercentageImage, percentageImage );
+            TDEIconEffect::overlay( iconWithPercentageImage, percentageImage );
         
             TQPixmap iconWithPercentage;
             iconWithPercentage.convertFromImage( iconWithPercentageImage );
diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h
index aa44c21..c518c92 100644
--- a/klaptopdaemon/profile.h
+++ b/klaptopdaemon/profile.h
@@ -33,8 +33,8 @@ class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
 class TQSlider;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;
 class KComboBox;
 
diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h
index 9b6d698..5339aaf 100644
--- a/klaptopdaemon/sony.h
+++ b/klaptopdaemon/sony.h
@@ -33,8 +33,8 @@ class TQSpinBox;
 class TDEConfig;
 class TQCheckBox;
 class TQSlider;
-class KIconLoader;
-class KIconButton;
+class TDEIconLoader;
+class TDEIconButton;
 class TQPushButton;