Browse Source

Rename KIcon to enhance compatibility with KDE4

Timothy Pearson 6 years ago
parent
commit
de9b6c9ad1
100 changed files with 469 additions and 469 deletions
  1. 2
    2
      kappfinder/toplevel.cpp
  2. 10
    10
      kate/app/kateconfigdialog.cpp
  3. 3
    3
      kate/app/kateexternaltools.cpp
  4. 1
    1
      kate/app/kateexternaltools.h
  5. 3
    3
      kate/app/katesavemodifieddialog.cpp
  6. 1
    1
      kate/interfaces/pluginconfiginterfaceextension.h
  7. 1
    1
      kcontrol/access/kaccess.cpp
  8. 2
    2
      kcontrol/filetypes/filetypedetails.cpp
  9. 2
    2
      kcontrol/filetypes/filetypedetails.h
  10. 1
    1
      kcontrol/filetypes/filetypesview.h
  11. 1
    1
      kcontrol/filetypes/typeslistitem.cpp
  12. 2
    2
      kcontrol/hwmanager/deviceiconview.cpp
  13. 1
    1
      kcontrol/hwmanager/deviceiconview.h
  14. 1
    1
      kcontrol/hwmanager/devicepropsdlg.cpp
  15. 87
    87
      kcontrol/icons/icons.cpp
  16. 13
    13
      kcontrol/icons/icons.h
  17. 24
    24
      kcontrol/icons/iconthemes.cpp
  18. 1
    1
      kcontrol/icons/main.cpp
  19. 1
    1
      kcontrol/icons/testicons.cpp
  20. 2
    2
      kcontrol/joystick/joywidget.cpp
  21. 3
    3
      kcontrol/kcontrol/aboutwidget.cpp
  22. 2
    2
      kcontrol/kcontrol/dockcontainer.cpp
  23. 1
    1
      kcontrol/kcontrol/global.cpp
  24. 3
    3
      kcontrol/kcontrol/global.h
  25. 2
    2
      kcontrol/kcontrol/modulemenu.cpp
  26. 4
    4
      kcontrol/kcontrol/moduletreeview.cpp
  27. 1
    1
      kcontrol/kcontrol/searchwidget.cpp
  28. 16
    16
      kcontrol/kcontrol/toplevel.cpp
  29. 6
    6
      kcontrol/kicker/menutab_impl.cpp
  30. 1
    1
      kcontrol/konsole/sessiondialog.ui
  31. 2
    2
      kcontrol/kthememanager/ktheme.cpp
  32. 8
    8
      kcontrol/kthememanager/kthememanager.cpp
  33. 4
    4
      kcontrol/kthememanager/kthememanager.h
  34. 2
    2
      kcontrol/locale/kcmlocale.cpp
  35. 2
    2
      kcontrol/style/menupreview.cpp
  36. 4
    4
      kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
  37. 1
    1
      kcontrol/tdeio/kmanualproxydlg.cpp
  38. 1
    1
      kcontrol/tdm/tdm-appear.cpp
  39. 1
    1
      kdcop/kdcopwindow.cpp
  40. 1
    1
      kdepasswd/kcm/chfacedlg.cpp
  41. 1
    1
      kdepasswd/kcm/chfacedlg.h
  42. 1
    1
      kdepasswd/kcm/kcm_useraccount.kcfg
  43. 1
    1
      kdesktop/desktop.cc
  44. 4
    4
      kdesktop/kcustommenu.cc
  45. 4
    4
      kdesktop/kdiconview.cc
  46. 1
    1
      kdesktop/minicli.cpp
  47. 2
    2
      kdesktop/startupid.cpp
  48. 3
    3
      kdesktop/tdefileividesktop.cpp
  49. 1
    1
      kdesktop/tdefileividesktop.h
  50. 21
    21
      kdialog/kdialog.cpp
  51. 1
    1
      kfind/kftabdlg.cpp
  52. 4
    4
      kicker/applets/clock/clock.cpp
  53. 6
    6
      kicker/applets/launcher/quickbutton.cpp
  54. 1
    1
      kicker/applets/launcher/quickbutton.h
  55. 1
    1
      kicker/applets/minipager/pagerbutton.cpp
  56. 1
    1
      kicker/extensions/kasbar/ChangeLog
  57. 2
    2
      kicker/extensions/kasbar/kasaboutdlg.cpp
  58. 1
    1
      kicker/extensions/kasbar/kasbar.cpp
  59. 8
    8
      kicker/extensions/kasbar/kasgroupitem.cpp
  60. 2
    2
      kicker/extensions/kasbar/kasprefsdlg.cpp
  61. 12
    12
      kicker/extensions/kasbar/kasstartupitem.cpp
  62. 7
    7
      kicker/extensions/kasbar/kastaskitem.cpp
  63. 4
    4
      kicker/kicker/core/containerarea.cpp
  64. 2
    2
      kicker/kicker/ui/addapplet.cpp
  65. 2
    2
      kicker/kicker/ui/appletop_mnu.cpp
  66. 2
    2
      kicker/kicker/ui/browser_dlg.cpp
  67. 2
    2
      kicker/kicker/ui/browser_dlg.h
  68. 4
    4
      kicker/kicker/ui/browser_mnu.cpp
  69. 3
    3
      kicker/kicker/ui/exe_dlg.cpp
  70. 4
    4
      kicker/kicker/ui/hidebutton.cpp
  71. 3
    3
      kicker/kicker/ui/itemview.cpp
  72. 1
    1
      kicker/kicker/ui/nonKDEButtonSettings.ui
  73. 2
    2
      kicker/kicker/ui/service_mnu.cpp
  74. 8
    8
      kicker/libkicker/global.cpp
  75. 14
    14
      kicker/libkicker/panelbutton.cpp
  76. 5
    5
      kicker/libkicker/simplebutton.cpp
  77. 2
    2
      kicker/menuext/prefmenu/prefmenu.cpp
  78. 16
    16
      kicker/menuext/tom/tom.cc
  79. 2
    2
      kicker/taskbar/taskbarcontainer.cpp
  80. 7
    7
      kicker/taskbar/taskcontainer.cpp
  81. 16
    16
      kicker/taskmanager/taskmanager.cpp
  82. 7
    7
      kicker/taskmanager/taskmanager.h
  83. 1
    1
      kmenuedit/basictab.cpp
  84. 2
    2
      kmenuedit/basictab.h
  85. 1
    1
      kmenuedit/treeview.cpp
  86. 1
    1
      konqueror/ChangeLog
  87. 1
    1
      konqueror/TODO
  88. 26
    26
      konqueror/about/konq_aboutpage.cc
  89. 2
    2
      konqueror/iconview/konq_iconview.cc
  90. 2
    2
      konqueror/keditbookmarks/actionsimpl.cpp
  91. 7
    7
      konqueror/konq_combo.cc
  92. 1
    1
      konqueror/konq_guiclients.cc
  93. 1
    1
      konqueror/konq_mainwindow.cc
  94. 1
    1
      konqueror/konq_misc.cc
  95. 1
    1
      konqueror/konq_tabs.cc
  96. 1
    1
      konqueror/listview/konq_infolistviewitem.cc
  97. 1
    1
      konqueror/listview/konq_listview.cc
  98. 2
    2
      konqueror/listview/konq_listviewitems.cc
  99. 3
    3
      konqueror/listview/konq_listviewitems.h
  100. 0
    0
      konqueror/listview/konq_listviewwidget.cc

+ 2
- 2
kappfinder/toplevel.cpp View File

@@ -161,7 +161,7 @@ TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString &
161 161
 
162 162
 void TopLevel::slotScan()
163 163
 {
164
-  KIconLoader* loader = TDEGlobal::iconLoader();
164
+  TDEIconLoader* loader = TDEGlobal::iconLoader();
165 165
 
166 166
   mTemplates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );
167 167
 
@@ -229,7 +229,7 @@ void TopLevel::slotScan()
229 229
       else
230 230
         item = new TQCheckListItem( mListView, desktop.readName(), TQCheckListItem::CheckBox );
231 231
 
232
-      item->setPixmap( 0, loader->loadIcon( desktop.readIcon(), KIcon::Small ) );
232
+      item->setPixmap( 0, loader->loadIcon( desktop.readIcon(), TDEIcon::Small ) );
233 233
       item->setText( 1, desktop.readGenericName() );
234 234
       item->setText( 2, desktop.readPathEntry( "Exec" ) );
235 235
       if ( desktop.readBoolEntry( "X-StandardInstall" ) )

+ 10
- 10
kate/app/kateconfigdialog.cpp View File

@@ -89,13 +89,13 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
89 89
 
90 90
   path.clear();
91 91
   path << i18n("Application");
92
-  setFolderIcon (path, SmallIcon("kate", KIcon::SizeSmall));
92
+  setFolderIcon (path, SmallIcon("kate", TDEIcon::SizeSmall));
93 93
 
94 94
   path.clear();
95 95
 
96 96
   //BEGIN General page
97 97
   path << i18n("Application") << i18n("General");
98
-  TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", KIcon::SizeSmall));
98
+  TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", TDEIcon::SizeSmall));
99 99
 
100 100
   TQVBoxLayout *lo = new TQVBoxLayout( frGeneral );
101 101
   lo->setSpacing(KDialog::spacingHint());
@@ -193,7 +193,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
193 193
 
194 194
   //BEGIN Session page
195 195
   path << i18n("Application") << i18n("Sessions");
196
-  TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", KIcon::SizeSmall));
196
+  TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", TDEIcon::SizeSmall));
197 197
 
198 198
   lo = new TQVBoxLayout( frSessions );
199 199
   lo->setSpacing(KDialog::spacingHint());
@@ -264,7 +264,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
264 264
   path << i18n("Application") << i18n("File Selector");
265 265
 
266 266
   TQVBox *page = addVBoxPage( path, i18n("File Selector Settings"),
267
-                              BarIcon("fileopen", KIcon::SizeSmall) );
267
+                              BarIcon("fileopen", TDEIcon::SizeSmall) );
268 268
   fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
269 269
                                          mainWindow->fileselector );
270 270
   connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -272,7 +272,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
272 272
 
273 273
   path << i18n("Application") << i18n("Document List");
274 274
   page = addVBoxPage( path, i18n("Document List Settings"),
275
-  BarIcon("view_text", KIcon::SizeSmall) );
275
+  BarIcon("view_text", TDEIcon::SizeSmall) );
276 276
   filelistConfigPage = new KFLConfigPage( page, "file list config page",
277 277
 					  mainWindow->filelist );
278 278
   connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -280,7 +280,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
280 280
 
281 281
   path << i18n("Application") << i18n("Plugins");
282 282
   /*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
283
-                          BarIcon("connect_established",KIcon::SizeSmall));
283
+                          BarIcon("connect_established",TDEIcon::SizeSmall));
284 284
   KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
285 285
   connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
286 286
 
@@ -288,21 +288,21 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
288 288
   path.clear();
289 289
   path << i18n("Application") << i18n("External Tools");
290 290
   page = addVBoxPage( path, i18n("External Tools"),
291
-      BarIcon("configure", KIcon::SizeSmall) );
291
+      BarIcon("configure", TDEIcon::SizeSmall) );
292 292
   configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
293 293
   connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
294 294
 
295 295
   // editor widgets from kwrite/kwdialog
296 296
   path.clear();
297 297
   path << i18n("Editor");
298
-  setFolderIcon (path, SmallIcon("edit", KIcon::SizeSmall));
298
+  setFolderIcon (path, SmallIcon("edit", TDEIcon::SizeSmall));
299 299
 
300 300
   for (uint i = 0; i < KTextEditor::configInterfaceExtension (v->document())->configPages (); i++)
301 301
   {
302 302
     path.clear();
303 303
     path << i18n("Editor") << KTextEditor::configInterfaceExtension (v->document())->configPageName (i);
304 304
     /*TQVBox **/page = addVBoxPage(path, KTextEditor::configInterfaceExtension (v->document())->configPageFullName (i),
305
-                              KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, KIcon::SizeSmall) );
305
+                              KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, TDEIcon::SizeSmall) );
306 306
 
307 307
     KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page);
308 308
     connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -336,7 +336,7 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin)
336 336
     TQStringList path;
337 337
     path.clear();
338 338
     path << i18n("Application")<<i18n("Plugins") << Kate::pluginConfigInterfaceExtension(plugin)->configPageName(i);
339
-    TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, KIcon::SizeSmall));
339
+    TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, TDEIcon::SizeSmall));
340 340
 
341 341
     PluginPageListItem *info=new PluginPageListItem;
342 342
     info->plugin = plugin;

+ 3
- 3
kate/app/kateexternaltools.cpp View File

@@ -445,8 +445,8 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
445 445
   TQWhatsThis::add( leName, i18n(
446 446
       "The name will be displayed in the 'Tools->External' menu") );
447 447
 
448
-  btnIcon = new KIconButton( w );
449
-  btnIcon->setIconSize( KIcon::SizeSmall );
448
+  btnIcon = new TDEIconButton( w );
449
+  btnIcon->setIconSize( TDEIcon::SizeSmall );
450 450
   lo->addWidget( btnIcon, 1, 3 );
451 451
   if ( tool && !tool->icon.isEmpty() )
452 452
     btnIcon->setIcon( tool->icon );
@@ -649,7 +649,7 @@ void KateExternalToolsConfigWidget::reload()
649 649
 
650 650
 TQPixmap KateExternalToolsConfigWidget::blankIcon()
