4 files changed, 50 insertions, 50 deletions

diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index ac0fa1340..003df72fc 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -73,7 +73,7 @@ static const int bgOffset = 300;
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
       TDEGlobal::locale()->insertCatalogue("kminipagerapplet");
       return new KMiniPager(configFile, KPanelApplet::Normal, 0, parent, "kminipagerapplet");
@@ -114,7 +114,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
 
     setFont( TDEGlobalSettings::taskbarFont() );
 
-    m_twin = new KWinModule(TQT_TQOBJECT(this));
+    m_twin = new KWinModule(this);
     m_activeWindow = m_twin->activeWindow();
     m_curDesk = m_twin->currentDesktop();
 
@@ -123,7 +123,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
         m_curDesk = 1;
     }
 
-    desktopLayoutOrientation = Qt::Horizontal;
+    desktopLayoutOrientation = TQt::Horizontal;
     desktopLayoutX = -1;
     desktopLayoutY = -1;
 
@@ -132,22 +132,22 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
 
     drawButtons();
 
-    connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) );
-    connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
-    connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) );
-    connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) );
-    connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) );
-    connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) );
-    connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
-    connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
+    connect( m_twin, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotSetDesktop(int) ) );
+    connect( m_twin, TQ_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotSetDesktopViewport(int, const TQPoint&)));
+    connect( m_twin, TQ_SIGNAL( numberOfDesktopsChanged(int)), TQ_SLOT( slotSetDesktopCount(int) ) );
+    connect( m_twin, TQ_SIGNAL( desktopGeometryChanged(int)), TQ_SLOT( slotRefreshViewportCount(int) ) );
+    connect( m_twin, TQ_SIGNAL( activeWindowChanged(WId)), TQ_SLOT( slotActiveWindowChanged(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowAdded(WId) ), this, TQ_SLOT( slotWindowAdded(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) );
+    connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) );
+    connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) );
+    connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) );
 
     if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
     {
         m_contextMenu = new TQPopupMenu();
-        connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
-        connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+        connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu()));
+        connect(m_contextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
         setCustomMenu(m_contextMenu);
     }
 
@@ -246,7 +246,7 @@ void KMiniPager::slotButtonSelected( int desk )
 
 int KMiniPager::widthForHeight(int h) const
 {
-    if (orientation() == Qt::Vertical)
+    if (orientation() == TQt::Vertical)
     {
         return width();
     }
@@ -302,7 +302,7 @@ int KMiniPager::widthForHeight(int h) const
 
 int KMiniPager::heightForWidth(int w) const
 {
-    if (orientation() == Qt::Horizontal)
+    if (orientation() == TQt::Horizontal)
     {
         return height();
     }
@@ -366,7 +366,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
     { // must own manager selection before setting global desktop layout
         int screen = DefaultScreen( tqt_xdisplay());
         m_desktopLayoutOwner = new TDESelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
-            screen, TQT_TQOBJECT(this) );
+            screen, this );
         if( !m_desktopLayoutOwner->claim( false ))
         {
             delete m_desktopLayoutOwner;
@@ -374,14 +374,14 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
             return;
         }
     }
-    NET::Orientation orient = o == Qt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
+    NET::Orientation orient = o == TQt::Horizontal ? NET::OrientationHorizontal : NET::OrientationVertical;
     NETRootInfo i( tqt_xdisplay(), 0 );
     i.setDesktopLayout( orient, x, y, NET::DesktopLayoutCornerTopLeft );
 }
 
 void KMiniPager::resizeEvent(TQResizeEvent*)
 {
-    bool horiz = orientation() == Qt::Horizontal;
+    bool horiz = orientation() == TQt::Horizontal;
 
     int deskNum = m_desktops.count();
     int rowNum = m_settings->numberOfRows();
@@ -408,13 +408,13 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
     {
         nDX = rowNum;
         nDY = deskCols;
-        updateDesktopLayout(Qt::Horizontal, -1, nDX);
+        updateDesktopLayout(TQt::Horizontal, -1, nDX);
     }
     else
     {
         nDX = deskCols;
         nDY = rowNum;
-        updateDesktopLayout(Qt::Horizontal, nDY, -1);
+        updateDesktopLayout(TQt::Horizontal, nDY, -1);
     }
 
     // 1 pixel spacing.
@@ -484,10 +484,10 @@ void KMiniPager::drawButtons()
             m_desktops.append( desk );
             m_group->insert( desk, count );
 
-            connect(desk, TQT_SIGNAL(buttonSelected(int)),
-                    TQT_SLOT(slotButtonSelected(int)) );
-            connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )),
-                    TQT_SLOT(slotShowMenu(const TQPoint&, int )) );
+            connect(desk, TQ_SIGNAL(buttonSelected(int)),
+                    TQ_SLOT(slotButtonSelected(int)) );
+            connect(desk, TQ_SIGNAL(showMenu(const TQPoint&, int )),
+                    TQ_SLOT(slotShowMenu(const TQPoint&, int )) );
 
             desk->show();
             ++count;
@@ -727,8 +727,8 @@ void KMiniPager::aboutToShowContextMenu()
     rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset);
     rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset);
     rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset);
