summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/clock/clock.cpp8
-rw-r--r--kicker/applets/launcher/configdlgbase.ui4
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp2
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp4
-rw-r--r--kicker/applets/minipager/pagerbutton.cpp4
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp2
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp6
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp18
-rw-r--r--kicker/extensions/kasbar/kasbar.h2
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp2
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.h2
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp6
-rw-r--r--kicker/extensions/kasbar/kasitem.h4
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp2
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp2
-rw-r--r--kicker/kicker/buttons/knewbutton.cpp2
-rw-r--r--kicker/kicker/core/applethandle.cpp2
-rw-r--r--kicker/kicker/core/container_applet.cpp2
-rw-r--r--kicker/kicker/core/container_base.cpp6
-rw-r--r--kicker/kicker/core/container_base.h4
-rw-r--r--kicker/kicker/core/container_extension.cpp18
-rw-r--r--kicker/kicker/core/container_extension.h4
-rw-r--r--kicker/kicker/core/containerarea.cpp8
-rw-r--r--kicker/kicker/core/containerarea.h2
-rw-r--r--kicker/kicker/core/containerarealayout.cpp10
-rw-r--r--kicker/kicker/core/extensionmanager.cpp2
-rw-r--r--kicker/kicker/core/userrectsel.h10
-rw-r--r--kicker/kicker/ui/addappletvisualfeedback.cpp2
-rw-r--r--kicker/kicker/ui/appletitem.ui6
-rw-r--r--kicker/kicker/ui/appletop_mnu.cpp10
-rw-r--r--kicker/kicker/ui/clicklineedit.cpp8
-rw-r--r--kicker/kicker/ui/client_mnu.cpp2
-rw-r--r--kicker/kicker/ui/extensionop_mnu.cpp2
-rw-r--r--kicker/kicker/ui/flipscrollview.cpp6
-rw-r--r--kicker/kicker/ui/hidebutton.cpp6
-rw-r--r--kicker/kicker/ui/itemview.cpp8
-rw-r--r--kicker/kicker/ui/k_mnu.cpp8
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp4
-rw-r--r--kicker/kicker/ui/kmenuitembase.ui6
-rw-r--r--kicker/kicker/ui/removeapplet_mnu.cpp4
-rw-r--r--kicker/kicker/ui/removebutton_mnu.cpp4
-rw-r--r--kicker/kicker/ui/removeextension_mnu.cpp4
-rw-r--r--kicker/kicker/ui/service_mnu.cpp4
-rw-r--r--kicker/libkicker/kickertip.cpp2
-rw-r--r--kicker/libkicker/panelbutton.cpp6
-rw-r--r--kicker/libkicker/simplebutton.cpp4
-rw-r--r--kicker/menuext/konsole/konsole_mnu.cpp2
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp4
-rw-r--r--kicker/proxy/appletproxy.cpp10
-rw-r--r--kicker/proxy/extensionproxy.cpp6
-rw-r--r--kicker/taskbar/taskbar.cpp6
-rw-r--r--kicker/taskbar/taskcontainer.cpp18
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp4
-rw-r--r--kicker/taskmanager/taskmanager.cpp2
55 files changed, 144 insertions, 144 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 6c4bb7175..772ea1601 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -827,7 +827,7 @@ void FuzzyClock::drawContents(TQPainter *p)
}
if (phStart >= 0)
newTimeStr.replace(phStart, phLength, hourNames[realHour]);
- newTimeStr.replace(0, 1, TQString(newTimeStr.tqat(0).upper()));
+ newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper()));
}
} else if (_prefs->fuzzyness() == 3) {
newTimeStr = dayTime[_time.hour() / 3];
@@ -1020,7 +1020,7 @@ int ClockApplet::widthForHeight(int h) const
// if the date format STARTS with a year, assume it's in descending
// order and should therefore PRECEED the date.
TQString dateFormat = KGlobal::locale()->dateFormatShort();
- dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y';
+ dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y';
}
if (dateFirst)
@@ -1272,7 +1272,7 @@ void ClockApplet::reconfigure()
_clock->widget()->installEventFilter(this); // catch mouse clicks
_clock->widget()->show();
- _clock->forceUpdate(); /* force tqrepaint */
+ _clock->forceUpdate(); /* force repaint */
if (showDayOfWeek)
{
@@ -1623,7 +1623,7 @@ void ClockApplet::showZone(int z)
zone->setZone(z);
TZoffset = zone->calc_TZ_offset( zone->zone() );
updateDateLabel();
- _clock->forceUpdate(); /* force tqrepaint */
+ _clock->forceUpdate(); /* force repaint */
}
void ClockApplet::nextZone()
diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui
index 2aaffe781..edfa6f02f 100644
--- a/kicker/applets/launcher/configdlgbase.ui
+++ b/kicker/applets/launcher/configdlgbase.ui
@@ -152,7 +152,7 @@
<property name="text">
<string>Short Term</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -163,7 +163,7 @@
<property name="text">
<string>Long Term</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index db49642cc..30b125726 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -1097,7 +1097,7 @@ void QuickLauncher::updateStickyHighlightLayer()
}
}
}
- tqrepaint();
+ repaint();
}
void QuickLauncher::paintEvent(TQPaintEvent* e)
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 6975af0c0..cc47d17cb 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
if( m_desktopLayoutOwner == NULL )
{ // must own manager selection before setting global desktop layout
int screen = DefaultScreen( qt_xdisplay());
- m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(),
+ m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
screen, TQT_TQOBJECT(this) );
if( !m_desktopLayoutOwner->claim( false ))
{
@@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged()
{
TQString name = m_kwin->desktopName(i);
(*it)->setDesktopName(name);
- (*it)->tqrepaint();
+ (*it)->repaint();
TQToolTip::remove((*it));
TQToolTip::add((*it), name);
}
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index e408cf6aa..4e2d5aa9e 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
TQRect r = mapGeometryToViewport(*info);
if (!info->hasState(NET::Sticky) &&
- !TQApplication::desktop()->tqgeometry().contains(r.topLeft()) &&
- !TQApplication::desktop()->tqgeometry().contains(r.topRight()))
+ !TQApplication::desktop()->geometry().contains(r.topLeft()) &&
+ !TQApplication::desktop()->geometry().contains(r.topRight()))
return false;
}
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index b1dde4221..191657e75 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -388,7 +388,7 @@ void SystemTrayApplet::checkAutoRetract()
return;
}
- if (!tqgeometry().contains(mapFromGlobal(TQCursor::pos())))
+ if (!geometry().contains(mapFromGlobal(TQCursor::pos())))
{
m_autoRetractTimer->stop();
if (m_autoRetract)
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 8493426ff..bba5e686e 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p)
it != containers.constEnd();
++it, ++i)
{
- if ((*it)->tqgeometry().contains(p))
+ if ((*it)->geometry().contains(p))
{
return i;
}
@@ -350,7 +350,7 @@ void DockBarExtension::mousePressEvent(TQMouseEvent *e ) {
mclic_pos = e->pos();
} else if (e->button() == Qt::RightButton) {
int pos = findContainerAtPoint(e->pos());
- if (pos != -1) containers.tqat(pos)->popupMenu(e->globalPos());
+ if (pos != -1) containers.at(pos)->popupMenu(e->globalPos());
}
}
@@ -374,7 +374,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) {
int pos = findContainerAtPoint(e->pos());
original_container = 0;
if (pos > -1) {
- original_container = containers.tqat(pos);
+ original_container = containers.at(pos);
mclic_dock_pos = e->pos() - original_container->pos();
dragged_container_original_pos = pos;
dragging_container = new DockContainer(original_container->command(), 0, original_container->resName(), original_container->resClass(), true);
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 6ebb6b05c..89fcad751 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
setMouseTracking( true );
setMaxBoxes( 0 );
- connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) );
+ connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
}
KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f )
@@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
items.setAutoDelete( true );
setMouseTracking( true );
setMaxBoxes( 0 );
- connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) );
+ connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) );
}
KasBar::~KasBar()
@@ -255,7 +255,7 @@ void KasBar::setTint( bool enable )
}
emit configChanged();
- tqrepaint( true );
+ repaint( true );
}
}
@@ -269,7 +269,7 @@ void KasBar::setTint( double amount, TQColor color )
emit configChanged();
if ( rootPix->isAvailable() )
- rootPix->tqrepaint( true );
+ rootPix->repaint( true );
}
}
@@ -451,24 +451,24 @@ void KasBar::updateLayout()
KasItem *i;
if ( orient == Qt::Horizontal ) {
for ( i = items.first(); i; i = items.next() ) {
- int x = (items.tqat() % c) * itemExtent();
+ int x = (items.at() % c) * itemExtent();
if ( direction_ == TQBoxLayout::RightToLeft )
x = width() - x - itemExtent();
- i->setPos( x, (items.tqat() / c) * itemExtent() );
+ i->setPos( x, (items.at() / c) * itemExtent() );
i->update();
mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) );
}
}
else {
for ( i = items.first(); i; i = items.next() ) {
- int y = (items.tqat() / r) * itemExtent();
+ int y = (items.at() / r) * itemExtent();
if ( direction_ == TQBoxLayout::BottomToTop )
y = height() - y - itemExtent();
- i->setPos( (items.tqat() % r) * itemExtent(), y );
+ i->setPos( (items.at() % r) * itemExtent(), y );
i->update();
mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) );
}
@@ -658,7 +658,7 @@ void KasBar::repaintItem(KasItem *i, bool erase )
paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) );
i->paint( &p, pos.x(), pos.y() );
- tqrepaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase );
+ repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase );
}
KasItem* KasBar::itemAt(const TQPoint &p)
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index c9a3ddd52..342da3743 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -120,7 +120,7 @@ public:
void remove( KasItem *i );
void clear();
KasItem *take( KasItem *i ) { return items.take( indexOf(i) ); }
- KasItem *itemAt( uint i ) { return items.tqat( i ); }
+ KasItem *itemAt( uint i ) { return items.at( i ); }
int indexOf( KasItem *i ) { return items.find( i ); }
KasItemList *itemList() { return &items; }
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index cedc49a67..c0a55753a 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -141,7 +141,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ )
{
updateGeometry();
resize( kasbar->size() );
- tqrepaint( true );
+ repaint( true );
}
TQSize KasBarExtension::detachedSize()
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index fe5f02ef6..12058a3c7 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -213,7 +213,7 @@ void KasGroupItem::paint( TQPainter *p )
int ypos = 16;
for ( int i = 0; ( i < (int) items.count() ) && ( i < microsPerCol ); i++ ) {
- Task::Ptr t = items.tqat( i );
+ Task::Ptr t = items.at( i );
if( t->isIconified() )
p->drawPixmap( xpos, ypos, res->microMinIcon() );
diff --git a/kicker/extensions/kasbar/kasgroupitem.h b/kicker/extensions/kasbar/kasgroupitem.h
index ec6f07493..e30260f57 100644
--- a/kicker/extensions/kasbar/kasgroupitem.h
+++ b/kicker/extensions/kasbar/kasgroupitem.h
@@ -91,7 +91,7 @@ public:
KasTasker *kasbar() const;
- Task::Ptr task( uint i ) { return items.tqat( i ); }
+ Task::Ptr task( uint i ) { return items.at( i ); }
int taskCount() const { return items.count(); }
TQPixmap icon();
diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp
index a1b3f55fc..323148713 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -547,12 +547,12 @@ void KasItem::paint( TQPainter *p, int x, int y )
p->restore();
}
-void KasItem::tqrepaint()
+void KasItem::repaint()
{
- tqrepaint( true );
+ repaint( true );
}
-void KasItem::tqrepaint( bool erase )
+void KasItem::repaint( bool erase )
{
if ( kas->isVisible() )
kas->repaintItem( this, erase );
diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h
index 7fd0875d0..5c7378825 100644
--- a/kicker/extensions/kasbar/kasitem.h
+++ b/kicker/extensions/kasbar/kasitem.h
@@ -171,8 +171,8 @@ public:
void paintModified( TQPainter *p );
public slots:
- void tqrepaint();
- void tqrepaint( bool erase );
+ void repaint();
+ void repaint( bool erase );
void update();
void setActive( bool yes );
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index 20374addd..8b6714cad 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -135,7 +135,7 @@ TQPixmap KasTaskItem::icon()
TQPixmap thumb = task_->thumbnail();
TQSize sz = thumb.size();
- sz.tqscale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin );
+ sz.scale( sizes[kasbar()->itemSize()], sizes[kasbar()->itemSize()], TQSize::ScaleMin );
TQImage img = thumb.convertToImage();
img = img.smoothScale( sz );
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 24e37b505..1394823e3 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -155,7 +155,7 @@ void TaskBarExtension::setBackgroundTheme()
}
else
{
- m_rootPixmap->tqrepaint(true);
+ m_rootPixmap->repaint(true);
}
double tint = double(KickerSettings::tintValue()) / 100;
diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp
index 2b5153545..a05027628 100644
--- a/kicker/kicker/buttons/knewbutton.cpp
+++ b/kicker/kicker/buttons/knewbutton.cpp
@@ -286,7 +286,7 @@ void KNewButton::drawEye()
}
m_active_pixmap = pixmap.xForm(matrix);
- tqrepaint(false);
+ repaint(false);
}
#undef eye_x
#undef eye_y
diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index 6b03269eb..26f90b116 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -269,7 +269,7 @@ void AppletHandle::checkHandleHover()
{
if (!m_handleHoverTimer ||
(m_menuButton && m_menuButton->isOn()) ||
- m_applet->tqgeometry().contains(m_applet->mapToParent(
+ m_applet->geometry().contains(m_applet->mapToParent(
m_applet->mapFromGlobal(TQCursor::pos()))))
{
return;
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 47a07a5f5..5fc276d44 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
_valid = true;
_applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection()));
- _applet->setAlignment((KPanelApplet::Alignment)tqalignment());
+ _applet->setAlignment((KPanelApplet::Alignment)alignment());
_actions = _applet->actions();
_type = _applet->type();
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index 0b1ff30f7..183ceb0f2 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -38,7 +38,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const
: TQWidget( parent, name )
, _dir(KPanelApplet::Up)
, _orient(Qt::Horizontal)
- , _tqalignment(KPanelExtension::LeftTop)
+ , _alignment(KPanelExtension::LeftTop)
, _fspace(0)
, _moveOffset(TQPoint(0,0))
, _aid(TQString::null)
@@ -112,12 +112,12 @@ void BaseContainer::slotRemoved(KConfig* config)
void BaseContainer::setAlignment(KPanelExtension::Alignment a)
{
- if (_tqalignment == a)
+ if (_alignment == a)
{
return;
}
- _tqalignment = a;
+ _alignment = a;
alignmentChange(a);
}
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index 0c4a79539..f1eaddee1 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -73,7 +73,7 @@ public:
KPanelApplet::Direction popupDirection() const { return _dir; }
KPanelExtension::Orientation orientation() const { return _orient; }
- KPanelExtension::Alignment tqalignment() const { return _tqalignment; }
+ KPanelExtension::Alignment alignment() const { return _alignment; }
virtual void setBackground() {}
@@ -118,7 +118,7 @@ protected:
KPanelApplet::Direction _dir;
KPanelExtension::Orientation _orient;
- KPanelExtension::Alignment _tqalignment;
+ KPanelExtension::Alignment _alignment;
double _fspace;
TQPoint _moveOffset;
TQString _aid;
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index eface400a..20bac8bbd 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -315,7 +315,7 @@ void ExtensionContainer::readConfig()
}
positionChange(position());
- alignmentChange(tqalignment());
+ alignmentChange(alignment());
setSize(static_cast<KPanelExtension::Size>(m_settings.size()),
m_settings.customSize());
@@ -523,7 +523,7 @@ void ExtensionContainer::moveMe()
}
UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor);
- arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen);
+ arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen);
_is_lmb_down = false;
@@ -788,7 +788,7 @@ void ExtensionContainer::autoHide(bool hide)
blockUserInput(true);
TQPoint oldpos = pos();
- TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden );
+ TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden );
TQPoint newpos = newextent.topLeft();
if (hide)
@@ -900,7 +900,7 @@ void ExtensionContainer::animatedHide(bool left)
}
TQPoint oldpos = pos();
- TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState);
+ TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState);
TQPoint newpos(newextent.topLeft());
if (newState != Unhidden)
@@ -987,7 +987,7 @@ bool ExtensionContainer::reserveStrut() const
return !m_extension || m_extension->reserveStrut();
}
-KPanelExtension::Alignment ExtensionContainer::tqalignment() const
+KPanelExtension::Alignment ExtensionContainer::alignment() const
{
// KConfigXT really needs to get support for vars that are enums that
// are defined in other classes
@@ -1005,7 +1005,7 @@ void ExtensionContainer::updateWindowManager()
int w = 0;
int h = 0;
- TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen());
+ TQRect geom = initialGeometry(position(), alignment(), xineramaScreen());
TQRect virtRect(TQApplication::desktop()->geometry());
TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen()));
@@ -1590,7 +1590,7 @@ KPanelExtension::Position ExtensionContainer::position() const
void ExtensionContainer::resetLayout()
{
- TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(),
+ TQRect g = initialGeometry(position(), alignment(), xineramaScreen(),
autoHidden(), userHidden());
// Disable the layout while we rearrange the panel.
@@ -1997,12 +1997,12 @@ void ExtensionContainer::setXineramaScreen(int screen)
return;
}
- arrange(position(),tqalignment(), screen);
+ arrange(position(),alignment(), screen);
}
TQRect ExtensionContainer::currentGeometry() const
{
- return initialGeometry(position(), tqalignment(), xineramaScreen(),
+ return initialGeometry(position(), alignment(), xineramaScreen(),
autoHidden(), userHidden());
}
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index c6347ba08..724ba0a10 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -86,7 +86,7 @@ public:
KPanelExtension::Orientation orientation() const;
KPanelExtension::Position position() const;
- void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); }
+ void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); }
int xineramaScreen() const;
void setXineramaScreen(int screen);
@@ -100,7 +100,7 @@ public:
void unhideIfHidden(int showForHowManyMS = 0);
bool reserveStrut() const;
- KPanelExtension::Alignment tqalignment() const;
+ KPanelExtension::Alignment alignment() const;
void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); }
TQRect currentGeometry() const;
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 20f6720d7..3651e1a93 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -1441,7 +1441,7 @@ void ContainerArea::setBackground()
}
else
{
- _rootPixmap->tqrepaint(true);
+ _rootPixmap->repaint(true);
}
double tint = double(KickerSettings::tintValue()) / 100;
@@ -1725,7 +1725,7 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
setBackground();
// container extension repaints for us!
- //tqrepaint();
+ //repaint();
}
void ContainerArea::setAlignment(KPanelExtension::Alignment a)
@@ -1900,9 +1900,9 @@ TQStringList ContainerArea::listContainers() const
return m_layout->listItems();
}
-void ContainerArea::tqrepaint()
+void ContainerArea::repaint()
{
- Panner::tqrepaint();
+ Panner::repaint();
}
void ContainerArea::showAddAppletDialog()
diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h
index 8b473124e..54bbf6f48 100644
--- a/kicker/kicker/core/containerarea.h
+++ b/kicker/kicker/core/containerarea.h
@@ -103,7 +103,7 @@ public slots:
void setPosition(KPanelExtension::Position p);
void setAlignment(KPanelExtension::Alignment a);
void slotSaveContainerConfig();
- void tqrepaint();
+ void repaint();
void showAddAppletDialog();
void addAppletDialogDone();
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index dc325597b..68d0aafa4 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -43,7 +43,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator
TQLayoutItem* current()
{
- return m_idx < int(m_list->count()) ? (*m_list->tqat(m_idx))->item : 0;
+ return m_idx < int(m_list->count()) ? (*m_list->at(m_idx))->item : 0;
}
TQLayoutItem* next()
@@ -55,7 +55,7 @@ class ContainerAreaLayoutIterator : public TQGLayoutIterator
TQLayoutItem* takeCurrent()
{
TQLayoutItem* item = 0;
- ContainerAreaLayout::ItemList::iterator b = m_list->tqat(m_idx);
+ ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx);
if (b != m_list->end())
{
ContainerAreaLayoutItem* layoutItem = *b;
@@ -223,7 +223,7 @@ int ContainerAreaLayout::count() const {
\reimp
*/
TQLayoutItem* ContainerAreaLayout::itemAt(int index) const {
- return index >= 0 && index < m_items.count() ? (*m_items.tqat(index))->item : 0;
+ return index >= 0 && index < m_items.count() ? (*m_items.at(index))->item : 0;
}
/*!
@@ -232,8 +232,8 @@ TQLayoutItem* ContainerAreaLayout::itemAt(int index) const {
TQLayoutItem* ContainerAreaLayout::takeAt(int index) {
if (index < 0 || index >= m_items.count())
return 0;
- ContainerAreaLayoutItem *b = *m_items.tqat(index);
- m_items.remove(m_items.tqat(index));
+ ContainerAreaLayoutItem *b = *m_items.at(index);
+ m_items.remove(m_items.at(index));
TQLayoutItem *item = b->item;
b->item = 0;
delete b;
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index b7a1816e0..e0f68ce8a 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -702,7 +702,7 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens
return;
}
- TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(),
+ TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(),
extension->xineramaScreen());
// reduce given area (TQRect) to the space not covered by the given extension
diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h
index 0e9533e08..564a6d980 100644
--- a/kicker/kicker/core/userrectsel.h
+++ b/kicker/kicker/core/userrectsel.h
@@ -43,17 +43,17 @@ class UserRectSel : public TQWidget
PanelStrut()
: m_screen(-1),
m_pos(KPanelExtension::Bottom),
- m_tqalignment(KPanelExtension::LeftTop)
+ m_alignment(KPanelExtension::LeftTop)
{
}
PanelStrut(const TQRect& rect, int XineramaScreen,
KPanelExtension::Position pos,
- KPanelExtension::Alignment tqalignment)
+ KPanelExtension::Alignment alignment)
: m_rect(rect),
m_screen(XineramaScreen),
m_pos(pos),
- m_tqalignment(tqalignment)
+ m_alignment(alignment)
{
}
@@ -61,7 +61,7 @@ class UserRectSel : public TQWidget
{
return m_screen == rhs.m_screen &&
m_pos == rhs.m_pos &&
- m_tqalignment == rhs.m_tqalignment;
+ m_alignment == rhs.m_alignment;
}
bool operator!=(const PanelStrut& rhs)
@@ -72,7 +72,7 @@ class UserRectSel : public TQWidget
TQRect m_rect;
int m_screen;
KPanelExtension::Position m_pos;
- KPanelExtension::Alignment m_tqalignment;
+ KPanelExtension::Alignment m_alignment;
};
typedef TQValueVector<PanelStrut> RectList;
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index 294be2463..e5fa5672c 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -225,7 +225,7 @@ void AddAppletVisualFeedback::swoopCloser()
void AddAppletVisualFeedback::internalUpdate()
{
m_dirty = true;
- tqrepaint(false);
+ repaint(false);
}
#include "addappletvisualfeedback.moc"
diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui
index 7ddb827b4..46e62b342 100644
--- a/kicker/kicker/ui/appletitem.ui
+++ b/kicker/kicker/ui/appletitem.ui
@@ -65,7 +65,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -87,7 +87,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -117,7 +117,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop</set>
</property>
</widget>
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index f784a9ca2..e0e162d33 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -52,7 +52,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") :
i18n("&Move %1 Button")) :
i18n("&Move %1");
- insertItem(SmallIcon("move"), text.tqarg(titleText), Move);
+ insertItem(SmallIcon("move"), text.arg(titleText), Move);
// we look for a container area to see if we can add containers
// this is part of the kiosk support in kicker, allowing
@@ -76,7 +76,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
text = isButton ? (isMenu ? i18n("&Remove %1 Menu") :
i18n("&Remove %1 Button")) :
i18n("&Remove %1");
- insertItem(SmallIcon("remove"), text.tqarg(titleText), Remove);
+ insertItem(SmallIcon("remove"), text.arg(titleText), Remove);
needSeparator = true;
}
}
@@ -103,7 +103,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
KIcon::Small, 0,
KIcon::DefaultState,
0, true));
- insertItem(iconPix, i18n("&About %1").tqarg( titleText ), About);
+ insertItem(iconPix, i18n("&About %1").arg( titleText ), About);
needSeparator = !(actions & KPanelApplet::Help);
}
@@ -123,12 +123,12 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
if (isButton)
{
insertItem(SmallIcon("configure"),
- i18n("&Configure %1 Button...").tqarg(titleText), Preferences);
+ i18n("&Configure %1 Button...").arg(titleText), Preferences);
}
else
{
insertItem(SmallIcon("configure"),
- i18n("&Configure %1...").tqarg(titleText), Preferences);
+ i18n("&Configure %1...").arg(titleText), Preferences);
}
needSeparator = true;
}
diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp
index debe91d3e..68e5befe4 100644
--- a/kicker/kicker/ui/clicklineedit.cpp
+++ b/kicker/kicker/ui/clicklineedit.cpp
@@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {}
void ClickLineEdit::setClickMessage( const TQString &msg )
{
mClickMessage = msg;
- tqrepaint();
+ repaint();
}
void ClickLineEdit::setText( const TQString &txt )
{
mDrawClickMsg = txt.isEmpty();
- tqrepaint();
+ repaint();
KLineEdit::setText( txt );
}
@@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
if ( mDrawClickMsg == true )
{
mDrawClickMsg = false;
- tqrepaint();
+ repaint();
}
TQLineEdit::focusInEvent( ev );
}
@@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
if ( text().isEmpty() )
{
mDrawClickMsg = true;
- tqrepaint();
+ repaint();
}
TQLineEdit::focusOutEvent( ev );
}
diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp
index deaae70b9..959726bfa 100644
--- a/kicker/kicker/ui/client_mnu.cpp
+++ b/kicker/kicker/ui/client_mnu.cpp
@@ -59,7 +59,7 @@ void KickerClientMenu::insertItem( TQString text, int id )
TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id )
{
TQString subname("%1-submenu%2");
- TQCString subid = subname.tqarg(static_cast<const char *>(objId())).tqarg(id).local8Bit();
+ TQCString subid = subname.arg(static_cast<const char *>(objId())).arg(id).local8Bit();
KickerClientMenu *sub = new KickerClientMenu(this, subid);
int globalid = TQPopupMenu::insertItem( icon, text, sub, id);
setItemParameter( globalid, id );
diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp
index 582c44b46..a30434a48 100644
--- a/kicker/kicker/ui/extensionop_mnu.cpp
+++ b/kicker/kicker/ui/extensionop_mnu.cpp
@@ -59,7 +59,7 @@ PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int action
if (!Kicker::the()->isImmutable() && (actions & KPanelExtension::Preferences)) {
insertSeparator();
- insertItem(SmallIcon("configure"), i18n("&Configure %1...").tqarg(extension), Preferences);
+ insertItem(SmallIcon("configure"), i18n("&Configure %1...").arg(extension), Preferences);
}
adjustSize();
diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp
index 34b3b310f..ae96ebcaa 100644
--- a/kicker/kicker/ui/flipscrollview.cpp
+++ b/kicker/kicker/ui/flipscrollview.cpp
@@ -270,7 +270,7 @@ void FlipScrollView::slotScrollTimer()
if (!mSelectMenuPath.isEmpty()) {
if (mSelectMenuPath=="kicker:/goup/") {
currentView()->setSelected(currentView()->firstChild(),true);
- currentView()->firstChild()->tqrepaint();
+ currentView()->firstChild()->repaint();
}
else {
TQListViewItem * child = currentView()->firstChild();
@@ -278,8 +278,8 @@ void FlipScrollView::slotScrollTimer()
KMenuItem* kitem = dynamic_cast<KMenuItem*>(child);
if (kitem && kitem->menuPath()==mSelectMenuPath) {
currentView()->setSelected(child,true);
- kdDebug() << "child tqrepaint\n";
- child->tqrepaint();
+ kdDebug() << "child repaint\n";
+ child->repaint();
break;
}
child = child->nextSibling();
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index 77e1dc22c..25263e872 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -173,14 +173,14 @@ void HideButton::slotIconChanged(int group)
}
generateIcons();
- tqrepaint(false);
+ repaint(false);
}
void HideButton::enterEvent(TQEvent *e)
{
m_highlight = true;
- tqrepaint(false);
+ repaint(false);
TQButton::enterEvent(e);
}
@@ -188,7 +188,7 @@ void HideButton::leaveEvent(TQEvent *e)
{
m_highlight = false;
- tqrepaint(false);
+ repaint(false);
TQButton::enterEvent(e);
}
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index 4ce92358a..6cb94ed56 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -145,7 +145,7 @@ void KMenuItem::setIcon(const TQString& icon, int size)
void KMenuItem::setHasChildren( bool flag )
{
m_has_children = flag;
- tqrepaint();
+ repaint();
}
void KMenuItem::setup()
@@ -197,7 +197,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int
else
listview->m_lastOne = static_cast<KMenuItem*>( itemBelow() );
listview->m_old_contentY = -1;
- tqrepaint();
+ repaint();
}
}
}
@@ -350,7 +350,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column
{
// the listview caches paint events
m_old_width = width;
- tqrepaint();
+ repaint();
}
}
@@ -975,7 +975,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe )
if ( m_lastOne && m_old_contentY != contentsY() ) {
m_old_contentY = contentsY();
- m_lastOne->tqrepaint();
+ m_lastOne->repaint();
}
}
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index fc0b62392..31f93c227 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -348,7 +348,7 @@ void PanelKMenu::initialize()
if (clients.count() > 0) {
TQIntDictIterator<KickerClientMenu> it(clients);
while (it){
- if (it.current()->text.tqat(0) != '.')
+ if (it.current()->text.at(0) != '.')
insertItem(
it.current()->icon,
it.current()->text,
@@ -419,10 +419,10 @@ void PanelKMenu::repairDisplay(void) {
displayRepairTimer->stop();
// Now do a nasty hack to prevent search bar merging into the side image
- // This forces a layout/tqrepaint of the qpopupmenu
- tqrepaint(); // This ensures that the side bar image was applied
+ // This forces a layout/repaint of the qpopupmenu
+ repaint(); // This ensures that the side bar image was applied
styleChange(tqstyle()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu.
- update(); // This repaints the entire popup menu to apply the widget size/tqalignment changes made above
+ update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above
}
}
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index d9de1e37a..2abe63dcf 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -1131,7 +1131,7 @@ void KMenu::fillMenu(KServiceGroup::Ptr&
}
// Ignore dotfiles.
- if ((g->name().tqat(0) == '.'))
+ if ((g->name().at(0) == '.'))
{
continue;
}
@@ -3625,7 +3625,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
df.writeEntry("Encoding", "UTF-8");
df.writeEntry("Type","Link");
df.writeEntry("Name", item->name());
- df.writeEntry("GenericName", i18n("Directory: %1").tqarg(kurl.upURL().path()));
+ df.writeEntry("GenericName", i18n("Directory: %1").arg(kurl.upURL().path()));
df.writeEntry("Icon", item->iconName());
df.writeEntry("URL", text);
diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui
index 113fc905b..ee4f26ffa 100644
--- a/kicker/kicker/ui/kmenuitembase.ui
+++ b/kicker/kicker/ui/kmenuitembase.ui
@@ -73,7 +73,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -102,7 +102,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@@ -129,7 +129,7 @@
<property name="text">
<string></string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignTop|AlignHCenter</set>
</property>
</widget>
diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp
index 8dfaa00d2..2e0543dae 100644
--- a/kicker/kicker/ui/removeapplet_mnu.cpp
+++ b/kicker/kicker/ui/removeapplet_mnu.cpp
@@ -87,9 +87,9 @@ void PanelRemoveAppletMenu::slotAboutToShow()
void PanelRemoveAppletMenu::slotExec(int id)
{
- if (m_containers.tqat(id) != m_containers.end())
+ if (m_containers.at(id) != m_containers.end())
{
- m_containerArea->removeContainer(*m_containers.tqat(id));
+ m_containerArea->removeContainer(*m_containers.at(id));
}
}
diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp
index 678d6a78f..8f02abd67 100644
--- a/kicker/kicker/ui/removebutton_mnu.cpp
+++ b/kicker/kicker/ui/removebutton_mnu.cpp
@@ -95,9 +95,9 @@ void PanelRemoveButtonMenu::slotAboutToShow()
void PanelRemoveButtonMenu::slotExec( int id )
{
- if (containers.tqat(id) != containers.end())
+ if (containers.at(id) != containers.end())
{
- containerArea->removeContainer(*containers.tqat(id));
+ containerArea->removeContainer(*containers.at(id));
}
}
diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp
index 9a1655bae..9d5d80d2b 100644
--- a/kicker/kicker/ui/removeextension_mnu.cpp
+++ b/kicker/kicker/ui/removeextension_mnu.cpp
@@ -100,9 +100,9 @@ void PanelRemoveExtensionMenu::slotExec( int id )
{
ExtensionManager::the()->removeAllContainers();
}
- else if (m_containers.tqat(id) != m_containers.end())
+ else if (m_containers.at(id) != m_containers.end())
{
- ExtensionManager::the()->removeContainer(*m_containers.tqat(id));
+ ExtensionManager::the()->removeContainer(*m_containers.at(id));
}
}
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 982586c2f..8dcc2fbde 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -281,7 +281,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
}
// Ignore dotfiles.
- if ((g->name().tqat(0) == '.'))
+ if ((g->name().at(0) == '.'))
{
continue;
}
@@ -445,7 +445,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
return;
// ignore dotfiles.
- if ((serviceName.tqat(0) == '.'))
+ if ((serviceName.at(0) == '.'))
return;
// item names may contain ampersands. To avoid them being converted
diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp
index 97df6918d..490f5bbfe 100644
--- a/kicker/libkicker/kickertip.cpp
+++ b/kicker/libkicker/kickertip.cpp
@@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o)
void KickerTip::internalUpdate()
{
m_dirty = true;
- tqrepaint(false);
+ repaint(false);
}
void KickerTip::enableTipping(bool tip)
diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp
index 6d628a7e9..abd181820 100644
--- a/kicker/libkicker/panelbutton.cpp
+++ b/kicker/libkicker/panelbutton.cpp
@@ -438,7 +438,7 @@ void PanelButton::enterEvent(TQEvent* e)
if (!m_highlight && m_disableHighlighting == FALSE)
{
m_highlight = true;
- tqrepaint(false);
+ repaint(false);
}
TQButton::enterEvent(e);
@@ -449,7 +449,7 @@ void PanelButton::leaveEvent(TQEvent* e)
if (m_highlight)
{
m_highlight = false;
- tqrepaint(false);
+ repaint(false);
}
TQButton::leaveEvent(e);
@@ -558,7 +558,7 @@ void PanelButton::drawButton(TQPainter *p)
}
else if (isDown() || isOn())
{
- // Draw tqshapes to indicate the down state.
+ // Draw shapes to indicate the down state.
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken);
}
diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp
index bc85c4521..f809c2127 100644
--- a/kicker/libkicker/simplebutton.cpp
+++ b/kicker/libkicker/simplebutton.cpp
@@ -202,7 +202,7 @@ void SimpleButton::enterEvent( TQEvent *e )
if (KickerSettings::showMouseOverEffects())
m_highlight = true;
- tqrepaint( false );
+ repaint( false );
TQButton::enterEvent( e );
}
@@ -210,7 +210,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
{
m_highlight = false;
- tqrepaint( false );
+ repaint( false );
TQButton::enterEvent( e );
}
diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp
index be060b75c..afd1127f6 100644
--- a/kicker/menuext/konsole/konsole_mnu.cpp
+++ b/kicker/menuext/konsole/konsole_mnu.cpp
@@ -185,7 +185,7 @@ void KonsoleMenu::initialize()
screenList.append(TQFile::decodeName(entry->d_name));
insertItem(SmallIconSet("konsole"),
i18n("Screen is a program controlling screens!",
- "Screen at %1").tqarg(entry->d_name), id);
+ "Screen at %1").arg(entry->d_name), id);
id++;
}
}
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 3f50e5275..93a948dee 100644
--- a/kicker/menuext/prefmenu/prefmenu.cpp
+++ b/kicker/menuext/prefmenu/prefmenu.cpp
@@ -113,7 +113,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s,
}
// ignore dotfiles.
- if ((serviceName.tqat(0) == '.'))
+ if ((serviceName.at(0) == '.'))
{
return;
}
@@ -290,7 +290,7 @@ void PrefMenu::initialize()
}
// Ignore dotfiles.
- if ((g->name().tqat(0) == '.'))
+ if ((g->name().at(0) == '.'))
{
continue;
}
diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp
index 26b11a6ac..61745d8ba 100644
--- a/kicker/proxy/appletproxy.cpp
+++ b/kicker/proxy/appletproxy.cpp
@@ -228,7 +228,7 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info)
void AppletProxy::repaintApplet(TQWidget* widget)
{
- widget->tqrepaint();
+ widget->repaint();
const TQObjectList children = widget->childrenListObject();
@@ -375,11 +375,11 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data,
else if ( fun == "setAlignment(int)" )
{
TQDataStream dataStream( data, IO_ReadOnly );
- int tqalignment;
- dataStream >> tqalignment;
+ int alignment;
+ dataStream >> alignment;
if(_applet) {
- _applet->setAlignment( (KPanelApplet::Alignment)tqalignment );
+ _applet->setAlignment( (KPanelApplet::Alignment)alignment );
}
return true;
}
@@ -435,7 +435,7 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data,
if(_applet)
if ( _bg.isNull() ) { // no transparency
_applet->unsetPalette();
- _applet->tqrepaint();
+ _applet->repaint();
}
else { //transparency
_applet->blockSignals(true);
diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp
index 8fc230352..48a64c612 100644
--- a/kicker/proxy/extensionproxy.cpp
+++ b/kicker/proxy/extensionproxy.cpp
@@ -290,11 +290,11 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
else if ( fun == "setAlignment(int)" )
{
TQDataStream dataStream( data, IO_ReadOnly );
- int tqalignment;
- dataStream >> tqalignment;
+ int alignment;
+ dataStream >> alignment;
if(_extension) {
- _extension->setAlignment( (KPanelExtension::Alignment)tqalignment );
+ _extension->setAlignment( (KPanelExtension::Alignment)alignment );
}
return true;
}
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index 2dcddc22d..1a156930d 100644
--- a/kicker/taskbar/taskbar.cpp
+++ b/kicker/taskbar/taskbar.cpp
@@ -1074,7 +1074,7 @@ void TaskBar::activateNextTask(bool forward)
TaskContainer::List::iterator it;
for (int i = 0; i < numContainers; ++i)
{
- it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1);
+ it = forward ? list.at(i) : list.at(numContainers - i - 1);
if (it != list.end() && (*it)->activateNextTask(forward, forcenext))
{
@@ -1087,7 +1087,7 @@ void TaskBar::activateNextTask(bool forward)
// moving forward from the last, or backward from the first, loop around
for (int i = 0; i < numContainers; ++i)
{
- it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1);
+ it = forward ? list.at(i) : list.at(numContainers - i - 1);
if (it != list.end() && (*it)->activateNextTask(forward, forcenext))
{
@@ -1101,7 +1101,7 @@ void TaskBar::activateNextTask(bool forward)
forcenext = true; // select first
for (int i = 0; i < numContainers; ++i)
{
- it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1);
+ it = forward ? list.at(i) : list.at(numContainers - i - 1);
if (it == list.end())
{
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index e66ced291..4f4d15e7c 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -233,9 +233,9 @@ void TaskContainer::setLastActivated()
void TaskContainer::animationTimerFired()
{
- if (!frames.isEmpty() && taskBar->showIcon() && frames.tqat(currentFrame) != frames.end())
+ if (!frames.isEmpty() && taskBar->showIcon() && frames.at(currentFrame) != frames.end())
{
- TQPixmap *pm = *frames.tqat(currentFrame);
+ TQPixmap *pm = *frames.at(currentFrame);
// draw pixmap
if ( pm && !pm->isNull() ) {
@@ -477,7 +477,7 @@ void TaskContainer::paintEvent( TQPaintEvent* )
}
TQPainter p;
- p.tqbegin(pm ,this);
+ p.begin(pm ,this);
drawButton(&p);
p.end();
@@ -736,7 +736,7 @@ void TaskContainer::drawButton(TQPainter *p)
TQPaintDevice* opd = p->device();
p->end();
pm->convertFromImage(img);
- p->tqbegin(opd ,this);
+ p->begin(opd ,this);
}
else
{
@@ -754,9 +754,9 @@ void TaskContainer::drawButton(TQPainter *p)
}
}
- if (!frames.isEmpty() && m_startup && frames.tqat(currentFrame) != frames.end())
+ if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end())
{
- TQPixmap *anim = *frames.tqat(currentFrame);
+ TQPixmap *anim = *frames.at(currentFrame);
if (anim && !anim->isNull())
{
@@ -830,13 +830,13 @@ TQString TaskContainer::name()
// in common, and then use everything UP TO that as the name in the button
while (i < maxLength)
{
- TQChar check = match.tqat(i).lower();
+ TQChar check = match.at(i).lower();
Task::List::iterator itEnd = m_filteredTasks.end();
for (Task::List::iterator it = m_filteredTasks.begin(); it != itEnd; ++it)
{
// we're doing a lot of Utf8 -> TQString conversions here
// by repeatedly calling visibleIconicName() =/
- if (check != (*it)->visibleName().tqat(i).lower())
+ if (check != (*it)->visibleName().at(i).lower())
{
if (i > 0)
{
@@ -856,7 +856,7 @@ TQString TaskContainer::name()
}
// strip trailing crap
- while (i > 0 && !match.tqat(i).isLetterOrNumber())
+ while (i > 0 && !match.at(i).isLetterOrNumber())
{
--i;
}
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index bd8ef360c..4eab82bc1 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -213,7 +213,7 @@ void TaskLMBMenu::dragMoveEvent( TQDragMoveEvent* e )
void TaskLMBMenu::dragSwitch()
{
bool ok = false;
- Task::Ptr t = m_tasks.tqat(indexOf(m_lastDragId), &ok);
+ Task::Ptr t = m_tasks.at(indexOf(m_lastDragId), &ok);
if (ok)
{
t->activate();
@@ -264,7 +264,7 @@ void TaskLMBMenu::mouseMoveEvent(TQMouseEvent* e)
if (index != -1)
{
bool ok = false;
- Task::Ptr task = m_tasks.tqat(index, &ok);
+ Task::Ptr task = m_tasks.at(index, &ok);
if (ok)
{
Task::List tasks;
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index c77f3522b..369c6e140 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension)
Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format,
CPSubwindowMode, &picAttr);
- // Get tqshaped windows handled correctly.
+ // Get shaped windows handled correctly.
XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId,
WindowRegionBounding);
XFixesSetPictureClipRegion(dpy, picture, 0, 0, region);