651 651
 {
652
-  TQPixmap pm( KIcon::SizeSmall, KIcon::SizeSmall );
652
+  TQPixmap pm( TDEIcon::SizeSmall, TDEIcon::SizeSmall );
653 653
   pm.fill();
654 654
   pm.setMask( pm.createHeuristicMask() );
655 655
   return pm;

+ 1
- 1
kate/app/kateexternaltools.h View File

@@ -210,7 +210,7 @@ class KateExternalToolServiceEditor : public KDialogBase
210 210
 
211 211
     class TQLineEdit *leName, *leExecutable, *leMimetypes,*leCmdLine;
212 212
     class TQTextEdit *teCommand;
213
-    class KIconButton *btnIcon;
213
+    class TDEIconButton *btnIcon;
214 214
     class TQComboBox *cmbSave;
215 215
 
216 216
   private slots:

+ 3
- 3
kate/app/katesavemodifieddialog.cpp View File

@@ -48,16 +48,16 @@ public:
48 48
 	STATE state() const { return m_state;}
49 49
 	void setState(enum STATE state) {
50 50
 		m_state=state;
51
-		KIconLoader *loader = TDEGlobal::instance()->iconLoader();
51
+		TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
52 52
 		switch (state) {
53 53
 			case InitialState:
54 54
 				setPixmap(0,TQPixmap());
55 55
 				break;
56 56
 			case SaveOKState:
57
-				setPixmap(0,loader->loadIcon("ok",KIcon::NoGroup,height()));
57
+				setPixmap(0,loader->loadIcon("ok",TDEIcon::NoGroup,height()));
58 58
 				break;
59 59
 			case SaveFailedState:
60
-				setPixmap(0,loader->loadIcon("cancel",KIcon::NoGroup,height()));
60
+				setPixmap(0,loader->loadIcon("cancel",TDEIcon::NoGroup,height()));
61 61
 				break;
62 62
 		}
63 63
 	}

+ 1
- 1
kate/interfaces/pluginconfiginterfaceextension.h View File

@@ -88,7 +88,7 @@ class KDE_EXPORT PluginConfigInterfaceExtension
88 88
   
89 89
     virtual TQString configPageName (uint number = 0) const = 0;
90 90
     virtual TQString configPageFullName (uint number = 0) const = 0;
91
-    virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0;    
91
+    virtual TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const = 0;    
92 92
     
93 93
   private:
94 94
     class PrivatePluginConfigInterfaceExtension *d;

+ 1
- 1
kcontrol/access/kaccess.cpp View File

@@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
574 574
       lay->setSpacing(KDialog::spacingHint());
575 575
 
576 576
       TQLabel *label1 = new TQLabel( contents);
577
-      TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
577
+      TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
578 578
       if (pixmap.isNull())
579 579
          pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
580 580
       label1->setPixmap(pixmap);

+ 2
- 2
kcontrol/filetypes/filetypedetails.cpp View File

@@ -28,8 +28,8 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
28 28
   TQHBoxLayout *hBox = new TQHBoxLayout(0L, 0, KDialog::spacingHint());
29 29
   firstLayout->addLayout(hBox, 1);
30 30
 
31
-  iconButton = new KIconButton(firstWidget);
32
-  iconButton->setIconType(KIcon::Desktop, KIcon::MimeType);
31
+  iconButton = new TDEIconButton(firstWidget);
32
+  iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType);
33 33
   connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString)));
34 34
 
35 35
   iconButton->setFixedSize(70, 70);

+ 2
- 2
kcontrol/filetypes/filetypedetails.h View File

@@ -3,7 +3,7 @@
3 3
 
4 4
 #include <tqtabwidget.h>
5 5
 class TypesListItem;
6
-class KIconButton;
6
+class TDEIconButton;
7 7
 class TQLineEdit;
8 8
 class TQListBox;
9 9
 class TQButtonGroup;
@@ -47,7 +47,7 @@ private:
47 47
   TypesListItem * m_item;
48 48
 
49 49
   // First tab - General
50
-  KIconButton *iconButton;
50
+  TDEIconButton *iconButton;
51 51
   TQListBox *extensionLB;
52 52
   TQPushButton *addExtButton, *removeExtButton;
53 53
   TQLineEdit *description;

+ 1
- 1
kcontrol/filetypes/filetypesview.h View File

@@ -14,7 +14,7 @@ class TDEListView;
14 14
 class TQListViewItem;
15 15
 class TQListBox;
16 16
 class TQPushButton;
17
-class KIconButton;
17
+class TDEIconButton;
18 18
 class TQLineEdit;
19 19
 class TQComboBox;
20 20
 class FileTypeDetails;

+ 1
- 1
kcontrol/filetypes/typeslistitem.cpp View File

@@ -82,7 +82,7 @@ void TypesListItem::setup()
82 82
 {
83 83
   if (m_mimetype)
84 84
   {
85
-     setPixmap(0, m_mimetype->pixmap(KIcon::Small, IconSize(KIcon::Small)));
85
+     setPixmap(0, m_mimetype->pixmap(TDEIcon::Small, IconSize(TDEIcon::Small)));
86 86
   }
87 87
   TQListViewItem::setup();
88 88
 }

+ 2
- 2
kcontrol/hwmanager/deviceiconview.cpp View File

@@ -103,6 +103,6 @@ TQPixmap DeviceIconView::loadIcon( const TQString &name )
103 103
 	return icon;
104 104
 }
105 105
 
106
-KIcon::StdSizes DeviceIconView::iconSize() {
107
-	return KIcon::SizeSmall;
106
+TDEIcon::StdSizes DeviceIconView::iconSize() {
107
+	return TDEIcon::SizeSmall;
108 108
 }

+ 1
- 1
kcontrol/hwmanager/deviceiconview.h View File

@@ -65,7 +65,7 @@ class DeviceIconView : public TDEListView
65 65
 
66 66
 public:
67 67
 	DeviceIconView(TQWidget * parent = 0, const char * name = 0);
68
-	KIcon::StdSizes iconSize();
68
+	TDEIcon::StdSizes iconSize();
69 69
 
70 70
 signals:
71 71
 	void deviceSelected(TDEGenericDevice*);

+ 1
- 1
kcontrol/hwmanager/devicepropsdlg.cpp View File

@@ -343,7 +343,7 @@ TQString assembleSwitchList(TDESwitchType::TDESwitchType switches) {
343 343
 void DevicePropertiesDialog::populateDeviceInformation() {
344 344
 	if (m_device) {
345 345
 		base->labelDeviceType->setText(m_device->friendlyDeviceType());
346
-		base->iconDeviceType->setPixmap(m_device->icon(KIcon::SizeSmall));
346
+		base->iconDeviceType->setPixmap(m_device->icon(TDEIcon::SizeSmall));
347 347
 		base->labelDeviceName->setText(m_device->friendlyName());
348 348
 		base->labelDeviceNode->setText((m_device->deviceNode().isNull())?i18n("<none>"):m_device->deviceNode());
349 349
 		base->labelSystemPath->setText(m_device->systemPath());

+ 87
- 87
kcontrol/icons/icons.cpp View File

@@ -32,9 +32,9 @@
32 32
 
33 33
 #include "icons.h"
34 34
 
35
-/**** KIconConfig ****/
35
+/**** TDEIconConfig ****/
36 36
 
37
-KIconConfig::KIconConfig(TQWidget *parent, const char *name)
37
+TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
38 38
     : TDECModule(parent, name)
39 39
 {
40 40
 
@@ -114,13 +114,13 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
114 114
     preview();
115 115
 }
116 116
 
117
-KIconConfig::~KIconConfig()
117
+TDEIconConfig::~TDEIconConfig()
118 118
 {
119 119
   delete mpSystrayConfig;
120 120
   delete mpEffect;
121 121
 }
122 122
 
123
-TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
123
+TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
124 124
 {
125 125
     TQLabel *lab = new TQLabel(str, parent);
126 126
     lay->addWidget(lab, 1, i, Qt::AlignCenter);
@@ -133,14 +133,14 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
133 133
     return push;
134 134
 }
135 135
 
136
-void KIconConfig::init()
136
+void TDEIconConfig::init()
137 137
 {
138 138
     mpLoader = TDEGlobal::iconLoader();
139 139
     mpConfig = TDEGlobal::config();
140
-    mpEffect = new KIconEffect;
140
+    mpEffect = new TDEIconEffect;
141 141
     mpTheme = mpLoader->theme();
142 142
     mUsage = 0;
143
-    for (int i=0; i<KIcon::LastGroup; i++)
143
+    for (int i=0; i<TDEIcon::LastGroup; i++)
144 144
 	mbChanged[i] = false;
145 145
 
146 146
     // Fill list/checkboxen
@@ -165,11 +165,11 @@ void KIconConfig::init()
165 165
     mStates += "Disabled";
166 166
 }
167 167
 
168
-void KIconConfig::initDefaults()
168
+void TDEIconConfig::initDefaults()
169 169
 {
170
-    mDefaultEffect[0].type = KIconEffect::NoEffect;
171
-    mDefaultEffect[1].type = KIconEffect::NoEffect;
172
-    mDefaultEffect[2].type = KIconEffect::ToGray;
170
+    mDefaultEffect[0].type = TDEIconEffect::NoEffect;
171
+    mDefaultEffect[1].type = TDEIconEffect::NoEffect;
172
+    mDefaultEffect[2].type = TDEIconEffect::ToGray;
173 173
     mDefaultEffect[0].transparant = false;
174 174
     mDefaultEffect[1].transparant = false;
175 175
     mDefaultEffect[2].transparant = true;
@@ -185,9 +185,9 @@ void KIconConfig::initDefaults()
185 185
 
186 186
     const int defDefSizes[] = { 32, 22, 22, 16, 32 };
187 187
 
188
-    KIcon::Group i;
188
+    TDEIcon::Group i;
189 189
     TQStringList::ConstIterator it;
190
-    for(it=mGroups.begin(), i=KIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
190
+    for(it=mGroups.begin(), i=TDEIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
191 191
     {
192 192
 	mbDP[i] = false;
193 193
 	mbChanged[i] = true;
@@ -213,24 +213,24 @@ void KIconConfig::initDefaults()
213 213
         int group = mGroups.findIndex( "Desktop" );
214 214
         if ( group != -1 )
215 215
         {
216
-            mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
216
+            mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
217 217
             mEffects[ group ][ activeState ].value = 0.7;
218 218
         }
219 219
 
220 220
         group = mGroups.findIndex( "Panel" );
221 221
         if ( group != -1 )
222 222
         {
223
-            mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
223
+            mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
224 224
             mEffects[ group ][ activeState ].value = 0.7;
225 225
         }
226 226
     }
227 227
 }
228 228
 
229
-void KIconConfig::read()
229
+void TDEIconConfig::read()
230 230
 {
231 231
     if (mpTheme)
232 232
     {
233
-        for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
233
+        for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
234 234
             mAvSizes[i] = mpTheme->querySizes(i);
235 235
 
236 236
         mTheme = mpTheme->current();
@@ -238,7 +238,7 @@ void KIconConfig::read()
238 238
     }
239 239
     else
240 240
     {
241
-        for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
241
+        for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
242 242
             mAvSizes[i] = TQValueList<int>();
243 243
 
244 244
         mTheme = TQString::null;
@@ -262,17 +262,17 @@ void KIconConfig::read()
262 262
 	{
263 263
 	    TQString tmp = mpConfig->readEntry(*it2 + "Effect");
264 264
 	    if (tmp == "togray")
265
-		effect = KIconEffect::ToGray;
265
+		effect = TDEIconEffect::ToGray;
266 266
 	    else if (tmp == "colorize")
267
-		effect = KIconEffect::Colorize;
267
+		effect = TDEIconEffect::Colorize;
268 268
 	    else if (tmp == "togamma")
269
-		effect = KIconEffect::ToGamma;
269
+		effect = TDEIconEffect::ToGamma;
270 270
 	    else if (tmp == "desaturate")
271
-		effect = KIconEffect::DeSaturate;
271
+		effect = TDEIconEffect::DeSaturate;
272 272
 	    else if (tmp == "tomonochrome")
273
-		effect = KIconEffect::ToMonochrome;
273
+		effect = TDEIconEffect::ToMonochrome;
274 274
 	    else if (tmp == "none")
275
-		effect = KIconEffect::NoEffect;
275
+		effect = TDEIconEffect::NoEffect;
276 276
 	    else continue;
277 277
 	    mEffects[i][j].type = effect;
278 278
 	    mEffects[i][j].value = mpConfig->readDoubleNumEntry(*it2 + "Value");
@@ -287,14 +287,14 @@ void KIconConfig::read()
287 287
     mSysTraySize = mpSystrayConfig->readNumEntry("systrayIconWidth", 22);
288 288
 
289 289
     mpKickerConfig->setGroup("General");
290
-    mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
290
+    mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);
291 291
 
292 292
     TDEConfigGroup g( TDEGlobal::config(), "KDE" );
293 293
     mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
294 294
     mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
295 295
 }
296 296
 
297
-void KIconConfig::apply()
297
+void TDEIconConfig::apply()
298 298
 {
299 299
     int i;
300 300
 
@@ -332,7 +332,7 @@ void KIconConfig::apply()
332 332
         int delta = 1000, dw, index = -1, size = 0, i;
333 333
         TQValueList<int>::Iterator it;
334 334
         mpSizeBox->clear();
335
-        if (mUsage < KIcon::LastGroup) {
335
+        if (mUsage < TDEIcon::LastGroup) {
336 336
             for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++)
337 337
             {
338 338
                 mpSizeBox->insertItem(TQString().setNum(*it));
@@ -355,31 +355,31 @@ void KIconConfig::apply()
355 355
     }
356 356
 }
357 357
 
358
-void KIconConfig::preview(int i)
358
+void TDEIconConfig::preview(int i)
359 359
 {
360 360
     // Apply effects ourselves because we don't want to sync
361 361
     // the configuration every preview.
362 362
 
363 363
     int viewedGroup;
364 364
     if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
365
-        viewedGroup = KIcon::FirstGroup;
365
+        viewedGroup = TDEIcon::FirstGroup;
366 366
     }
367 367
     else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
368
-        viewedGroup = KIcon::FirstGroup;
368
+        viewedGroup = TDEIcon::FirstGroup;
369 369
     }
370 370
     else {
371
-        viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
371
+        viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;
372 372
     }
373 373
 
374 374
     TQPixmap pm;
375 375
     if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
376
-        pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mQuickLaunchSize);
376
+        pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mQuickLaunchSize);
377 377
     }
378 378
     else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
379
-        pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSysTraySize);
379
+        pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSysTraySize);
380 380
     }
381 381
     else {
382
-        pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
382
+        pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
383 383
     }
384 384
     TQImage img = pm.convertToImage();
385 385
     if (mbDP[viewedGroup])
@@ -396,32 +396,32 @@ void KIconConfig::preview(int i)
396 396
     mpPreview[i]->setPixmap(pm);
397 397
 }
