summaryrefslogtreecommitdiffstats
path: root/kicker/taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/taskbar')
-rw-r--r--kicker/taskbar/taskbar.cpp56
-rw-r--r--kicker/taskbar/taskbar.h2
-rw-r--r--kicker/taskbar/taskbar.kcfg14
-rw-r--r--kicker/taskbar/taskbarbindings.cpp2
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp36
-rw-r--r--kicker/taskbar/taskbarcontainer.h4
-rw-r--r--kicker/taskbar/taskbarsettings.kcfgc2
-rw-r--r--kicker/taskbar/taskcontainer.cpp115
-rw-r--r--kicker/taskbar/taskcontainer.h2
9 files changed, 120 insertions, 113 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index d4e04f6b5..3f82f1e50 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -36,10 +36,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeapplication.h>
#include <kdebug.h>
#include <tdeglobal.h>
-#include <kglobalaccel.h>
+#include <tdeglobalaccel.h>
#include <kimageeffect.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kickerSettings.h"
#include "taskbarsettings.h"
@@ -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,8 +131,8 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin
blocklayout = false;
- connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)));
- keys = new TDEGlobalAccel( TQT_TQOBJECT(this) );
+ connect(tdeApp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)));
+ keys = new TDEGlobalAccel( this );
#include "taskbarbindings.cpp"
keys->readSettings();
keys->updateConnections();
@@ -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()
@@ -746,7 +746,7 @@ void TaskBar::reLayout()
int minButtonHeight = buttonHeight();
// horizontal layout
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int bwidth=buttonWidth();
int rows = contentsRect().height() / minButtonHeight;
@@ -854,7 +854,7 @@ void TaskBar::reLayout()
}
}
- TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry()));
+ TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry()));
}
void TaskBar::setViewportBackground()
@@ -1005,7 +1005,7 @@ int TaskBar::maximumButtonsWithoutShrinking() const
rows = 1;
}
- if ( orientation() == Qt::Horizontal ) {
+ if ( orientation() == TQt::Horizontal ) {
// maxWidth of 0 means no max width, drop back to default
int maxWidth = READ_MERGED_TASKBAR_SETTING(maximumButtonWidth);
if (maxWidth == 0)
@@ -1254,7 +1254,7 @@ TQImage* TaskBar::blendGradient(const TQSize& size)
void TaskBar::sortContainersByDesktop(TaskContainer::List& list)
{
- typedef TQValueVector<QPair<int, QPair<int, TaskContainer*> > > SortVector;
+ typedef TQValueVector<TQPair<int, TQPair<int, TaskContainer*> > > SortVector;
SortVector sorted;
sorted.resize(list.count());
int i = 0;
diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h
index 917e9e2de..dc34129e0 100644
--- a/kicker/taskbar/taskbar.h
+++ b/kicker/taskbar/taskbar.h
@@ -70,7 +70,7 @@ namespace TaskMoveDestination
class TaskBar : public Panner
{
- Q_OBJECT
+ TQ_OBJECT
public:
TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent = 0, const char *name = 0 );
diff --git a/kicker/taskbar/taskbar.kcfg b/kicker/taskbar/taskbar.kcfg
index 7436f2e8e..0665470df 100644
--- a/kicker/taskbar/taskbar.kcfg
+++ b/kicker/taskbar/taskbar.kcfg
@@ -93,14 +93,14 @@
<default>200</default>
<min>50</min>
<max>500</max>
- <label>Maximum button width</label>
- <whatsthis>The maximum width to which a taskbar item can expand.</whatsthis>
+ <label>Maximum Taskbar Button Width</label>
+ <whatsthis>The maximum width each taskbar button will use. The default value is 200 pixels. The setting affects the Display options Text only and Icons and Text.</whatsthis>
</entry>
<entry key="MinimumButtonHeight" type="Int" >
<default>18</default>
- <label></label>
+ <label>Minimum Taskbar Button Height</label>
<min>1</min>
- <whatsthis></whatsthis>
+ <whatsthis>The minimum height to trigger taskbar buttons to stack into rows. The default value is 18 pixels. To prevent the taskbar buttons from stacking into rows, MinimumButtonHeight must be at least one pixel larger than the defined panel height.</whatsthis>
</entry>
<entry key="ShowCurrentScreenOnly" type="Bool" >
<default>false</default>
@@ -200,17 +200,17 @@
</entry>
<entry name="ActiveTaskTextColor" type="Color" >
<label>Color to use for active task button text</label>
- <default code="true">QColor()</default>
+ <default code="true">TQColor()</default>
<whatsthis>This color is used for displaying text on taskbar button for task which is active at the moment.</whatsthis>
</entry>
<entry name="InactiveTaskTextColor" type="Color" >
<label>Color to use for inactive tasks button text</label>
- <default code="true">QColor()</default>
+ <default code="true">TQColor()</default>
<whatsthis>This color is used for displaying text on taskbar button for tasks other than active.</whatsthis>
</entry>
<entry name="TaskBackgroundColor" type="Color" >
<label>Color to use for taskbar buttons background</label>
- <default code="true">QColor()</default>
+ <default code="true">TQColor()</default>
<whatsthis>This color is used for displaying background of taskbar buttons.</whatsthis>
</entry>
<entry name="IconSize" type="UInt" >
diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp
index 364faac97..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, TQT_TQOBJECT(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 a891cf64e..e9cc87979 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tdeapplication.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <twindowlistmenu.h>
#include <X11/X.h>
@@ -65,10 +65,10 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid
TQFile configFileObject(locateLocal("config", configFile));
if (!configFileObject.exists())
{
- TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, TRUE, TRUE);
+ TDEConfig globalConfig(GLOBAL_TASKBAR_CONFIG_FILE_NAME, true, true);
TDEConfig localConfig(configFile);
globalConfig.copyTo(configFile, &localConfig);
- localConfig.writeEntry("UseGlobalSettings", TRUE);
+ localConfig.writeEntry("UseGlobalSettings", true);
localConfig.sync();
}
settingsObject = new TaskBarSettings(TDESharedConfig::openConfig(configFile));
@@ -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;
@@ -161,7 +161,7 @@ void TaskBarContainer::configure()
break;
}
- windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+ windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
TDEIcon::Panel,
16));
windowListButton->setMinimumSize(windowListButton->sizeHint());
@@ -188,26 +188,26 @@ void TaskBarContainer::preferences()
{
TQByteArray data;
- if (!kapp->dcopClient()->isAttached())
+ if (!tdeApp->dcopClient()->isAttached())
{
- kapp->dcopClient()->attach();
+ tdeApp->dcopClient()->attach();
}
if (configFile == GLOBAL_TASKBAR_CONFIG_FILE_NAME)
{
- kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
+ tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig()", data);
}
else
{
TQDataStream args( data, IO_WriteOnly );
args << configFile;
- kapp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
+ tdeApp->dcopClient()->send("kicker", "kicker", "showTaskBarConfig(TQString)", data);
}
}
void TaskBarContainer::orientationChange(Orientation o)
{
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
if (windowListButton)
{
@@ -266,7 +266,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
if (windowListButton)
{
- windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
+ windowListButton->setPixmap(tdeApp->iconLoader()->loadIcon(icon,
TDEIcon::Panel,
16));
windowListButton->setMinimumSize(windowListButton->sizeHint());
@@ -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/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h
index 7fc13241f..006724e30 100644
--- a/kicker/taskbar/taskbarcontainer.h
+++ b/kicker/taskbar/taskbarcontainer.h
@@ -36,9 +36,9 @@ class KWindowListMenu;
class TaskBar;
class TaskBarSettings;
-class KDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
+class TDE_EXPORT TaskBarContainer : public TQFrame, public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
diff --git a/kicker/taskbar/taskbarsettings.kcfgc b/kicker/taskbar/taskbarsettings.kcfgc
index c5219f64e..1e6a7c8cc 100644
--- a/kicker/taskbar/taskbarsettings.kcfgc
+++ b/kicker/taskbar/taskbarsettings.kcfgc
@@ -2,6 +2,6 @@ File=taskbar.kcfg
Singleton=false
ClassName=TaskBarSettings
Mutators=true
-Visibility=KDE_EXPORT
+Visibility=TDE_EXPORT
SetUserTexts=true
GlobalEnums=true
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 2b497ccd0..8e44f100f 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -26,6 +26,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <assert.h>
+#ifdef Q_OS_SOLARIS
+#include <procfs.h>
+#endif /* SunOS */
+
#include <tqbitmap.h>
#include <tqcolor.h>
#include <tqcursor.h>
@@ -45,7 +49,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kiconloader.h>
#include <kimageeffect.h>
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
#include <X11/Xlib.h>
#include <netwm.h>
#include <fixx11h.h>
@@ -96,24 +100,32 @@ static void create_atoms(Display *d) {
}
bool is_process_resumable(pid_t pid) {
+#ifdef Q_OS_SOLARIS
+ TQFile procStatFile(TQString("/proc/%1/lwp/1/lwpsinfo").arg(pid));
+ if (procStatFile.open(IO_ReadOnly)) {
+ TQByteArray statRaw = procStatFile.readAll();
+ lwpsinfo_t *inf = (lwpsinfo_t *)statRaw.data();
+
+ procStatFile.close();
+ if( inf->pr_sname == 'T' ) {
+ return true;
+ }
+ }
+#else /* default */
TQFile procStatFile(TQString("/proc/%1/stat").arg(pid));
if (procStatFile.open(IO_ReadOnly)) {
TQByteArray statRaw = procStatFile.readAll();
procStatFile.close();
TQString statString(statRaw);
- TQStringList statFields = TQStringList::split(" ", statString, TRUE);
+ TQStringList statFields = TQStringList::split(" ", statString, true);
TQString tcomm = statFields[1];
TQString state = statFields[2];
if( state == "T" ) {
return true;
}
- else {
- return false;
- }
- }
- else {
- return false;
}
+#endif /* read process status */
+ return false;
}
TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar, TaskBarSettings* settingsObject, TaskBarSettings* globalSettingsObject, TQWidget *parent, const char *name)
@@ -174,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);
}
@@ -200,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()
@@ -223,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()
@@ -244,7 +256,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
return;
}
- const TQObject* source = TQT_TQOBJECT_CONST(sender());
+ const TQObject* source = sender();
Task::Ptr task = 0;
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -267,7 +279,7 @@ void TaskContainer::taskChanged(bool geometryOnlyChange)
void TaskContainer::iconChanged()
{
- const TQObject* source = TQT_TQOBJECT_CONST(sender());
+ const TQObject* source = sender();
Task::Ptr task = 0;
Task::List::const_iterator itEnd = tasks.constEnd();
for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it)
@@ -430,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)
@@ -654,7 +666,7 @@ void TaskContainer::drawButton(TQPainter *p)
for (int i = 0; i < 2; ++i)
{
line = KickerLib::blendColors(line, colors.background());
- p->setPen(TQPen(line, 1, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
+ p->setPen(TQPen(line, 1, TQt::SolidLine, TQt::RoundCap, TQt::RoundJoin));
r.addCoords(-1, -1, 1, 1);
p->drawRect(r);
}
@@ -688,12 +700,12 @@ void TaskContainer::drawButton(TQPainter *p)
if (drawButton)
{
if (READ_MERGED_TASKBAR_SETTING(drawButtons) && KickerSettings::showDeepButtons()) {
- style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p,
+ style().drawPrimitive(TQStyle::PE_ButtonBevel, p,
TQRect(1, 1, width()-3, height()-2),
colors, sunken ? TQStyle::Style_On : TQStyle::Style_Raised);
}
else {
- style().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
+ style().drawPrimitive(TQStyle::PE_ButtonTool, p,
TQRect(1, 1, width()-2, height()-2),
colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised);
}
@@ -712,7 +724,7 @@ void TaskContainer::drawButton(TQPainter *p)
if (taskBar->showIcons())
{
if (pixmap.isNull() && m_startup)
- pixmap = kapp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
+ pixmap = tdeApp->iconLoader()->loadIcon(m_startup->icon(), TDEIcon::Panel, iconSize);
if ( !pixmap.isNull() )
{
@@ -882,10 +894,10 @@ void TaskContainer::drawButton(TQPainter *p)
switch (arrowType)
{
- case Qt::LeftArrow: e = TQStyle::PE_ArrowLeft; break;
- case Qt::RightArrow: e = TQStyle::PE_ArrowRight; break;
- case Qt::UpArrow: e = TQStyle::PE_ArrowUp; break;
- case Qt::DownArrow: e = TQStyle::PE_ArrowDown; break;
+ case TQt::LeftArrow: e = TQStyle::PE_ArrowLeft; break;
+ case TQt::RightArrow: e = TQStyle::PE_ArrowRight; break;
+ case TQt::UpArrow: e = TQStyle::PE_ArrowUp; break;
+ case TQt::DownArrow: e = TQStyle::PE_ArrowDown; break;
}
int flags = TQStyle::Style_Enabled;
@@ -896,7 +908,7 @@ void TaskContainer::drawButton(TQPainter *p)
flags |= TQStyle::Style_Down;
}
- style().tqdrawPrimitive(e, p, ar, colors, flags);
+ style().drawPrimitive(e, p, ar, colors, flags);
}
// draw mouse over frame in transparent mode
@@ -1003,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
return;
}
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_dragStartPos = e->pos();
}
@@ -1018,13 +1030,13 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
// Other actions will be handled in mouseReleaseEvent
switch (e->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
break;
- case Qt::MidButton:
+ case TQt::MidButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
break;
- case Qt::RightButton:
+ case TQt::RightButton:
default:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
break;
@@ -1049,7 +1061,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
// This is to avoid the flicker caused by redrawing the
// button as unpressed just before it's activated.
- if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos()))
+ if (!rect().contains(e->pos()))
{
TQToolButton::mouseReleaseEvent(e);
return;
@@ -1059,13 +1071,13 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e)
switch (e->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->LeftButton);
break;
- case Qt::MidButton:
+ case TQt::MidButton:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->MiddleButton);
break;
- case Qt::RightButton:
+ case TQt::RightButton:
default:
buttonAction = READ_MERGED_TASKBAR_ACTION(m_settingsObject->RightButton);
break;
@@ -1085,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)
@@ -1242,7 +1254,7 @@ void TaskContainer::popupMenu(int action)
}
else if (action == m_settingsObject->ShowOperationsMenu)
{
- if (!kapp->authorizeTDEAction("twin_rmb"))
+ if (!tdeApp->authorizeTDEAction("twin_rmb"))
{
return;
}
@@ -1298,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;
@@ -1352,11 +1364,6 @@ void TaskContainer::mouseMoveEvent( TQMouseEvent* e )
bool TaskContainer::startDrag(const TQPoint& pos)
{
- if (m_filteredTasks.count() != 1)
- {
- return false;
- }
-
int delay = TDEGlobalSettings::dndEventDelay();
if ((m_dragStartPos - pos).manhattanLength() > delay)
@@ -1399,7 +1406,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
if ( TQApplication::widgetAt( p, true ) == this )
{
if (me->type() == TQEvent::MouseButtonPress &&
- me->button() == Qt::LeftButton)
+ me->button() == TQt::LeftButton)
{
m_dragStartPos = mapFromGlobal(p);
}
@@ -1417,10 +1424,10 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
{
if (!m_dragStartPos.isNull())
{
- TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+ TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
TQPoint p(me->globalPos());
- if (me->state() & Qt::LeftButton &&
+ if (me->state() & TQt::LeftButton &&
TQApplication::widgetAt(p, true) == this)
{
kdDebug() << "event move" << endl;
@@ -1658,7 +1665,7 @@ void TaskContainer::updateFilteredTaskList()
(!READ_MERGED_TASKBAR_SETTING(showOnlyIconified) || t->isIconified()))
{
pid_t pid = 0;
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
Atom type_ret;
int format_ret;
unsigned long nitems_ret = 0, unused = 0;
@@ -1719,7 +1726,7 @@ void TaskContainer::updateFilteredTaskList()
// sort container list by desktop
if (taskBar->sortByDesktop() && m_filteredTasks.count() > 1)
{
- TQValueVector<QPair<int, Task::Ptr> > sorted;
+ TQValueVector<TQPair<int, Task::Ptr> > sorted;
sorted.resize(m_filteredTasks.count());
int i = 0;
@@ -1734,7 +1741,7 @@ void TaskContainer::updateFilteredTaskList()
qHeapSort(sorted);
m_filteredTasks.clear();
- for (TQValueVector<QPair<int, Task::Ptr> >::iterator it = sorted.begin();
+ for (TQValueVector<TQPair<int, Task::Ptr> >::iterator it = sorted.begin();
it != sorted.end();
++it)
{
diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h
index cc95b5f8c..0ae864185 100644
--- a/kicker/taskbar/taskcontainer.h
+++ b/kicker/taskbar/taskcontainer.h
@@ -39,7 +39,7 @@ typedef TQValueList<TQPixmap*> PixmapList;
class TaskContainer : public TQToolButton, public KickerTip::Client
{
- Q_OBJECT
+ TQ_OBJECT
public:
typedef TQValueList<TaskContainer*> List;
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-14 00:20:20 +0000