Rename KIcon to enhance compatibility with KDE4

34 files changed, 97 insertions, 97 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
index c66f9c9b..9c9e8de7 100644
--- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
+++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp
@@ -65,7 +65,7 @@
 HiddenListViewItem::HiddenListViewItem( TQListView *parent, KFileItem *fi, bool hidden=false, bool veto=false, bool vetoOplock=false )
   : QMultiCheckListItem( parent )
 {
-  setPixmap( COL_NAME, fi->pixmap(KIcon::SizeSmall));
+  setPixmap( COL_NAME, fi->pixmap(TDEIcon::SizeSmall));
 
   setText( COL_NAME, fi->text() );
   setText( COL_SIZE, TDEGlobal::locale()->formatNumber( fi->size(), 0));
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index e1d466da..07446885 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -158,7 +158,7 @@ void KFileShareConfig::updateShareListView()
         dirs += *it;            
       }
 
-      TQPixmap folderPix = SmallIcon("folder",0,KIcon::ShareOverlay);
+      TQPixmap folderPix = SmallIcon("folder",0,TDEIcon::ShareOverlay);
       TQPixmap okPix = SmallIcon("button_ok");
       TQPixmap cancelPix = SmallIcon("button_cancel");
       
diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp
index 8499e23e..681603b4 100644
--- a/kdict/applet/kdictapplet.cpp
+++ b/kdict/applet/kdictapplet.cpp
@@ -99,7 +99,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid
 
   iconLabel = new TQLabel(baseWidget);
   iconLabel->setBackgroundOrigin(AncestorOrigin);
-  TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, KIcon::SizeSmall, KIcon::DefaultState, 0L, true);
+  TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", TDEIcon::Panel, TDEIcon::SizeSmall, TDEIcon::DefaultState, 0L, true);
   iconLabel->setPixmap(pm);
   baseLay->addWidget(iconLabel,1,0);
   iconLabel->setAlignment(TQt::AlignCenter | TQt::AlignVCenter);
@@ -251,8 +251,8 @@ void DictApplet::resizeEvent(TQResizeEvent*)
     baseWidget->hide();
     verticalBtn->setFixedSize(width(),width());
 
-    KIcon::StdSizes sz = 	width() < 32 ?	KIcon::SizeSmall : (width() < 48 ? KIcon::SizeMedium : KIcon::SizeLarge);
-    TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", KIcon::Panel, sz, KIcon::DefaultState, 0L, true);
+    TDEIcon::StdSizes sz = 	width() < 32 ?	TDEIcon::SizeSmall : (width() < 48 ? TDEIcon::SizeMedium : TDEIcon::SizeLarge);
+    TQPixmap pm = TDEGlobal::iconLoader()->loadIcon("kdict", TDEIcon::Panel, sz, TDEIcon::DefaultState, 0L, true);
     verticalBtn->setPixmap(pm);
 	}
 }
diff --git a/kdict/options.cpp b/kdict/options.cpp
index e3ea91cc..6885ae8d 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -493,7 +493,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
 {
 
   //******** Server ************************************
-  serverTab = addPage(i18n("Server"),i18n("DICT Server Configuration"), BarIcon("network", KIcon::SizeMedium ));
+  serverTab = addPage(i18n("Server"),i18n("DICT Server Configuration"), BarIcon("network", TDEIcon::SizeMedium ));
   TQGridLayout* grid = new TQGridLayout(serverTab,10,3,0,spacingHint());
 
   w_server = new KLineEdit(serverTab);
@@ -579,7 +579,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   grid->setColStretch(2,2);
 
   //************ Appearance ***************************
-  appTab = addPage(i18n("Appearance"),i18n("Customize Visual Appearance"), BarIcon("appearance", KIcon::SizeMedium ));
+  appTab = addPage(i18n("Appearance"),i18n("Customize Visual Appearance"), BarIcon("appearance", TDEIcon::SizeMedium ));
 
   TQGridLayout *topL=new TQGridLayout(appTab, 8, 3, 0, spacingHint());
 
@@ -641,7 +641,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
     f_List->insertItem(new FontListItem(global->fontName(i), global->font(i)));
 
   //************ Layout ***************************
-  layoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", KIcon::SizeMedium ));
+  layoutTab = addPage(i18n("Layout"),i18n("Customize Output Format"), BarIcon("text_left", TDEIcon::SizeMedium ));
 
   TQVBoxLayout *vbox = new TQVBoxLayout(layoutTab, 0, spacingHint());
 
@@ -666,7 +666,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name)
   vbox->addStretch(1);
 
   //************ Other ***************************