398 398
 
399
-void KIconConfig::preview()
399
+void TDEIconConfig::preview()
400 400
 {
401 401
     preview(0);
402 402
     preview(1);
403 403
     preview(2);
404 404
 }
405 405
 
406
-void KIconConfig::load()
406
+void TDEIconConfig::load()
407 407
 {
408 408
     load( false );
409 409
 }
410 410
 
411
-void KIconConfig::load( bool useDefaults )
411
+void TDEIconConfig::load( bool useDefaults )
412 412
 {
413 413
     mpConfig = TDEGlobal::config();
414 414
     mpConfig->setReadDefaults( useDefaults );
415 415
     read();
416 416
     apply();
417
-    for (int i=0; i<KIcon::LastGroup; i++)
417
+    for (int i=0; i<TDEIcon::LastGroup; i++)
418 418
 	mbChanged[i] = false;
419 419
     preview();
420 420
     emit changed( useDefaults );
421 421
 }
422 422
 
423 423
 
424
-void KIconConfig::save()
424
+void TDEIconConfig::save()
425 425
 {
426 426
     int i, j;
427 427
     TQStringList::ConstIterator it, it2;
@@ -436,19 +436,19 @@ void KIconConfig::save()
436 436
 	    TQString tmp;
437 437
 	    switch (mEffects[i][j].type)
438 438
 	    {
439
-	    case KIconEffect::ToGray:
439
+	    case TDEIconEffect::ToGray:
440 440
 		tmp = "togray";
441 441
 		break;
442
-	    case KIconEffect::ToGamma:
442
+	    case TDEIconEffect::ToGamma:
443 443
 		tmp = "togamma";
444 444
 		break;
445
-	    case KIconEffect::Colorize:
445
+	    case TDEIconEffect::Colorize:
446 446
 		tmp = "colorize";
447 447
 		break;
448
-	    case KIconEffect::DeSaturate:
448
+	    case TDEIconEffect::DeSaturate:
449 449
 		tmp = "desaturate";
450 450
 		break;
451
-	    case KIconEffect::ToMonochrome:
451
+	    case TDEIconEffect::ToMonochrome:
452 452
 		tmp = "tomonochrome";
453 453
 		break;
454 454
 	    default:
@@ -487,7 +487,7 @@ void KIconConfig::save()
487 487
     emit changed(false);
488 488
 
489 489
     // Emit KIPC change message.
490
-    for (int i=0; i<KIcon::LastGroup; i++)
490
+    for (int i=0; i<TDEIcon::LastGroup; i++)
491 491
     {
492 492
 	if (mbChanged[i])
493 493
 	{
@@ -503,16 +503,16 @@ void KIconConfig::save()
503 503
     kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
504 504
 }
505 505
 
506
-void KIconConfig::defaults()
506
+void TDEIconConfig::defaults()
507 507
 {
508 508
     load( true );
509 509
 }
510 510
 
511
-void KIconConfig::QLSizeLockedChanged(bool checked) {
511
+void TDEIconConfig::QLSizeLockedChanged(bool checked) {
512 512
     emit changed();
513 513
 }
514 514
 
515
-void KIconConfig::slotUsage(int index)
515
+void TDEIconConfig::slotUsage(int index)
516 516
 {
517 517
     mUsage = index;
518 518
     if (mpUsageList->text(index) == i18n("Panel Buttons")) {
@@ -531,11 +531,11 @@ void KIconConfig::slotUsage(int index)
531 531
         mPreviewButton2->setEnabled(false);
532 532
         mPreviewButton3->setEnabled(false);
533 533
     }
534
-    else if ( mUsage == KIcon::Panel || mUsage == KIcon::LastGroup )
534
+    else if ( mUsage == TDEIcon::Panel || mUsage == TDEIcon::LastGroup )
535 535
     {
536 536
         mpSizeBox->setEnabled(false);
537 537
         mpDPCheck->setEnabled(false);
538
-	mpAnimatedCheck->setEnabled( mUsage == KIcon::Panel );
538
+	mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Panel );
539 539
         mPreviewButton1->setEnabled(true);
540 540
         mPreviewButton2->setEnabled(true);
541 541
         mPreviewButton3->setEnabled(true);
@@ -544,7 +544,7 @@ void KIconConfig::slotUsage(int index)
544 544
     {
545 545
         mpSizeBox->setEnabled(true);
546 546
         mpDPCheck->setEnabled(true);
547
-	mpAnimatedCheck->setEnabled( mUsage == KIcon::Desktop );
547
+	mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Desktop );
548 548
         mPreviewButton1->setEnabled(true);
549 549
         mPreviewButton2->setEnabled(true);
550 550
         mPreviewButton3->setEnabled(true);
@@ -554,9 +554,9 @@ void KIconConfig::slotUsage(int index)
554 554
     preview();
555 555
 }
556 556
 
557
-void KIconConfig::EffectSetup(int state)
557
+void TDEIconConfig::EffectSetup(int state)
558 558
 {
559
-    int viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
559
+    int viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;
560 560
 
561 561
     if (mpUsageList->currentText() == i18n("Panel Buttons")) {
562 562
         return;
@@ -565,7 +565,7 @@ void KIconConfig::EffectSetup(int state)
565 565
         return;
566 566
     }
567 567
 
568
-    TQPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
568
+    TQPixmap pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
569 569
     TQImage img = pm.convertToImage();
570 570
     if (mbDP[viewedGroup])
571 571
     {
@@ -581,12 +581,12 @@ void KIconConfig::EffectSetup(int state)
581 581
     case 2 : caption = i18n("Setup Disabled Icon Effect"); break;
582 582
     }
583 583
 
584
-    KIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
584
+    TDEIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
585 585
 
586 586
     if (dlg.exec() == TQDialog::Accepted)
587 587
     {
588
-        if (mUsage == KIcon::LastGroup) {
589
-            for (int i=0; i<KIcon::LastGroup; i++)
588
+        if (mUsage == TDEIcon::LastGroup) {
589
+            for (int i=0; i<TDEIcon::LastGroup; i++)
590 590
                 mEffects[i][state] = dlg.effect();
591 591
         } else {
592 592
             mEffects[mUsage][state] = dlg.effect();
@@ -597,8 +597,8 @@ void KIconConfig::EffectSetup(int state)
597 597
 
598 598
         emit changed(true);
599 599
 
600
-        if (mUsage == KIcon::LastGroup) {
601
-            for (int i=0; i<KIcon::LastGroup; i++)
600
+        if (mUsage == TDEIcon::LastGroup) {
601
+            for (int i=0; i<TDEIcon::LastGroup; i++)
602 602
                 mbChanged[i] = true;
603 603
         } else {
604 604
             mbChanged[mUsage] = true;
@@ -607,7 +607,7 @@ void KIconConfig::EffectSetup(int state)
607 607
     preview(state);
608 608
 }
609 609
 
610
-void KIconConfig::slotSize(int index)
610
+void TDEIconConfig::slotSize(int index)
611 611
 {
612 612
     if (mpUsageList->currentText() == i18n("Panel Buttons")) {
613 613
         mQuickLaunchSize = mpSizeBox->currentText().toInt();
@@ -620,7 +620,7 @@ void KIconConfig::slotSize(int index)
620 620
         emit changed(true);
621 621
     }
622 622
     else {
623
-        Q_ASSERT(mUsage < KIcon::LastGroup);
623
+        Q_ASSERT(mUsage < TDEIcon::LastGroup);
624 624
         mSizes[mUsage] = mAvSizes[mUsage][index];
625 625
         preview();
626 626
         emit changed(true);
@@ -628,9 +628,9 @@ void KIconConfig::slotSize(int index)
628 628
     }
629 629
 }
630 630
 
631
-void KIconConfig::slotDPCheck(bool check)
631
+void TDEIconConfig::slotDPCheck(bool check)
632 632
 {
633
-    Q_ASSERT(mUsage < KIcon::LastGroup);
633
+    Q_ASSERT(mUsage < TDEIcon::LastGroup);
634 634
     if (mbDP[mUsage] != check)
635 635
     {
636 636
         mbDP[mUsage] = check;
@@ -641,9 +641,9 @@ void KIconConfig::slotDPCheck(bool check)
641 641
 
642 642
 }
643 643
 
644
-void KIconConfig::slotAnimatedCheck(bool check)
644
+void TDEIconConfig::slotAnimatedCheck(bool check)
645 645
 {
646
-    Q_ASSERT(mUsage < KIcon::LastGroup);
646
+    Q_ASSERT(mUsage < TDEIcon::LastGroup);
647 647
     if (mbAnimated[mUsage] != check)
648 648
     {
649 649
         mbAnimated[mUsage] = check;
@@ -652,17 +652,17 @@ void KIconConfig::slotAnimatedCheck(bool check)
652 652
     }
653 653
 }
654 654
 
655
-void KIconConfig::slotRoundedCheck(bool check)
655
+void TDEIconConfig::slotRoundedCheck(bool check)
656 656
 {
657 657
     emit changed(true);
658 658
 }
659 659
 
660
-void KIconConfig::slotActiveEffect(bool check)
660
+void TDEIconConfig::slotActiveEffect(bool check)
661 661
 {
662 662
     emit changed(true);
663 663
 }
664 664
 
665
-KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
665
+TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
666 666
     const Effect &defaultEffect,
667 667
     const TQString &caption, const TQImage &image,
668 668
     TQWidget *parent, char *name)
@@ -672,7 +672,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
672 672
       mDefaultEffect(defaultEffect),
673 673
       mExample(image)
674 674
 {
675
-    mpEffect = new KIconEffect;
675
+    mpEffect = new TDEIconEffect;
676 676
 
677 677
     TQLabel *lbl;
678 678
     TQGroupBox *frame;
@@ -749,67 +749,67 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
749 749
     preview();
750 750
 }
751 751
 
752
-KIconEffectSetupDialog::~KIconEffectSetupDialog()
752
+TDEIconEffectSetupDialog::~TDEIconEffectSetupDialog()
753 753
 {
754 754
   delete mpEffect;
755 755
 }
756 756
 
757
-void KIconEffectSetupDialog::init()
757
+void TDEIconEffectSetupDialog::init()
758 758
 {
759 759
     mpEffectBox->setCurrentItem(mEffect.type);
760
-    mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
761
-    mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
762
-    mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
760
+    mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
761
+    mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
762
+    mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
763 763
     mpEffectSlider->setValue((int) (100.0 * mEffect.value + 0.5));
764 764
     mpEColButton->setColor(mEffect.color);
765 765
     mpECol2Button->setColor(mEffect.color2);
766 766
     mpSTCheck->setChecked(mEffect.transparant);
767 767
 }
768 768
 
769
-void KIconEffectSetupDialog::slotEffectValue(int value)
769
+void TDEIconEffectSetupDialog::slotEffectValue(int value)
770 770
 {
771 771
      mEffect.value = 0.01 * value;
772 772
      preview();
773 773
 }
774 774
 
775
-void KIconEffectSetupDialog::slotEffectColor(const TQColor &col)
775
+void TDEIconEffectSetupDialog::slotEffectColor(const TQColor &col)
776 776
 {
777 777
      mEffect.color = col;
778 778
      preview();
779 779
 }
780 780
 
781
-void KIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
781
+void TDEIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
782 782
 {
783 783
      mEffect.color2 = col;
784 784
      preview();
785 785
 }
786 786
 
787
-void KIconEffectSetupDialog::slotEffectType(int type)
787
+void TDEIconEffectSetupDialog::slotEffectType(int type)
788 788
 {
789 789
     mEffect.type = type;
790
-    mpEffectGroup->setEnabled(mEffect.type != KIconEffect::NoEffect);
791
-    mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
792
-    mpEffectColor->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
793
-    mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
794
-    mpEffectColor2->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
795
-    mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
790
+    mpEffectGroup->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
791
+    mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
792
+    mpEffectColor->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
793
+    mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
794
+    mpEffectColor2->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
795
+    mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
796 796
     preview();
797 797
 }
798 798
 
799
-void KIconEffectSetupDialog::slotSTCheck(bool b)
799
+void TDEIconEffectSetupDialog::slotSTCheck(bool b)
800 800
 {
801 801
      mEffect.transparant = b;
802 802
      preview();
803 803
 }
804 804
 
805
-void KIconEffectSetupDialog::slotDefault()
805
+void TDEIconEffectSetupDialog::slotDefault()
806 806
 {
807 807
      mEffect = mDefaultEffect;
808 808
      init();
809 809
      preview();
810 810
 }
811 811
 
812
-void KIconEffectSetupDialog::preview()
812
+void TDEIconEffectSetupDialog::preview()
813 813
 {
814 814
     TQPixmap pm;
815 815
     TQImage img = mExample.copy();

+ 13
- 13
kcontrol/icons/icons.h View File

@@ -36,9 +36,9 @@ class TQWidget;
36 36
 
37 37
 class KColorButton;
38 38
 class TDEConfig;
39
-class KIconEffect;
40
-class KIconLoader;
41
-class KIconTheme;
39
+class TDEIconEffect;
40
+class TDEIconLoader;
41
+class TDEIconTheme;
42 42
 
43 43
 struct Effect 
44 44
 {
@@ -53,13 +53,13 @@ struct Effect
53 53
 /**
54 54
  * The General Icons tab in kcontrol.
55 55
  */
56
-class KIconConfig: public TDECModule
56
+class TDEIconConfig: public TDECModule
57 57
 {
58 58
     Q_OBJECT
59 59
 
60 60
 public:
61
-    KIconConfig(TQWidget *parent, const char *name=0);
62
-    ~KIconConfig();
61
+    TDEIconConfig(TQWidget *parent, const char *name=0);
62
+    ~TDEIconConfig();
63 63
 
64 64
     virtual void load();
65 65
     virtual void load( bool useDefaults );
@@ -103,9 +103,9 @@ private:
103 103
     int mSysTraySize;
104 104
     int mQuickLaunchSize;
105 105
 
106
-    KIconEffect *mpEffect;
107
-    KIconTheme *mpTheme;
108
-    KIconLoader *mpLoader;
106
+    TDEIconEffect *mpEffect;
107
+    TDEIconTheme *mpTheme;
108
+    TDEIconLoader *mpLoader;
109 109
     TDEConfig *mpConfig;
110 110
     KSimpleConfig *mpSystrayConfig;
111 111
     KSimpleConfig *mpKickerConfig;
@@ -121,15 +121,15 @@ private:
121 121
     TQPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3;
122 122
 };
123 123
 
124
-class KIconEffectSetupDialog: public KDialogBase
124
+class TDEIconEffectSetupDialog: public KDialogBase
125 125
 {
126 126
     Q_OBJECT
127 127
      
128 128
 public:
129
-    KIconEffectSetupDialog(const Effect &, const Effect &,
129
+    TDEIconEffectSetupDialog(const Effect &, const Effect &,
130 130
                            const TQString &, const TQImage &,
131 131
 			   TQWidget *parent=0L, char *name=0L);
132
-    ~KIconEffectSetupDialog();
132
+    ~TDEIconEffectSetupDialog();
133 133
     Effect effect() { return mEffect; }
134 134
 
135 135
 protected:
@@ -145,7 +145,7 @@ protected slots:
145 145
     void slotDefault();
146 146
 
147 147
 private:
148
-    KIconEffect *mpEffect;
148
+    TDEIconEffect *mpEffect;
149 149
     TQListBox *mpEffectBox;
150 150
     TQCheckBox *mpSTCheck;
151 151
     TQSlider *mpEffectSlider;

+ 24
- 24
kcontrol/icons/iconthemes.cpp View File

@@ -124,13 +124,13 @@ void IconThemesConfig::loadThemes()
124 124
 {
125 125
   m_iconThemes->clear();
126 126
   m_themeNames.clear();
127
-  TQStringList themelist(KIconTheme::list());
127
+  TQStringList themelist(TDEIconTheme::list());
128 128
   TQString name;
129 129
   TQString tname;
130 130
   TQStringList::Iterator it;
131 131
   for (it=themelist.begin(); it != themelist.end(); ++it)
132 132
   {
133
-    KIconTheme icontheme(*it);
133
+    TDEIconTheme icontheme(*it);
134 134
     if (!icontheme.isValid()) kdDebug() << "notvalid\n";
135 135
     if (icontheme.isHidden()) continue;
136 136
 
@@ -194,7 +194,7 @@ void IconThemesConfig::installNewTheme()
194 194
   TDEGlobal::instance()->newIconLoader();
195 195
   loadThemes();
196 196
 
197
-  TQListViewItem *item=iconThemeItem(KIconTheme::current());
197
+  TQListViewItem *item=iconThemeItem(TDEIconTheme::current());
198 198
   m_iconThemes->setSelected(item, true);
199 199
   updateRemoveButton();
200 200
 }
@@ -289,12 +289,12 @@ void IconThemesConfig::removeSelectedTheme()
289 289
         "This will delete the files installed by this theme.</qt>").
290 290
 	arg(selected->text(0));
291 291
 
292
-  bool deletingCurrentTheme=(selected==iconThemeItem(KIconTheme::current()));
292
+  bool deletingCurrentTheme=(selected==iconThemeItem(TDEIconTheme::current()));
293 293
 
294 294
   int r=KMessageBox::warningContinueCancel(this,question,i18n("Confirmation"),KStdGuiItem::del());
295 295
   if (r!=KMessageBox::Continue) return;
296 296
 
297
-  KIconTheme icontheme(m_themeNames[selected->text(0)]);
297
+  TDEIconTheme icontheme(m_themeNames[selected->text(0)]);
298 298
 
299 299
   // delete the index file before the async TDEIO::del so loadThemes() will
300 300
   // ignore that dir.
@@ -309,9 +309,9 @@ void IconThemesConfig::removeSelectedTheme()
309 309
   TQListViewItem *item=0L;
310 310
   //Fallback to the default if we've deleted the current theme
311 311
   if (!deletingCurrentTheme)
312
-     item=iconThemeItem(KIconTheme::current());
312
+     item=iconThemeItem(TDEIconTheme::current());
313 313
   if (!item)
314
-     item=iconThemeItem(KIconTheme::defaultThemeName());
314
+     item=iconThemeItem(TDEIconTheme::defaultThemeName());
315 315
 
316 316
   m_iconThemes->setSelected(item, true);
317 317
   updateRemoveButton();
@@ -326,12 +326,12 @@ void IconThemesConfig::updateRemoveButton()
326 326
   bool enabled = false;
327 327
   if (selected)
328 328
   {
329
-    KIconTheme icontheme(m_themeNames[selected->text(0)]);
329
+    TDEIconTheme icontheme(m_themeNames[selected->text(0)]);
330 330
     TQFileInfo fi(icontheme.dir());
331 331
     enabled = fi.isWritable();
332 332
     // Don't let users remove the current theme.
333
-    if(m_themeNames[selected->text(0)] == KIconTheme::current() || 
334
-			 m_themeNames[selected->text(0)] == KIconTheme::defaultThemeName())
333
+    if(m_themeNames[selected->text(0)] == TDEIconTheme::current() || 
334
+			 m_themeNames[selected->text(0)] == TDEIconTheme::defaultThemeName())
335 335
       enabled = false;
336 336
   }
337 337
   m_removeButton->setEnabled(enabled);
@@ -343,20 +343,20 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
343 343
   KSVGIconEngine engine;
344 344
 #endif 
345 345
   TQString dirName(m_themeNames[item->text(0)]);
346
-  KIconTheme icontheme(dirName);
346
+  TDEIconTheme icontheme(dirName);
347 347
   if (!icontheme.isValid()) kdDebug() << "notvalid\n";
348 348
 
349 349
   updateRemoveButton();
350
-  const int size = icontheme.defaultSize(KIcon::Desktop);
350
+  const int size = icontheme.defaultSize(TDEIcon::Desktop);
351 351
 
352
-  KIcon icon=icontheme.iconPath("exec.png", size, KIcon::MatchBest);
352
+  TDEIcon icon=icontheme.iconPath("exec.png", size, TDEIcon::MatchBest);
353 353
   if (!icon.isValid()) {
354 354
 #ifdef HAVE_LIBART
355
-	  icon=icontheme.iconPath("exec.svg", size, KIcon::MatchBest);
355
+	  icon=icontheme.iconPath("exec.svg", size, TDEIcon::MatchBest);
356 356
 	  if(engine.load(size, size, icon.path))
357 357
               m_previewExec->setPixmap(*engine.image());
358 358
           else {
359
-              icon=icontheme.iconPath("exec.svgz", size, KIcon::MatchBest);
359
+              icon=icontheme.iconPath("exec.svgz", size, TDEIcon::MatchBest);
360 360
               if(engine.load(size, size, icon.path))
361 361
                   m_previewExec->setPixmap(*engine.image());
362 362
           }
@@ -365,14 +365,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
365 365
   else
366 366
           m_previewExec->setPixmap(TQPixmap(icon.path));
367 367
 
368
-  icon=icontheme.iconPath("folder.png",size,KIcon::MatchBest);
368
+  icon=icontheme.iconPath("folder.png",size,TDEIcon::MatchBest);
369 369
   if (!icon.isValid()) {
370 370
 #ifdef HAVE_LIBART
371
-	  icon=icontheme.iconPath("folder.svg", size, KIcon::MatchBest);
371
+	  icon=icontheme.iconPath("folder.svg", size, TDEIcon::MatchBest);
372 372
 	  if(engine.load(size, size, icon.path))
373 373
               m_previewFolder->setPixmap(*engine.image());
374 374
           else {
375
-              icon=icontheme.iconPath("folder.svgz", size, KIcon::MatchBest);
375
+              icon=icontheme.iconPath("folder.svgz", size, TDEIcon::MatchBest);
376 376
               if(engine.load(size, size, icon.path))
377 377
                   m_previewFolder->setPixmap(*engine.image());
378 378
           }
@@ -381,14 +381,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
381 381
   else
382 382
   	  m_previewFolder->setPixmap(TQPixmap(icon.path));
383 383
 
384
-  icon=icontheme.iconPath("txt.png",size,KIcon::MatchBest);
384
+  icon=icontheme.iconPath("txt.png",size,TDEIcon::MatchBest);
385 385
   if (!icon.isValid()) {
386 386
 #ifdef HAVE_LIBART
387
-	  icon=icontheme.iconPath("txt.svg", size, KIcon::MatchBest);
387
+	  icon=icontheme.iconPath("txt.svg", size, TDEIcon::MatchBest);
388 388
 	  if(engine.load(size, size, icon.path))
389 389
               m_previewDocument->setPixmap(*engine.image());
390 390
           else {
391
-              icon=icontheme.iconPath("txt.svgz", size, KIcon::MatchBest);
391
+              icon=icontheme.iconPath("txt.svgz", size, TDEIcon::MatchBest);
392 392
               if(engine.load(size, size, icon.path))
393 393
                   m_previewDocument->setPixmap(*engine.image());
394 394
           }
@@ -403,7 +403,7 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
403 403
 
404 404
 void IconThemesConfig::load()
405 405
 {
406
-  m_defaultTheme=iconThemeItem(KIconTheme::current());
406
+  m_defaultTheme=iconThemeItem(TDEIconTheme::current());
407 407
   m_iconThemes->setSelected(m_defaultTheme, true);
408 408
   updateRemoveButton();
409 409
 
@@ -424,10 +424,10 @@ void IconThemesConfig::save()
424 424
   config->writeEntry("Theme", m_themeNames[selected->text(0)]);
425 425
   delete config;
426 426
 
427
-  KIconTheme::reconfigure();
427
+  TDEIconTheme::reconfigure();
428 428
   emit changed(false);
429 429
 
430
-  for (int i=0; i<KIcon::LastGroup; i++)
430
+  for (int i=0; i<TDEIcon::LastGroup; i++)
431 431
   {
432 432
     KIPC::sendMessageAll(KIPC::IconChanged, i);
433 433
   }

+ 1
- 1
kcontrol/icons/main.cpp View File

@@ -47,7 +47,7 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
47 47
   tab->addTab(tab1, i18n("&Theme"));
48 48
   connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
49 49
 
50
-  tab2 = new KIconConfig(this, "effects");
50
+  tab2 = new TDEIconConfig(this, "effects");
51 51
   tab->addTab(tab2, i18n("Ad&vanced"));
52 52
   connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
53 53
 

+ 1
- 1
kcontrol/icons/testicons.cpp View File

@@ -6,7 +6,7 @@
6 6
 int main(int argc, char **argv)
7 7
 {
8 8
     TDEApplication app(argc, argv, "testicons");
9
-    KIconConfig *w = new KIconConfig(0L, "testicons");
9
+    TDEIconConfig *w = new TDEIconConfig(0L, "testicons");
10 10
     app.setMainWidget(w);
11 11
     w->show();
12 12
     return app.exec();

+ 2
- 2
kcontrol/joystick/joywidget.cpp View File

@@ -54,8 +54,8 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
54 54
     messageBox = new TQHBox(mainVbox);
55 55
     messageBox->setSpacing(KDialog::spacingHint());
56 56
     TQLabel *icon = new TQLabel(messageBox);
57
-    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
58
-                                                    KIcon::SizeMedium, KIcon::DefaultState, 0, true));
57
+    icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup,
58
+                                                    TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true));
59 59
     icon->setFixedSize(icon->sizeHint());
60 60
     message = new TQLabel(messageBox);
61 61
     messageBox->hide();

+ 3
- 3
kcontrol/kcontrol/aboutwidget.cpp View File

@@ -150,10 +150,10 @@ void AboutWidget::updatePixmap()
150 150
     }
151 151
     else
152 152
     {
153
-        KIconLoader *loader = TDEGlobal::instance()->iconLoader();
153
+        TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
154 154
         TQString iconPath;
155 155
         if (!_icon.isEmpty()) {
156
-            iconPath = loader->iconPath( _icon, KIcon::Toolbar );
156
+            iconPath = loader->iconPath( _icon, TDEIcon::Toolbar );
157 157
             content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a>&nbsp;" + _caption + "</div>";
158 158
         }
159 159
 
@@ -171,7 +171,7 @@ void AboutWidget::updatePixmap()
171 171
             {
172 172
                 szName = module->moduleName();
173 173
                 szComment = module->comment();
174
-                iconPath = loader->iconPath( module->icon(), KIcon::Small );
174
+                iconPath = loader->iconPath( module->icon(), TDEIcon::Small );
175 175
 
176 176
                 content += "<img src=\"" + iconPath +" \"</a>&nbsp;<a href=\"%1\" class=\"kcm_link\">" + szName + "</a></td><td class=\"kc_rightcol\">" + szComment;
177 177
                 KURL moduleURL( TQString("kcm://%1").arg(TQString().sprintf("%p",module)) );

+ 2
- 2
kcontrol/kcontrol/dockcontainer.cpp View File

@@ -83,8 +83,8 @@ void ModuleTitle::showTitleFor( ConfigModule *config )
83 83
 
84 84
   TQWhatsThis::remove( this );
85 85
   TQWhatsThis::add( this, config->comment() );
86
-  KIconLoader *loader = TDEGlobal::instance()->iconLoader();
87
-  TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
86
+  TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
87
+  TQPixmap icon = loader->loadIcon( config->icon(), TDEIcon::NoGroup, 22 );
88 88
   m_icon->setPixmap( icon );
89 89
   m_name->setText( config->moduleName() );
90 90
 

+ 1
- 1
kcontrol/kcontrol/global.cpp View File

@@ -42,7 +42,7 @@ TQString KCGlobal::_irelease = "";
42 42
 TQString KCGlobal::_iversion = "";
43 43
 TQString KCGlobal::_imachine = "";
44 44
 IndexViewMode KCGlobal::_viewmode = Icon;
45
-KIcon::StdSizes KCGlobal::_iconsize = KIcon::SizeMedium;
45
+TDEIcon::StdSizes KCGlobal::_iconsize = TDEIcon::SizeMedium;
46 46
 TQString KCGlobal::_baseGroup = "";
47 47
 
48 48
 void KCGlobal::init()

+ 3
- 3
kcontrol/kcontrol/global.h View File

@@ -45,7 +45,7 @@ public:
45 45
   static TQString systemVersion() { return _iversion; }
46 46
   static TQString systemMachine() { return _imachine; }
47 47
   static IndexViewMode viewMode() { return _viewmode; }
48
-  static KIcon::StdSizes iconSize() { return _iconsize; }
48
+  static TDEIcon::StdSizes iconSize() { return _iconsize; }
49 49
   static TQString baseGroup();
50 50
 
51 51
   static void setIsInfoCenter(bool b) { _infocenter = b; }
@@ -59,7 +59,7 @@ public:
59 59
   static void setSystemVersion(const TQString& n){ _iversion = n; }
60 60
   static void setSystemMachine(const TQString& n){ _imachine = n; }
61 61
   static void setViewMode(IndexViewMode m) { _viewmode = m; }
62
-  static void setIconSize(KIcon::StdSizes s) { _iconsize = s; }
62
+  static void setIconSize(TDEIcon::StdSizes s) { _iconsize = s; }
63 63
 
64 64
   static void repairAccels( TQWidget * tw );
65 65
 
@@ -69,7 +69,7 @@ private:
69 69
   static TQStringList _types;
70 70
   static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _tdeversion;
71 71
   static IndexViewMode _viewmode;
72
-  static KIcon::StdSizes _iconsize;
72
+  static TDEIcon::StdSizes _iconsize;
73 73
   static TQString _baseGroup;
74 74
 };
75 75
 

+ 2
- 2
kcontrol/kcontrol/modulemenu.cpp View File

@@ -72,7 +72,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
72 72
      TQString name = group->caption();
73 73
      name.replace("&", "&&");
74 74
   
75
-     parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
75
+     parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
76 76
                         , name, menu);
77 77
 
78 78
      fill(menu, path);
@@ -87,7 +87,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
87 87
      TQString name = module->moduleName();
88 88
      name.replace("&", "&&");
89 89
 
90
-     int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
90
+     int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
91 91
                                      , name, id);
92 92
      _moduleDict.insert(realid, module);
93 93
 

+ 4
- 4
kcontrol/kcontrol/moduletreeview.cpp View File

@@ -38,12 +38,12 @@
38 38
 static TQPixmap appIcon(const TQString &iconName)
39 39
 {
40 40
      TQString path;
41
-     TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
42
-     // make sure they are not larger than KIcon::SizeSmall
43
-     if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall)
41
+     TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::Small, 0, TDEIcon::DefaultState, &path, true);
42
+     // make sure they are not larger than TDEIcon::SizeSmall
43
+     if (normal.width() > TDEIcon::SizeSmall || normal.height() > TDEIcon::SizeSmall)
44 44
      {
45 45
          TQImage tmp = normal.convertToImage();
46
-         tmp = tmp.smoothScale(KIcon::SizeSmall, KIcon::SizeSmall);
46
+         tmp = tmp.smoothScale(TDEIcon::SizeSmall, TDEIcon::SizeSmall);
47 47
          normal.convertFromImage(tmp);
48 48
      }
49 49
      return normal;

+ 1
- 1
kcontrol/kcontrol/searchwidget.cpp View File

@@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap
39 39
 public:
40 40
  ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
41 41
 	TQListBoxPixmap(listbox,
42
-      TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
42
+      TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall),
43 43
       module->moduleName())
44 44
   , m_module(module)
45 45
  { 

+ 16
- 16
kcontrol/kcontrol/toplevel.cpp View File

@@ -68,13 +68,13 @@ TopLevel::TopLevel(const char* name)
68 68
 
69 69
   TQString size = config->readEntry("IconSize", "Medium");
70 70
   if (size == "Small")
71
-    KCGlobal::setIconSize(KIcon::SizeSmall);
71
+    KCGlobal::setIconSize(TDEIcon::SizeSmall);
72 72
   else if (size == "Large")
73
-    KCGlobal::setIconSize(KIcon::SizeLarge);
73
+    KCGlobal::setIconSize(TDEIcon::SizeLarge);
74 74
   else if (size == "Huge")
75
-    KCGlobal::setIconSize(KIcon::SizeHuge);
75
+    KCGlobal::setIconSize(TDEIcon::SizeHuge);
76 76
   else
77
-    KCGlobal::setIconSize(KIcon::SizeMedium);
77
+    KCGlobal::setIconSize(TDEIcon::SizeMedium);
78 78
 
79 79
   // initialize the entries
80 80
   _modules = new ConfigModuleList();
@@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name)
182 182
                TQT_SLOT( activateModule( ConfigModule * ) ) );
183 183
       _dock->setBaseWidget( aw );
184 184
       KWin::setIcons(  winId(),
185
-		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  KIcon::NoGroup,  32 ),
186
-		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  KIcon::NoGroup,  16 ) );
185
+		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  TDEIcon::NoGroup,  32 ),
186
+		       TDEGlobal::iconLoader()->loadIcon("hwinfo",  TDEIcon::NoGroup,  16 ) );
187 187
   }
188 188
   else
189 189
   {
@@ -205,13 +205,13 @@ TopLevel::~TopLevel()
205 205
 
206 206
   switch (KCGlobal::iconSize())
207 207
     {
208
-    case KIcon::SizeSmall:
208
+    case TDEIcon::SizeSmall:
209 209
       config->writeEntry("IconSize", "Small");
210 210
       break;
211
-    case KIcon::SizeLarge:
211
+    case TDEIcon::SizeLarge:
212 212
       config->writeEntry("IconSize", "Large");
213 213
       break;
214
-    case KIcon::SizeHuge:
214
+    case TDEIcon::SizeHuge:
215 215
       config->writeEntry("IconSize", "Huge");
216 216
       break;
217 217
     default:
@@ -295,13 +295,13 @@ void TopLevel::activateIconView()
295 295
 
296 296
   switch(KCGlobal::iconSize())
297 297
     {
298
-    case KIcon::SizeSmall:
298
+    case TDEIcon::SizeSmall:
299 299
       icon_small->setChecked(true);
300 300
       break;
301
-    case KIcon::SizeLarge:
301
+    case TDEIcon::SizeLarge:
302 302
       icon_large->setChecked(true);
303 303
       break;
304
-    case KIcon::SizeHuge:
304
+    case TDEIcon::SizeHuge:
305 305
       icon_huge->setChecked(true);
306 306
       break;
307 307
     default:
@@ -323,25 +323,25 @@ void TopLevel::activateTreeView()
323 323
 
324 324
 void TopLevel::activateSmallIcons()
325 325
 {
326
-  KCGlobal::setIconSize(KIcon::SizeSmall);
326
+  KCGlobal::setIconSize(TDEIcon::SizeSmall);
327 327
   _index->reload();
328 328
 }
329 329
 
330 330
 void TopLevel::activateMediumIcons()
331 331
 {
332
-  KCGlobal::setIconSize(KIcon::SizeMedium);
332
+  KCGlobal::setIconSize(TDEIcon::SizeMedium);
333 333
   _index->reload();
334 334
 }
335 335
 
336 336
 void TopLevel::activateLargeIcons()
337 337
 {
338
-  KCGlobal::setIconSize(KIcon::SizeLarge);
338
+  KCGlobal::setIconSize(TDEIcon::SizeLarge);
339 339
   _index->reload();
340 340
 }
341 341
 
342 342
 void TopLevel::activateHugeIcons()
343 343
 {
344
-  KCGlobal::setIconSize(KIcon::SizeHuge);
344
+  KCGlobal::setIconSize(TDEIcon::SizeHuge);
345 345
   _index->reload();
346 346
 }
347 347
 

+ 6
- 6
kcontrol/kicker/menutab_impl.cpp View File

@@ -84,13 +84,13 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
84 84
     //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
85 85
     connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));
86 86
 
87
-    KIconLoader * ldr = TDEGlobal::iconLoader();
87
+    TDEIconLoader * ldr = TDEGlobal::iconLoader();
88 88
     TQPixmap kmenu_icon;
89 89
     m_kmenu_icon = KickerSettings::customKMenuIcon();
90 90
     if (m_kmenu_icon.isNull() == true) {
91 91
         m_kmenu_icon = TQString("kmenu");
92 92
     }
93
-    kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
93
+    kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
94 94
     btnCustomKMenuIcon->setPixmap(kmenu_icon);
95 95
 
96 96
     TDEConfig *config;
@@ -306,15 +306,15 @@ void MenuTab::launchMenuEditor()
306 306
 
307 307
 void MenuTab::launchIconEditor()
308 308
 {
309
-    KIconDialog dlg(this);
310
-    TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Application);
309
+    TDEIconDialog dlg(this);
310
+    TQString newIcon = dlg.selectIcon(TDEIcon::Small, TDEIcon::Application);
311 311
     if (newIcon.isEmpty())
312 312
         return;
313 313
 
314 314
     m_kmenu_icon = newIcon;
315
-    KIconLoader * ldr = TDEGlobal::iconLoader();
315
+    TDEIconLoader * ldr = TDEGlobal::iconLoader();
316 316
     TQPixmap kmenu_icon;
317
-    kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
317
+    kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
318 318
     btnCustomKMenuIcon->setPixmap(kmenu_icon);
319 319
     m_kmenu_button_changed = true;
320 320
 

+ 1
- 1
kcontrol/konsole/sessiondialog.ui View File

@@ -180,7 +180,7 @@
180 180
                                 </widget>
181 181
                             </grid>
182 182
                         </widget>
183
-                        <widget class="KIconButton" row="0" column="1">
183
+                        <widget class="TDEIconButton" row="0" column="1">
184 184
                             <property name="name">
185 185
                                 <cstring>previewIcon</cstring>
186 186
                             </property>

+ 2
- 2
kcontrol/kthememanager/ktheme.cpp View File

@@ -187,7 +187,7 @@ TQString KTheme::createYourself( bool pack )
187 187
     // 3. Icons
188 188
     globalConf->setGroup( "Icons" );
189 189
     TQDomElement iconElem = m_dom.createElement( "icons" );
190
-    iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
190
+    iconElem.setAttribute( "name", globalConf->readEntry( "Theme",TDEIconTheme::current() ) );
191 191
     createIconElems( "DesktopIcons", "desktop", iconElem, globalConf );
192 192
     createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf );
193 193
     createIconElems( "PanelIcons", "panel", iconElem, globalConf );
@@ -483,7 +483,7 @@ void KTheme::apply()
483 483
         }
484 484
         iconConf->sync();
485 485
 
486
-        for ( int i = 0; i < KIcon::LastGroup; i++ )
486
+        for ( int i = 0; i < TDEIcon::LastGroup; i++ )
487 487
             KIPC::sendMessageAll( KIPC::IconChanged, i );
488 488
         KService::rebuildKSycoca( m_parent );
489 489
     }

+ 8
- 8
kcontrol/kthememanager/kthememanager.cpp View File

@@ -385,20 +385,20 @@ void kthememanager::queryLNFModules()
385 385
         if ( p->isType( KST_KService ) )
386 386
         {
387 387
             KService *s = static_cast<KService *>( p );
388
-            ( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( KIcon::Desktop ), s->exec() );
388
+            ( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( TDEIcon::Desktop ), s->exec() );
389 389
         }
390 390
     }
391 391
 
392 392
     dlg->lvDetails->sort();*/
393 393
 
394 394
     // For now use a static list
395
-    KIconLoader * il = TDEGlobal::iconLoader();
396
-    dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) );
397
-    dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) );
398
-    dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
399
-    dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) );
400
-    dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) );
401
-    dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) );
395
+    TDEIconLoader * il = TDEGlobal::iconLoader();
396
+    dlg->btnBackground->setIconSet( il->loadIconSet( "background", TDEIcon::Desktop, 32 ) );
397
+    dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", TDEIcon::Desktop, 32 ) );
398
+    dlg->btnStyle->setIconSet( il->loadIconSet( "style", TDEIcon::Desktop, 32 ) );
399
+    dlg->btnIcons->setIconSet( il->loadIconSet( "icons", TDEIcon::Desktop, 32 ) );
400
+    dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", TDEIcon::Desktop, 32 ) );
401
+    dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", TDEIcon::Desktop, 32 ) );
402 402
 }
