From 93943a849d1abc2003ceefe294dc419b9927f7d0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 31 Jan 2013 21:49:59 -0600
Subject: Rename KStartup for enhanced compatibility with KDE4

---
 kicker/taskmanager/taskmanager.cpp | 24 ++++++++++++------------
 kicker/taskmanager/taskmanager.h   | 18 +++++++++---------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'kicker')

diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index a1d68e98a..18f04452f 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -97,16 +97,16 @@ void TaskManager::configure_startup()
     c.setGroup("FeedbackStyle");
     if (!c.readBoolEntry("TaskbarButton", false))
         return;
-    _startup_info = new KStartupInfo( KStartupInfo::CleanOnCantDetect, this );
+    _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this );
     connect( _startup_info,
-        TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )));
+        TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )));
+        TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )));
     connect( _startup_info,
-        TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )),
-        TQT_SLOT( killStartup( const KStartupInfoId& )));
+        TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )),
+        TQT_SLOT( killStartup( const TDEStartupInfoId& )));
     c.setGroup( "TaskbarButtonSettings" );
     _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 ));
 }
@@ -479,7 +479,7 @@ void TaskManager::currentDesktopChanged(int desktop)
     emit desktopChanged(desktop);
 }
 
-void TaskManager::gotNewStartup( const KStartupInfoId& id, const KStartupInfoData& data )
+void TaskManager::gotNewStartup( const TDEStartupInfoId& id, const TDEStartupInfoData& data )
 {
     Startup::Ptr s = new Startup( id, data, this );
     _startups.append(s);
@@ -487,7 +487,7 @@ void TaskManager::gotNewStartup( const KStartupInfoId& id, const KStartupInfoDat
     emit startupAdded(s);
 }
 
-void TaskManager::gotStartupChange( const KStartupInfoId& id, const KStartupInfoData& data )
+void TaskManager::gotStartupChange( const TDEStartupInfoId& id, const TDEStartupInfoData& data )
 {
     Startup::List::iterator itEnd = _startups.end();
     for (Startup::List::iterator sIt = _startups.begin(); sIt != itEnd; ++sIt)
@@ -500,7 +500,7 @@ void TaskManager::gotStartupChange( const KStartupInfoId& id, const KStartupInfo
     }
 }
 
-void TaskManager::killStartup( const KStartupInfoId& id )
+void TaskManager::killStartup( const TDEStartupInfoId& id )
 {
     Startup::List::iterator sIt = _startups.begin();
     Startup::List::iterator itEnd = _startups.end();
@@ -1452,7 +1452,7 @@ void Task::updateWindowPixmap()
 #endif // THUMBNAILING_POSSIBLE
 }
 
-Startup::Startup(const KStartupInfoId& id, const KStartupInfoData& data,
+Startup::Startup(const TDEStartupInfoId& id, const TDEStartupInfoData& data,
                  TQObject * parent, const char *name)
     : TQObject(parent, name), _id(id), _data(data)
 {
@@ -1462,7 +1462,7 @@ Startup::~Startup()
 {
 }
 
-void Startup::update(const KStartupInfoData& data)
+void Startup::update(const TDEStartupInfoData& data)
 {
     _data.update(data);
     emit changed();
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index 148c77da2..6b9dab397 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -522,7 +522,7 @@ public:
     typedef TDESharedPtr<Startup> Ptr;
     typedef TQValueVector<Startup::Ptr> List;
 
-    Startup( const KStartupInfoId& id, const KStartupInfoData& data, TQObject * parent,
+    Startup( const TDEStartupInfoId& id, const TDEStartupInfoData& data, TQObject * parent,
         const char *name = 0);
     virtual ~Startup();
 
@@ -540,8 +540,8 @@ public:
      * The name of the icon to be used for the starting task.
      */
     TQString icon() const { return _data.findIcon(); }
-    void update( const KStartupInfoData& data );
-    const KStartupInfoId& id() const { return _id; }
+    void update( const TDEStartupInfoData& data );
+    const TDEStartupInfoId& id() const { return _id; }
 
 signals:
     /**
@@ -550,8 +550,8 @@ signals:
     void changed();
 
 private:
-    KStartupInfoId _id;
-    KStartupInfoData _data;
+    TDEStartupInfoId _id;
+    TDEStartupInfoData _data;
     class StartupPrivate *d;
 };
 
@@ -680,14 +680,14 @@ protected slots:
     //* @internal
     void currentDesktopChanged(int);
     //* @internal
-    void killStartup( const KStartupInfoId& );
+    void killStartup( const TDEStartupInfoId& );
     //* @internal
     void killStartup(Startup::Ptr);
 
     //* @internal
-    void gotNewStartup( const KStartupInfoId&, const KStartupInfoData& );
+    void gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& );
     //* @internal
-    void gotStartupChange( const KStartupInfoId&, const KStartupInfoData& );
+    void gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& );
 
 protected:
     void configure_startup();
@@ -700,7 +700,7 @@ private:
     Task::Dict m_tasksByWId;
     WindowList _skiptaskbar_windows;
     Startup::List _startups;
-    KStartupInfo* _startup_info;
+    TDEStartupInfo* _startup_info;
     KWinModule* m_winModule;
     bool m_trackGeometry;
 
-- 
cgit v1.2.1