-    connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
-    showMenu->insertItem((orientation()==Qt::Horizontal) ? i18n("&Rows"):
+    connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
+    showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"):
                                                        i18n("&Columns"),
                          rowMenu);
 
@@ -753,7 +753,7 @@ void KMiniPager::aboutToShowContextMenu()
         showMenu->insertItem(i18n("&Desktop Wallpaper"),
                          PagerSettings::EnumBackgroundType::BgLive + bgOffset);
     }
-    connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int)));
+    connect(showMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int)));
     m_contextMenu->insertItem(i18n("&Pager Options"),showMenu);
 
     m_contextMenu->insertItem(SmallIcon("configure"),
@@ -892,7 +892,7 @@ void KMiniPager::showPager()
     else
     {
     // Let's run kpager if it isn't running
-        connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+        connect( dcop, TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) );
         dcop->setNotifications(true);
         TQString strAppPath(locate("exe", "kpager"));
         if (!strAppPath.isEmpty())
@@ -941,8 +941,8 @@ void KMiniPager::applicationRegistered( const TQCString  & appName )
 {
     if (appName == "kpager")
     {
-        disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ),
-                    this, TQT_SLOT(applicationRegistered(const TQCString &)) );
+        disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ),
+                    this, TQ_SLOT(applicationRegistered(const TQCString &)) );
         showKPager(false);
     }
 }
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index 1f0edc409..ceb5ec8f4 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -46,7 +46,7 @@ class PagerSettings;
 
 class KMiniPager : public KPanelApplet
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMiniPager(const TQString& configFile, Type t = Normal, int actions = 0,
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 3e51a199e..22f59956d 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -83,10 +83,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v
 
     m_desktopName = m_pager->twin()->desktopName(m_desktop);
 
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()));
-    connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
-    connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch()));
-    connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()));
+    connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
+    connect(&m_dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragSwitch()));
+    connect(&m_updateCompressor, TQ_SIGNAL(timeout()), this, TQ_SLOT(update()));
 
     if (m_pager->desktopPreview())
     {
@@ -247,8 +247,8 @@ void KMiniPagerButton::loadBgPixmap()
         }
         else if (s_commonSharedPixmap)
         { // other button is already fetching the pixmap
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
             return;
         }
     }
@@ -258,8 +258,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!s_commonSharedPixmap)
         {
             s_commonSharedPixmap = new TDESharedPixmap;
-            connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1"));
         if (retval == false) {
@@ -274,8 +274,8 @@ void KMiniPagerButton::loadBgPixmap()
         if (!m_sharedPixmap)
         {
             m_sharedPixmap = new TDESharedPixmap;
-            connect(m_sharedPixmap, TQT_SIGNAL(done(bool)),
-                    TQT_SLOT(backgroundLoaded(bool)));
+            connect(m_sharedPixmap, TQ_SIGNAL(done(bool)),
+                    TQ_SLOT(backgroundLoaded(bool)));
         }
         retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop));
         if (retval == false) {
@@ -528,10 +528,10 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
 void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
 {
-    if (e->button() == Qt::RightButton)
+    if (e->button() == TQt::RightButton)
     {
         // prevent LMB down -> RMB down -> LMB up sequence
-        if ((e->state() & Qt::MouseButtonMask ) == Qt::NoButton)
+        if ((e->state() & TQt::MouseButtonMask ) == TQt::NoButton)
         {
             emit showMenu(e->globalPos(), m_desktop);
             return;
@@ -726,7 +726,7 @@ void KMiniPagerButton::rename()
 {
   if ( !m_lineEdit ) {
     m_lineEdit = new TQLineEdit( this );
-    connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) );
+    connect( m_lineEdit, TQ_SIGNAL( returnPressed() ), m_lineEdit, TQ_SLOT( hide() ) );
     m_lineEdit->installEventFilter( this );
   }
   m_lineEdit->setGeometry( rect() );
@@ -747,12 +747,12 @@ void KMiniPagerButton::slotToggled( bool b )
 
 bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
 {
-    if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) &&
+    if (o && o == m_lineEdit &&
         (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide))
     {
         m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() );
         m_desktopName = m_lineEdit->text();
-        TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) );
+        TQTimer::singleShot( 0, m_lineEdit, TQ_SLOT( deleteLater() ) );
         m_lineEdit = 0;
         return true;
     }
@@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
     }
 
     data.duration = 4000;
-    data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium);
+    data.icon = DesktopIcon("window_duplicate", TDEIcon::SizeMedium);
     data.message = TQStyleSheet::escape(m_desktopName);
     data.direction = m_pager->popupDirection();
 }
diff --git a/kicker/applets/minipager/pagerbutton.h b/kicker/applets/minipager/pagerbutton.h
index 042820f20..4d889c39e 100644
--- a/kicker/applets/minipager/pagerbutton.h
+++ b/kicker/applets/minipager/pagerbutton.h
@@ -37,7 +37,7 @@ class TQLineEdit;
 
 class KMiniPagerButton : public TQButton, public KickerTip::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KMiniPagerButton(int desk, bool useViewports, const TQPoint& viewport,
             KMiniPager *parent=0, const char *name=0);