summaryrefslogtreecommitdiffstats
path: root/kicker/taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/taskbar')
-rw-r--r--kicker/taskbar/taskbar.cpp44
-rw-r--r--kicker/taskbar/taskbarbindings.cpp2
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp16
-rw-r--r--kicker/taskbar/taskcontainer.cpp30
4 files changed, 46 insertions, 46 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 81f54f25b..ac0133668 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -92,24 +92,24 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
// configure
configure();
- connect(&m_relayoutTimer, TQT_SIGNAL(timeout()),
- this, TQT_SLOT(reLayout()));
+ connect(&m_relayoutTimer, TQ_SIGNAL(timeout()),
+ this, TQ_SLOT(reLayout()));
- connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground()));
+ connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground()));
// connect manager
- connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)),
- this, TQT_SLOT(add(Task::Ptr)));
- connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)),
- this, TQT_SLOT(remove(Task::Ptr)));
- connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)),
- this, TQT_SLOT(add(Startup::Ptr)));
- connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)),
- this, TQT_SLOT(remove(Startup::Ptr)));
- connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)),
- this, TQT_SLOT(desktopChanged(int)));
- connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)),
- this, TQT_SLOT(windowChanged(Task::Ptr)));
+ connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)),
+ this, TQ_SLOT(add(Task::Ptr)));
+ connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)),
+ this, TQ_SLOT(remove(Task::Ptr)));
+ connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)),
+ this, TQ_SLOT(add(Startup::Ptr)));
+ connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)),
+ this, TQ_SLOT(remove(Startup::Ptr)));
+ connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)),
+ this, TQ_SLOT(desktopChanged(int)));
+ connect(TaskManager::the(), TQ_SIGNAL(windowChanged(Task::Ptr)),
+ this, TQ_SLOT(windowChanged(Task::Ptr)));
isGrouping = shouldGroup();
@@ -131,7 +131,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
blocklayout = false;
- connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
+ connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
keys = new TDEGlobalAccel( this );
#include "taskbarbindings.cpp"
keys->readSettings();
@@ -261,12 +261,12 @@ void TaskBar::configure()
// are paying attention to the current Xinerama screen
// disconnect first in case we've been here before
// to avoid multiple connections
- disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
- this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
+ disconnect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)),
+ this, TQ_SLOT(windowChangedGeometry(Task::Ptr)));
if (m_showOnlyCurrentScreen)
{
- connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)),
- this, TQT_SLOT(windowChangedGeometry(Task::Ptr)));
+ connect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)),
+ this, TQ_SLOT(windowChangedGeometry(Task::Ptr)));
}
TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen);
@@ -386,7 +386,7 @@ void TaskBar::add(Startup::Ptr startup)
// create new container
TaskContainer *container = new TaskContainer(startup, frames, this, m_settingsObject, m_globalSettingsObject, viewport());
m_hiddenContainers.append(container);
- connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*)));
+ connect(container, TQ_SIGNAL(showMe(TaskContainer*)), this, TQ_SLOT(showTaskContainer(TaskContainer*)));
}
void TaskBar::reSort()
@@ -854,7 +854,7 @@ void TaskBar::reLayout()
}
}
- TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry()));
+ TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry()));
}
void TaskBar::setViewportBackground()
diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp
index c451d621f..f604e3bc6 100644
--- a/kicker/taskbar/taskbarbindings.cpp
+++ b/kicker/taskbar/taskbarbindings.cpp
@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef NOSLOTS
# define DEF( name, key3, key4, fnSlot ) \
- keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) )
+ keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) )
#else
# define DEF( name, key3, key4, fnSlot ) \
keys->insert( name, i18n(name), TQString(), key3, key4 )
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index f9ba06c32..efde7dd2c 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -99,7 +99,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
taskBar = new TaskBar(settingsObject, globalSettingsObject, this);
layout->addWidget( taskBar );
- connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) );
+ connect( taskBar, TQ_SIGNAL( containerCountChanged() ), TQ_SIGNAL( containerCountChanged() ) );
setBackground();
@@ -134,10 +134,10 @@ void TaskBarContainer::configure()
// window list button
windowListButton = new SimpleButton(this);
windowListMenu= new KWindowListMenu;
- connect(windowListButton, TQT_SIGNAL(pressed()),
- TQT_SLOT(showWindowListMenu()));
- connect(windowListMenu, TQT_SIGNAL(aboutToHide()),
- TQT_SLOT(windowListMenuAboutToHide()));
+ connect(windowListButton, TQ_SIGNAL(pressed()),
+ TQ_SLOT(showWindowListMenu()));
+ connect(windowListMenu, TQ_SIGNAL(aboutToHide()),
+ TQ_SLOT(windowListMenuAboutToHide()));
// geometry
TQString icon;
@@ -299,9 +299,9 @@ void TaskBarContainer::showWindowListMenu()
break;
}
- disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) );
+ disconnect( windowListButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( showWindowListMenu() ) );
windowListMenu->exec( pos );
- TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton()));
+ TQTimer::singleShot(100, this, TQ_SLOT(reconnectWindowListButton()));
}
void TaskBarContainer::windowListMenuAboutToHide()
@@ -313,7 +313,7 @@ void TaskBarContainer::windowListMenuAboutToHide()
void TaskBarContainer::reconnectWindowListButton()
{
- connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) );
+ connect( windowListButton, TQ_SIGNAL( pressed() ), TQ_SLOT( showWindowListMenu() ) );
}
TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index d6b873e2b..3eba42cd1 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -186,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta
sid = m_startup->bin();
- connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update()));
+ connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update()));
dragSwitchTimer.start(333, true);
}
@@ -212,10 +212,10 @@ void TaskContainer::init()
installEventFilter(KickerTip::the());
- connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired()));
- connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe()));
- connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired()));
- connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow()));
+ connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired()));
+ connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe()));
+ connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired()));
+ connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow()));
}
TaskContainer::~TaskContainer()
@@ -235,8 +235,8 @@ void TaskContainer::showMe()
animationTimer.start(100);
emit showMe(this);
- disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe()));
- connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch()));
+ disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe()));
+ connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch()));
}
void TaskContainer::stopTimers()
@@ -442,9 +442,9 @@ void TaskContainer::add(Task::Ptr task)
KickerTip::Client::updateKickerTip();
update();
- connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool)));
- connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged()));
- connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated()));
+ connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool)));
+ connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged()));
+ connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated()));
}
void TaskContainer::remove(Task::Ptr task)
@@ -1097,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
}
performAction( buttonAction );
- TQTimer::singleShot(0, this, TQT_SLOT(update()));
+ TQTimer::singleShot(0, this, TQ_SLOT(update()));
}
void TaskContainer::performAction(int action)
@@ -1310,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu()
id = menu->insertItem(SmallIconSet("go-first"),
i18n("Move to Beginning"),
- this, TQT_SLOT(slotTaskMoveBeginning()));
+ this, TQ_SLOT(slotTaskMoveBeginning()));
menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
id = menu->insertItem(SmallIconSet("back"),
i18n("Move Left"),
- this, TQT_SLOT(slotTaskMoveLeft()));
+ this, TQ_SLOT(slotTaskMoveLeft()));
menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left));
id = menu->insertItem(SmallIconSet("forward"),
i18n("Move Right"),
- this, TQT_SLOT(slotTaskMoveRight()));
+ this, TQ_SLOT(slotTaskMoveRight()));
menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
id = menu->insertItem(SmallIconSet("go-last"),
i18n("Move to End"),
- this, TQT_SLOT(slotTaskMoveEnd()));
+ this, TQ_SLOT(slotTaskMoveEnd()));
menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right));
return menu;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-19 09:22:53 +0000