-  otherTab = addPage(i18n("Miscellaneous"),i18n("Various Settings"), BarIcon("misc", KIcon::SizeMedium ));
+  otherTab = addPage(i18n("Miscellaneous"),i18n("Various Settings"), BarIcon("misc", TDEIcon::SizeMedium ));
 
   vbox = new TQVBoxLayout(otherTab, 0, spacingHint());
 
diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp
index 869fb513..58a52d81 100644
--- a/kget/kget_plug_in/kget_plug_in.cpp
+++ b/kget/kget_plug_in/kget_plug_in.cpp
@@ -48,7 +48,7 @@ KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name )
     : Plugin( parent, name )
 {
     TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("kget",
-                                                  KIcon::MainToolbar);
+                                                  TDEIcon::MainToolbar);
     TDEActionMenu *menu = new TDEActionMenu( i18n("Download Manager"), pix,
                                          actionCollection(), "kget_menu" );
     menu->setDelayed( false );
diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp
index 3306680a..d009d87d 100644
--- a/kget/tdemainwidget.cpp
+++ b/kget/tdemainwidget.cpp
@@ -101,7 +101,7 @@ struct KURLPair
 
 TDEMainWidget *tdemain = 0L;
 
-#define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar)
+#define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, TDEIcon::MainToolbar)
 
 DropTarget *kdrop = 0L;
 
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index c894cb9a..0e95021f 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -1022,7 +1022,7 @@ TQString ChatMessagePart::formatStyleKeywords( const TQString &sourceHTML, const
 			iconName = message.from()->protocol()->pluginIcon();
 		}
 
-		protocolIcon = TDEGlobal::iconLoader()->iconPath( iconName, KIcon::Small );
+		protocolIcon = TDEGlobal::iconLoader()->iconPath( iconName, TDEIcon::Small );
 		
 		nickLink=TQString::fromLatin1("<a href=\"kopetemessage://%1/?protocolId=%2&amp;accountId=%3\" class=\"KopeteDisplayName\">")
 				.arg( TQStyleSheet::escape(message.from()->contactId()).replace('"',"&quot;"),
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index 105cf912..5e056d5e 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -398,7 +398,7 @@ void KopeteChatWindow::initActions(void)
 
 	//The Sending movie
 	normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) );
-	animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar);
+	animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), TDEIcon::Toolbar);
 
 	// Pause the animation because otherwise it's running even when we're not
 	// showing it. This eats resources, and also triggers a pixmap leak in
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 4af0ec95..48d9381a 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -239,7 +239,7 @@ void KopeteEmailWindow::initActions(void)
 
 	// The animated toolbarbutton
 	d->normalIcon = TQPixmap( BarIcon( TQString::fromLatin1( "kopete" ) ) );
-	d->animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Toolbar);
+	d->animIcon = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), TDEIcon::Toolbar);
 	d->animIcon.pause();
 
 	d->anim = new TQLabel( this, "kde toolbar widget" );
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index a5aaed41..747cb1ee 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -141,7 +141,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 		TQPopupMenu* menu = static_cast<TQPopupMenu*>( widget );
 		int id;
 		if ( hasIcon() )
-			id = menu->insertItem( iconSet(KIcon::Small), text(), d->m_popup, -1, index );
+			id = menu->insertItem( iconSet(TDEIcon::Small), text(), d->m_popup, -1, index );
 		else
 			id = menu->insertItem( text(), d->m_popup, -1, index );
 
@@ -163,10 +163,10 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 
 		int id_ = TDEAction::getToolButtonID();
 
-		if ( icon().isEmpty() && !iconSet(KIcon::Small).isNull() )
+		if ( icon().isEmpty() && !iconSet(TDEIcon::Small).isNull() )
 		{
 			bar->insertButton(
-				iconSet(KIcon::Small).pixmap(), id_, TQT_SIGNAL(clicked()), this,
+				iconSet(TDEIcon::Small).pixmap(), id_, TQT_SIGNAL(clicked()), this,
 				TQT_SLOT(slotActivated()), isEnabled(), plainText(),
 				index );
 		}
diff --git a/kopete/kopete/contactlist/kopetegvipropswidget.ui b/kopete/kopete/contactlist/kopetegvipropswidget.ui
index 6e13abba..90eecf6c 100644
--- a/kopete/kopete/contactlist/kopetegvipropswidget.ui
+++ b/kopete/kopete/contactlist/kopetegvipropswidget.ui
@@ -71,7 +71,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="KIconButton" row="1" column="1">
+                            <widget class="TDEIconButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>icnbOpen</cstring>
                                 </property>
