Rename KShared

8 files changed, 18 insertions, 18 deletions

diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 47228e620..0563dbb20 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -96,7 +96,7 @@ QuickURL::QuickURL(const TQString &u)
    if (_service) {
       if (!_service->isValid()) {
          DEBUGSTR << "QuickURL: _service is not valid"<<endl<<flush;
-         // _service is a KShared pointer, don't try to delete it!
+         // _service is a TDEShared pointer, don't try to delete it!
          _service = 0;
       } else {
          DEBUGSTR << "QuickURL: _service='"<<_service<<"' _service->desktopEntryPath()="<<_service->desktopEntryPath()<<endl<<flush;
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index b9af7efc0..eb1ba784c 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -55,7 +55,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #undef FocusOut
 #endif
 
-KSharedPixmap* KMiniPagerButton::s_commonSharedPixmap;
+TDESharedPixmap* KMiniPagerButton::s_commonSharedPixmap;
 KPixmap* KMiniPagerButton::s_commonBgPixmap;
 
 KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& viewport,
@@ -257,7 +257,7 @@ void KMiniPagerButton::loadBgPixmap()
     {
         if (!s_commonSharedPixmap)
         {
-            s_commonSharedPixmap = new KSharedPixmap;
+            s_commonSharedPixmap = new TDESharedPixmap;
             connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
                     TQT_SLOT(backgroundLoaded(bool)));
         }
@@ -273,7 +273,7 @@ void KMiniPagerButton::loadBgPixmap()
     {
         if (!m_sharedPixmap)
         {
-            m_sharedPixmap = new KSharedPixmap;
+            m_sharedPixmap = new TDESharedPixmap;
             connect(m_sharedPixmap, TQT_SIGNAL(done(bool)),
                     TQT_SLOT(backgroundLoaded(bool)));
         }
diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h
index 54645b8e7..042820f20 100644
--- a/kicker/applets/minipager/pagerbutton.h
+++ b/kicker/applets/minipager/pagerbutton.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class KPixmap;
 class KWinModule;
 class KMiniPager;
-class KSharedPixmap;
+class TDESharedPixmap;
 class TQLineEdit;
 
 class KMiniPagerButton : public TQButton, public KickerTip::Client
@@ -98,9 +98,9 @@ private:
 
     TQLineEdit* m_lineEdit;
 
-    KSharedPixmap *m_sharedPixmap;
+    TDESharedPixmap *m_sharedPixmap;
     KPixmap *m_bgPixmap;
-    static KSharedPixmap *s_commonSharedPixmap;
+    static TDESharedPixmap *s_commonSharedPixmap;
     static KPixmap *s_commonBgPixmap;
     bool m_isCommon;
 
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index d2f2982b7..381b36d4f 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -83,7 +83,7 @@ ExtensionContainer::ExtensionContainer(const AppletInfo& info,
                                        const TQString& extensionId,
                                        TQWidget *parent)
   : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)),
-    m_settings(KSharedConfig::openConfig(info.configFile())),
+    m_settings(TDESharedConfig::openConfig(info.configFile())),
     m_hideMode(ManualHide),
     m_unhideTriggeredAt(UnhideTrigger::None),
     _autoHidden(false),
@@ -110,7 +110,7 @@ ExtensionContainer::ExtensionContainer(KPanelExtension* extension,
                                        const TQString& extensionId,
                                        TQWidget *parent)
   : TQFrame(parent, ("ExtensionContainer#" + extensionId).latin1(), (WFlags)(WStyle_Customize | WStyle_NoBorder)),
-    m_settings(KSharedConfig::openConfig(info.configFile())),
+    m_settings(TDESharedConfig::openConfig(info.configFile())),
     _autoHidden(false),
     _userHidden(Unhidden),
     _block_user_input(false),
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index f5bf25471..c0b14d1c9 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -995,8 +995,8 @@ void KMenu::fillMenu(KServiceGroup::Ptr&
     bool separatorNeeded = false;
     KServiceGroup::List::ConstIterator it = _list.begin();
 #ifdef KDELIBS_SUSE
-    KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> slist;
-    KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> glist;
+    KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> slist;
+    KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> glist;
     TQMap<TQString,TQString> specialTitle;
     TQMap<TQString,TQString> categoryIcon;
     TQMap<TQString,TQString> shortenedMenuPath;
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index dfe3f4433..bb1c1fc85 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -114,8 +114,8 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
     TQStringList suppressGenericNames = _root->suppressGenericNames();
 
     KServiceGroup::List::ConstIterator it = _list.begin();
-    KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> slist;
-    KSortableValueList<KSharedPtr<KSycocaEntry>,TQCString> glist;
+    KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> slist;
+    KSortableValueList<TDESharedPtr<KSycocaEntry>,TQCString> glist;
     TQMap<TQString,TQString> specialTitle;
     TQMap<TQString,TQString> categoryIcon;
 
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index db7fd8729..c35820e4b 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -67,7 +67,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
         globalConfig.copyTo(configFile, &localConfig);
         localConfig.sync();
     }
-    settingsObject = new TaskBarSettings(KSharedConfig::openConfig(configFile));
+    settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile));
 
     setBackgroundOrigin( AncestorOrigin );
 
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index b78764331..148c77da2 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -68,7 +68,7 @@ typedef TQValueList<WId> WindowList;
  * @see TaskManager
  * @see KWinModule
  */
-class KDE_EXPORT Task: public TQObject, public KShared
+class KDE_EXPORT Task: public TQObject, public TDEShared
 {
     Q_OBJECT
     TQ_PROPERTY( TQString visibleIconicName READ visibleIconicName )
@@ -95,7 +95,7 @@ class KDE_EXPORT Task: public TQObject, public KShared
     TQ_PROPERTY( TQPixmap thumbnail READ thumbnail )
 
 public:
-    typedef KSharedPtr<Task> Ptr;
+    typedef TDESharedPtr<Task> Ptr;
     typedef TQValueVector<Task::Ptr> List;
     typedef TQMap<WId, Task::Ptr> Dict;
 
@@ -511,7 +511,7 @@ public:
  *
  * @see TaskManager
  */
-class KDE_EXPORT Startup: public TQObject, public KShared
+class KDE_EXPORT Startup: public TQObject, public TDEShared
 {
     Q_OBJECT
     TQ_PROPERTY( TQString text READ text )
@@ -519,7 +519,7 @@ class KDE_EXPORT Startup: public TQObject, public KShared
     TQ_PROPERTY( TQString icon READ icon )
 
 public:
-    typedef KSharedPtr<Startup> Ptr;
+    typedef TDESharedPtr<Startup> Ptr;
     typedef TQValueVector<Startup::Ptr> List;
 
     Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent,