summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2023-11-13 21:03:36 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2023-11-13 21:03:36 +0900
commitb965cbac5b21345e9dfc768a7e4f660ffa4aa72f (patch)
tree7fcff5d301752cbdcdfff64d8791aff1369b803f /kicker
parent7d6d35b42e00d6b6658951871b29489bdec80714 (diff)
downloadtdebase-b965cbac5b21345e9dfc768a7e4f660ffa4aa72f.tar.gz
tdebase-b965cbac5b21345e9dfc768a7e4f660ffa4aa72f.zip
Replace Qt with TQt
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/clock/clock.cpp20
-rw-r--r--kicker/applets/clock/datepicker.cpp2
-rw-r--r--kicker/applets/clock/zone.cpp2
-rw-r--r--kicker/applets/launcher/flowgridmanager.cpp16
-rw-r--r--kicker/applets/launcher/flowgridmanager.h8
-rw-r--r--kicker/applets/launcher/quickbutton.cpp8
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp8
-rw-r--r--kicker/applets/lockout/lockout.cpp12
-rw-r--r--kicker/applets/media/mediaapplet.cpp8
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp16
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp4
-rw-r--r--kicker/applets/run/runapplet.cpp4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp50
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp8
-rw-r--r--kicker/applets/trash/trashapplet.cpp4
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp12
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp18
-rw-r--r--kicker/extensions/kasbar/kasbar.h14
-rw-r--r--kicker/extensions/kasbar/kasbarapp.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp8
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp10
-rw-r--r--kicker/extensions/kasbar/kaspopup.cpp2
-rw-r--r--kicker/extensions/kasbar/kasprefsdlg.cpp4
-rw-r--r--kicker/extensions/kasbar/kasresources.cpp8
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp2
-rw-r--r--kicker/extensions/kasbar/kastasker.h6
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.cpp6
-rw-r--r--kicker/extensions/sidebar/sidebarextension.cpp2
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp4
-rw-r--r--kicker/kicker/buttons/knewbutton.cpp2
-rw-r--r--kicker/kicker/core/applethandle.cpp22
-rw-r--r--kicker/kicker/core/container_applet.cpp6
-rw-r--r--kicker/kicker/core/container_base.cpp2
-rw-r--r--kicker/kicker/core/container_button.cpp6
-rw-r--r--kicker/kicker/core/container_extension.cpp44
-rw-r--r--kicker/kicker/core/containerarea.cpp40
-rw-r--r--kicker/kicker/core/containerarealayout.cpp36
-rw-r--r--kicker/kicker/core/kickerbindings.cpp4
-rw-r--r--kicker/kicker/core/panelextension.cpp2
-rw-r--r--kicker/kicker/core/userrectsel.cpp4
-rw-r--r--kicker/kicker/core/usersizesel.cpp4
-rw-r--r--kicker/kicker/ui/addapplet.cpp18
-rw-r--r--kicker/kicker/ui/addappletvisualfeedback.cpp8
-rw-r--r--kicker/kicker/ui/appletop_mnu.cpp2
-rw-r--r--kicker/kicker/ui/browser_mnu.cpp4
-rw-r--r--kicker/kicker/ui/hidebutton.cpp20
-rw-r--r--kicker/kicker/ui/hidebutton.h4
-rw-r--r--kicker/kicker/ui/itemview.cpp8
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp8
-rw-r--r--kicker/kicker/ui/kickoff_bar.cpp2
-rw-r--r--kicker/kicker/ui/service_mnu.cpp4
-rw-r--r--kicker/libkicker/global.cpp10
-rw-r--r--kicker/libkicker/global.h2
-rw-r--r--kicker/libkicker/kickertip.cpp12
-rw-r--r--kicker/libkicker/kshadowengine.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp18
-rw-r--r--kicker/libkicker/panelbutton.h4
-rw-r--r--kicker/libkicker/panner.cpp18
-rw-r--r--kicker/libkicker/panner.h4
-rw-r--r--kicker/libkicker/simplebutton.cpp18
-rw-r--r--kicker/libkicker/simplebutton.h12
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp2
-rw-r--r--kicker/menuext/recentdocs/recentdocsmenu.cpp2
-rw-r--r--kicker/menuext/tom/tom.cpp24
-rw-r--r--kicker/taskbar/taskbar.cpp4
-rw-r--r--kicker/taskbar/taskbarcontainer.cpp2
-rw-r--r--kicker/taskbar/taskcontainer.cpp28
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp2
70 files changed, 345 insertions, 345 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 536d62065..c4fd6476a 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -425,7 +425,7 @@ void DigitalClock::drawContents( TQPainter * p)
p->translate( +1, +1 );
TQLCDNumber::drawContents( p );
if (_prefs->digitalLCDStyle())
- pal.setColor( TQColorGroup::Foreground, Qt::black);
+ pal.setColor( TQColorGroup::Foreground, TQt::black);
else
pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
setPalette( pal );
@@ -633,8 +633,8 @@ void AnalogClock::paintEvent( TQPaintEvent * )
}
if (_prefs->analogLCDStyle()) {
- paint.setPen( TQPen(Qt::black, aaFactor) );
- paint.setBrush( Qt::black );
+ paint.setPen( TQPen(TQt::black, aaFactor) );
+ paint.setBrush( TQt::black );
} else {
paint.setPen( TQPen(_prefs->analogForegroundColor(), aaFactor) );
paint.setBrush( _prefs->analogForegroundColor() );
@@ -854,7 +854,7 @@ void FuzzyClock::drawContents(TQPainter *p)
TQRect tr;
- if (_applet->getOrientation() == Qt::Vertical)
+ if (_applet->getOrientation() == TQt::Vertical)
{
p->rotate(90);
tr = TQRect(4, -2, height() - 8, -(width()) + 2);
@@ -970,7 +970,7 @@ KTextShadowEngine *ClockApplet::shadowEngine()
int ClockApplet::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
@@ -1081,7 +1081,7 @@ int ClockApplet::widthForHeight(int h) const
int ClockApplet::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
@@ -1642,13 +1642,13 @@ void ClockApplet::mousePressEvent(TQMouseEvent *ev)
{
switch (ev->button())
{
- case Qt::LeftButton:
+ case TQt::LeftButton:
toggleCalendar();
break;
- case Qt::RightButton:
+ case TQt::RightButton:
openContextMenu();
break;
- case Qt::MidButton:
+ case TQt::MidButton:
nextZone();
TQToolTip::remove(_clock->widget());
break;
@@ -1794,7 +1794,7 @@ void ClockApplet::fixupLayout()
// this fixes problems triggered by having the date first
// because of the date format (e.g. YY/MM/DD) and then hiding
// the date
- if (orientation() == Qt::Horizontal && height() < 32)
+ if (orientation() == TQt::Horizontal && height() < 32)
{
bool mustShowDate = showDate || (zone->zoneIndex() != 0);
diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp
index d6165306e..99b9fe33e 100644
--- a/kicker/applets/clock/datepicker.cpp
+++ b/kicker/applets/clock/datepicker.cpp
@@ -69,7 +69,7 @@ void DatePicker::keyPressEvent(TQKeyEvent *e)
{
TQVBox::keyPressEvent(e);
- if (e->key() == Qt::Key_Escape)
+ if (e->key() == TQt::Key_Escape)
{
close();
}
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index aa9126b8c..85a4f3f19 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -85,7 +85,7 @@ int Zone::calc_TZ_offset(const TQString& zone, bool /* reset */)
if (z)
{
- return -z->offset(Qt::LocalTime);
+ return -z->offset(TQt::LocalTime);
}
return 0;
diff --git a/kicker/applets/launcher/flowgridmanager.cpp b/kicker/applets/launcher/flowgridmanager.cpp
index 46c79a857..5172b4eee 100644
--- a/kicker/applets/launcher/flowgridmanager.cpp
+++ b/kicker/applets/launcher/flowgridmanager.cpp
@@ -17,7 +17,7 @@ FlowGridManager::FlowGridManager(TQSize p_item_size,
TQSize p_space_size,
TQSize p_border_size,
TQSize p_frame_size,
- Qt::Orientation orient,
+ TQt::Orientation orient,
int num_items,
Slack slack_x,Slack slack_y)
{
@@ -65,15 +65,15 @@ void FlowGridManager::setFrameSize(TQSize p_frame_size)
return;
_pFrameSize=p_frame_size;
if (_pFrameSize.width()<=0) {
- _orientation=Qt::Vertical;
+ _orientation=TQt::Vertical;
}
if (_pFrameSize.height()<=0) {
- _orientation=Qt::Horizontal;
+ _orientation=TQt::Horizontal;
}
_dirty=true;
}
-void FlowGridManager::setOrientation(Qt::Orientation orient)
+void FlowGridManager::setOrientation(TQt::Orientation orient)
{ if (orient==_orientation)
return;
_orientation=orient; _dirty=true;
@@ -114,7 +114,7 @@ TQSize FlowGridManager::frameSize() const
TQPoint FlowGridManager::origin() const
{ _checkReconfigure(); return _origin;}
-Qt::Orientation FlowGridManager::orientation() const
+TQt::Orientation FlowGridManager::orientation() const
{ _checkReconfigure(); return _orientation;}
/*Slack FlowGridManager::slackX() const
@@ -154,7 +154,7 @@ TQPoint FlowGridManager::cell(int index) const
// return height if orientation is Horizontal
// return width if orientation is Vertical
int FlowGridManager::_getHH(TQSize size) const
-{ if (_orientation==Qt::Horizontal)
+{ if (_orientation==TQt::Horizontal)
return size.height();
return size.width();
}
@@ -162,14 +162,14 @@ int FlowGridManager::_getHH(TQSize size) const
// return height if orientation is Vertical
// return width if orientation is Horizontal
int FlowGridManager::_getWH(TQSize size) const
-{ if (_orientation==Qt::Horizontal)
+{ if (_orientation==TQt::Horizontal)
return size.width();
return size.height();
}
// swap horizontal and vertical if orientation is Vertical, otherwise return arg
TQSize FlowGridManager::_swapHV(TQSize hv) const
-{ if (_orientation==Qt::Horizontal)
+{ if (_orientation==TQt::Horizontal)
return hv;
TQSize temp=hv;
temp.transpose();
diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h
index c801431b4..228210884 100644
--- a/kicker/applets/launcher/flowgridmanager.h
+++ b/kicker/applets/launcher/flowgridmanager.h
@@ -26,7 +26,7 @@ public:
TQSize p_space_size=TQSize(0,0),
TQSize p_border_size=TQSize(0,0),
TQSize frame_size=TQSize(0,0),
- Qt::Orientation orient=Qt::Horizontal,
+ TQt::Orientation orient=TQt::Horizontal,
int num_items=0,
Slack slack_x=ItemSlack,
Slack slack_y=ItemSlack);
@@ -36,7 +36,7 @@ public:
void setItemSize(TQSize item_size);
void setSpaceSize(TQSize space_size);
void setBorderSize(TQSize border_size);
- void setOrientation(Qt::Orientation orient);
+ void setOrientation(TQt::Orientation orient);
void setFrameSize(TQSize frame_size);
void setSlack(Slack slack_x, Slack slack_y);
void setConserveSpace(bool conserve);
@@ -49,7 +49,7 @@ public:
TQSize gridSpacing() const;
TQSize frameSize() const;
TQPoint origin() const;
- Qt::Orientation orientation() const;
+ TQt::Orientation orientation() const;
bool conserveSpace() const;
// Slack slackX() const;
@@ -76,7 +76,7 @@ protected:
TQSize _pItemSize,_pSpaceSize,_pBorderSize,_pFrameSize;
Slack _slackX, _slackY;
bool _conserveSpace;
- Qt::Orientation _orientation;
+ TQt::Orientation _orientation;
int _numItems;
// results
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index e85732431..741eee46d 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -219,9 +219,9 @@ void QuickButton::resizeEvent(TQResizeEvent *e)
void QuickButton::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
_popup->popup(e->globalPos());
- else if (e->button() == Qt::LeftButton) {
+ else if (e->button() == TQt::LeftButton) {
_dragPos = e->pos();
TQButton::mousePressEvent(e);
}
@@ -229,7 +229,7 @@ void QuickButton::mousePressEvent(TQMouseEvent *e)
void QuickButton::mouseMoveEvent(TQMouseEvent *e)
{
- if ((e->state() & Qt::LeftButton) == 0) return;
+ if ((e->state() & TQt::LeftButton) == 0) return;
TQPoint p(e->pos() - _dragPos);
if (p.manhattanLength() <= TDEGlobalSettings::dndEventDelay())
return;
@@ -246,7 +246,7 @@ void QuickButton::mouseMoveEvent(TQMouseEvent *e)
dd->drag();
releaseKeyboard();
} else {
- setCursor(Qt::ForbiddenCursor);
+ setCursor(TQt::ForbiddenCursor);
}
}
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 82a0a35a8..ebdc9346d 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -338,7 +338,7 @@ int QuickLauncher::widthForHeight(int h) const
{
FlowGridManager temp_manager = *m_manager;
temp_manager.setFrameSize(TQSize(h,h));
- temp_manager.setOrientation(Qt::Horizontal); // ??? probably not necessary
+ temp_manager.setOrientation(TQt::Horizontal); // ??? probably not necessary
if (temp_manager.isValid())
{
return temp_manager.frameSize().width();
@@ -351,7 +351,7 @@ int QuickLauncher::heightForWidth(int w) const
{
FlowGridManager temp_manager=*m_manager;
temp_manager.setFrameSize(TQSize(w,w));
- temp_manager.setOrientation(Qt::Vertical); // ??? probably not necessary
+ temp_manager.setOrientation(TQt::Vertical); // ??? probably not necessary
if (temp_manager.isValid())
{
return temp_manager.frameSize().height();
@@ -362,7 +362,7 @@ int QuickLauncher::heightForWidth(int w) const
int QuickLauncher::dimension() const
{
- if (orientation()==Qt::Vertical)
+ if (orientation()==TQt::Vertical)
{
return size().width();
}
@@ -507,7 +507,7 @@ void QuickLauncher::about()
void QuickLauncher::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::RightButton)
+ if (e->button() == TQt::RightButton)
{
m_popup->popup(e->globalPos());
}
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 75533202c..abe34c978 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -62,7 +62,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
//setFrameStyle(Panel | Sunken);
setBackgroundOrigin( AncestorOrigin );
- if ( orientation() == Qt::Horizontal )
+ if ( orientation() == TQt::Horizontal )
layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom );
else
layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight );
@@ -117,13 +117,13 @@ void Lockout::checkLayout( int height ) const
TQBoxLayout::Direction direction = layout->direction();
if ( direction == TQBoxLayout::LeftToRight &&
- ( ( orientation() == Qt::Vertical && s.width() - 2 >= height ) ||
- ( orientation() == Qt::Horizontal && s.width() - 2 < height ) ) ) {
+ ( ( orientation() == TQt::Vertical && s.width() - 2 >= height ) ||
+ ( orientation() == TQt::Horizontal && s.width() - 2 < height ) ) ) {
layout->setDirection( TQBoxLayout::TopToBottom );
}
else if ( direction == TQBoxLayout::TopToBottom &&
- ( ( orientation() == Qt::Vertical && s.height() - 2 < height ) ||
- ( orientation() == Qt::Horizontal && s.height() - 2 >= height ) ) ) {
+ ( ( orientation() == TQt::Vertical && s.height() - 2 < height ) ||
+ ( orientation() == TQt::Horizontal && s.height() - 2 >= height ) ) ) {
layout->setDirection( TQBoxLayout::LeftToRight );
}
}
@@ -194,7 +194,7 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
conf->setGroup("lockout");
TQMouseEvent *me = TQT_TQMOUSEEVENT( e );
- if( me->button() == Qt::RightButton )
+ if( me->button() == TQt::RightButton )
{
if( o == lockButton )
{
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index c3b964ce1..b50aea3d8 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -154,7 +154,7 @@ void MediaApplet::arrangeButtons()
MediumButton *button = *it;
button_size = std::max(button_size,
- orientation() == Qt::Vertical ?
+ orientation() == TQt::Vertical ?
button->heightForWidth(width()) :
button->widthForHeight(height()) );
// button->widthForHeight(height()) :
@@ -162,7 +162,7 @@ void MediaApplet::arrangeButtons()
}
int kicker_size;
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
kicker_size = width();
}
@@ -200,7 +200,7 @@ void MediaApplet::arrangeButtons()
++pack_count;
- if(orientation() == Qt::Vertical)
+ if(orientation() == TQt::Vertical)
{
if (pack_count < max_packed_buttons)
{
@@ -425,7 +425,7 @@ void MediaApplet::reloadList()
void MediaApplet::mousePressEvent(TQMouseEvent *e)
{
- if(e->button()==Qt::RightButton)
+ if(e->button()==TQt::RightButton)
{
TDEPopupMenu menu(this);
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index ac0fa1340..7685f04d7 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -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;
@@ -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();
}
@@ -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.
@@ -728,7 +728,7 @@ void KMiniPager::aboutToShowContextMenu()
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"):
+ showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"):
i18n("&Columns"),
rowMenu);
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 6d3355769..71e3f465b 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -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;
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index aaadfc33d..1121cf45b 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -115,7 +115,7 @@ RunApplet::~RunApplet()
void RunApplet::resizeEvent(TQResizeEvent*)
{
- if(orientation() == Qt::Horizontal)
+ if(orientation() == TQt::Horizontal)
{
_btn->hide();
_input->reparent(this, TQPoint(0,0), true);
@@ -288,7 +288,7 @@ void RunApplet::run_command(const TQString& command)
return;
hide:
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
_hbox->hide();
needsFocus(focusNeeded);
}
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 2fa4910cf..25a6de7de 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -119,7 +119,7 @@ void SystemTrayApplet::updateClockGeometry()
if (m_clockApplet)
{
m_clockApplet->setPosition(position());
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height());
}
@@ -253,7 +253,7 @@ void SystemTrayApplet::preferences()
connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings()));
connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished()));
- TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, Qt::Vertical);
+ TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, TQt::Vertical);
m_showClockSettingCB = new TQCheckBox(i18n("Show Clock in Tray"), settingsGrid);
m_showClockSettingCB->setChecked(m_showClockInTray);
@@ -432,11 +432,11 @@ void SystemTrayApplet::showExpandButton(bool show)
{
if (!m_expandButton)
{
- m_expandButton = new SimpleArrowButton(this, Qt::UpArrow, 0, KickerSettings::showDeepButtons());
+ m_expandButton = new SimpleArrowButton(this, TQt::UpArrow, 0, KickerSettings::showDeepButtons());
m_expandButton->installEventFilter(this);
refreshExpandButton();
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
m_expandButton->setFixedSize(width() - 4,
m_expandButton->sizeHint()
@@ -677,12 +677,12 @@ void SystemTrayApplet::refreshExpandButton()
return;
}
- Qt::ArrowType a;
+ TQt::ArrowType a;
- if (orientation() == Qt::Vertical)
- a = m_showHidden ? Qt::DownArrow : Qt::UpArrow;
+ if (orientation() == TQt::Vertical)
+ a = m_showHidden ? TQt::DownArrow : TQt::UpArrow;
else
- a = (m_showHidden ^ kapp->reverseLayout()) ? Qt::RightArrow : Qt::LeftArrow;
+ a = (m_showHidden ^ kapp->reverseLayout()) ? TQt::RightArrow : TQt::LeftArrow;
m_expandButton->setArrowType(a);
}
@@ -843,7 +843,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
else if (e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if (me->button() == Qt::RightButton)
+ if (me->button() == TQt::RightButton)
{
p = me->globalPos();
}
@@ -867,7 +867,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e)
int SystemTrayApplet::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
@@ -886,7 +886,7 @@ int SystemTrayApplet::widthForHeight(int h) const
int SystemTrayApplet::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
@@ -937,7 +937,7 @@ void SystemTrayApplet::layoutTray()
if (m_expandButton)
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height());
}
@@ -961,7 +961,7 @@ void SystemTrayApplet::layoutTray()
// This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded.
//
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout
heightWidth = width() - ICON_MARGIN;
@@ -972,7 +972,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_leftSpacer,
0, 0,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 1;
if (showExpandButton)
@@ -980,7 +980,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_expandButton,
1, 1,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 2;
}
@@ -993,7 +993,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), col, line,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1011,7 +1011,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), col, line,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1024,7 +1024,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_rightSpacer,
col, col,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if (m_clockApplet) {
if (m_showClockInTray)
@@ -1035,7 +1035,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_clockApplet,
col+1, col+1,
0, nbrOfLines - 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
}
}
else // horizontal
@@ -1048,7 +1048,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_leftSpacer,
0, nbrOfLines - 1,
0, 0,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 1;
if (showExpandButton)
@@ -1056,7 +1056,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_expandButton,
0, nbrOfLines - 1,
1, 1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
col = 2;
}
@@ -1068,7 +1068,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), line, col,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1086,7 +1086,7 @@ void SystemTrayApplet::layoutTray()
line = i % nbrOfLines;
(*emb)->show();
m_layout->addWidget((*emb), line, col,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if ((line + 1) == nbrOfLines)
{
@@ -1099,7 +1099,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_rightSpacer,
0, nbrOfLines - 1,
col, col,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
if (m_clockApplet) {
if (m_showClockInTray)
@@ -1110,7 +1110,7 @@ void SystemTrayApplet::layoutTray()
m_layout->addMultiCellWidget(m_clockApplet,
0, nbrOfLines - 1,
col+1, col+1,
- Qt::AlignHCenter | Qt::AlignVCenter);
+ TQt::AlignHCenter | TQt::AlignVCenter);
}
}
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 5673cb563..3e76d6a8d 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -72,14 +72,14 @@ TaskbarApplet::~TaskbarApplet()
int TaskbarApplet::widthForHeight(int h) const
{
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
return width();
}
// FIXME KDE4: when either TaskBarContainer or Applet smartens up
// simplify this
- KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+ KPanelExtension::Position d = orientation() == TQt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
return container->sizeHint(d, TQSize(200, h)).width();
@@ -87,14 +87,14 @@ int TaskbarApplet::widthForHeight(int h) const
int TaskbarApplet::heightForWidth(int w) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return height();
}
// FIXME KDE4: when either TaskBarContainer or Applet smartens up
// simplify this
- KPanelExtension::Position d = orientation() == Qt::Horizontal ?
+ KPanelExtension::Position d = orientation() == TQt::Horizontal ?
KPanelExtension::Top :
KPanelExtension::Left;
return container->sizeHint(d, TQSize(w, 200)).height();
diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp
index f431b8aed..9665d21b9 100644
--- a/kicker/applets/trash/trashapplet.cpp
+++ b/kicker/applets/trash/trashapplet.cpp
@@ -121,12 +121,12 @@ void TrashApplet::resizeEvent( TQResizeEvent * )
int size = 1;
size = std::max( size,
- orientation() == Qt::Vertical ?
+ orientation() == TQt::Vertical ?
mButton->heightForWidth( width() ) :
mButton->widthForHeight( height() ) );
- if(orientation() == Qt::Vertical)
+ if(orientation() == TQt::Vertical)
{
mButton->resize( width(), size );
}
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 446991109..cbd336f6f 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -174,7 +174,7 @@ void DockBarExtension::layoutContainers()
it != containers.constEnd();
++it)
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
(*it)->move(DockContainer::sz() * i, 0);
else
(*it)->move(0, DockContainer::sz() * i);
@@ -345,17 +345,17 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
}
void DockBarExtension::mousePressEvent(TQMouseEvent *e ) {
- if (e->button() == Qt::LeftButton) {
+ if (e->button() == TQt::LeftButton) {
// Store the position of the mouse clic.
mclic_pos = e->pos();
- } else if (e->button() == Qt::RightButton) {
+ } else if (e->button() == TQt::RightButton) {
int pos = findContainerAtPoint(e->pos());
if (pos != -1) containers.at(pos)->popupMenu(e->globalPos());
}
}
void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
- if (e->button() != Qt::LeftButton) return;
+ if (e->button() != TQt::LeftButton) return;
if (dragging_container) {
releaseMouse();
original_container->embed(dragging_container->embeddedWinId());
@@ -366,7 +366,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) {
}
void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
- if (! (e->state() & Qt::LeftButton) ) return;
+ if (! (e->state() & TQt::LeftButton) ) return;
if (dragging_container == 0) {
// Check whether the user has moved far enough.
int delay = TQApplication::startDragDistance();
@@ -393,7 +393,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
int pdrag1,pdrag2,psz;
pdrag1 = dragpos.x() - barpos.x() + DockContainer::sz()/2;
pdrag2 = dragpos.y() - barpos.y() + DockContainer::sz()/2;
- if (orientation() == Qt::Vertical) {
+ if (orientation() == TQt::Vertical) {
int tmp = pdrag1; pdrag1 = pdrag2; pdrag2 = tmp;
psz = height();
} else psz = width();
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 1d15dc7c8..54dd1dfd6 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -118,7 +118,7 @@ void KasAboutDialog::addDemoBar()
box->setSpacing( spacingHint() );
box->setMargin( marginHint() );
- KasBar *bar = new KasBar( Qt::Horizontal, box );
+ KasBar *bar = new KasBar( TQt::Horizontal, box );
bar->setItemSize( KasBar::Large );
bar->setMasked( false );
@@ -131,7 +131,7 @@ void KasAboutDialog::addDemoBar()
ci->setCustomPopup( true );
connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) );
- KasBar *groupbar = bar->createChildBar( ( bar->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+ KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
KasItem *i = 0;
KasClockItem *clk = new KasClockItem( groupbar );
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 87fc7c629..f28d2fd1f 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -80,7 +80,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
: TQWidget( parent, name, f ),
master_(0),
orient( o ),
- direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+ direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
itemUnderMouse_( 0 ),
boxesPerLine_(10), // Temp value
inDrag( false ),
@@ -109,7 +109,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
: TQWidget( parent, name, f ),
master_(master),
orient( o ),
- direction_( o == Qt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
+ direction_( o == TQt::Horizontal ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom ),
itemUnderMouse_( 0 ),
boxesPerLine_(10), // Temp value
inDrag( false ),
@@ -318,9 +318,9 @@ void KasBar::setDirection( Direction dir )
return;
if ( ( dir == TQBoxLayout::LeftToRight ) || ( dir == TQBoxLayout::RightToLeft ) )
- orient = Qt::Horizontal;
+ orient = TQt::Horizontal;
else
- orient = Qt::Vertical;
+ orient = TQt::Vertical;
direction_ = dir;
emit directionChanged();
@@ -332,7 +332,7 @@ void KasBar::setOrientation( Orientation o )
if ( orient == o )
return;
- if ( o == Qt::Horizontal )
+ if ( o == TQt::Horizontal )
setDirection( TQBoxLayout::LeftToRight );
else
setDirection( TQBoxLayout::TopToBottom );
@@ -377,7 +377,7 @@ void KasBar::setDetached( bool detach )
TQSize KasBar::sizeHint( Orientation o, TQSize sz )
{
- if ( o == Qt::Horizontal )
+ if ( o == TQt::Horizontal )
setBoxesPerLine( sz.width() / itemExtent() );
else
setBoxesPerLine( sz.height() / itemExtent() );
@@ -396,7 +396,7 @@ TQSize KasBar::sizeHint( Orientation o, TQSize sz )
++r;
TQSize s;
- if( o == Qt::Horizontal ) {
+ if( o == TQt::Horizontal ) {
s.setWidth( c*itemExtent() );
s.setHeight( r*itemExtent() );
}
@@ -434,7 +434,7 @@ void KasBar::updateLayout()
++r;
TQSize sz;
- if ( orient == Qt::Horizontal )
+ if ( orient == TQt::Horizontal )
sz = TQSize( c * itemExtent(), r * itemExtent() );
else
sz = TQSize( r * itemExtent(), c * itemExtent() );
@@ -449,7 +449,7 @@ void KasBar::updateLayout()
TQRegion mask;
KasItem *i;
- if ( orient == Qt::Horizontal ) {
+ if ( orient == TQt::Horizontal ) {
for ( i = items.first(); i; i = items.next() ) {
int x = (items.at() % c) * itemExtent();
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index 7602591e7..5aad7392a 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -84,8 +84,8 @@ class KDE_EXPORT KasBar : public TQWidget
friend class KasItem;
public:
- KasBar( Qt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
- KasBar( Qt::Orientation o, KasBar *master,
+ KasBar( TQt::Orientation o, TQWidget *parent=0, const char *name=0, WFlags f=0 );
+ KasBar( TQt::Orientation o, KasBar *master,
TQWidget* parent=0, const char* name=0, WFlags f=0 );
virtual ~KasBar();
@@ -99,7 +99,7 @@ public:
KasBar *master() const { return master_; }
/** Creates a child bar of the kasbar. The child will inherit the appearance options. */
- virtual KasBar *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+ virtual KasBar *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
/** Factory method that returns the singleton resources object. */
virtual KasResources *resources();
@@ -136,8 +136,8 @@ public:
int maxBoxes() const { return maxBoxes_; }
uint boxesPerLine() const { return boxesPerLine_; }
- void setOrientation( Qt::Orientation o );
- Qt::Orientation orientation() const { return orient; }
+ void setOrientation( TQt::Orientation o );
+ TQt::Orientation orientation() const { return orient; }
void setDirection( Direction dir );
Direction direction() const { return direction_; }
@@ -147,7 +147,7 @@ public:
bool isDrag() const { return inDrag; }
- TQSize sizeHint( Qt::Orientation, TQSize max );
+ TQSize sizeHint( TQt::Orientation, TQSize max );
//
// Look and feel options
@@ -282,7 +282,7 @@ private:
TQPixmap offscreen;
KasBar *master_;
KasItemList items;
- Qt::Orientation orient;
+ TQt::Orientation orient;
Direction direction_;
KasItem *itemUnderMouse_;
uint boxesPerLine_;
diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp
index 51e281a4f..1dc85038c 100644
--- a/kicker/extensions/kasbar/kasbarapp.cpp
+++ b/kicker/extensions/kasbar/kasbarapp.cpp
@@ -88,7 +88,7 @@ int main( int argc, char **argv )
TDEConfig conf( "kasbarrc" );
if ( args->isSet("test") ) {
- kasbar = new KasBar( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+ kasbar = new KasBar( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
kasbar->setItemSize( KasBar::Large );
kasbar->append( new KasClockItem(kasbar) );
kasbar->append( new KasItem(kasbar) );
@@ -97,7 +97,7 @@ int main( int argc, char **argv )
kasbar->addTestItems();
}
else {
- KasTasker *kastasker = new KasTasker( Qt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
+ KasTasker *kastasker = new KasTasker( TQt::Vertical, 0, "testkas", (TQt::WFlags)wflags );
kastasker->setConfig( &conf );
kastasker->setStandAlone( true );
kasbar = kastasker;
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index 5d870dae6..1aa373d3c 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -146,7 +146,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ )
TQSize KasBarExtension::detachedSize()
{
- if ( orientation() == Qt::Vertical )
+ if ( orientation() == TQt::Vertical )
return TQSize( kasbar->itemExtent()/2, 0 );
else
return TQSize( 0, kasbar->itemExtent()/2 );
@@ -155,13 +155,13 @@ TQSize KasBarExtension::detachedSize()
TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const
{
- Orientation o = Qt::Horizontal;
+ Orientation o = TQt::Horizontal;
if ( p == Left || p == Right )
- o = Qt::Vertical;
+ o = TQt::Vertical;
if ( detached_ ) {
- if ( o == Qt::Vertical )
+ if ( o == TQt::Vertical )
return TQSize( kasbar->itemExtent()/2, 0 );
else
return TQSize( 0, kasbar->itemExtent()/2 );
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index a14dff2ea..693f912c4 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -255,7 +255,7 @@ void KasGroupItem::updatePopup()
KasPopup *KasGroupItem::createPopup()
{
KasPopup *pop = new KasPopup( this );
- bar = kasbar()->createChildBar( ( kasbar()->orientation() == Qt::Horizontal ) ? Qt::Vertical : Qt::Horizontal, pop );
+ bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop );
connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) );
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index 2523ef18c..1967465f4 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -179,11 +179,11 @@ void KasItem::mouseEnter()
void KasItem::mouseReleaseEvent( TQMouseEvent *ev )
{
- if ( ev->button() == Qt::LeftButton )
+ if ( ev->button() == TQt::LeftButton )
emit leftButtonClicked( ev );
- else if ( ev->button() == Qt::RightButton )
+ else if ( ev->button() == TQt::RightButton )
emit rightButtonClicked( ev );
- else if ( ev->button() == Qt::MidButton )
+ else if ( ev->button() == TQt::MidButton )
emit middleButtonClicked( ev );
}
@@ -312,13 +312,13 @@ void KasItem::paintFrame( TQPainter *p )
p->drawRect( 0, 0, extent(), extent());
}
else {
- pen = TQPen( Qt::white );
+ pen = TQPen( TQt::white );
p->setPen( pen );
p->drawRect(0, 0, extent(), extent());
}
}
else if ( kas->paintInactiveFrames() ) {
- p->setPen( attention_ ? resources()->attentionColor() : Qt::black );
+ p->setPen( attention_ ? resources()->attentionColor() : TQt::black );
p->drawRect(0, 0, extent(), extent());
}
}
diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp
index 0edc0a77a..33966bdb9 100644
--- a/kicker/extensions/kasbar/kaspopup.cpp
+++ b/kicker/extensions/kasbar/kaspopup.cpp
@@ -95,7 +95,7 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h )
int x = pos.x();
int y = pos.y();
- if ( kasbar->orientation() == Qt::Horizontal ) {
+ if ( kasbar->orientation() == TQt::Horizontal ) {
if ( y < ( tqApp->desktop()->height() / 2 ) )
y = y + kasbar->itemExtent();
else
diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp
index 729fda525..6d5255082 100644
--- a/kicker/extensions/kasbar/kasprefsdlg.cpp
+++ b/kicker/extensions/kasbar/kasprefsdlg.cpp
@@ -227,7 +227,7 @@ void KasPrefsDialog::addBackgroundPage()
TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox );
int percent = (int) (kasbar->tintAmount() * 100.0);
- tintAmount = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, tintAmtBox );
+ tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox );
tintAmount->setTracking( true );
connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ),
kasbar, TQT_SLOT( setTintAmount( int ) ) );
@@ -261,7 +261,7 @@ void KasPrefsDialog::addThumbsPage()
"cause performance problems." ) );
TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox );
int percent = (int) (kasbar->thumbnailSize() * 100.0);
- thumbSizeSlider = new TQSlider( 0, 100, 1, percent, Qt::Horizontal, thumbSizeBox );
+ thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox );
connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ),
kasbar, TQT_SLOT( setThumbnailSize( int ) ) );
thumbSizeLabel->setBuddy( thumbSizeSlider );
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 78b25e8c0..219c324fb 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -126,10 +126,10 @@ static const char *micro_shade[]={
KasResources::KasResources( KasBar *parent, const char *name )
: TQObject( parent, name ? name : "kasbar_resources" ),
kasbar( parent ),
- labelPenColor_( Qt::white ), labelBgColor_( Qt::black ),
- activePenColor_( Qt::black ), activeBgColor_( Qt::white ),
- inactivePenColor_( Qt::black ), inactiveBgColor_( Qt::white ),
- progressColor_( Qt::green ), attentionColor_( Qt::red ),
+ labelPenColor_( TQt::white ), labelBgColor_( TQt::black ),
+ activePenColor_( TQt::black ), activeBgColor_( TQt::white ),
+ inactivePenColor_( TQt::black ), inactiveBgColor_( TQt::white ),
+ progressColor_( TQt::green ), attentionColor_( TQt::red ),
startupFrames_()
{
}
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index d10805a78..11185c9e0 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -635,7 +635,7 @@ void KasTasker::readConfig( TDEConfig *conf )
conf->setGroup("Layout");
setDirection( (Direction) conf->readNumEntry( "Direction", TQBoxLayout::LeftToRight ) );
- setOrientation( (Qt::Orientation) conf->readNumEntry( "Orientation", Qt::Horizontal ) );
+ setOrientation( (TQt::Orientation) conf->readNumEntry( "Orientation", TQt::Horizontal ) );
setMaxBoxes( conf->readUnsignedNumEntry( "MaxBoxes", 0 ) );
TQPoint pos(100, 100);
diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h
index d07c865fb..c05c13bb6 100644
--- a/kicker/extensions/kasbar/kastasker.h
+++ b/kicker/extensions/kasbar/kastasker.h
@@ -89,14 +89,14 @@ class KDE_EXPORT KasTasker : public KasBar
public:
/** Create a KasTasker widget. */
- KasTasker( Qt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+ KasTasker( TQt::Orientation o, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
/**
* Create a KasTasker widget that is slaved to another KasTasker. The
* created widget will inherit the settings of the parent, but will
* not connect to the signals of the TaskManager.
*/
- KasTasker( Qt::Orientation o, KasTasker *master,
+ KasTasker( TQt::Orientation o, KasTasker *master,
TQWidget *parent=0, const char *name=0, WFlags f=0 );
/** Cleans up. */
@@ -105,7 +105,7 @@ public:
/** Factory method that returns the default menu for items in the bar. */
virtual TDEPopupMenu *contextMenu();
- virtual KasTasker *createChildBar( Qt::Orientation o, TQWidget *parent, const char *name=0 );
+ virtual KasTasker *createChildBar( TQt::Orientation o, TQWidget *parent, const char *name=0 );
/**
* Returns true if this is the top KasTasker. Note that it is possible for
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 7b5fe4ed5..32ef9de81 100644
--- a/kicker/extensions/kasbar/kastaskpopup.cpp
+++ b/kicker/extensions/kasbar/kastaskpopup.cpp
@@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
}
KPixmapEffect::gradient( titleBg,
- Qt::black, colorGroup().mid(),
+ TQt::black, colorGroup().mid(),
KPixmapEffect::DiagonalGradient );
connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );
@@ -119,7 +119,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
TQString text = item->task()->visibleIconicName();
- p.setPen( Qt::white );
+ p.setPen( TQt::white );
if ( fontMetrics().width( text ) > width() - 4 )
p.drawText( 1, 1, width() - 4, TITLE_HEIGHT - 1, AlignLeft | AlignVCenter,
text );
@@ -133,7 +133,7 @@ void KasTaskPopup::paintEvent( TQPaintEvent * )
//
// Draw border
//
- p.setPen( Qt::black );
+ p.setPen( TQt::black );
p.drawRect( 0, 0, width(), height() );
}
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 1a4f6924b..89b0c4028 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -73,7 +73,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
m_resizeHandle->setFrameShape(TQFrame::Panel);
m_resizeHandle->setFrameShadow(TQFrame::Raised);
m_resizeHandle->setFixedWidth(6);
- m_resizeHandle->setCursor(TQCursor(Qt::SizeHorCursor));
+ m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor));
connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool)));
needLayoutUpdate(false);
m_resizeHandle->installEventFilter(this);
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 4606b27fb..dbb6c4195 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -101,7 +101,7 @@ void TaskBarExtension::positionChange( Position p )
m_container->popupDirectionChange(KPanelApplet::Right);
break;
case Floating:
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_container->popupDirectionChange(KPanelApplet::Down);
}
@@ -185,7 +185,7 @@ void TaskBarExtension::setBackgroundTheme()
{
TQImage bgImage = m_bgImage;
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
if (KickerSettings::rotateBackground())
{
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index d1bab6f3b..54e91b97d 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -116,7 +116,7 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e)
if (rect().contains(mapFromGlobal(me->globalPos())))
{
if (m_pressedDuringPopup && m_popup && m_openTimer != -1
- && (me->button() & Qt::LeftButton) )
+ && (me->button() & TQt::LeftButton) )
return true;
}
}
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index d00ef13d9..5bcf059c9 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -89,7 +89,7 @@ int AppletHandle::widthForHeight( int /* h */ ) const
void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
{
- Qt::ArrowType a = Qt::UpArrow;
+ TQt::ArrowType a = TQt::UpArrow;
if (d == m_popupDirection || !m_menuButton)
{
@@ -102,19 +102,19 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
{
case KPanelApplet::Up:
m_layout->setDirection(TQBoxLayout::BottomToTop);
- a = Qt::UpArrow;
+ a = TQt::UpArrow;
break;
case KPanelApplet::Down:
m_layout->setDirection(TQBoxLayout::TopToBottom);
- a = Qt::DownArrow;
+ a = TQt::DownArrow;
break;
case KPanelApplet::Left:
m_layout->setDirection(TQBoxLayout::RightToLeft);
- a = Qt::LeftArrow;
+ a = TQt::LeftArrow;
break;
case KPanelApplet::Right:
m_layout->setDirection(TQBoxLayout::LeftToRight);
- a = Qt::RightArrow;
+ a = TQt::RightArrow;
break;
}
@@ -225,7 +225,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
if (e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
- if (ev->button() == Qt::LeftButton || ev->button() == Qt::MidButton)
+ if (ev->button() == TQt::LeftButton || ev->button() == TQt::MidButton)
{
emit moveApplet(m_applet->mapFromGlobal(ev->globalPos()));
}
@@ -235,7 +235,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
if (m_menuButton && e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* ev = TQT_TQMOUSEEVENT(e);
- if (ev->button() == Qt::RightButton)
+ if (ev->button() == TQt::RightButton)
{
if (!m_menuButton->isDown())
{
@@ -312,7 +312,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
{
int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
return TQSize(wh, 0);
}
@@ -322,7 +322,7 @@ TQSize AppletHandleDrag::minimumSizeHint() const
TQSizePolicy AppletHandleDrag::sizePolicy() const
{
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Preferred );
}
@@ -360,7 +360,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
TQStyle::SFlags flags = TQStyle::Style_Default;
flags |= TQStyle::Style_Enabled;
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
flags |= TQStyle::Style_Horizontal;
}
@@ -387,7 +387,7 @@ TQSize AppletHandleButton::minimumSizeHint() const
int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
int width = height;
- if (m_parent->orientation() == Qt::Horizontal)
+ if (m_parent->orientation() == TQt::Horizontal)
{
return TQSize(width, height);
}
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index d710a1ade..81f2139c5 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -79,7 +79,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
_appletframe->setFrameStyle(TQFrame::NoFrame);
_appletframe->installEventFilter(this);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
_layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
}
@@ -191,7 +191,7 @@ void AppletContainer::resetLayout()
{
_handle->resetLayout();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
_layout->setDirection( TQBoxLayout::LeftToRight );
}
@@ -298,7 +298,7 @@ void AppletContainer::doSaveConfiguration( TDEConfigGroup& config,
bool layoutOnly ) const
{
// immutability is checked by ContainerBase
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
config.writeEntry( "WidthForHeightHint", widthForHeight(height()) );
}
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index e3131b2ed..8a7cd6d3c 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const char * name )
: TQWidget( parent, name )
, _dir(KPanelApplet::Up)
- , _orient(Qt::Horizontal)
+ , _orient(TQt::Horizontal)
, _alignment(KPanelExtension::LeftTop)
, _fspace(0)
, _moveOffset(TQPoint(0,0))
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index ac4c46733..529deb8b0 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -238,7 +238,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
switch (me->button())
{
- case Qt::MidButton:
+ case TQt::MidButton:
{
if (isImmutable())
{
@@ -252,7 +252,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
return true;
}
- case Qt::RightButton:
+ case TQt::RightButton:
{
if (!kapp->authorizeTDEAction("kicker_rmb") ||
isImmutable())
@@ -263,7 +263,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e)
TQPopupMenu* menu = opMenu();
connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) );
TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, TQT_TQWIDGET(this),
- (orientation() == Qt::Horizontal) ?
+ (orientation() == TQt::Horizontal) ?
TQPoint(0, 0) : me->pos());
Kicker::the()->setInsertionPoint(me->globalPos());
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 623deb786..4378e5a48 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -1208,7 +1208,7 @@ int ExtensionContainer::arrangeHideButtons()
_layout->setEnabled(false);
}
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
int maxWidth = width();
@@ -1227,7 +1227,7 @@ int ExtensionContainer::arrangeHideButtons()
_ltHB->setMaximumWidth(maxWidth);
_ltHB->setMaximumHeight(14);
_layout->remove(_ltHB);
- _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
+ _layout->addWidget(_ltHB, 0, 1, TQt::AlignBottom | TQt::AlignLeft);
}
if (_rbHB)
@@ -1252,8 +1252,8 @@ int ExtensionContainer::arrangeHideButtons()
maxHeight = maxHeight - (PANEL_RESIZE_HANDLE_WIDTH + PANEL_BOTTOM_SPACING_W_RESIZE_HANDLE);
}
- int vertAlignment = (position() == KPanelExtension::Top) ? Qt::AlignTop : 0;
- int leftAlignment = Qt::AlignRight;
+ int vertAlignment = (position() == KPanelExtension::Top) ? TQt::AlignTop : 0;
+ int leftAlignment = TQt::AlignRight;
if (_ltHB)
{
@@ -1262,11 +1262,11 @@ int ExtensionContainer::arrangeHideButtons()
_layout->remove(_ltHB);
if (kapp->reverseLayout())
{
- _layout->addWidget(_ltHB, 1, 2, (Qt::AlignmentFlags)vertAlignment);
+ _layout->addWidget(_ltHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
}
else
{
- _layout->addWidget(_ltHB, 1, 0, (Qt::AlignmentFlags)(leftAlignment | vertAlignment));
+ _layout->addWidget(_ltHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
}
}
@@ -1277,11 +1277,11 @@ int ExtensionContainer::arrangeHideButtons()
_layout->remove(_rbHB);
if (kapp->reverseLayout())
{
- _layout->addWidget(_rbHB, 1, 0, (Qt::AlignmentFlags)(leftAlignment | vertAlignment));
+ _layout->addWidget(_rbHB, 1, 0, (TQt::AlignmentFlags)(leftAlignment | vertAlignment));
}
else
{
- _layout->addWidget(_rbHB, 1, 2, (Qt::AlignmentFlags)vertAlignment);
+ _layout->addWidget(_rbHB, 1, 2, (TQt::AlignmentFlags)vertAlignment);
}
}
}
@@ -1315,7 +1315,7 @@ int ExtensionContainer::setupBorderSpace()
TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen());
TQRect h = geometry();
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
if (h.top() > 0)
{
@@ -1582,11 +1582,11 @@ KPanelExtension::Orientation ExtensionContainer::orientation() const
{
if (position() == KPanelExtension::Top || position() == KPanelExtension::Bottom)
{
- return Qt::Horizontal;
+ return TQt::Horizontal;
}
else
{
- return Qt::Vertical;
+ return TQt::Vertical;
}
}
@@ -1631,14 +1631,14 @@ void ExtensionContainer::resetLayout()
haveToArrangeButtons = true;
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
- _ltHB->setArrowType(Qt::LeftArrow);
+ _ltHB->setArrowType(TQt::LeftArrow);
_ltHB->setFixedSize(m_settings.hideButtonSize(), height());
}
else
{
- _ltHB->setArrowType(Qt::UpArrow);
+ _ltHB->setArrowType(TQt::UpArrow);
_ltHB->setFixedSize(width(), m_settings.hideButtonSize());
}
@@ -1662,14 +1662,14 @@ void ExtensionContainer::resetLayout()
haveToArrangeButtons = true;
}
- if ( orientation() == Qt::Horizontal)
+ if ( orientation() == TQt::Horizontal)
{
- _rbHB->setArrowType(Qt::RightArrow);
+ _rbHB->setArrowType(TQt::RightArrow);
_rbHB->setFixedSize(m_settings.hideButtonSize(), height());
}
else
{
- _rbHB->setArrowType(Qt::DownArrow);
+ _rbHB->setArrowType(TQt::DownArrow);
_rbHB->setFixedSize(width(), m_settings.hideButtonSize());
}
@@ -1709,7 +1709,7 @@ void ExtensionContainer::resetLayout()
updateGeometry();
int endBorderWidth = haveToArrangeButtons ? arrangeHideButtons() : setupBorderSpace();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (m_extension)
{
@@ -2146,7 +2146,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
case TQEvent::MouseButtonPress:
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if ( me->button() == Qt::LeftButton )
+ if ( me->button() == TQt::LeftButton )
{
if (inResizeArea(me->pos()))
{
@@ -2170,7 +2170,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
_is_lmb_down = true;
}
}
- else if (me->button() == Qt::RightButton)
+ else if (me->button() == TQt::RightButton)
{
showPanelMenu(me->globalPos());
return true; // don't crash!
@@ -2181,7 +2181,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
case TQEvent::MouseButtonRelease:
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if ( me->button() == Qt::LeftButton )
+ if ( me->button() == TQt::LeftButton )
{
_is_lmb_down = false;
}
@@ -2241,7 +2241,7 @@ bool ExtensionContainer::eventFilter( TQObject*, TQEvent * e)
}
if (_is_lmb_down &&
- ((me->state() & Qt::LeftButton) == Qt::LeftButton) &&
+ ((me->state() & TQt::LeftButton) == TQt::LeftButton) &&
!Kicker::the()->isImmutable() &&
!m_settings.config()->isImmutable() &&
!ExtensionManager::the()->isMenuBar(this))
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 89878a50d..589b512e1 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -153,7 +153,7 @@ void ContainerArea::defaultContainerConfig()
containers.append(new KMenuButtonContainer(m_opMenu, m_contents));
int dsize;
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
dsize = width();
}
@@ -850,7 +850,7 @@ void ContainerArea::resizeContents()
int w = width();
int h = height();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int newWidth = m_layout->widthForHeight(h);
if (newWidth > w)
@@ -962,7 +962,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
return;
}
- if (ev->state() == Qt::LeftButton && !rect().contains(ev->pos()))
+ if (ev->state() == TQt::LeftButton && !rect().contains(ev->pos()))
{
// leaveEvent() doesn't work, while grabbing the mouse
_autoScrollTimer.stop();
@@ -986,7 +986,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
return;
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int oldX = _moveAC->x() + _moveAC->moveOffset().x();
int x = ev->pos().x() + contentsX();
@@ -1082,7 +1082,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
preferedHeight = draggedContainer->heightForWidth(width());
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
_dragIndicator->setPreferredSize(TQSize(preferedWidth, height()));
}
@@ -1103,9 +1103,9 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
--it;
BaseContainer* a = *it;
- if ((orientation() == Qt::Horizontal &&
+ if ((orientation() == TQt::Horizontal &&
a->x() < (ev->pos().x() + contentsX()) - _dragMoveOffset.x()) ||
- (orientation() == Qt::Vertical &&
+ (orientation() == TQt::Vertical &&
a->y() < (ev->pos().y() + contentsY()) - _dragMoveOffset.y()))
{
_dragMoveAC = a;
@@ -1114,7 +1114,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
} while (it != m_containers.begin());
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
}
@@ -1143,7 +1143,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
startContainerMove(_moveAC);
// Align the container to the mouse position.
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x());
}
@@ -1159,7 +1159,7 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
return;
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
moveDragIndicator(ev->pos().x() + contentsX() - _dragMoveOffset.x());
}
@@ -1209,13 +1209,13 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
if (parent)
{
// Move container a
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
int oldX = a->x();
int x = _dragIndicator->x();
m_layout->moveContainerSwitch(a, x - oldX);
}
- else if (orientation() == Qt::Vertical)
+ else if (orientation() == TQt::Vertical)
{
int oldY = a->y();
int y = _dragIndicator->y();
@@ -1408,7 +1408,7 @@ void ContainerArea::resizeEvent(TQResizeEvent *ev)
void ContainerArea::viewportResizeEvent(TQResizeEvent* ev)
{
Panner::viewportResizeEvent(ev);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
m_contents->resize(kMax(widthForHeight(ev->size().height()),
ev->size().width()),
@@ -1487,7 +1487,7 @@ void ContainerArea::setBackground()
{
TQImage bgImage = srcImage;
- if (orientation() == Qt::Vertical)
+ if (orientation() == TQt::Vertical)
{
if (KickerSettings::rotateBackground())
{
@@ -1565,7 +1565,7 @@ TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a)
}
}
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (a)
{
@@ -1599,7 +1599,7 @@ void ContainerArea::moveDragIndicator(int pos)
// Move _dragIndicator to position pos, restricted by availableSpace.
// Resize _dragIndicator if necessary.
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (availableSpace.size().width() <
_dragIndicator->preferredSize().width())
@@ -1680,9 +1680,9 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
}
_pos = p;
- Qt::Orientation o = (p == KPanelExtension::Top ||
+ TQt::Orientation o = (p == KPanelExtension::Top ||
p == KPanelExtension::Bottom) ?
- Qt::Horizontal : Qt::Vertical;
+ TQt::Horizontal : TQt::Vertical;
bool orientationChanged = (orientation() != o);
m_layout->setEnabled(false);
@@ -1696,7 +1696,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
// when that gets called AFTER we've been moved
// it's not always safe to do the resize here, as scroll buttons
// from the panner may get in our way. =/
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
resizeContents(0, height());
}
@@ -1742,7 +1742,7 @@ void ContainerArea::autoScroll()
{
if(!_moveAC) return;
- if(orientation() == Qt::Horizontal) {
+ if(orientation() == TQt::Horizontal) {
if(_moveAC->pos().x() <= 80)
scrollBy(-10, 0);
else if(_moveAC->pos().x() >= width() - _moveAC->width() - 80)
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index 11d834630..9ee3b8835 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -122,7 +122,7 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio)
m_freeSpaceRatio = ratio;
}
-Qt::Orientation ContainerAreaLayoutItem::orientation() const
+TQt::Orientation ContainerAreaLayoutItem::orientation() const
{
return m_layout->orientation();
}
@@ -139,7 +139,7 @@ void ContainerAreaLayoutItem::setGeometryR(const TQRect& r)
int ContainerAreaLayoutItem::widthForHeightR(int h) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return widthForHeight(h);
}
@@ -151,7 +151,7 @@ int ContainerAreaLayoutItem::widthForHeightR(int h) const
int ContainerAreaLayoutItem::widthR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().width();
}
@@ -163,7 +163,7 @@ int ContainerAreaLayoutItem::widthR() const
int ContainerAreaLayoutItem::heightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().height();
}
@@ -175,7 +175,7 @@ int ContainerAreaLayoutItem::heightR() const
int ContainerAreaLayoutItem::leftR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (TQApplication::reverseLayout())
return m_layout->geometry().right() - geometry().right();
@@ -190,7 +190,7 @@ int ContainerAreaLayoutItem::leftR() const
int ContainerAreaLayoutItem::rightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (TQApplication::reverseLayout())
return m_layout->geometry().right() - geometry().left();
@@ -206,7 +206,7 @@ int ContainerAreaLayoutItem::rightR() const
ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent)
: TQLayout(parent),
- m_orientation(Qt::Horizontal),
+ m_orientation(TQt::Horizontal),
m_stretchEnabled(true)
{
}
@@ -251,7 +251,7 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio
return;
}
- int insPos = (orientation() == Qt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
+ int insPos = (orientation() == TQt::Horizontal) ? insertionPoint.x(): insertionPoint.y();
Item* current = *currentIt;
Item* next = *nextIt;
@@ -387,7 +387,7 @@ TQSize ContainerAreaLayout::sizeHint() const
{
const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return TQSize(widthForHeight(size), size);
}
@@ -401,7 +401,7 @@ TQSize ContainerAreaLayout::minimumSize() const
{
const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny);
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return TQSize(widthForHeight(size), size);
}
@@ -521,7 +521,7 @@ int ContainerAreaLayout::distanceToPreviousItem(ItemList::const_iterator it) con
void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
{
- const bool horizontal = orientation() == Qt::Horizontal;
+ const bool horizontal = orientation() == TQt::Horizontal;
const bool reverseLayout = TQApplication::reverseLayout();
if (horizontal && reverseLayout)
@@ -658,7 +658,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance)
{
- const bool horizontal = orientation() == Qt::Horizontal;
+ const bool horizontal = orientation() == TQt::Horizontal;
const bool reverseLayout = TQApplication::reverseLayout();
// Get the iterator 'it' pointing to the layoutitem representing 'a'.
@@ -729,7 +729,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it,
TQRect ContainerAreaLayout::transform(const TQRect& r) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (TQApplication::reverseLayout())
{
@@ -750,7 +750,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const
int ContainerAreaLayout::widthForHeightR(int h) const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return widthForHeight(h);
}
@@ -762,7 +762,7 @@ int ContainerAreaLayout::widthForHeightR(int h) const
int ContainerAreaLayout::widthR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().width();
}
@@ -774,7 +774,7 @@ int ContainerAreaLayout::widthR() const
int ContainerAreaLayout::heightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
return geometry().height();
}
@@ -786,7 +786,7 @@ int ContainerAreaLayout::heightR() const
int ContainerAreaLayout::leftR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
return geometry().left();
else
return geometry().top();
@@ -794,7 +794,7 @@ int ContainerAreaLayout::leftR() const
int ContainerAreaLayout::rightR() const
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
return geometry().right();
else
return geometry().bottom();
diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp
index 46cfa432d..b8d774fdb 100644
--- a/kicker/kicker/core/kickerbindings.cpp
+++ b/kicker/kicker/core/kickerbindings.cpp
@@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef LAUNCH_MENU
keys->insert("Program:kicker", i18n("Panel"));
- DEF(I18N_NOOP("Popup Launch Menu" ), ALT+Qt::Key_F1, WIN+Qt::Key_Menu,
+ DEF(I18N_NOOP("Popup Launch Menu" ), ALT+TQt::Key_F1, WIN+TQt::Key_Menu,
MenuManager::the(), kmenuAccelActivated());
#endif
#ifdef SHOW_DESKTOP
- DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+Qt::Key_D, WIN+CTRL+Qt::Key_D,
+ DEF(I18N_NOOP( "Toggle Showing Desktop" ), ALT+CTRL+TQt::Key_D, WIN+CTRL+TQt::Key_D,
this, slotToggleShowDesktop());
#endif
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 93bd2356b..9e8d7130a 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -162,7 +162,7 @@ bool PanelExtension::eventFilter(TQObject*, TQEvent * e)
if ( e->type() == TQEvent::MouseButtonPress )
{
TQMouseEvent* me = (TQMouseEvent*) e;
- if ( me->button() == Qt::RightButton && kapp->authorize("action/kicker_rmb"))
+ if ( me->button() == TQt::RightButton && kapp->authorize("action/kicker_rmb"))
{
Kicker::the()->setInsertionPoint(me->globalPos());
opMenu()->exec(me->globalPos());
diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp
index d48c43aad..04a2a4afd 100644
--- a/kicker/kicker/core/userrectsel.cpp
+++ b/kicker/kicker/core/userrectsel.cpp
@@ -46,7 +46,7 @@ UserRectSel::~UserRectSel()
void UserRectSel::mouseReleaseEvent(TQMouseEvent * e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
tqApp->exit_loop();
}
@@ -89,7 +89,7 @@ void UserRectSel::paintCurrent()
for (i = 0; i < 4; i++)
{
_frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
- _frame[i]->setPaletteBackgroundColor(Qt::black);
+ _frame[i]->setPaletteBackgroundColor(TQt::black);
}
for (i = 4; i < 8; i++)
{
diff --git a/kicker/kicker/core/usersizesel.cpp b/kicker/kicker/core/usersizesel.cpp
index 107a2527a..de18e7fe4 100644
--- a/kicker/kicker/core/usersizesel.cpp
+++ b/kicker/kicker/core/usersizesel.cpp
@@ -69,7 +69,7 @@ UserSizeSel::~UserSizeSel()
void UserSizeSel::mouseReleaseEvent(TQMouseEvent * e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
tqApp->exit_loop();
}
@@ -156,7 +156,7 @@ void UserSizeSel::paintCurrent()
for (i = 0; i < 4; i++)
{
_frame[i] = new TQWidget(0, 0, (WFlags)(WStyle_Customize | WStyle_NoBorder | WX11BypassWM));
- _frame[i]->setPaletteBackgroundColor(Qt::black);
+ _frame[i]->setPaletteBackgroundColor(TQt::black);
}
for (i = 4; i < 8; i++)
{
diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index cf63bd697..205f5a43d 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -85,7 +85,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
if (e->type() == TQEvent::MouseButtonPress)
{
TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
- if (me->button() & Qt::LeftButton)
+ if (me->button() & TQt::LeftButton)
{
m_dragStart = me->pos();
}
@@ -123,21 +123,21 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
void AppletWidget::keyPressEvent(TQKeyEvent *e)
{
- if (e->key() == Qt::Key_Enter ||
- e->key() == Qt::Key_Return)
+ if (e->key() == TQt::Key_Enter ||
+ e->key() == TQt::Key_Return)
{
emit doubleClicked(this);
}
- else if (e->key() == Qt::Key_Up)
+ else if (e->key() == TQt::Key_Up)
{
TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0);
TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0);
TQApplication::sendEvent(this, &fakedKeyPress);
TQApplication::sendEvent(this, &fakedKeyRelease);
}
- else if (e->key() == Qt::Key_Down)
+ else if (e->key() == TQt::Key_Down)
{
- TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_Tab, 0, 0);
+ TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_Tab, 0, 0);
TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0);
TQApplication::sendEvent(this, &fakedKeyPress);
TQApplication::sendEvent(this, &fakedKeyRelease);
@@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e)
void AppletWidget::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
emit clicked(this);
m_dragStart = e->pos();
@@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e)
void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton &&
+ if (e->button() == TQt::LeftButton &&
!m_dragStart.isNull() &&
(e->pos() - m_dragStart).manhattanLength() >
TDEGlobalSettings::dndEventDelay())
@@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e)
void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e)
{
- if (!e->button() == Qt::LeftButton)
+ if (!e->button() == TQt::LeftButton)
{
AppletItem::mouseDoubleClickEvent(e);
return;
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 77bccbb0a..1226c9b37 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -109,10 +109,10 @@ void AddAppletVisualFeedback::makeMask()
{
TQPainter maskPainter(&m_mask);
- m_mask.fill(Qt::black);
+ m_mask.fill(TQt::black);
- maskPainter.setBrush(Qt::white);
- maskPainter.setPen(Qt::white);
+ maskPainter.setBrush(TQt::white);
+ maskPainter.setPen(TQt::white);
maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
1600 / m_mask.rect().height());
setMask(m_mask);
@@ -156,7 +156,7 @@ void AddAppletVisualFeedback::displayInternal()
// draw background
TQPainter bufferPainter(&m_pixmap);
- bufferPainter.setPen(Qt::black);
+ bufferPainter.setPen(TQt::black);
bufferPainter.setBrush(colorGroup().background());
bufferPainter.drawRoundRect(0, 0, width, height,
1600 / width, 1600 / height);
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index a037909b6..f1aa98023 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -213,7 +213,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
void PanelAppletOpMenu::keyPressEvent(TQKeyEvent* e)
{
- if (e->key() == Qt::Key_Escape)
+ if (e->key() == TQt::Key_Escape)
{
emit escapePressed();
}
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index c5b76569c..2082c4bb5 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
{
TQPopupMenu::mouseMoveEvent(e);
- if (!(e->state() & Qt::LeftButton)) return;
+ if (!(e->state() & TQt::LeftButton)) return;
if(_lastpress == TQPoint(-1, -1)) return;
// DND delay
@@ -422,7 +422,7 @@ void PanelBrowserMenu::dragEnterEvent( TQDragEnterEvent *ev )
void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev)
{
- TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), Qt::NoButton, Qt::LeftButton);
+ TQMouseEvent mev(TQEvent::MouseMove, ev->pos(), TQt::NoButton, TQt::LeftButton);
TQPopupMenu::mouseMoveEvent(&mev);
}
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 031aed93e..795535976 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -34,7 +34,7 @@
HideButton::HideButton(TQWidget *parent, const char *name)
: TQButton(parent, name),
m_highlight(false),
- m_arrow(Qt::LeftArrow)
+ m_arrow(TQt::LeftArrow)
{
setBackgroundOrigin(AncestorOrigin);
@@ -49,22 +49,22 @@ HideButton::HideButton(TQWidget *parent, const char *name)
void HideButton::drawButton(TQPainter *p)
{
- if (m_arrow == Qt::LeftArrow)
+ if (m_arrow == TQt::LeftArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(width()-1, 0, width()-1, height());
}
- else if (m_arrow == Qt::RightArrow)
+ else if (m_arrow == TQt::RightArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(0, 0, 0, height());
}
- else if (m_arrow == Qt::UpArrow)
+ else if (m_arrow == TQt::UpArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(0, height()-1, width(), height()-1);
}
- else if (m_arrow == Qt::DownArrow)
+ else if (m_arrow == TQt::DownArrow)
{
p->setPen(colorGroup().mid());
p->drawLine(0, 0, width(), 0);
@@ -106,24 +106,24 @@ void HideButton::setPixmap(const TQPixmap &pix)
generateIcons();
}
-void HideButton::setArrowType(Qt::ArrowType arrow)
+void HideButton::setArrowType(TQt::ArrowType arrow)
{
m_arrow = arrow;
switch (arrow)
{
- case Qt::LeftArrow:
+ case TQt::LeftArrow:
setPixmap(SmallIcon("1leftarrow"));
break;
- case Qt::RightArrow:
+ case TQt::RightArrow:
setPixmap(SmallIcon("1rightarrow"));
break;
- case Qt::UpArrow:
+ case TQt::UpArrow:
setPixmap(SmallIcon("1uparrow"));
break;
- case Qt::DownArrow:
+ case TQt::DownArrow:
default:
setPixmap(SmallIcon("1downarrow"));
break;
diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h
index 9a36d0df3..c8c754857 100644
--- a/kicker/kicker/ui/hidebutton.h
+++ b/kicker/kicker/ui/hidebutton.h
@@ -29,7 +29,7 @@ class HideButton : public TQButton
public:
HideButton(TQWidget *parent, const char *name = 0);
- void setArrowType(Qt::ArrowType arrow);
+ void setArrowType(TQt::ArrowType arrow);
void setPixmap(const TQPixmap &pix);
protected:
@@ -44,7 +44,7 @@ class HideButton : public TQButton
bool m_highlight;
TQPixmap m_normalIcon;
TQPixmap m_activeIcon;
- Qt::ArrowType m_arrow;
+ TQt::ArrowType m_arrow;
protected slots:
void slotSettingsChanged( int category );
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 58be287bb..64576a71f 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -944,14 +944,14 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
if (m_mouseMoveSelects) {
if(i && i->isEnabled() && !i->isSelected() &&
// FIXME: This is wrong if you drag over the items.
- (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+ (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
TDEListView::setSelected(i, true);
else if (!i && selectedItem())
TDEListView::setSelected(selectedItem(), false);
}
if ( link_cursor )
- setCursor( Qt::PointingHandCursor );
+ setCursor( TQt::PointingHandCursor );
else
unsetCursor();
@@ -999,7 +999,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e)
if(i && i->isEnabled() && !i->isSelected() &&
// FIXME: This is wrong if you drag over the items.
- (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
+ (e->state() & (TQt::LeftButton|TQt::MidButton|TQt::RightButton)) == 0)
TDEListView::setSelected(i, true);
else if (!i && selectedItem())
TDEListView::setSelected(selectedItem(), false);
@@ -1029,7 +1029,7 @@ TQDragObject * ItemView::dragObject()
mask = *pix.mask();
else {
mask.resize(pix.size());
- mask.fill(Qt::color1);
+ mask.fill(TQt::color1);
}
bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP );
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index af8012c11..07a2817af 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -743,8 +743,8 @@ void KMenu::paintSearchTab( bool active )
m_tabBar->deactivateTabs(true);
- p.setBrush( Qt::white );
- p.setPen( Qt::NoPen );
+ p.setBrush( TQt::white );
+ p.setPen( TQt::NoPen );
if ( m_orientation == BottomUp ) {
search_tab_center.convertFromImage( search_tab_center.convertToImage().scale(search_tab_center.width(), m_searchFrame->height()));
@@ -2001,7 +2001,7 @@ void KMenu::createNewProgramList()
m_seenPrograms = KickerSettings::firstSeenApps();
m_newInstalledPrograms.clear();
- m_currentDate = TQDate::currentDate().toString(Qt::ISODate);
+ m_currentDate = TQDate::currentDate().toString(TQt::ISODate);
bool initialize = (m_seenPrograms.count() == 0);
@@ -2063,7 +2063,7 @@ void KMenu::createNewProgramList(TQString relPath)
else {
++it_find;
if (*(it_find)!="-") {
- TQDate date = TQDate::fromString(*(it_find),Qt::ISODate);
+ TQDate date = TQDate::fromString(*(it_find),TQt::ISODate);
if (date.daysTo(TQDate::currentDate())<3) {
if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
m_newInstalledPrograms+=s->storageId();
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index c13bffe14..266de18fb 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -223,7 +223,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event)
void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
{
- if ( e->button() != Qt::LeftButton ) {
+ if ( e->button() != TQt::LeftButton ) {
e->ignore();
return;
}
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 57b027a34..10510ca6f 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -571,7 +571,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev)
void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
{
- if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable())
+ if (ev->button() == TQt::RightButton && !Kicker::the()->isKioskImmutable())
{
int id = idAt( ev->pos() );
@@ -758,7 +758,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
if (Kicker::the()->isKioskImmutable())
return;
- if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton )
+ if ( (ev->state() & TQt::LeftButton ) != TQt::LeftButton )
return;
TQPoint p = ev->pos() - startPos_;
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 8c45d519d..224cf427a 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -114,19 +114,19 @@ KPanelApplet::Direction arrowToDirection(TQt::ArrowType p)
{
switch (p)
{
- case Qt::DownArrow:
+ case TQt::DownArrow:
return KPanelApplet::Down;
break;
- case Qt::LeftArrow:
+ case TQt::LeftArrow:
return KPanelApplet::Left;
break;
- case Qt::RightArrow:
+ case TQt::RightArrow:
return KPanelApplet::Right;
break;
- case Qt::UpArrow:
+ case TQt::UpArrow:
default:
return KPanelApplet::Up;
break;
@@ -464,7 +464,7 @@ TQIconSet menuIconSet(const TQString& icon)
void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int alpha)
{
static TQPixmap pix;
- static TQColor last_color = Qt::black;
+ static TQColor last_color = TQt::black;
static int last_alpha = 0;
if (pix.isNull() || last_color != color || last_alpha != alpha)
diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h
index 663987174..61ba2f0ea 100644
--- a/kicker/libkicker/global.h
+++ b/kicker/libkicker/global.h
@@ -57,7 +57,7 @@ KDE_EXPORT void colorize(TQImage& image);
/**
* Blend a color rectangle on a painter
*/
-KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = Qt::black, int alpha = 0x40);
+KDE_EXPORT void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color = TQt::black, int alpha = 0x40);
/**
* Blend two colours together to get a colour halfway in between
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 99c81ce6d..b3716a871 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -283,10 +283,10 @@ void KickerTip::plainMask()
{
TQPainter maskPainter(&m_mask);
- m_mask.fill(Qt::color0);
+ m_mask.fill(TQt::color0);
- maskPainter.setBrush(Qt::color1);
- maskPainter.setPen(Qt::NoPen);
+ maskPainter.setBrush(TQt::color1);
+ maskPainter.setPen(TQt::NoPen);
//maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
drawRoundRect(maskPainter, m_mask.rect());
setMask(m_mask);
@@ -297,10 +297,10 @@ void KickerTip::dissolveMask()
{
TQPainter maskPainter(&m_mask);
- m_mask.fill(Qt::color0);
+ m_mask.fill(TQt::color0);
- maskPainter.setBrush(Qt::color1);
- maskPainter.setPen(Qt::NoPen);
+ maskPainter.setBrush(TQt::color1);
+ maskPainter.setPen(TQt::NoPen);
//maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
drawRoundRect(maskPainter, m_mask.rect());
diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp
index a933026d5..76f1b9d87 100644
--- a/kicker/libkicker/kshadowengine.cpp
+++ b/kicker/libkicker/kshadowengine.cpp
@@ -236,7 +236,7 @@ void KTextShadowEngine::drawText(TQPainter &p, const TQRect &tr, int tf, const T
// draw text
pixPainter.begin(&textPixmap);
- pixPainter.setPen(Qt::white);
+ pixPainter.setPen(TQt::white);
pixPainter.setFont(p.font()); // get the font from the root painter
pixPainter.drawText(tr, tf, str);
pixPainter.end();
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index b7b7ba457..b8091e020 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -74,7 +74,7 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard
m_arrowDirection(KPanelExtension::Bottom),
m_popupDirection(KPanelApplet::Up),
m_iconAlignment(AlignCenter),
- m_orientation(Qt::Horizontal),
+ m_orientation(TQt::Horizontal),
m_size((TDEIcon::StdSizes)-1),
m_fontPercent(0.40),
m_forceStandardCursor(forceStandardCursor)
@@ -196,7 +196,7 @@ void PanelButton::setPopupDirection(KPanelApplet::Direction d)
setArrowDirection(KickerLib::directionToPopupPosition(d));
}
-void PanelButton::setIconAlignment(Qt::AlignmentFlags align)
+void PanelButton::setIconAlignment(TQt::AlignmentFlags align)
{
m_iconAlignment = align;
update();
@@ -305,7 +305,7 @@ int PanelButton::widthForHeight(int height) const
// we only paint the text when horizontal, so make sure we're horizontal
// before adding the text in here
- if (orientation() == Qt::Horizontal && !m_buttonText.isEmpty())
+ if (orientation() == TQt::Horizontal && !m_buttonText.isEmpty())
{
TQFont f(font());
//f.setPixelSize(KMIN(height, KMAX(int(float(height) * m_fontPercent), 16)));
@@ -483,7 +483,7 @@ void PanelButton::dropEvent(TQDropEvent* e)
void PanelButton::mouseMoveEvent(TQMouseEvent *e)
{
- if (!m_isLeftMouseButtonDown || (e->state() & Qt::LeftButton) == 0)
+ if (!m_isLeftMouseButtonDown || (e->state() & TQt::LeftButton) == 0)
{
return;
}
@@ -501,7 +501,7 @@ void PanelButton::mouseMoveEvent(TQMouseEvent *e)
void PanelButton::mousePressEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_lastLeftMouseButtonPress = e->pos();
m_isLeftMouseButtonDown = true;
@@ -511,7 +511,7 @@ void PanelButton::mousePressEvent(TQMouseEvent *e)
void PanelButton::mouseReleaseEvent(TQMouseEvent *e)
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_isLeftMouseButtonDown = false;
@@ -645,7 +645,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
else if (m_iconAlignment & AlignBottom)
y = (height() - icon.height());
- if (!m_buttonText.isEmpty() && orientation() == Qt::Horizontal)
+ if (!m_buttonText.isEmpty() && orientation() == TQt::Horizontal)
{
int h = height();
int w = width();
@@ -749,7 +749,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
r = TQRect(0, (height() - arrowSize)/2, arrowSize, arrowSize);
break;
case KPanelExtension::Floating:
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
e = TQStyle::PE_ArrowDown;
r.moveBy(0, height() - arrowSize);
@@ -795,7 +795,7 @@ int PanelButton::preferredIconSize(int proposed_size) const
if (proposed_size < 0)
{
- proposed_size = (orientation() == Qt::Horizontal) ? height() : width();
+ proposed_size = (orientation() == TQt::Horizontal) ? height() : width();
}
// determine the upper limit on the size. Normally, this is panelSize,
diff --git a/kicker/libkicker/panelbutton.h b/kicker/libkicker/panelbutton.h
index 5df1c62b6..cea132680 100644
--- a/kicker/libkicker/panelbutton.h
+++ b/kicker/libkicker/panelbutton.h
@@ -263,7 +263,7 @@ public slots:
protected:
- void setIconAlignment(Qt::AlignmentFlags align);
+ void setIconAlignment(TQt::AlignmentFlags align);
/**
* Subclasses must implement this to define the name of the button which is
* used to identify this button for saving and loading. It must be unique
@@ -406,7 +406,7 @@ private:
TQPixmap m_iconz; // mouse over
KPanelExtension::Position m_arrowDirection;
KPanelApplet::Direction m_popupDirection;
- Qt::AlignmentFlags m_iconAlignment;
+ TQt::AlignmentFlags m_iconAlignment;
Orientation m_orientation;
int m_size;
double m_fontPercent;
diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp
index 580d0e088..a868747fb 100644
--- a/kicker/libkicker/panner.cpp
+++ b/kicker/libkicker/panner.cpp
@@ -57,7 +57,7 @@ Panner::Panner( TQWidget* parent, const char* name )
// layout
_layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight);
_layout->addWidget(_clipper, 1);
- setOrientation(Qt::Horizontal);
+ setOrientation(TQt::Horizontal);
}
Panner::~Panner()
@@ -97,12 +97,12 @@ void Panner::createScrollButtons()
void Panner::setupButtons()
{
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
if (_luSB)
{
- _luSB->setArrowType(Qt::LeftArrow);
- _rdSB->setArrowType(Qt::RightArrow);
+ _luSB->setArrowType(TQt::LeftArrow);
+ _rdSB->setArrowType(TQt::RightArrow);
_luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
_rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
TQToolTip::add(_luSB, i18n("Scroll left"));
@@ -115,8 +115,8 @@ void Panner::setupButtons()
{
if (_luSB)
{
- _luSB->setArrowType(Qt::UpArrow);
- _rdSB->setArrowType(Qt::DownArrow);
+ _luSB->setArrowType(TQt::UpArrow);
+ _rdSB->setArrowType(TQt::DownArrow);
_luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
_rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
TQToolTip::add(_luSB, i18n("Scroll up"));
@@ -149,7 +149,7 @@ void Panner::resizeEvent( TQResizeEvent* )
void Panner::scrollRightDown()
{
- if(orientation() == Qt::Horizontal) // scroll right
+ if(orientation() == TQt::Horizontal) // scroll right
scrollBy( _step, 0 );
else // scroll down
scrollBy( 0, _step );
@@ -159,7 +159,7 @@ void Panner::scrollRightDown()
void Panner::scrollLeftUp()
{
- if(orientation() == Qt::Horizontal) // scroll left
+ if(orientation() == TQt::Horizontal) // scroll left
scrollBy( -_step, 0 );
else // scroll up
scrollBy( 0, -_step );
@@ -197,7 +197,7 @@ void Panner::reallyUpdateScrollButtons()
_updateScrollButtonsTimer->stop();
- if (orientation() == Qt::Horizontal)
+ if (orientation() == TQt::Horizontal)
{
delta = contentsWidth() - width();
}
diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h
index efdb6bde5..36305bb0c 100644
--- a/kicker/libkicker/panner.h
+++ b/kicker/libkicker/panner.h
@@ -41,8 +41,8 @@ public:
TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
- Qt::Orientation orientation() const { return _orient; }
- virtual void setOrientation(Qt::Orientation orientation);
+ TQt::Orientation orientation() const { return _orient; }
+ virtual void setOrientation(TQt::Orientation orientation);
TQWidget *viewport() const { return _viewport; }
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index 12d5085d4..8d438d7ce 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -42,7 +42,7 @@
SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandardCursor)
: TQButton(parent, name),
m_highlight(false),
- m_orientation(Qt::Horizontal),
+ m_orientation(TQt::Horizontal),
m_forceStandardCursor(forceStandardCursor)
{
setBackgroundOrigin( AncestorOrigin );
@@ -65,7 +65,7 @@ void SimpleButton::setPixmap(const TQPixmap &pix)
update();
}
-void SimpleButton::setOrientation(Qt::Orientation orientation)
+void SimpleButton::setOrientation(TQt::Orientation orientation)
{
m_orientation = orientation;
update();
@@ -220,7 +220,7 @@ void SimpleButton::resizeEvent( TQResizeEvent * )
}
-SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, const char *name, bool forceStandardCursor)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name, bool forceStandardCursor)
: SimpleButton(parent, name, forceStandardCursor),
m_forceStandardCursor(forceStandardCursor)
{
@@ -234,7 +234,7 @@ TQSize SimpleArrowButton::sizeHint() const
return TQSize( 12, 12 );
}
-void SimpleArrowButton::setArrowType(Qt::ArrowType a)
+void SimpleArrowButton::setArrowType(TQt::ArrowType a)
{
if (_arrow != a)
{
@@ -243,7 +243,7 @@ void SimpleArrowButton::setArrowType(Qt::ArrowType a)
}
}
-Qt::ArrowType SimpleArrowButton::arrowType() const
+TQt::ArrowType SimpleArrowButton::arrowType() const
{
return _arrow;
}
@@ -255,10 +255,10 @@ void SimpleArrowButton::drawButton( TQPainter *p )
TQStyle::PrimitiveElement pe = TQStyle::PE_ArrowLeft;
switch (_arrow)
{
- case Qt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
- case Qt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
- case Qt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
- case Qt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
+ case TQt::LeftArrow: pe = TQStyle::PE_ArrowLeft; break;
+ case TQt::RightArrow: pe = TQStyle::PE_ArrowRight; break;
+ case TQt::UpArrow: pe = TQStyle::PE_ArrowUp; break;
+ case TQt::DownArrow: pe = TQStyle::PE_ArrowDown; break;
}
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h
index b34bd4efd..7f1718273 100644
--- a/kicker/libkicker/simplebutton.h
+++ b/kicker/libkicker/simplebutton.h
@@ -33,7 +33,7 @@ class KDE_EXPORT SimpleButton : public TQButton
public:
SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE);
void setPixmap(const TQPixmap &pix);
- void setOrientation(Qt::Orientation orientaton);
+ void setOrientation(TQt::Orientation orientaton);
TQSize sizeHint() const;
TQSize minimumSizeHint() const;
@@ -55,7 +55,7 @@ class KDE_EXPORT SimpleButton : public TQButton
TQPixmap m_normalIcon;
TQPixmap m_activeIcon;
TQPixmap m_disabledIcon;
- Qt::Orientation m_orientation;
+ TQt::Orientation m_orientation;
bool m_forceStandardCursor;
class SimpleButtonPrivate;
SimpleButtonPrivate* d;
@@ -66,7 +66,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
TQ_OBJECT
public:
- SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
+ SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
virtual ~SimpleArrowButton() {};
TQSize sizeHint() const;
@@ -74,13 +74,13 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
virtual void enterEvent( TQEvent *e );
virtual void leaveEvent( TQEvent *e );
virtual void drawButton(TQPainter *p);
- Qt::ArrowType arrowType() const;
+ TQt::ArrowType arrowType() const;
public slots:
- void setArrowType(Qt::ArrowType a);
+ void setArrowType(TQt::ArrowType a);
private:
- Qt::ArrowType _arrow;
+ TQt::ArrowType _arrow;
bool m_forceStandardCursor;
bool _inside;
};
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 3d9369fc6..2ab6afc2c 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -136,7 +136,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev)
{
KPanelMenu::mouseMoveEvent(ev);
- if ((ev->state() & Qt::LeftButton) != Qt::LeftButton)
+ if ((ev->state() & TQt::LeftButton) != TQt::LeftButton)
{
return;
}
diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp
index df6854efc..ae4137017 100644
--- a/kicker/menuext/recentdocs/recentdocsmenu.cpp
+++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp
@@ -111,7 +111,7 @@ void RecentDocsMenu::mousePressEvent(TQMouseEvent* e) {
void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) {
KPanelMenu::mouseMoveEvent(e);
- if (!(e->state() & Qt::LeftButton))
+ if (!(e->state() & TQt::LeftButton))
return;
if (!rect().contains(_mouseDown))
diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp
index 0fa85a1e3..28fbdf000 100644
--- a/kicker/menuext/tom/tom.cpp
+++ b/kicker/menuext/tom/tom.cpp
@@ -105,7 +105,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
l1->setPixmap(foo);
runLayout->addWidget(l1);*/
/*TQLabel* l2 = new TQLabel(i18n("&Run: "), this);
- l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+ l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
l2->setBuddy(this);
runLayout->addWidget(l2);*/
m_runEdit = new KHistoryCombo(this);
@@ -116,21 +116,21 @@ class runMenuWidget : public TQWidget, public QMenuItem
TQSettings settings;
if (settings.readEntry("/TDEStyle/Settings/MenuTransparencyEngine", "Disabled") != "Disabled")
{
- setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- //l1->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+ setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ //l1->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
}
else
{
- /*setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- l2->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- m_runEdit->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);*/
+ /*setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ l2->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ m_runEdit->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);*/
//l1->setAutoMask(true);
- //l1->setBackgroundMode(Qt::NoBackground, Qt::NoBackground);
- //l2->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
- //m_runEdit->setBackgroundMode(Qt::X11ParentRelative, Qt::X11ParentRelative);
+ //l1->setBackgroundMode(TQt::NoBackground, TQt::NoBackground);
+ //l2->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
+ //m_runEdit->setBackgroundMode(TQt::X11ParentRelative, TQt::X11ParentRelative);
}
setMinimumHeight(TDEIcon::SizeMedium + 2);
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index af4f0f909..9ca123a94 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -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;
@@ -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)
diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index a891cf64e..f9ba06c32 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -207,7 +207,7 @@ void TaskBarContainer::preferences()
void TaskBarContainer::orientationChange(Orientation o)
{
- if (o == Qt::Horizontal)
+ if (o == TQt::Horizontal)
{
if (windowListButton)
{
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index cf3dbc648..c8a3d3423 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -666,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);
}
@@ -894,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;
@@ -1015,7 +1015,7 @@ void TaskContainer::mousePressEvent( TQMouseEvent* e )
return;
}
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_dragStartPos = e->pos();
}
@@ -1030,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;
@@ -1071,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;
@@ -1406,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);
}
@@ -1427,7 +1427,7 @@ bool TaskContainer::eventFilter(TQObject *o, TQEvent *e)
TQMouseEvent* me = TQT_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;
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index 1be54ca8b..3286c8576 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -229,7 +229,7 @@ void TaskLMBMenu::dragSwitch()
void TaskLMBMenu::mousePressEvent( TQMouseEvent* e )
{
- if (e->button() == Qt::LeftButton)
+ if (e->button() == TQt::LeftButton)
{
m_dragStartPos = e->pos();
}