@@ -101,7 +101,7 @@
                                     <cstring>icnbClosed</cstring>
                                 </property>
                             </widget>
-                            <widget class="KIconButton" row="2" column="1">
+                            <widget class="TDEIconButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>icnbClosed</cstring>
                                 </property>
diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp
index f64af84d..d05bd12f 100644
--- a/kopete/kopete/contactlist/kopetelviprops.cpp
+++ b/kopete/kopete/contactlist/kopetelviprops.cpp
@@ -69,8 +69,8 @@ KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const
 : KDialogBase(parent, name, true, i18n("Properties of Group %1").arg(gvi->group()->displayName()), Ok|Cancel, Ok, false)
 {
 	mainWidget = new KopeteGVIPropsWidget(this, "mainWidget");
-	mainWidget->icnbOpen->setIconSize(KIcon::SizeSmall);
-	mainWidget->icnbClosed->setIconSize(KIcon::SizeSmall);
+	mainWidget->icnbOpen->setIconSize(TDEIcon::SizeSmall);
+	mainWidget->icnbClosed->setIconSize(TDEIcon::SizeSmall);
 	
 	mNotificationProps = new CustomNotificationProps( this, gvi->group() );
 	mainWidget->tabWidget->addTab( mNotificationProps->widget(), i18n( "Custom &Notifications" ) );
@@ -150,10 +150,10 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare
 {
 	m_countPhotoCapable = 0;
 	mainWidget = new KopeteMetaLVIPropsWidget( this, "mainWidget" );
-	mainWidget->icnbOffline->setIconSize( KIcon::SizeSmall );
-	mainWidget->icnbOnline->setIconSize( KIcon::SizeSmall );
-	mainWidget->icnbAway->setIconSize( KIcon::SizeSmall );
-	mainWidget->icnbUnknown->setIconSize( KIcon::SizeSmall );
+	mainWidget->icnbOffline->setIconSize( TDEIcon::SizeSmall );
+	mainWidget->icnbOnline->setIconSize( TDEIcon::SizeSmall );
+	mainWidget->icnbAway->setIconSize( TDEIcon::SizeSmall );
+	mainWidget->icnbUnknown->setIconSize( TDEIcon::SizeSmall );
 
 	mNotificationProps = new CustomNotificationProps( this, lvi->metaContact() );
 	// add a button to the notification props to get the sound from KABC
diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
index 374c92bc..b791dc5b 100644
--- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
+++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp
@@ -254,7 +254,7 @@ void KopeteMetaContactLVI::initLVI()
 	mIsBlinkIcon = false;
 
 	//if ( !mBlinkIcon )
-	//	mBlinkIcon = new TQPixmap( TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), KIcon::Small ) );
+	//	mBlinkIcon = new TQPixmap( TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "newmsg" ), TDEIcon::Small ) );
 
 	slotConfigChanged();  // this calls slotIdleStateChanged(), which sets up the constituent components, spacing, fonts and indirectly, the contact icon
 	slotDisplayNameChanged();
@@ -515,7 +515,7 @@ void KopeteMetaContactLVI::slotPhotoChanged()
 	{
 		m_oldStatusIcon= d->metaContactIcon->pixmap();
 		TQPixmap photoPixmap;
-		//TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) );
+		//TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) );
 		TQImage photoImg = m_metaContact->photo();
 		if ( !photoImg.isNull() && (photoImg.width() > 0) &&  (photoImg.height() > 0) )
 		{
@@ -716,9 +716,9 @@ void KopeteMetaContactLVI::setDisplayMode( int mode, int iconmode )
 	d->metaContactIcon = 0L;
 	d->contactIconSize = 12;
 	if (mode == KopetePrefs::Detailed) {
-		d->iconSize =  iconmode == KopetePrefs::IconPic ?  KIcon::SizeMedium : KIcon::SizeLarge;
+		d->iconSize =  iconmode == KopetePrefs::IconPic ?  TDEIcon::SizeMedium : TDEIcon::SizeLarge;
 	} else {
-		d->iconSize = iconmode == KopetePrefs::IconPic ? IconSize( KIcon::Small ) :  KIcon::SizeMedium;
+		d->iconSize = iconmode == KopetePrefs::IconPic ? IconSize( TDEIcon::Small ) :  TDEIcon::SizeMedium;
 	}
 	disconnect( Kopete::KABCPersistence::self()->addressBook() , 0 , this , 0);
 
@@ -747,7 +747,7 @@ void KopeteMetaContactLVI::setDisplayMode( int mode, int iconmode )
 
 	if( mode == KopetePrefs::Detailed )
 	{
-		d->contactIconSize = IconSize( KIcon::Small );
+		d->contactIconSize = IconSize( TDEIcon::Small );
 		Component *vbox = new BoxComponent( hbox, BoxComponent::Vertical );
 		d->nameText = new DisplayNameComponent( vbox );
 		d->extraText = new DisplayNameComponent( vbox );
@@ -1000,7 +1000,7 @@ void KopeteMetaContactLVI::slotIdleStateChanged( Kopete::Contact *c )
 		if ( doWeHaveToGrayThatContact )
 		{
 			// TODO: TQPixmapCache this result
-			KIconEffect::semiTransparent( icon );
+			TDEIconEffect::semiTransparent( icon );
 		}
 
 		d->metaContactIcon->setPixmap( icon );
diff --git a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
index 718a3ae9..d9d85bd4 100644
--- a/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
+++ b/kopete/kopete/contactlist/kopetemetalvipropswidget.ui
@@ -455,7 +455,7 @@
                                     <string>Check to set custom icons for this contact</string>
                                 </property>
                             </widget>
-                            <widget class="KIconButton" row="2" column="1">
+                            <widget class="TDEIconButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>icnbAway</cstring>
                                 </property>
@@ -463,7 +463,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="KIconButton" row="1" column="1">
+                            <widget class="TDEIconButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>icnbOnline</cstring>
                                 </property>
@@ -471,7 +471,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="KIconButton" row="1" column="3">
+                            <widget class="TDEIconButton" row="1" column="3">
                                 <property name="name">
                                     <cstring>icnbOffline</cstring>
                                 </property>
@@ -479,7 +479,7 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="KIconButton" row="2" column="3">
+                            <widget class="TDEIconButton" row="2" column="3">
                                 <property name="name">
                                     <cstring>icnbUnknown</cstring>
                                 </property>
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index 6e9d9ae7..ef938d0a 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -828,9 +828,9 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact )
 
 	// Because we want null pixmaps to detect the need for a loadMovie
 	// we can't use the SmallIcon() method directly
-	KIconLoader *loader = TDEGlobal::instance()->iconLoader();
+	TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
 
-	TQMovie mv = loader->loadMovie( status.overlayIcons().first(), KIcon::Small );
+	TQMovie mv = loader->loadMovie( status.overlayIcons().first(), TDEIcon::Small );
 
 	if ( mv.isNull() )
 	{
@@ -842,7 +842,7 @@ void KopeteWindow::slotAccountStatusIconChanged( Kopete::Contact *contact )
 
 		// No Pixmap found, fallback to Unknown
 		if( pm.isNull() )
-			i->setPixmap( KIconLoader::unknown() );
+			i->setPixmap( TDEIconLoader::unknown() );
 		else
 			i->setPixmap( pm );
 	}
diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp
index 782a3a55..eda74da0 100644
--- a/kopete/kopete/systemtray.cpp
+++ b/kopete/kopete/systemtray.cpp
@@ -132,7 +132,7 @@ void KopeteSystemTray::contextMenuAboutToShow( TDEPopupMenu *me )
 
 void KopeteSystemTray::startBlink( const TQString &icon )
 {
-	startBlink( TDEGlobal::iconLoader()->loadIcon( icon , KIcon::Panel ) );
+	startBlink( TDEGlobal::iconLoader()->loadIcon( icon , TDEIcon::Panel ) );
 }
 
 void KopeteSystemTray::startBlink( const TQPixmap &icon )
@@ -164,7 +164,7 @@ void KopeteSystemTray::startBlink( const TQMovie &movie )
 void KopeteSystemTray::startBlink()
 {
 	if ( mMovie.isNull() )
-		mMovie = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), KIcon::Panel );
+		mMovie = TDEGlobal::iconLoader()->loadMovie( TQString::fromLatin1( "newmessage" ), TDEIcon::Panel );
 
 	startBlink( mMovie );
 }
diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index e0f49646..ea28132f 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -163,11 +163,11 @@ void KNotification::notifyByMessagebox()
 void KNotification::notifyByPassivePopup(const TQPixmap &pix )
 {
 	TQString appName = TQString::fromAscii( KNotifyClient::instance()->instanceName() );
-	KIconLoader iconLoader( appName );
+	TDEIconLoader iconLoader( appName );
 	TDEConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data");
 	TDEConfigGroup config( &eventsFile, "!Global!" );
 	TQString iconName = config.readEntry( "IconName", appName );
-	TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small );
+	TQPixmap icon = iconLoader.loadIcon( iconName, TDEIcon::Small );
 	TQString title = config.readEntry( "Comment", appName );
     //KPassivePopup::message(title, text, icon, senderWinId);
 
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 70b88819..c3af2df8 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -186,12 +186,12 @@ TQPixmap Account::accountIcon(const int size) const
 	
 	// FIXME: this code is duplicated with OnlineStatus, can we merge it somehow?
 	TQPixmap base = TDEGlobal::instance()->iconLoader()->loadIcon(
-		icon, KIcon::Small, size );
+		icon, TDEIcon::Small, size );
 
 	if ( d->color.isValid() )
 	{
-		KIconEffect effect;
-		base = effect.apply( base, KIconEffect::Colorize, 1, d->color, 0);
+		TDEIconEffect effect;
+		base = effect.apply( base, TDEIconEffect::Colorize, 1, d->color, 0);
 	}
 
 	if ( size > 0 && base.width() != size )
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index c583198a..02daf0ab 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -311,26 +311,26 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 
 	// Colorize
 	if ( color.isValid() )
-		*basis = KIconEffect().apply( *basis, KIconEffect::Colorize, 1, color, 0);
+		*basis = TDEIconEffect().apply( *basis, TDEIconEffect::Colorize, 1, color, 0);
 
 	// Note that we do this before compositing the overlay, since we want
 	// that to be colored in this case.
 	if ( statusFor.internalStatus() == Kopete::OnlineStatus::AccountOffline || statusFor.status() == Kopete::OnlineStatus::Offline )
 	{
-		*basis = KIconEffect().apply( *basis, KIconEffect::ToGray , 0.85, TQColor() , false  );
+		*basis = TDEIconEffect().apply( *basis, TDEIconEffect::ToGray , 0.85, TQColor() , false  );
 	}
 
 	//composite the iconOverlay for this status and the supplied baseIcon
 	TQStringList overlays = statusFor.overlayIcons();
 	if ( !( overlays.isEmpty() ) ) // otherwise leave the basis as-is
 	{
-		KIconLoader *loader = TDEGlobal::instance()->iconLoader();
+		TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
 
 		int i = 0;
 		for( TQStringList::iterator it = overlays.begin(), end = overlays.end(); it != end; ++it )
 		{
-			TQPixmap overlay = loader->loadIcon(*it, KIcon::Small, 0 ,
-				KIcon::DefaultState, 0L, /*canReturnNull=*/ true );
+			TQPixmap overlay = loader->loadIcon(*it, TDEIcon::Small, 0 ,
+				TDEIcon::DefaultState, 0L, /*canReturnNull=*/ true );
 
 			if ( !overlay.isNull() )
 			{
@@ -363,7 +363,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 
 	// if idle, apply effects
 	if ( idle )
-		KIconEffect::semiTransparent( *basis );
+		TDEIconEffect::semiTransparent( *basis );
 
 	return basis;
 }
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index 8ee74036..766dfb46 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -420,7 +420,7 @@ void Kopete::Password::writeConfig()
 
 int Kopete::Password::preferredImageSize()
 {
-	return IconSize(KIcon::Toolbar);
+	return IconSize(TDEIcon::Toolbar);
 }
 
 bool Kopete::Password::allowBlankPassword()
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 18580b7a..ee6ab0d5 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -146,7 +146,7 @@ void MetaContactSelectorWidgetLVI::buildVisualComponents()
 	Component *hbox = new BoxComponent( this, BoxComponent::Horizontal );
 	d->spacerBox = new BoxComponent( hbox, BoxComponent::Horizontal );
 	
-	d->contactIconSize = IconSize( KIcon::Small );
+	d->contactIconSize = IconSize( TDEIcon::Small );
 	Component *imageBox = new BoxComponent( hbox, BoxComponent::Vertical );
 	new VSpacerComponent( imageBox );
 	// include borders in size
@@ -169,7 +169,7 @@ void MetaContactSelectorWidgetLVI::slotUpdateContactBox()
 	TQPtrList<Kopete::Contact> contacts = d->metaContact->contacts();
 	for(Kopete::Contact *c = contacts.first(); c; c = contacts.next())
 	{
-		new ContactComponent(d->contactIconBox, c, IconSize( KIcon::Small ));
+		new ContactComponent(d->contactIconBox, c, IconSize( TDEIcon::Small ));
 	}
 }
 
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index e0a03cf8..8604e97c 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -43,9 +43,9 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
   TQString keyname;
   TQWidget *page = new TQWidget(this);
   TQLabel *labeltxt;
-  KIconLoader *loader = TDEGlobal::iconLoader();
+  TDEIconLoader *loader = TDEGlobal::iconLoader();
 
-  keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
+  keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
 
   setMinimumSize(300,200);
   keysListpr = new TDEListView( page );
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index 76151f57..7263e95c 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -102,11 +102,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
 /*        if (KGpgSettings::allowCustomEncryptionOptions())
                 customOptions=KGpgSettings::customEncryptionOptions();*/
 
-        KIconLoader *loader = TDEGlobal::iconLoader();
+        TDEIconLoader *loader = TDEGlobal::iconLoader();
 
-        keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
-        keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20);
-	keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20);
+        keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20);
+        keySingle=loader->loadIcon("kgpg_key1",TDEIcon::Small,20);
+	keyGroup=loader->loadIcon("kgpg_key3",TDEIcon::Small,20);
 
         if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile));
         fmode=filemode;	
diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp
index a5eb3dce..6f622b7d 100644
--- a/kopete/protocols/gadu/gaduregisteraccount.cpp
+++ b/kopete/protocols/gadu/gaduregisteraccount.cpp
@@ -49,7 +49,7 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name )
 	cRegister = new RegisterCommand( TQT_TQOBJECT(this) );
 
 	emailRegexp = new TQRegExp(  "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" );
-	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", KIcon::Small );
+	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", TDEIcon::Small );
 
 	connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( doRegister() ) );
 	connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotClose() ) );
diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
index 7cb869e9..e18adbf9 100644
--- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
+++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp
@@ -73,7 +73,7 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent,
 	connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) );
 	
 	jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" );
-	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", KIcon::Small );
+	hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", TDEIcon::Small );
 
 	mSuccess = false;
 
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
index 4d09d70f..32eeb9b9 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
@@ -47,28 +47,28 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name )
 	
 	TQFrame* genInfo = addPage( i18n( "General Info" ),
 	                                         i18n( "General ICQ Information" ),
-	                                         TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) );
+	                                         TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), TDEIcon::Desktop ) );
 	TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo );
 	m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" );
 	genLayout->addWidget( m_genInfoWidget );
 	
 	TQFrame* workInfo = addPage( i18n( "Work Info" ),
 	                                          i18n( "Work Information" ),
-	                                          TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) );
+	                                          TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), TDEIcon::Desktop ) );
 	TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo );
 	m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" );
 	workLayout->addWidget( m_workInfoWidget );
 	
 	TQFrame* otherInfo = addPage( i18n( "Other Info" ),
 	                                           i18n( "Other ICQ Information" ),
-	                                           TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
+	                                           TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), TDEIcon::Desktop ) );
 	TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo );
 	m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information"  );
 	otherLayout->addWidget( m_otherInfoWidget );
 	
 	TQFrame* interestInfo = addPage( i18n( "Interest Info" ),
 	                                           i18n( "Interest" ),
-	                                           TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
+	                                           TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), TDEIcon::Desktop ) );
 	TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo );
 	m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information"  );
 	interestLayout->addWidget( m_interestInfoWidget );
diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
index 7b1839d4..023b50b5 100644
--- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
+++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp
@@ -47,21 +47,21 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co
 	showButton( User2, false );
 	TQFrame* genInfo = addPage( i18n( "General Info" ),
 	                                         i18n( "General Yahoo Information" ),
-	                                         TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) );
+	                                         TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), TDEIcon::Desktop ) );
 	TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo );
 	m_genInfoWidget = new YahooGeneralInfoWidget( genInfo, "Basic Information" );
 	genLayout->addWidget( m_genInfoWidget );
 	
 	TQFrame* workInfo = addPage( i18n( "Work Info" ),
 	                                          i18n( "Work Information" ),
-	                                          TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) );
+	                                          TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), TDEIcon::Desktop ) );
 	TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo );
 	m_workInfoWidget = new YahooWorkInfoWidget( workInfo, "Work Information" );
 	workLayout->addWidget( m_workInfoWidget );
 	
 	TQFrame* otherInfo = addPage( i18n( "Other Info" ),
 	                                           i18n( "Other Yahoo Information" ),
-	                                           TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
+	                                           TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), TDEIcon::Desktop ) );
 	TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo );
 	m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information"  );
 	otherLayout->addWidget( m_otherInfoWidget );
diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp
index 81fa7514..8a1f5a4e 100644
--- a/kopete/protocols/yahoo/yahooaccount.cpp
+++ b/kopete/protocols/yahoo/yahooaccount.cpp
@@ -81,16 +81,16 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con
 	m_chatChatSession = 0;
 
 	// FIXME
