Rename many classes and header files to avoid conflicts with KDE4

2 files changed, 4 insertions, 4 deletions

diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 6662d57d4..7ff922ed5 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <dcopclient.h>
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index eb1ba784c..78353abbf 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -590,9 +590,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
         bp.drawRect(0, 0, ww, wh);
         bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
 
-        Task::List tasklist;
-        tasklist.append(m_currentWindow);
-        TaskDrag* drag = new TaskDrag(tasklist, this);
+        Task::List tastdelist;
+        tastdelist.append(m_currentWindow);
+        TaskDrag* drag = new TaskDrag(tastdelist, this);
         TQPoint offset(m_pager->clickPos.x() - (r.x() * w / dw),
                 m_pager->clickPos.y() - (r.y() * h / dh));
         drag->setPixmap(windowImage, offset);