Rename KIcon to enhance compatibility with KDE4

11 files changed, 38 insertions, 38 deletions

diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp
index a4de9c31b..10db4fde7 100644
--- a/tdeio/tdeio/defaultprogress.cpp
+++ b/tdeio/tdeio/defaultprogress.cpp
@@ -89,8 +89,8 @@ void DefaultProgress::init()
 #ifdef Q_WS_X11 //FIXME(E): Remove once all the KWin::foo calls have been ported to QWS
   // Set a useful icon for this window!
   KWin::setIcons( winId(),
-          TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 32 ),
-          TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::NoGroup, 16 ) );
+          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 32 ),
+          TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::NoGroup, 16 ) );
 #endif
 
   TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index 243388cbc..c610e7e3f 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -450,10 +450,10 @@ KMimeType::~KMimeType()
 {
 }
 
-TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state,
+TQPixmap KMimeType::pixmap( TDEIcon::Group _group, int _force_size, int _state,
                            TQString * _path ) const
 {
-  KIconLoader *iconLoader=TDEGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   TQString iconName=icon( TQString::null, false );
   if (!iconLoader->extraDesktopThemesAdded())
   {
@@ -466,10 +466,10 @@ TQPixmap KMimeType::pixmap( KIcon::Group _group, int _force_size, int _state,
   return iconLoader->loadIcon( iconName , _group, _force_size, _state, _path, false );
 }
 
-TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_size,
+TQPixmap KMimeType::pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size,
                            int _state, TQString * _path ) const
 {
-  KIconLoader *iconLoader=TDEGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   TQString iconName=icon( _url, _url.isLocalFile() );
   if (!iconLoader->extraDesktopThemesAdded())
   {
@@ -482,10 +482,10 @@ TQPixmap KMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_si
   return iconLoader->loadIcon( iconName , _group, _force_size, _state, _path, false );
 }
 
-TQPixmap KMimeType::pixmapForURL( const KURL & _url, mode_t _mode, KIcon::Group _group,
+TQPixmap KMimeType::pixmapForURL( const KURL & _url, mode_t _mode, TDEIcon::Group _group,
                                  int _force_size, int _state, TQString * _path )
 {
-  KIconLoader *iconLoader=TDEGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   TQString iconName = iconForURL( _url, _mode );
 
   if (!iconLoader->extraDesktopThemesAdded())
@@ -745,7 +745,7 @@ TQString KDEDesktopMimeType::icon( const KURL& _url, bool _is_local ) const
   return icon;
 }
 
-TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, KIcon::Group _group, int _force_size,
+TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size,
                                     int _state, TQString * _path ) const
 {
   TQString _icon = icon( _url, _url.isLocalFile() );
diff --git a/tdeio/tdeio/kmimetype.h b/tdeio/tdeio/kmimetype.h
index 42f1cad8d..894c4556c 100644
--- a/tdeio/tdeio/kmimetype.h
+++ b/tdeio/tdeio/kmimetype.h
@@ -120,13 +120,13 @@ public:
    * @param group The icon group where the icon is going to be used.
    * @param force_size Override globallly configured icon size.
    *        Use 0 for the default size
-   * @param state The icon state, one of: @p KIcon::DefaultState,
-   *         @p KIcon::ActiveState or @p KIcon::DisabledState.
+   * @param state The icon state, one of: @p TDEIcon::DefaultState,
+   *         @p TDEIcon::ActiveState or @p TDEIcon::DisabledState.
    * @param path Output parameter to get the full path. Seldom needed.
    *              Ignored if 0
    * @return the pixmap of the mime type, can be a default icon if not found
    */
-  virtual TQPixmap pixmap( KIcon::Group group, int force_size = 0, int state = 0,
+  virtual TQPixmap pixmap( TDEIcon::Group group, int force_size = 0, int state = 0,
                           TQString * path = 0L ) const;
 
   /**
@@ -139,13 +139,13 @@ public:
    * @param _group The icon group where the icon is going to be used.
    * @param _force_size Override globallly configured icon size.
    *        Use 0 for the default size
-   * @param _state The icon state, one of: KIcon::DefaultState,
-   * KIcon::ActiveState or KIcon::DisabledState.
+   * @param _state The icon state, one of: TDEIcon::DefaultState,
+   * TDEIcon::ActiveState or TDEIcon::DisabledState.
    * @param _path Output parameter to get the full path. Seldom needed.
    *              Ignored if 0
    * @return the pixmap of the URL, can be a default icon if not found
    */
-  virtual TQPixmap pixmap( const KURL& _url, KIcon::Group _group, int _force_size = 0,
+  virtual TQPixmap pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size = 0,
 	    int _state = 0, TQString * _path = 0L ) const;
 
   /**
@@ -160,19 +160,19 @@ public:
    * @param _group The icon group where the icon is going to be used.
    * @param _force_size Override globally configured icon size.
    *        Use 0 for the default size
-   * @param _state The icon state, one of: KIcon::DefaultState,
-   * KIcon::ActiveState or KIcon::DisabledState.
+   * @param _state The icon state, one of: TDEIcon::DefaultState,
+   * TDEIcon::ActiveState or TDEIcon::DisabledState.
    * @param _path Output parameter to get the full path. Seldom needed.
    *              Ignored if 0
    * @return the pixmap of the URL, can be a default icon if not found
    */
-  static TQPixmap pixmapForURL( const KURL & _url, mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
+  static TQPixmap pixmapForURL( const KURL & _url, mode_t _mode = 0, TDEIcon::Group _group = TDEIcon::Desktop,
                                int _force_size = 0, int _state = 0, TQString * _path = 0L );
 
 
   /**
    * The same functionality as pixmapForURL(), but this method returns the name
-   * of the icon to load. You'll have to use KIconLoader to load the pixmap for it.
+   * of the icon to load. You'll have to use TDEIconLoader to load the pixmap for it.
    * The advantage of this method is that you can store the result, and then use it
    * later on for any kind of size.
    * @param _url URL for the file
@@ -537,7 +537,7 @@ public:
 
   virtual TQString icon( const TQString& _url, bool _is_local ) const;
   virtual TQString icon( const KURL& _url, bool _is_local ) const;
-  virtual TQPixmap pixmap( const KURL& _url, KIcon::Group _group, int _force_size = 0,
+  virtual TQPixmap pixmap( const KURL& _url, TDEIcon::Group _group, int _force_size = 0,
                           int _state = 0, TQString * _path = 0L ) const;
   virtual TQString comment( const TQString& _url, bool _is_local ) const;
   virtual TQString comment( const KURL& _url, bool _is_local ) const;
@@ -603,7 +603,7 @@ public:
   static pid_t run( const KURL& _url, bool _is_local );
 
 protected:
-  virtual TQPixmap pixmap( KIcon::Group group, int force_size = 0, int state = 0,
+  virtual TQPixmap pixmap( TDEIcon::Group group, int force_size = 0, int state = 0,
                           TQString * path = 0L ) const
      { return KMimeType::pixmap( group, force_size, state, path ); }
 
diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp
index 29ce88859..5147af0ad 100644
--- a/tdeio/tdeio/kservice.cpp
+++ b/tdeio/tdeio/kservice.cpp
@@ -308,9 +308,9 @@ KService::~KService()
   delete d;
 }
 
-TQPixmap KService::pixmap( KIcon::Group _group, int _force_size, int _state, TQString * _path ) const
+TQPixmap KService::pixmap( TDEIcon::Group _group, int _force_size, int _state, TQString * _path ) const
 {
-  KIconLoader *iconLoader=TDEGlobal::iconLoader();
+  TDEIconLoader *iconLoader=TDEGlobal::iconLoader();
   if (!iconLoader->extraDesktopThemesAdded())
   {
       TQPixmap pixmap=iconLoader->loadIcon( m_strIcon, _group, _force_size, _state, _path, true );
diff --git a/tdeio/tdeio/kservice.h b/tdeio/tdeio/kservice.h
index a2e00d740..02519c1e8 100644
--- a/tdeio/tdeio/kservice.h
+++ b/tdeio/tdeio/kservice.h
@@ -129,7 +129,7 @@ public:
    *         null if not set
    * @see icon()
    */
-  TQPixmap pixmap( KIcon::Group _group, int _force_size = 0, int _state = 0,
+  TQPixmap pixmap( TDEIcon::Group _group, int _force_size = 0, int _state = 0,
                   TQString * _path = 0L ) const;
   /**
    * Checks whethe the service should be run in a terminal.
diff --git a/tdeio/tdeio/kurifilter.cpp b/tdeio/tdeio/kurifilter.cpp
index 49953e5b7..809e2f504 100644
--- a/tdeio/tdeio/kurifilter.cpp
+++ b/tdeio/tdeio/kurifilter.cpp
@@ -186,7 +186,7 @@ TQString KURIFilterData::iconName()
                 if (service && service->icon() != TQString::fromLatin1( "unknown" )) {
                     m_strIconName = service->icon();
                 }
-                else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) {
+                else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0, true ).isNull() ) {
                     m_strIconName = exeName;
                 }
                 else {
@@ -200,7 +200,7 @@ TQString KURIFilterData::iconName()
 		if (service && service->icon() != TQString::fromLatin1( "unknown" )) {
 			m_strIconName = service->icon();
 		}
-		else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, KIcon::NoGroup, 16, KIcon::DefaultState, 0, true ).isNull() ) {
+		else if ( !TDEGlobal::iconLoader()->loadIcon( exeName, TDEIcon::NoGroup, 16, TDEIcon::DefaultState, 0, true ).isNull() ) {
 			m_strIconName = exeName;
 		}
 		else {
diff --git a/tdeio/tdeio/kurlpixmapprovider.cpp b/tdeio/tdeio/kurlpixmapprovider.cpp
index caeedf066..b0ecb7e43 100644
--- a/tdeio/tdeio/kurlpixmapprovider.cpp
+++ b/tdeio/tdeio/kurlpixmapprovider.cpp
@@ -26,7 +26,7 @@ TQPixmap KURLPixmapProvider::pixmapFor( const TQString& url, int size ) {
 	    u.setPath( url );
 	else
 	    u = url;
-	return KMimeType::pixmapForURL( u, 0, KIcon::Desktop, size );
+	return KMimeType::pixmapForURL( u, 0, TDEIcon::Desktop, size );
     }
 
 void KURLPixmapProvider::virtual_hook( int id, void* data )
diff --git a/tdeio/tdeio/kurlpixmapprovider.h b/tdeio/tdeio/kurlpixmapprovider.h
index 82be4bd1b..3dad217e3 100644
--- a/tdeio/tdeio/kurlpixmapprovider.h
+++ b/tdeio/tdeio/kurlpixmapprovider.h
@@ -48,7 +48,7 @@ public:
      * @param url the URL to fetch a pixmap for
      * @param size the size of the pixmap in pixels, or 0 for default.
      * @return the resulting pixmap
-     * @see KIcon::StdSizes
+     * @see TDEIcon::StdSizes
      */
     virtual TQPixmap pixmapFor( const TQString& url, int size = 0 );
 protected:
diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp
index 54bcec3b2..942d16c64 100644
--- a/tdeio/tdeio/passdlg.cpp
+++ b/tdeio/tdeio/passdlg.cpp
@@ -82,7 +82,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
 
     // Row 0: pixmap  prompt
     TQLabel* lbl;
-    TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( "password", KIcon::NoGroup, KIcon::SizeHuge, 0, 0, true));
+    TQPixmap pix( TDEGlobal::iconLoader()->loadIcon( "password", TDEIcon::NoGroup, TDEIcon::SizeHuge, 0, 0, true));
     if ( !pix.isNull() )
     {
         lbl = new TQLabel( main );
diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index bd043504a..3d09e6877 100644
--- a/tdeio/tdeio/tdefileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -570,14 +570,14 @@ int KFileItem::overlays() const
 {
   int _state = 0;
   if ( m_bLink )
-      _state |= KIcon::LinkOverlay;
+      _state |= TDEIcon::LinkOverlay;
 
   if ( !S_ISDIR( m_fileMode ) // Locked dirs have a special icon, use the overlay for files only
        && !isReadable())
-     _state |= KIcon::LockOverlay;
+     _state |= TDEIcon::LockOverlay;
 
   if ( isHidden() )
-     _state |= KIcon::HiddenOverlay;
+     _state |= TDEIcon::HiddenOverlay;
 
   if( S_ISDIR( m_fileMode ) && m_bIsLocalURL)
   {
@@ -585,12 +585,12 @@ int KFileItem::overlays() const
         KNFSShare::instance()->isDirectoryShared( m_url.path() ))
     {
       //kdDebug()<<"KFileShare::isDirectoryShared : "<<m_url.path()<<endl;
-      _state |= KIcon::ShareOverlay;
+      _state |= TDEIcon::ShareOverlay;
     }
   }
 
   if ( m_pMimeType->name() == "application/x-gzip" && m_url.fileName().right(3) == ".gz" )
-     _state |= KIcon::ZipOverlay;
+     _state |= TDEIcon::ZipOverlay;
   return _state;
 }
 
@@ -632,7 +632,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
   bool isLocalURL;
   KURL url = mostLocalURL(isLocalURL);
 
-  TQPixmap p = mime->pixmap( url, KIcon::Desktop, _size, _state );
+  TQPixmap p = mime->pixmap( url, TDEIcon::Desktop, _size, _state );
   //kdDebug() << "finding pixmap for " << url.url() << " : " << mime->name() << endl;
   if (p.isNull())
       kdWarning() << "Pixmap not found for mimetype " << m_pMimeType->name() << endl;
diff --git a/tdeio/tdeio/tdefileitem.h b/tdeio/tdeio/tdefileitem.h
index 45970f814..95207a537 100644
--- a/tdeio/tdeio/tdefileitem.h
+++ b/tdeio/tdeio/tdefileitem.h
@@ -346,14 +346,14 @@ public:
    * Returns a pixmap representing the file.
    * @param _size Size for the pixmap in pixels. Zero will return the
    * globally configured default size.
-   * @param _state The state of the icon: KIcon::DefaultState,
-   * KIcon::ActiveState or KIcon::DisabledState.
+   * @param _state The state of the icon: TDEIcon::DefaultState,
+   * TDEIcon::ActiveState or TDEIcon::DisabledState.
    * @return the pixmap
    */
   TQPixmap pixmap( int _size, int _state=0 ) const;
 
   /**
-   * Returns the overlays (bitfield of KIcon::*Overlay flags) that are used
+   * Returns the overlays (bitfield of TDEIcon::*Overlay flags) that are used
    * for this item's pixmap. Overlays are used to show for example, whether
    * a file can be modified.
    * @return the overlays of the pixmap