-	//m_openInboxAction = new TDEAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this );
+	//m_openInboxAction = new TDEAction( TDEIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this );
         //, "m_openInboxAction" );
 	//TQObject::connect(m_openInboxAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenInbox() ) );
-	//m_openYABAction = new TDEAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this );
+	//m_openYABAction = new TDEAction( TDEIcon("x-office-address-book"), i18n( "Open &Address book..." ), this );
         //, "m_openYABAction" );
 	//TQObject::connect(m_openYABAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenYAB() ) );
-	//m_editOwnYABEntry = new TDEAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this );
+	//m_editOwnYABEntry = new TDEAction( TDEIcon("document-properties"), i18n( "&Edit my contact details..."), this );
         //, "m_editOwnYABEntry" );
 	//TQObject::connect(m_editOwnYABEntry, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotEditOwnYABEntry() ) );
-	//m_joinChatAction = new TDEAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this );
+	//m_joinChatAction = new TDEAction( TDEIcon("im-chat-room-join"), i18n( "&Join chat room..."), this );
         //, "m_joinChatAction" );
 	//TQObject::connect(m_joinChatAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotJoinChatRoom() ) );
 
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index dfe0c165..3b6b1902 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -372,11 +372,11 @@ namespace KPF
     TQPixmap px;
 
     if (width() > 48)