403 403
 
404 404
 void kthememanager::updatePreview( const TQString & pixFile )

+ 4
- 4
kcontrol/kthememanager/kthememanager.h View File

@@ -34,13 +34,13 @@ class TDEAboutData;
34 34
 #define ORIGINAL_THEME "original" // no i18n() here!!!
35 35
 
36 36
 /*
37
-class KIconViewItem;
37
+class TDEIconViewItem;
38 38
 
39
-class KThemeDetailsItem: public KIconViewItem
39
+class KThemeDetailsItem: public TDEIconViewItem
40 40
 {
41 41
 public:
42
-    KThemeDetailsItem( KIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
43
-        : KIconViewItem( parent, text, icon ) { m_exec = execString; }
42
+    KThemeDetailsItem( TDEIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
43
+        : TDEIconViewItem( parent, text, icon ) { m_exec = execString; }
44 44
     virtual ~KThemeDetailsItem() { };
45 45
 
46 46
     void exec() {

+ 2
- 2
kcontrol/locale/kcmlocale.cpp View File

@@ -356,7 +356,7 @@ void TDELocaleConfig::loadCountryList()
356 356
                           .arg(tag) ) );
357 357
     TQIconSet icon;
358 358
     if ( !map.isNull() )
359
-      icon = TDEGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
359
+      icon = TDEGlobal::iconLoader()->loadIconSet(map, TDEIcon::Small);
360 360
     m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
361 361
   }
362 362
 
@@ -383,7 +383,7 @@ void TDELocaleConfig::loadCountryList()
383 383
     TQString flag( locate( "locale",
384 384
                           TQString::fromLatin1( "l10n/%1/flag.png" )
385 385
                           .arg(tag) ) );
386
-    TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
386
+    TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, TDEIcon::Small) );
387 387
     m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
388 388
   }
389 389
 

+ 2
- 2
kcontrol/style/menupreview.cpp View File

@@ -82,8 +82,8 @@ void MenuPreview::createPixmaps()
82 82
 								 (x % 2) ? 
83 83
 								((y % 2) ?  c2 : c1  ) : 	// See the grid? ;-)
84 84
 								((y % 2) ?  c1 : c2  ) );	
85
-		KIconLoader* icl = TDEGlobal::iconLoader();
86
-		TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
85
+		TDEIconLoader* icl = TDEGlobal::iconLoader();
86
+		TQPixmap pix = icl->loadIcon("go", TDEIcon::Desktop, TDEIcon::SizeLarge, TDEIcon::ActiveState);
87 87
 		p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
88 88
 	}
89 89
 

+ 4
- 4
kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp View File

@@ -260,7 +260,7 @@ void CKFileFontView::updateView(bool b)
260 260
         {
261 261
             CFontListViewItem *item=static_cast<CFontListViewItem *>(it.current());
262 262
 
263
-            item->setPixmap(0, item->fileInfo()->pixmap(KIcon::SizeSmall));
263
+            item->setPixmap(0, item->fileInfo()->pixmap(TDEIcon::SizeSmall));
264 264
         }
265 265
     }
266 266
 }
@@ -475,9 +475,9 @@ TQDragObject *CKFileFontView::dragObject()
475 475
         urls.append( (*it)->url() );
476 476
 
477 477
     if(urls.count()> 1)
478
-        pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall);
478
+        pixmap = DesktopIcon("tdemultiple", TDEIcon::SizeSmall);
479 479
     if(pixmap.isNull())
480
-        pixmap = currentFileItem()->pixmap(KIcon::SizeSmall);
480
+        pixmap = currentFileItem()->pixmap(TDEIcon::SizeSmall);
481 481
 
482 482
     hotspot.setX(pixmap.width() / 2);
483 483
     hotspot.setY(pixmap.height() / 2);
@@ -629,7 +629,7 @@ void CKFileFontView::writeConfig(TDEConfig *kc, const TQString &group)
629 629
 
630 630
 void CFontListViewItem::init()
631 631
 {
632
-    CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall));
632
+    CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(TDEIcon::SizeSmall));
633 633
 
634 634
     setText(COL_NAME, itsInf->text());
635 635
     setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0));

+ 1
- 1
kcontrol/tdeio/kmanualproxydlg.cpp View File

@@ -49,7 +49,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name )
49 49
     mDlg = new ManualProxyDlgUI (this);
50 50
     setMainWidget( mDlg );
51 51
 
52
-    mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
52
+    mDlg->pbCopyDown->setPixmap( BarIcon("down", TDEIcon::SizeSmall) );
53 53
     TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
54 54
                             mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
55 55
     mDlg->pbCopyDown->setSizePolicy( sizePolicy );

+ 1
- 1
kcontrol/tdm/tdm-appear.cpp View File

@@ -462,7 +462,7 @@ void TDMAppearanceWidget::save()
462 462
   config->writeEntry("LogoArea", noneRadio->isChecked() ? "None" :
463 463
 			    logoRadio->isChecked() ? "Logo" : "Clock" );
464 464
 
465
-  config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
465
+  config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, TDEIcon::Desktop, true));
466 466
 
467 467
   config->writeEntry("Compositor", compositorcombo->currentId());
468 468
 

+ 1
- 1
kdcop/kdcopwindow.cpp View File

@@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
114 114
 {
115 115
   setExpandable(true);
116 116
   setText(0, TQString::fromUtf8(app_));
117
-  setPixmap(0,  TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
117
+  setPixmap(0,  TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), TDEIcon::Small ));
118 118
 
119 119
 
120 120
 	/* Get the icon:  we use the icon from a mainwindow in that class.

+ 1
- 1
kdepasswd/kcm/chfacedlg.cpp View File

@@ -63,7 +63,7 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
63 63
   TQLabel *header = new TQLabel( i18n("Select a new face:"), page );
64 64
   top->addWidget( header );
65 65
 
66
-  m_FacesWidget = new KIconView( page );
66
+  m_FacesWidget = new TDEIconView( page );
67 67
   m_FacesWidget->setSelectionMode( TQIconView::Single );
68 68
   m_FacesWidget->setItemsMovable( false );
69 69
   m_FacesWidget->setMinimumSize( 400, 200 );

+ 1
- 1
kdepasswd/kcm/chfacedlg.h View File

@@ -63,7 +63,7 @@ private slots:
63 63
 private:
64 64
   void addCustomPixmap( TQString imPath, bool saveCopy );
65 65
 
66
-  KIconView *m_FacesWidget;
66
+  TDEIconView *m_FacesWidget;
67 67
 };
68 68
 
69 69
 #endif // CHFACEDLG_H

+ 1
- 1
kdepasswd/kcm/kcm_useraccount.kcfg View File

@@ -37,7 +37,7 @@
37 37
 			<default>$HOME/.face.icon</default>
38 38
 		</entry>
39 39
 		<entry name="CustomKey" type="String">
40
-			<label>Sort key for KIconViewItems</label>
40
+			<label>Sort key for TDEIconViewItems</label>
41 41
 			<default>Zz_custom</default>
42 42
 		</entry>
43 43
 	</group>

+ 1
- 1
kdesktop/desktop.cc View File

@@ -810,7 +810,7 @@ void KDesktop::slotSettingsChanged(int category)
810 810
 
811 811
 void KDesktop::slotIconChanged(int group)
812 812
 {
813
-    if ( group == KIcon::Desktop )
813
+    if ( group == TDEIcon::Desktop )
814 814
     {
815 815
         kdDebug(1204) << "KDesktop::slotIconChanged" << endl;
816 816
         refresh();

+ 4
- 4
kdesktop/kcustommenu.cc View File

@@ -84,10 +84,10 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
84 84
     // to accelators, replace them with two ampersands.
85 85
     serviceName.replace("&", "&&");
86 86
 
87
-    TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
88
-                                                                 0, KIcon::DefaultState, 0L, true);
89
-    TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
90
-                                                                 0, KIcon::ActiveState, 0L, true);
87
+    TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small,
88
+                                                                 0, TDEIcon::DefaultState, 0L, true);
89
+    TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small,
90
+                                                                 0, TDEIcon::ActiveState, 0L, true);
91 91
     // make sure they are not larger than 16x16
92 92
     if (normal.width() > 16 || normal.height() > 16) {
93 93
         TQImage tmp = normal.convertToImage();

+ 4
- 4
kdesktop/kdiconview.cc View File

@@ -490,7 +490,7 @@ void KDIconView::setAutoAlign( bool b )
490 490
     // Auto line-up icons
491 491
     if ( b ) {
492 492
         // set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
493
-        int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
493
+        int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
494 494
         setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
495 495
         setFont( font() );  // Force calcRect()
496 496
 
@@ -505,7 +505,7 @@ void KDIconView::setAutoAlign( bool b )
505 505
     }
506 506
     else {
507 507
         // change maxItemWidth, because when grid-align was active, it changed this for the grid
508
-        int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
508
+        int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
509 509
         setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
510 510
         setFont( font() );  // Force calcRect()
511 511
 
@@ -1528,7 +1528,7 @@ void KDIconView::showEvent( TQShowEvent *e )
1528 1528
     if (m_hasExistingPos)
1529 1529
         TQScrollView::showEvent( e );
1530 1530
     else
1531
-        KIconView::showEvent( e );
1531
+        TDEIconView::showEvent( e );
1532 1532
 }
1533 1533
 
1534 1534
 void KDIconView::contentsDropEvent( TQDropEvent * e )
@@ -1548,7 +1548,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
1548 1548
         bool bSignals = signalsBlocked();
1549 1549
         setItemsMovable(false);
1550 1550
         blockSignals(true);
1551
-        KIconView::contentsDropEvent( e );
1551
+        TDEIconView::contentsDropEvent( e );
1552 1552
         blockSignals(bSignals);
1553 1553
         setItemsMovable(bMovable);
1554 1554
         // End hack

+ 1
- 1
kdesktop/minicli.cpp View File

@@ -864,7 +864,7 @@ void Minicli::setIcon ()
864 864
 
865 865
   if ( m_iconName == "www" )
866 866
   {
867
-    // Not using KIconEffect::overlay as that requires the same size
867
+    // Not using TDEIconEffect::overlay as that requires the same size
868 868
     // for the icon and the overlay, also the overlay definately doesn't
869 869
     // have a more that one-bit alpha channel here
870 870
     TQPixmap overlay( locate ( "icon", KMimeType::favIconForURL( m_filterData->uri() ) + ".png" ) );

+ 2
- 2
kdesktop/startupid.cpp View File

@@ -179,8 +179,8 @@ void StartupId::start_startupid( const TQString& icon_P )
179 179
     = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };
180 180
 
181 181
 
182
-    TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
183
-        KIcon::DefaultState, 0, true ); // return null pixmap if not found
182
+    TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
183
+        TDEIcon::DefaultState, 0, true ); // return null pixmap if not found
184 184
     if( icon_pixmap.isNull())
185 185
         icon_pixmap = SmallIcon( "exec" );
186 186
     if( startup_widget == NULL )

+ 3
- 3
kdesktop/tdefileividesktop.cpp View File

@@ -64,7 +64,7 @@ KFileIVIDesktop::~KFileIVIDesktop()
64 64
 
65 65
 void KFileIVIDesktop::calcRect( const TQString& _text )
66 66
 {
67
-    KIconViewItem::calcRect( _text );
67
+    TDEIconViewItem::calcRect( _text );
68 68
 
69 69
     if ( !iconView() || !m_shadow ||
70 70
          !wordWrap() || !( static_cast<KDesktopShadowSettings *>
@@ -99,7 +99,7 @@ void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)
99 99
 
100 100
   p->save();
101 101
 
102
-  // draw the pixmap as in KIconViewItem::paintItem(...)
102
+  // draw the pixmap as in TDEIconViewItem::paintItem(...)
103 103
   paintPixmap(p, colors);
104 104
 
105 105
   //
@@ -147,7 +147,7 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
147 147
   else
148 148
     textX = textRect( FALSE ).x() + 2;
149 149
   int textY = textRect( FALSE ).y();
150
-  int align = ((KIconView *) iconView())->itemTextPos() == TQIconView::Bottom
150
+  int align = ((TDEIconView *) iconView())->itemTextPos() == TQIconView::Bottom
151 151
     ? AlignHCenter : AlignAuto;
152 152
   bool rebuild = shouldUpdateShadow(isSelected());
153 153
 

+ 1
- 1
kdesktop/tdefileividesktop.h View File

@@ -66,7 +66,7 @@ class KFileIVIDesktop : public KFileIVI
66 66
 
67 67
  protected:
68 68
     /**
69
-     * Reimplements KIconView::calcRect to take the shadow metrics
69
+     * Reimplements TDEIconView::calcRect to take the shadow metrics
70 70
      * into account
71 71
      */
