You must be aware that shredding is not secure on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).
"));
page7->groupShred->adjustSize();
- pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20);
- pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20);
+ pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",TDEIcon::Small,20);
+ pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",TDEIcon::Small,20);
addPage(page1, i18n("Encryption"), "encrypted");
addPage(page2, i18n("Decryption"), "decrypted");
addPage(page3, i18n("Appearance"), "looknfeel");
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 5804280..903fe3d 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -219,8 +219,8 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
TQString keyname;
page = new TQWidget(this);
TQLabel *labeltxt;
- KIconLoader *loader = TDEGlobal::iconLoader();
- keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
+ keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
setMinimumSize(350,100);
keysListpr = new TDEListView( page );
@@ -395,16 +395,16 @@ TQString KgpgSelKey::getkeyMail()
KeyView::KeyView( TQWidget *parent, const char *name )
: TDEListView( parent, name )
{
- KIconLoader *loader = TDEGlobal::iconLoader();
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
- pixkeyOrphan=loader->loadIcon("kgpg_key4",KIcon::Small,20);
- pixkeyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
- pixkeyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
- pixkeySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
- pixsignature=loader->loadIcon("signature",KIcon::Small,20);
- pixuserid=loader->loadIcon("kgpg_identity",KIcon::Small,20);
- pixuserphoto=loader->loadIcon("kgpg_photo",KIcon::Small,20);
- pixRevoke=loader->loadIcon("stop",KIcon::Small,20);
+ pixkeyOrphan=loader->loadIcon("kgpg_key4",TDEIcon::Small,20);
+ pixkeyGroup=loader->loadIcon("kgpg_key3",TDEIcon::Small,20);
+ pixkeyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
+ pixkeySingle=loader->loadIcon("kgpg_key1",TDEIcon::Small,20);
+ pixsignature=loader->loadIcon("signature",TDEIcon::Small,20);
+ pixuserid=loader->loadIcon("kgpg_identity",TDEIcon::Small,20);
+ pixuserphoto=loader->loadIcon("kgpg_photo",TDEIcon::Small,20);
+ pixRevoke=loader->loadIcon("stop",TDEIcon::Small,20);
TQPixmap blankFrame;
blankFrame.load(locate("appdata", "pics/kgpg_blank.png"));
@@ -1778,8 +1778,8 @@ void listKeys::editGroup()
KDialogBase *dialogGroupEdit=new KDialogBase(KDialogBase::Swallow, i18n("Group Properties"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true);
gEdit=new groupEdit();
- gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",KIcon::Small,20));
- gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",KIcon::Small,20));
+ gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",TDEIcon::Small,20));
+ gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",TDEIcon::Small,20));
connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupAdd()));
connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupRemove()));
@@ -2149,7 +2149,7 @@ void listKeys::slotgenkey()
TQWidget *wid=new TQWidget(pop);
TQVBoxLayout *vbox=new TQVBoxLayout(wid,3);
- TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),wid);
+ TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),wid);
TQMovie anim;
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index fd7343b..59864f7 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -100,11 +100,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
if (KGpgSettings::allowCustomEncryptionOptions())
customOptions=KGpgSettings::customEncryptionOptions();
- KIconLoader *loader = TDEGlobal::iconLoader();
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
- keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
- keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
- keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
+ keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
+ keySingle=loader->loadIcon("kgpg_key1",TDEIcon::Small,20);
+ keyGroup=loader->loadIcon("kgpg_key3",TDEIcon::Small,20);
if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile));
fmode=filemode;
diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc
index f833256..eff7c93 100644
--- a/khexedit/hexdrag.cc
+++ b/khexedit/hexdrag.cc
@@ -52,7 +52,7 @@ void CHexDrag::prepPixmap(void)
// Wont use it yet,
//
/*
- KIconLoader &loader = *TDEGlobal::iconLoader();
+ TDEIconLoader &loader = *TDEGlobal::iconLoader();
TQPixmap pix = loader.loadIcon( "binary.xpm" );
TQPoint hotspot( pix.width()-20,pix.height()/2 );
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 05a86ca..0b17930 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -103,7 +103,7 @@ void COptionDialog::setupLayoutPage( void )
{
TQString text;
TQFrame *page = addPage( i18n("Layout"), i18n("Data Layout in Editor"),
- BarIcon("khexedit", KIcon::SizeMedium ) );
+ BarIcon("khexedit", TDEIcon::SizeMedium ) );
TQGridLayout *gbox = new TQGridLayout( page, 15, 2, 0, spacingHint() );
gbox->setColStretch( 1, 10 );
@@ -256,7 +256,7 @@ void COptionDialog::setupCursorPage( void )
TQString text;
TQFrame *page = addPage( i18n("Cursor"),
i18n("Cursor Behavior (only valid for editor)"),
- BarIcon("mouse", KIcon::SizeMedium ) );
+ BarIcon("mouse", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
TQVButtonGroup *group = new TQVButtonGroup( i18n("Blinking"), page );
@@ -322,7 +322,7 @@ void COptionDialog::setupColorPage( void )
TQString text;
TQFrame *page = addPage( i18n("Colors"),
i18n("Editor Colors (system selection color is always used)"),
- BarIcon("colorize", KIcon::SizeMedium ) );
+ BarIcon("colorize", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
@@ -374,7 +374,7 @@ void COptionDialog::setupFontPage( void )
TQString text;
TQFrame *page = addPage( i18n("Font"),
i18n("Font Selection (editor can only use a fixed font)"),
- BarIcon("fonts", KIcon::SizeMedium ) );
+ BarIcon("fonts", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
@@ -426,7 +426,7 @@ void COptionDialog::setupFilePage( void )
{
TQString text;
TQFrame *page = addPage( i18n("Files"), i18n("File Management"),
- BarIcon("tdemultiple", KIcon::SizeMedium ) );
+ BarIcon("tdemultiple", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
@@ -518,7 +518,7 @@ void COptionDialog::setupMiscPage( void )
TQLabel *label;
TQFrame *page = addPage( i18n("Miscellaneous"), i18n("Various Properties"),
- BarIcon("gear", KIcon::SizeMedium ) );
+ BarIcon("gear", TDEIcon::SizeMedium ) );
TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() );
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 4d42209..a91ea78 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -50,7 +50,7 @@
#define KJOTSVERSION "0.7"
-extern KIconLoader* global_pix_loader;
+extern TDEIconLoader* global_pix_loader;
//----------------------------------------------------------------------
// KJOTSMAIN
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index d1f94e2..1376a68 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -245,7 +245,7 @@ void KJotsBook::init()
m_open = false;
m_saveProgressDialog = 0;
setExpandable(true);
- setPixmap(0, kapp->iconLoader()->loadIcon(TQString("contents"),KIcon::Small));
+ setPixmap(0, kapp->iconLoader()->loadIcon(TQString("contents"),TDEIcon::Small));
}
/*!
@@ -849,7 +849,7 @@ KJotsPage::KJotsPage(KJotsBook* parent, TQListViewItem *after)
{
m_isBook = false;
m_paraPos = m_indexPos = 0;
- setPixmap(0, kapp->iconLoader()->loadIcon(TQString("edit"), KIcon::Small));
+ setPixmap(0, kapp->iconLoader()->loadIcon(TQString("edit"), TDEIcon::Small));
}
KJotsPage::~KJotsPage()
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;
diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp
index 269e8e5..147e348 100644
--- a/kregexpeditor/kregexpeditorprivate.cpp
+++ b/kregexpeditor/kregexpeditorprivate.cpp
@@ -174,7 +174,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
#ifdef TQT_ONLY
TQPixmap pix( "icons/error.png" );
#else
- TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar );
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), TDEIcon::Toolbar );
#endif
_error = new TQLabel( this );
_error->setPixmap( pix );
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index b450d84..62500c8 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -53,7 +53,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
TQPixmap pix;
pix.convertFromImage( qembed_findImage( "select" ) );
#else
- TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar );
+ TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), TDEIcon::Toolbar );
#endif
_selectBut->setPixmap( pix );
@@ -159,7 +159,7 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
pix.convertFromImage( qembed_findImage( TQString::fromLatin1( name ) ) );
#else
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) +
- TQString::fromLatin1(".png") ), KIcon::Toolbar );
+ TQString::fromLatin1(".png") ), TDEIcon::Toolbar );
#endif
DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but");
diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp
index bfcd0fe..dedccfc 100644
--- a/kregexpeditor/util.cpp
+++ b/kregexpeditor/util.cpp
@@ -27,7 +27,7 @@ TQPixmap Util::getKRegExpEditorIcon( const TQString& name )
return pix;
#else
return TDEGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ),
- KIcon::Toolbar );
+ TDEIcon::Toolbar );
#endif
}
@@ -38,8 +38,8 @@ TQPixmap Util::getSystemIcon( const TQString& name )
pix.convertFromImage( qembed_findImage( name ) );
return pix;
#else
- KIconLoader loader;
- return loader.loadIcon( name, KIcon::Toolbar);
+ TDEIconLoader loader;
+ return loader.loadIcon( name, TDEIcon::Toolbar);
#endif
}
@@ -51,8 +51,8 @@ TQIconSet Util::getSystemIconSet( const TQString& name )
pix.convertFromImage( qembed_findImage( name ) );
return TQIconSet( pix );
#else
- KIconLoader loader;
- return loader.loadIconSet( name, KIcon::Toolbar);
+ TDEIconLoader loader;
+ return loader.loadIconSet( name, TDEIcon::Toolbar);
#endif
}
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 66d2ef3..073324b 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -48,12 +48,12 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config,
m_config = config;
setFolderIcon(TQStringList(' ' + i18n("Plugins")),
- BarIcon("folder", KIcon::SizeSmall));
+ BarIcon("folder", TDEIcon::SizeSmall));
setFolderIcon(TQStringList(' ' + i18n("Miscellaneous")),
- BarIcon("misc", KIcon::SizeSmall));
+ BarIcon("misc", TDEIcon::SizeSmall));
TQFrame *monitors = addHBoxPage(' ' + i18n("Monitors"),
- i18n("Monitors Installed"), BarIcon("ksim", KIcon::SizeSmall));
+ i18n("Monitors Installed"), BarIcon("ksim", TDEIcon::SizeSmall));
m_monPage = new KSim::MonitorPrefs(monitors);
TQStringList list;
@@ -87,7 +87,7 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config,
m_swapPage = new KSim::SwapPrefs(swap);
TQFrame *theme = addHBoxPage(' ' + i18n("Themes"),
- i18n("Theme Selector"), BarIcon("folder_image", KIcon::SizeSmall));
+ i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall));
m_themePage = new KSim::ThemePrefs(theme);
connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs()));
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 9186349..4e3afb2 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -345,8 +345,8 @@ Task::Task(WId win, TaskManager * parent, const char *name) :
// try to guess the icon from the classhint
if(_pixmap.isNull())
TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
- KIcon::Small,KIcon::Small,
- KIcon::DefaultState, 0, true);
+ TDEIcon::Small,TDEIcon::Small,
+ TDEIcon::DefaultState, 0, true);
// load xapp icon
if (_pixmap.isNull())
@@ -373,7 +373,7 @@ void Task::refresh(bool icon)
if(_pixmap.isNull())
{
TDEGlobal::instance()->iconLoader()->loadIcon(className().lower(),
- KIcon::Small, KIcon::Small, KIcon::DefaultState, 0, true);
+ TDEIcon::Small, TDEIcon::Small, TDEIcon::DefaultState, 0, true);
}
// load xapp icon
@@ -532,20 +532,20 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
isStaticIcon = false;
switch( size ) {
- case KIcon::SizeSmall:
+ case TDEIcon::SizeSmall:
{
pixmap = icon( 16, 16, true );
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
- KIcon::NoGroup,
- KIcon::SizeSmall );
+ TDEIcon::NoGroup,
+ TDEIcon::SizeSmall );
isStaticIcon = true;
}
}
break;
- case KIcon::SizeMedium:
+ case TDEIcon::SizeMedium:
{
//
// Try 34x34 first for KDE 2.1 icons with shadows, if we don't
@@ -562,13 +562,13 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
- KIcon::NoGroup,
- KIcon::SizeMedium );
+ TDEIcon::NoGroup,
+ TDEIcon::SizeMedium );
isStaticIcon = true;
}
}
break;
- case KIcon::SizeLarge:
+ case TDEIcon::SizeLarge:
{
// If there's a 48x48 icon in the hints then use it
pixmap = icon( size, size, false );
@@ -576,9 +576,9 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// If not, try to get one from the classname
if ( pixmap.isNull() || pixmap.width() != size || pixmap.height() != size ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( className(),
- KIcon::NoGroup,
+ TDEIcon::NoGroup,
size,
- KIcon::DefaultState,
+ TDEIcon::DefaultState,
0L,
true );
isStaticIcon = true;
@@ -593,7 +593,7 @@ TQPixmap Task::bestIcon( int size, bool &isStaticIcon )
// Icon of last resort
if( pixmap.isNull() ) {
pixmap = TDEGlobal::iconLoader()->loadIcon( "go",
- KIcon::NoGroup,
+ TDEIcon::NoGroup,
size );
isStaticIcon = true;
}
diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h
index 12915f2..6740f54 100644
--- a/superkaramba/src/taskmanager.h
+++ b/superkaramba/src/taskmanager.h
@@ -104,25 +104,25 @@ public:
TQValueList