-      px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 48);
+      px = TDEGlobal::iconLoader()->loadIcon("kpf", TDEIcon::Panel, 48);
     else if (width() > 32)
-      px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 32);
+      px = TDEGlobal::iconLoader()->loadIcon("kpf", TDEIcon::Panel, 32);
     else if (width() > 16)
-      px = TDEGlobal::iconLoader()->loadIcon("kpf", KIcon::Panel, 16);
+      px = TDEGlobal::iconLoader()->loadIcon("kpf", TDEIcon::Panel, 16);
     else
       return;
 
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index ba02e69d..bbc56747 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -144,15 +144,15 @@ namespace KPF
     buffer_.resize(size());
 
     if ( width() > 48 )
-      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 48 );
+      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", TDEIcon::Panel, 48 );
     else if ( width() > 32 )
-      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 32 );
+      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", TDEIcon::Panel, 32 );
     else if ( width() > 16 )
-      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", KIcon::Panel, 16 );
+      bgPix_ = TDEGlobal::iconLoader()->loadIcon( "kpf", TDEIcon::Panel, 16 );
     else
       bgPix_.fill( this, TQPoint( 0, 0 ) );
 
-    KIconEffect::semiTransparent( bgPix_ );
+    TDEIconEffect::semiTransparent( bgPix_ );
 
     if (width() < 2)
     {
diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp
index b8bdc69f..5e953109 100644
--- a/krdc/krdc.cpp
+++ b/krdc/krdc.cpp
@@ -469,7 +469,7 @@ void KRDC::switchToFullscreen(bool scaling)
 
 	TDEToolBar *t = new TDEToolBar(m_fsToolbar);
 	m_fsToolbarWidget = t;
-	t->setIconSize(KIcon::Panel);
+	t->setIconSize(TDEIcon::Panel);
 
 	TQIconSet pinIconSet;
 	pinIconSet.setPixmap(m_pinup, TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On);
diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp
index 849c42f8..f1956d21 100644
--- a/krfb/krfb/trayicon.cpp
+++ b/krfb/krfb/trayicon.cpp
@@ -54,9 +54,9 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
 	actionCollection(this),
 	quitting(false)
 {
-	KIconLoader *loader = TDEGlobal::iconLoader();
-	trayIconOpen = loader->loadIcon("eyes-open24", KIcon::User);
-	trayIconClosed = loader->loadIcon("eyes-closed24", KIcon::User);
+	TDEIconLoader *loader = TDEGlobal::iconLoader();
+	trayIconOpen = loader->loadIcon("eyes-open24", TDEIcon::User);
+	trayIconClosed = loader->loadIcon("eyes-closed24", TDEIcon::User);
 	setPixmap(trayIconClosed);
 	TQToolTip::add(this, i18n("Desktop Sharing - connecting"));
 
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp
index b4260829..340c882c 100644
--- a/ksirc/FilterRuleEditor.cpp
+++ b/ksirc/FilterRuleEditor.cpp
@@ -53,8 +53,8 @@ FilterRuleEditor::FilterRuleEditor
   filter->RuleList->setHScrollBarMode( TQListBox::AlwaysOff );
   filter->RuleList->setMultiSelection( FALSE );
 
-  filter->DownButton->setPixmap( BarIcon( "down", KIcon::SizeSmall ) );
-  filter->UpButton->setPixmap( BarIcon( "up", KIcon::SizeSmall ) );
+  filter->DownButton->setPixmap( BarIcon( "down", TDEIcon::SizeSmall ) );
+  filter->UpButton->setPixmap( BarIcon( "up", TDEIcon::SizeSmall ) );
 }
 
 
diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp
index 40ccc56f..d0c57537 100644
--- a/ksirc/KSPrefs/ksprefs.cpp
+++ b/ksirc/KSPrefs/ksprefs.cpp
@@ -32,17 +32,17 @@ KSPrefs::KSPrefs(TQWidget * parent, const char * name):
                 KDialogBase::Ok, parent, name)
 {
     setWFlags( getWFlags() | WDestructiveClose );
-    TQFrame *itemLooknFeel= addPage( i18n( "Look and Feel" ), i18n( "Controls how kSirc looks" ), BarIcon( "ksirc", KIcon::SizeMedium ) );
-    TQFrame *itemGeneral  = addPage( i18n( "General" ), i18n( "General KSirc Settings" ), BarIcon( "ksirc", KIcon::SizeMedium ) );
-    TQFrame *itemStartup  = addPage( i18n( "Startup" ), i18n( "KSirc Startup Settings" ), BarIcon( "gear", KIcon::SizeMedium ) );
-    TQFrame *itemColors   = addPage( i18n( "Colors" ), i18n( "KSirc Color Settings" ), BarIcon( "colors", KIcon::SizeMedium ) );
-    TQFrame *itemIRCColors   = addPage( i18n( "IRC Colors" ), i18n( "KSirc IRC Color Settings" ), BarIcon( "colors", KIcon::SizeMedium ) );
-
-    TQFrame *itemRMBMenu  = addPage( i18n( "User Menu" ), i18n( "User Menu Configuration" ), BarIcon( "", KIcon::SizeMedium ) );
-    TQFrame *itemServChan = addPage( i18n( "Server/Channel" ), i18n( "Server/Channel Configuration" ), BarIcon( "", KIcon::SizeMedium ) );
-    TQFrame *itemAutoConnect = addPage( i18n( "Auto Connect" ), i18n( "Auto Connect Configuration" ), BarIcon( "", KIcon::SizeMedium ) );
-    TQFrame *itemFont = addPage( i18n( "Fonts" ), i18n( "Font Settings" ), BarIcon( "fonts", KIcon::SizeMedium ) );
-    TQFrame *itemShortcuts = addPage( i18n( "Shortcuts" ), i18n( "Shortcut Configuration" ), BarIcon( "", KIcon::SizeMedium ) );
+    TQFrame *itemLooknFeel= addPage( i18n( "Look and Feel" ), i18n( "Controls how kSirc looks" ), BarIcon( "ksirc", TDEIcon::SizeMedium ) );
+    TQFrame *itemGeneral  = addPage( i18n( "General" ), i18n( "General KSirc Settings" ), BarIcon( "ksirc", TDEIcon::SizeMedium ) );
+    TQFrame *itemStartup  = addPage( i18n( "Startup" ), i18n( "KSirc Startup Settings" ), BarIcon( "gear", TDEIcon::SizeMedium ) );
+    TQFrame *itemColors   = addPage( i18n( "Colors" ), i18n( "KSirc Color Settings" ), BarIcon( "colors", TDEIcon::SizeMedium ) );
+    TQFrame *itemIRCColors   = addPage( i18n( "IRC Colors" ), i18n( "KSirc IRC Color Settings" ), BarIcon( "colors", TDEIcon::SizeMedium ) );
+
+    TQFrame *itemRMBMenu  = addPage( i18n( "User Menu" ), i18n( "User Menu Configuration" ), BarIcon( "", TDEIcon::SizeMedium ) );
+    TQFrame *itemServChan = addPage( i18n( "Server/Channel" ), i18n( "Server/Channel Configuration" ), BarIcon( "", TDEIcon::SizeMedium ) );
+    TQFrame *itemAutoConnect = addPage( i18n( "Auto Connect" ), i18n( "Auto Connect Configuration" ), BarIcon( "", TDEIcon::SizeMedium ) );
+    TQFrame *itemFont = addPage( i18n( "Fonts" ), i18n( "Font Settings" ), BarIcon( "fonts", TDEIcon::SizeMedium ) );
+    TQFrame *itemShortcuts = addPage( i18n( "Shortcuts" ), i18n( "Shortcut Configuration" ), BarIcon( "", TDEIcon::SizeMedium ) );
 
     TQVBoxLayout *fontTopLayout  = new TQVBoxLayout( itemFont, 0, 6 );