72 72
      virtual void calcRect( const TQString& _text );

+ 21
- 21
kdialog/kdialog.cpp View File

@@ -596,47 +596,47 @@ static int directCommand(TDECmdLineArgs *args)
596 596
         if (args->count() >= 1)  {
597 597
             contextStr = TQString::fromLocal8Bit(args->arg(0));
598 598
         }
599
-        KIcon::Group group = KIcon::NoGroup;
599
+        TDEIcon::Group group = TDEIcon::NoGroup;
600 600
         if ( groupStr == TQString::fromLatin1( "Desktop" ) )
601
-            group = KIcon::Desktop;
601
+            group = TDEIcon::Desktop;
602 602
         else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
603
-            group = KIcon::Toolbar;
603
+            group = TDEIcon::Toolbar;
604 604
         else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
605
-            group = KIcon::MainToolbar;
605
+            group = TDEIcon::MainToolbar;
606 606
         else if ( groupStr == TQString::fromLatin1( "Small" ) )
607
-            group = KIcon::Small;
607
+            group = TDEIcon::Small;
608 608
         else if ( groupStr == TQString::fromLatin1( "Panel" ) )
609
-            group = KIcon::Panel;
609
+            group = TDEIcon::Panel;
610 610
         else if ( groupStr == TQString::fromLatin1( "User" ) )
611
-            group = KIcon::User;
612
-        KIcon::Context context = KIcon::Any;
611
+            group = TDEIcon::User;
612
+        TDEIcon::Context context = TDEIcon::Any;
613 613
         // From kicontheme.cpp
614 614
         if ( contextStr == TQString::fromLatin1( "Devices" ) )
615
-            context = KIcon::Device;
615
+            context = TDEIcon::Device;
616 616
         else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
617
-            context = KIcon::MimeType;
617
+            context = TDEIcon::MimeType;
618 618
         else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
619
-            context = KIcon::FileSystem;
619
+            context = TDEIcon::FileSystem;
620 620
         else if ( contextStr == TQString::fromLatin1( "Applications" ) )
621
-            context = KIcon::Application;
621
+            context = TDEIcon::Application;
622 622
         else if ( contextStr == TQString::fromLatin1( "Actions" ) )
623
-            context = KIcon::Action;
623
+            context = TDEIcon::Action;
624 624
         else if ( contextStr == TQString::fromLatin1( "Animations" ) )
625
-            context = KIcon::Animation;
625
+            context = TDEIcon::Animation;
626 626
         else if ( contextStr == TQString::fromLatin1( "Categories" ) )
627
-            context = KIcon::Category;
627
+            context = TDEIcon::Category;
628 628
         else if ( contextStr == TQString::fromLatin1( "Emblems" ) )
629
-            context = KIcon::Emblem;
629
+            context = TDEIcon::Emblem;
630 630
         else if ( contextStr == TQString::fromLatin1( "Emotes" ) )
631
-            context = KIcon::Emote;
631
+            context = TDEIcon::Emote;
632 632
         else if ( contextStr == TQString::fromLatin1( "International" ) )
633
-            context = KIcon::International;
633
+            context = TDEIcon::International;
634 634
         else if ( contextStr == TQString::fromLatin1( "Places" ) )
635
-            context = KIcon::Place;
635
+            context = TDEIcon::Place;
636 636
         else if ( contextStr == TQString::fromLatin1( "Status" ) )
637
-            context = KIcon::StatusIcon;
637
+            context = TDEIcon::StatusIcon;
638 638
 
639
-	KIconDialog dlg(0, "icon dialog");
639
+	TDEIconDialog dlg(0, "icon dialog");
640 640
 	kapp->setTopWidget( &dlg );
641 641
 	dlg.setup( group, context);
642 642
 	if (!title.isNull())

+ 1
- 1
kfind/kftabdlg.cpp View File

@@ -301,7 +301,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
301 301
           it != m_types.end(); ++it )
302 302
     {
303 303
       KMimeType::Ptr typ = *it;
304
-      typeBox->insertItem(typ->pixmap( KIcon::Small ), typ->comment());
304
+      typeBox->insertItem(typ->pixmap( TDEIcon::Small ), typ->comment());
305 305
     }
306 306
 
307 307
     if ( editRegExp ) {

+ 4
- 4
kicker/applets/clock/clock.cpp View File

@@ -370,7 +370,7 @@ void DigitalClock::loadSettings()
370 370
     setSegmentStyle(TQLCDNumber::Flat);
371 371
 
372 372
     if (_prefs->digitalLCDStyle())
373
-        lcdPattern = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User);
373
+        lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User);
374 374
 
375 375
     setNumDigits(_prefs->digitalShowSeconds() ? 8:5);
376 376
 
@@ -477,14 +477,14 @@ void AnalogClock::initBackgroundPixmap()
477 477
     //if no antialiasing, use pixmap as-is
478 478
     if (_prefs->analogAntialias() == 0)
479 479
     {
480
-      lcdPattern = KIconLoader("clockapplet").loadIcon("lcd",KIcon::User);
480
+      lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd",TDEIcon::User);
481 481
       _bgScale = 1;
482 482
     }
483 483
     else
484 484
     {
485 485
         //make a scaled pixmap -- so when image is reduced it'll look "OK".
486 486
         _bgScale = _prefs->analogAntialias()+1;
487
-        TQImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage();
487
+        TQImage bgImage = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User).convertToImage();
488 488
         lcdPattern = TQPixmap(bgImage.scale(bgImage.width() * _bgScale,
489 489
                              bgImage.height() * _bgScale));
490 490
 
@@ -1780,7 +1780,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
1780 1780
         TZoffset = zone->calc_TZ_offset(activeZone);
1781 1781
     }
1782 1782
 
1783
-    data.icon = DesktopIcon("date", KIcon::SizeMedium);
1783
+    data.icon = DesktopIcon("date", TDEIcon::SizeMedium);
1784 1784
     data.direction = popupDirection();
1785 1785
     data.duration = 4000;
1786 1786
 }

+ 6
- 6
kicker/applets/launcher/quickbutton.cpp View File

@@ -126,7 +126,7 @@ void QuickURL::run() const
126 126
 }
127 127
 
128 128
 //similar to MimeType::pixmapForURL
129
-TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
129
+TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
130 130
                           int _force_size, int _state, TQString *) const
131 131
 {
132 132
    TQPixmap pxmap;
@@ -206,8 +206,8 @@ void QuickButton::loadIcon()
206 206
     // Set Icon Dimension from size
207 207
    _iconDim=std::min(size().width(),size().height())-2*ICON_MARGIN;
208 208
    // Load icons
209
-   _icon = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::DefaultState);
210
-   _iconh = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::ActiveState);
209
+   _icon = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::DefaultState);
210
+   _iconh = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::ActiveState);
211 211
    setPixmap(_icon);
212 212
 }
213 213
 
@@ -262,7 +262,7 @@ void QuickButton::launch()
262 262
    if (!KickerSettings::showDeepButtons()) {
263 263
        setDown(false);
264 264
        update();
265
-       KIconEffect::visualActivate(this, rect());
265
+       TDEIconEffect::visualActivate(this, rect());
266 266
    }
267 267
    if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
268 268
        if (isOn()) {
@@ -344,10 +344,10 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
344 344
         data.subtext = data.message;
345 345
     }
346 346
     if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
347
-        data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
347
+        data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
348 348
     }
349 349
     else {
350
-        data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
350
+        data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
351 351
     }
352 352
 }
353 353
 

+ 1
- 1
kicker/applets/launcher/quickbutton.h View File

@@ -53,7 +53,7 @@ public:
53 53
     TQString name() const { return m_name; }
54 54
     KService::Ptr service() const {return _service;};
55 55
     void run() const;
56
-    TQPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
56
+    TQPixmap pixmap(mode_t _mode = 0, TDEIcon::Group _group = TDEIcon::Desktop,
57 57
                    int _force_size = 0, int _state = 0, TQString * _path = 0L) const;
58 58
 
59 59
 private:

+ 1
- 1
kicker/applets/minipager/pagerbutton.cpp View File

@@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
829 829
     }
830 830
 
831 831
     data.duration = 4000;
832
-    data.icon = DesktopIcon("window_list", KIcon::SizeMedium);
832
+    data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium);
833 833
     data.message = TQStyleSheet::escape(m_desktopName);
834 834
     data.direction = m_pager->popupDirection();
835 835
 }

+ 1
- 1
kicker/extensions/kasbar/ChangeLog View File

@@ -786,7 +786,7 @@
786 786
 
787 787
 	* Moved the icon handling code out of Kasbar and into the Task
788 788
 	  class.  Task now provides an API for icon loading that allows
789
-	  access to different icon sizes and uses KIconLoader where needed.
789
+	  access to different icon sizes and uses TDEIconLoader where needed.
790 790
 
791 791
 2001-05-15 Tuesday 01:19  rich
792 792
 

+ 2
- 2
kicker/extensions/kasbar/kasaboutdlg.cpp View File

@@ -80,8 +80,8 @@
80 80
 #include "kasaboutdlg.h"
81 81
 #include "version.h"
82 82
 
83
-#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
84
-#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
83
+#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
84
+#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge )
85 85
 
86 86
 KasAboutDialog::KasAboutDialog( TQWidget *parent )
87 87
    : KDialogBase( KDialogBase::IconList, i18n("About Kasbar"),

+ 1
- 1
kicker/extensions/kasbar/kasbar.cpp View File

@@ -717,7 +717,7 @@ void KasBar::addTestItems()
717 717
    KasItem *i = new KasItem( this );
718 718
    insert( 0, i );
719 719
    i->setText( "Animated" );
720
-   i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
720
+   i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
721 721
    i->setAnimation( resources()->startupAnimation() );
722 722
    TQTimer *aniTimer = new TQTimer( i, "aniTimer" );
723 723
    connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );

+ 8
- 8
kicker/extensions/kasbar/kasgroupitem.cpp View File

@@ -145,19 +145,19 @@ void KasGroupItem::updateIcon()
145 145
     Task::Ptr t = items.first();
146 146
     if (!t)
147 147
 	p = TDEGlobal::iconLoader()->loadIcon( "kicker",
148
-					     KIcon::NoGroup,
149
-					     KIcon::SizeSmall );
148
+					     TDEIcon::NoGroup,
149
+					     TDEIcon::SizeSmall );
150 150
 
151
-    int sizes[] = { KIcon::SizeEnormous,
152
-		    KIcon::SizeHuge,
153
-		    KIcon::SizeLarge,
154
-		    KIcon::SizeMedium,
155
-		    KIcon::SizeSmall };
151
+    int sizes[] = { TDEIcon::SizeEnormous,
152
+		    TDEIcon::SizeHuge,
153
+		    TDEIcon::SizeLarge,
154
+		    TDEIcon::SizeMedium,
155
+		    TDEIcon::SizeSmall };
156 156
 
157 157
     p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader );
158 158
 
159 159
     if ( p.isNull() )
160
-	p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall );
160
+	p = TDEGlobal::iconLoader()->loadIcon( "error", TDEIcon::NoGroup, TDEIcon::SizeSmall );
161 161
 
162 162
     setIcon( p );
163 163
 }

+ 2
- 2
kicker/extensions/kasbar/kasprefsdlg.cpp View File

@@ -75,8 +75,8 @@
75 75
 #include "kasprefsdlg.h"
76 76
 #include "kasprefsdlg.moc"
77 77
 
78
-#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
79
-#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
78
+#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
79
+#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge )
80 80
 
81 81
 
82 82
 KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent )

+ 12
- 12
kicker/extensions/kasbar/kasstartupitem.cpp View File

@@ -99,34 +99,34 @@ TQPixmap KasStartupItem::icon() const
99 99
    case KasBar::Small:
100 100
      /* ***** NOP ******
101 101
 	pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
102
-						  KIcon::NoGroup,
103
-						  KIcon::SizeSmall );
102
+						  TDEIcon::NoGroup,
103
+						  TDEIcon::SizeSmall );
104 104
      */
105 105
       break;
106 106
    case KasBar::Medium:
107 107
 	pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
108
-						  KIcon::NoGroup,
109
-						  KIcon::SizeMedium );
108
+						  TDEIcon::NoGroup,
109
+						  TDEIcon::SizeMedium );
110 110
       break;
111 111
    case KasBar::Large:
112 112
 	pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
113
-						  KIcon::NoGroup,
114
-						  KIcon::SizeLarge );
113
+						  TDEIcon::NoGroup,
114
+						  TDEIcon::SizeLarge );
115 115
       break;
116 116
    case KasBar::Huge:
117 117
 	pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
118
-						  KIcon::NoGroup,
119
-						  KIcon::SizeHuge );
118
+						  TDEIcon::NoGroup,
119
+						  TDEIcon::SizeHuge );
120 120
       break;
121 121
    case KasBar::Enormous:
122 122
 	pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
123
-						  KIcon::NoGroup,
124
-						  KIcon::SizeEnormous );
123
+						  TDEIcon::NoGroup,
124
+						  TDEIcon::SizeEnormous );
125 125
       break;
126 126
    default:
127 127
 	pixmap = TDEGlobal::iconLoader()->loadIcon( "error",
128
-						  KIcon::NoGroup,
129
-						  KIcon::SizeSmall );
128
+						  TDEIcon::NoGroup,
129
+						  TDEIcon::SizeSmall );
130 130
    }
131 131
 
132 132
    return pixmap;

+ 7
- 7
kicker/extensions/kasbar/kastaskitem.cpp View File

@@ -85,7 +85,7 @@
85 85
 #include "kastaskitem.h"
86 86
 #include "kasbarextension.h"
87 87
 
88
-#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
88
+#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
89 89
 
90 90
 static const int CHECK_ATTENTION_DELAY = 2000;
91 91
 
@@ -124,11 +124,11 @@ KasTasker *KasTaskItem::kasbar() const
124 124
 
125 125
 TQPixmap KasTaskItem::icon()
126 126
 {
127
-    int sizes[] = { KIcon::SizeEnormous,
128
-		    KIcon::SizeHuge,
129
-		    KIcon::SizeLarge,
130
-		    KIcon::SizeMedium,
131
-		    KIcon::SizeSmall };
127
+    int sizes[] = { TDEIcon::SizeEnormous,
128
+		    TDEIcon::SizeHuge,
129
+		    TDEIcon::SizeLarge,
130
+		    TDEIcon::SizeMedium,
131
+		    TDEIcon::SizeSmall };
132 132
 
133 133
     if ( kasbar()->embedThumbnails() && task_->hasThumbnail() ) {
134 134
 	usedIconLoader = true;
@@ -194,7 +194,7 @@ void KasTaskItem::paint( TQPainter *p )
194 194
 
195 195
     //
196 196
     // Overlay the small icon if the icon has changed, we have space,
197
-    // and we are using a KIconLoader icon rather than one from the NET props.
197
+    // and we are using a TDEIconLoader icon rather than one from the NET props.
198 198
     // This only exists because we are almost always using the icon loader for
199 199
     // large icons.
200 200
     //

+ 4
- 4
kicker/kicker/core/containerarea.cpp View File

@@ -979,7 +979,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
979 979
         saveContainerConfig(true);
980 980
 
981 981
         PanelDrag *dd = new PanelDrag(_moveAC, this);
982
-        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), KIcon::Small));
982
+        dd->setPixmap(kapp->iconLoader()->loadIcon(_moveAC->icon(), TDEIcon::Small));
983 983
         grabKeyboard();
984 984
         dd->drag();
985 985
         releaseKeyboard();
@@ -1334,13 +1334,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
1334 1334
             {
1335 1335
                 // non-TDE executable
1336 1336
                 TQString pixmapFile;
1337
-                KMimeType::pixmapForURL(url, 0, KIcon::Panel, 0,
1338
-                                        KIcon::DefaultState, &pixmapFile);
1337
+                KMimeType::pixmapForURL(url, 0, TDEIcon::Panel, 0,
1338
+                                        TDEIcon::DefaultState, &pixmapFile);
1339 1339
                 PanelExeDialog dlg(TQString::null, TQString::null, url.path(),
1340 1340
                                    pixmapFile, TQString::null, false, 0);
1341 1341
                 if (dlg.exec() == TQDialog::Accepted)
1342 1342
                 {
1343
-                    // KIconloader returns a full path, we only want the name
1343
+                    // TDEIconloader returns a full path, we only want the name
1344 1344
                     TQFileInfo iconfi(dlg.iconPath());
1345 1345
                     a = new NonKDEAppButtonContainer(dlg.title(),
1346 1346
                                                      dlg.description(),

+ 2
- 2
kicker/kicker/ui/addapplet.cpp View File

@@ -74,8 +74,8 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
74 74
 
75 75
     itemDescription->installEventFilter(this);
76 76
 
77
-    KIconLoader * ldr = TDEGlobal::iconLoader();
78
-    TQPixmap icon = ldr->loadIcon(info.icon(), KIcon::Panel, KIcon::SizeLarge);
77
+    TDEIconLoader * ldr = TDEGlobal::iconLoader();
78
+    TQPixmap icon = ldr->loadIcon(info.icon(), TDEIcon::Panel, TDEIcon::SizeLarge);
79 79
     itemPixmap->setPixmap(icon);
80 80
     itemPixmap->installEventFilter(this);
81 81
 }

+ 2
- 2
kicker/kicker/ui/appletop_mnu.cpp View File

@@ -100,8 +100,8 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
100 100
         }
101 101
 
102 102
         TQPixmap iconPix(kapp->iconLoader()->loadIcon(icon,
103
-                                                     KIcon::Small, 0,
104
-                                                     KIcon::DefaultState,
103
+                                                     TDEIcon::Small, 0,
104
+                                                     TDEIcon::DefaultState,
105 105
                                                      0, true));
106 106
         insertItem(iconPix, i18n("&About %1").arg( titleText ), About);
107 107
         needSeparator = !(actions & KPanelApplet::Help);

+ 2
- 2
kicker/kicker/ui/browser_dlg.cpp View File

@@ -46,9 +46,9 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic
46 46
     hbox2->setSpacing( KDialog::spacingHint() );
47 47
     TQLabel *label1 = new TQLabel( i18n( "Button icon:" ), hbox2 );
48 48
 
49
-    iconBtn = new KIconButton( hbox2 );
49
+    iconBtn = new TDEIconButton( hbox2 );
50 50
     iconBtn->setFixedSize( 50, 50 );
51
-    iconBtn->setIconType( KIcon::Panel, KIcon::Place );
51
+    iconBtn->setIconType( TDEIcon::Panel, TDEIcon::Place );
52 52
     label1->setBuddy( iconBtn );
53 53
 
54 54
     TQHBox *hbox1 = new TQHBox( page );

+ 2
- 2
kicker/kicker/ui/browser_dlg.h View File

@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
26 26
 
27 27
 #include <kdialogbase.h>
28 28
 
29
-class KIconButton;
29
+class TDEIconButton;
30 30
 class KLineEdit;
31 31
 
32 32
 class PanelBrowserDialog : public KDialogBase
@@ -45,7 +45,7 @@ protected slots:
45 45
     virtual void slotOk();
46 46
     void slotPathChanged( const TQString &_text );
47 47
 protected:
48
-    KIconButton *iconBtn;
48
+    TDEIconButton *iconBtn;
49 49
     KLineEdit *pathInput;
50 50
     TQPushButton *browseBtn;
51 51
 };

+ 4
- 4
kicker/kicker/ui/browser_mnu.cpp View File

@@ -197,8 +197,8 @@ void PanelBrowserMenu::initialize()
197 197
                     iconPath = path + '/' + iconPath.mid(2);
198 198
 
199 199
                 icon = TDEGlobal::iconLoader()->loadIcon(iconPath,
200
-                                                       KIcon::Small, KIcon::SizeSmall,
201
-                                                       KIcon::DefaultState, 0, true);
200
+                                                       TDEIcon::Small, TDEIcon::SizeSmall,
201
+                                                       TDEIcon::DefaultState, 0, true);
202 202
                 if(icon.isNull())
203 203
                     icon = CICON("folder");
204 204
                 name = c.readEntry("Name", name);
@@ -245,8 +245,8 @@ void PanelBrowserMenu::initialize()
245 245
 
246 246
                 TQString s = c.readEntry("Icon");
247 247
                 if(!_icons->contains(s)) {
248
-                    icon  = TDEGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
249
-                                                            KIcon::DefaultState, 0, true);
248
+                    icon  = TDEGlobal::iconLoader()->loadIcon(s, TDEIcon::Small, TDEIcon::SizeSmall,
249
+                                                            TDEIcon::DefaultState, 0, true);
250 250
 
251 251
                     if(icon.isNull()) {
252 252
                         TQString type = c.readEntry("Type", "Application");

+ 3
- 3
kicker/kicker/ui/exe_dlg.cpp View File

@@ -64,7 +64,7 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
64 64
     ui->m_exec->setURL(path);
65 65
     ui->m_commandLine->setText(cmd);
66 66
     ui->m_inTerm->setChecked(inTerm);
67
-    ui->m_icon->setIconType(KIcon::Panel, KIcon::Application);
67
+    ui->m_icon->setIconType(TDEIcon::Panel, TDEIcon::Application);
68 68
 
69 69
     updateIcon();
70 70
 
@@ -168,7 +168,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str)
168 168
 
169 169
     if (it != m_partialPath2full.end())
170 170
         exeLocation = it.data();
171
-    KMimeType::pixmapForURL(KURL( exeLocation ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
171
+    KMimeType::pixmapForURL(KURL( exeLocation ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
172 172
     updateIcon();
173 173
 }
174 174
 
@@ -196,7 +196,7 @@ void PanelExeDialog::slotSelect(const TQString& exec)
196 196
         return;
197 197
     }
198 198
 
199
-    KMimeType::pixmapForURL(KURL( exec ), 0, KIcon::Panel, 0, KIcon::DefaultState, &m_icon);
199
+    KMimeType::pixmapForURL(KURL( exec ), 0, TDEIcon::Panel, 0, TDEIcon::DefaultState, &m_icon);
200 200
     updateIcon();
201 201
 }
202 202
 

+ 4
- 4
kicker/kicker/ui/hidebutton.cpp View File

@@ -140,10 +140,10 @@ void HideButton::generateIcons()
140 140
     TQImage image = pixmap()->convertToImage();
141 141
     image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
142 142
 
143
-    KIconEffect effect;
143
+    TDEIconEffect effect;
144 144
 
145
-    m_normalIcon = effect.apply(image, KIcon::Panel, KIcon::DefaultState);
146
-    m_activeIcon = effect.apply(image, KIcon::Panel, KIcon::ActiveState);
145
+    m_normalIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::DefaultState);
146
+    m_activeIcon = effect.apply(image, TDEIcon::Panel, TDEIcon::ActiveState);
147 147
 }
148 148
 
149 149
 void HideButton::slotSettingsChanged(int category)
@@ -167,7 +167,7 @@ void HideButton::slotSettingsChanged(int category)
167 167
 
168 168
 void HideButton::slotIconChanged(int group)
169 169
 {
170
-    if (group != KIcon::Panel)
170
+    if (group != TDEIcon::Panel)
171 171
     {
172 172
         return;
173 173
     }

+ 3
- 3
kicker/kicker/ui/itemview.cpp View File

@@ -139,7 +139,7 @@ void KMenuItem::setDescription(const TQString& txt)
139 139
 void KMenuItem::setIcon(const TQString& icon, int size)
140 140
 {
141 141
     m_icon = icon;
142
-    TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, KIcon::Panel, size ));
142
+    TQListViewItem::setPixmap(0, TDEGlobal::iconLoader()->loadIcon(icon, TDEIcon::Panel, size ));
143 143
 }
144 144
 
145 145
 void KMenuItem::setHasChildren( bool flag )
@@ -1013,8 +1013,8 @@ TQDragObject * ItemView::dragObject()
1013 1013
         return 0;
1014 1014
 
1015 1015
       o = new KMultipleDrag(viewport());
1016
-      TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), KIcon::Panel, m_iconSize);
1017
-      TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", KIcon::Small );
1016
+      TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( kitem->icon(), TDEIcon::Panel, m_iconSize);
1017
+      TQPixmap add = TDEGlobal::iconLoader()->loadIcon( "add", TDEIcon::Small );
1018 1018
 
1019 1019
       TQPainter p( &pix );
1020 1020
       p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add);

+ 1
- 1
kicker/kicker/ui/nonKDEButtonSettings.ui View File

@@ -128,7 +128,7 @@
128 128
                 </size>
129 129
             </property>
130 130
         </spacer>
131
-        <widget class="KIconButton" row="0" column="0" rowspan="3" colspan="1">
131
+        <widget class="TDEIconButton" row="0" column="0" rowspan="3" colspan="1">
132 132
             <property name="name">
133 133
                 <cstring>m_icon</cstring>
134 134
             </property>

+ 2
- 2
kicker/kicker/ui/service_mnu.cpp View File

@@ -783,7 +783,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
783 783
 
784 784
         case KST_KService:
785 785
         {
786
-            icon = static_cast<KService *>(e)->pixmap(KIcon::Small);
786
+            icon = static_cast<KService *>(e)->pixmap(TDEIcon::Small);
787 787
             TQString filePath = static_cast<KService *>(e)->desktopEntryPath();
788 788
             if (filePath[0] != '/')
789 789
             {
@@ -796,7 +796,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
796 796
         case KST_KServiceGroup:
797 797
         {
798 798
             icon = TDEGlobal::iconLoader()
799
-                   ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), KIcon::Small);
799
+                   ->loadIcon(static_cast<KServiceGroup *>(e)->icon(), TDEIcon::Small);
800 800
             url = "programs:/" + static_cast<KServiceGroup *>(e)->relPath();
801 801
             break;
802 802
         }

+ 8
- 8
kicker/libkicker/global.cpp View File

@@ -159,11 +159,11 @@ int sizeValue(KPanelExtension::Size s)
159 159
 int maxButtonDim()
160 160
 {
161 161
     int maxDim;
162
-    //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
162
+    //return (2 * KickerSettings::iconMargin()) + TDEIcon::SizeLarge;
163 163
 
164 164
     KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
165 165
     kickerconfig->setGroup("General");
166
-    maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
166
+    maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);;
167 167
     delete kickerconfig;
168 168
     return maxDim;
169 169
 }
@@ -358,7 +358,7 @@ void colorize(TQImage& image)
358 358
         b = (b + (76 - gray) > 255 ? 255 : b + (76 - gray));
359 359
     }
360 360
     color.setRgb(r, g, b);
361
-    KIconEffect::colorize(image, color, 1.0);
361
+    TDEIconEffect::colorize(image, color, 1.0);
362 362
 }
363 363
 
364 364
 TQColor blendColors(const TQColor& c1, const TQColor& c2)
@@ -415,22 +415,22 @@ TQIconSet menuIconSet(const TQString& icon)
415 415
         if (iconSize > 0)
416 416
         {
417 417
             iconset = TDEGlobal::iconLoader()->loadIconSet(icon,
418
-                                                     KIcon::NoGroup,
418
+                                                     TDEIcon::NoGroup,
419 419
                                                      iconSize, true);
420 420
         }
421 421
         else if (iconSize == 0)
422 422
         {
423 423
             TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(icon,
424
-                                                         KIcon::Small,
424
+                                                         TDEIcon::Small,
425 425
                                                          0,
426