summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-15 19:15:16 +0000
commitcc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch)
tree2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /kicker
parent107dd1f98367d07df7cbe2042786511e44706d3a (diff)
downloadtdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz
tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker')
-rw-r--r--kicker/applets/clock/clock.cpp12
-rw-r--r--kicker/applets/launcher/quickbuttongroup.h6
-rw-r--r--kicker/applets/launcher/quicklauncher.cpp8
-rw-r--r--kicker/applets/media/mediaapplet.cpp4
-rw-r--r--kicker/applets/naughty/NaughtyApplet.h2
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp4
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp4
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp14
-rw-r--r--kicker/extensions/kasbar/kasbar.h4
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp2
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp6
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.h2
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp12
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp4
-rw-r--r--kicker/kicker/core/containerarealayout.cpp10
-rw-r--r--kicker/kicker/ui/k_mnu.cpp2
-rw-r--r--kicker/kicker/ui/k_new_mnu.cpp2
-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/global.cpp3
-rw-r--r--kicker/menuext/prefmenu/prefmenu.cpp4
-rw-r--r--kicker/taskbar/taskbar.cpp6
-rw-r--r--kicker/taskbar/taskcontainer.cpp25
-rw-r--r--kicker/taskmanager/tasklmbmenu.cpp4
26 files changed, 80 insertions, 76 deletions
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 072bd6161..48cd1d2ae 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -364,9 +364,9 @@ void DigitalClock::updateClock()
if (_force || newStr != _timeStr)
{
_timeStr = newStr;
- setUpdatesEnabled( FALSE );
+ tqsetUpdatesEnabled( FALSE );
display(_timeStr);
- setUpdatesEnabled( TRUE );
+ tqsetUpdatesEnabled( TRUE );
update();
}
@@ -426,7 +426,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
// but other colors would break the lcd-lock anyway
void DigitalClock::drawContents( TQPainter * p)
{
- setUpdatesEnabled( FALSE );
+ tqsetUpdatesEnabled( FALSE );
TQPalette pal = palette();
if (_prefs->digitalLCDStyle())
pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128));
@@ -441,7 +441,7 @@ void DigitalClock::drawContents( TQPainter * p)
pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
setPalette( pal );
p->translate( -2, -2 );
- setUpdatesEnabled( TRUE );
+ tqsetUpdatesEnabled( TRUE );
TQLCDNumber::drawContents( p );
p->translate( +1, +1 );
}
@@ -1031,7 +1031,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.at(1) == 'y' || dateFormat.at(1) == 'Y';
+ dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y';
}
if (dateFirst)
@@ -1616,7 +1616,7 @@ void ClockApplet::slotCopyMenuActivated( int id )
{
TQPopupMenu *m = (TQPopupMenu *) sender();
TQString s = m->text(id);
- TQApplication::clipboard()->setText(s);
+ TQApplication::tqclipboard()->setText(s);
}
TQTime ClockApplet::clockGetTime()
diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h
index 85f28845c..d96e72140 100644
--- a/kicker/applets/launcher/quickbuttongroup.h
+++ b/kicker/applets/launcher/quickbuttongroup.h
@@ -24,15 +24,15 @@ public:
void setDragging(bool drag);
void setEnableDrag(bool enable);
void deleteContents();
- void setUpdatesEnabled(bool enable);
+ void tqsetUpdatesEnabled(bool enable);
};
QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc)
{ return findProperty(desc, std::mem_fun(&QuickButton::url));}
-inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
+inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable)
{ for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
- (*i)->setUpdatesEnabled(enable);
+ (*i)->tqsetUpdatesEnabled(enable);
if (enable) { (*i)->update();}
}
}
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 9c1228a2d..85bea706e 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -741,8 +741,8 @@ void QuickLauncher::refreshContents()
unsigned index;
TQPoint pos;
- setUpdatesEnabled(false);
- m_buttons->setUpdatesEnabled(false);
+ tqsetUpdatesEnabled(false);
+ m_buttons->tqsetUpdatesEnabled(false);
for (index = 0; index < m_buttons->size(); index++)
{
pos = m_manager->pos(index);
@@ -762,9 +762,9 @@ void QuickLauncher::refreshContents()
m_dragButtons->setDragging(true);
}
m_buttons->show();
- setUpdatesEnabled(true);
+ tqsetUpdatesEnabled(true);
update();
- m_buttons->setUpdatesEnabled(true);
+ m_buttons->tqsetUpdatesEnabled(true);
updateGeometry();
emit updateLayout();
updateStickyHighlightLayer();
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp
index 25b5869ff..d07bfdd2b 100644
--- a/kicker/applets/media/mediaapplet.cpp
+++ b/kicker/applets/media/mediaapplet.cpp
@@ -175,9 +175,9 @@ void MediaApplet::arrangeButtons()
// Center icons if we only have one column/row
if (mButtonList.count() < max_packed_buttons)
{
- max_packed_buttons = QMAX(uint(1), mButtonList.count());
+ max_packed_buttons = TQMAX(uint(1), mButtonList.count());
}
- max_packed_buttons = QMAX(uint(1), max_packed_buttons);
+ max_packed_buttons = TQMAX(uint(1), max_packed_buttons);
int padded_button_size = kicker_size / max_packed_buttons;
mButtonSizeSum = 0;
diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h
index beb70552d..23bdf62c9 100644
--- a/kicker/applets/naughty/NaughtyApplet.h
+++ b/kicker/applets/naughty/NaughtyApplet.h
@@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet
signals:
- void layoutChanged();
+ void tqlayoutChanged();
protected slots:
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index e8ab4b567..299206032 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -867,7 +867,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* )
void SystemTrayApplet::layoutTray()
{
- setUpdatesEnabled(false);
+ tqsetUpdatesEnabled(false);
int iconCount = m_shownWins.count();
@@ -1017,7 +1017,7 @@ void SystemTrayApplet::layoutTray()
}
}
- setUpdatesEnabled(true);
+ tqsetUpdatesEnabled(true);
updateGeometry();
setBackground();
}
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index 95dcccbc9..c39ac5d4b 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -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.at(pos)->popupMenu(e->globalPos());
+ if (pos != -1) containers.tqat(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.at(pos);
+ original_container = containers.tqat(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 72dca2567..1fb2d6ad3 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -414,7 +414,7 @@ void KasBar::updateLayout()
if ( !isUpdatesEnabled() )
return;
bool updates = isUpdatesEnabled();
- setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
// This is for testing a rectangular layout
// boxesPerLine_ = (uint) ceil(sqrt( items.count() ));
@@ -443,7 +443,7 @@ void KasBar::updateLayout()
resize( sz );
}
- setUpdatesEnabled( updates );
+ tqsetUpdatesEnabled( updates );
TQWidget *top = tqtopLevelWidget();
TQRegion mask;
@@ -451,24 +451,24 @@ void KasBar::updateLayout()
KasItem *i;
if ( orient == Qt::Horizontal ) {
for ( i = items.first(); i; i = items.next() ) {
- int x = (items.at() % c) * itemExtent();
+ int x = (items.tqat() % c) * itemExtent();
if ( direction_ == TQBoxLayout::RightToLeft )
x = width() - x - itemExtent();
- i->setPos( x, (items.at() / c) * itemExtent() );
+ i->setPos( x, (items.tqat() / 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.at() / r) * itemExtent();
+ int y = (items.tqat() / r) * itemExtent();
if ( direction_ == TQBoxLayout::BottomToTop )
y = height() - y - itemExtent();
- i->setPos( (items.at() % r) * itemExtent(), y );
+ i->setPos( (items.tqat() % r) * itemExtent(), y );
i->update();
mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) );
}
@@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev)
TQPainter p( &offscreen );
paintBackground( &p, TQRect(TQPoint(0,0),size()) );
TQWidget::resizeEvent(ev);
- emit layoutChanged();
+ emit tqlayoutChanged();
}
diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h
index e1fabddae..c75bdc31e 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.at( i ); }
+ KasItem *itemAt( uint i ) { return items.tqat( i ); }
int indexOf( KasItem *i ) { return items.tqfind( i ); }
KasItemList *itemList() { return &items; }
@@ -251,7 +251,7 @@ signals:
void directionChanged();
/** Emitted when kasbar wants to resize. This happens when a new window is added. */
- void layoutChanged();
+ void tqlayoutChanged();
/** Emitted when the item size is changed. */
void itemSizeChanged( int );
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index c63d6e277..dcb1a1ef1 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -97,7 +97,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile,
// setBackgroundMode( NoBackground );
kasbar = new KasTasker( orientation(), this, name );
- connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );
+ connect( kasbar, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SIGNAL( updateLayout() ) );
connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) );
kasbar->setConfig( config() );
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 12058a3c7..5f282db97 100644
--- a/kicker/extensions/kasbar/kasgroupitem.cpp
+++ b/kicker/extensions/kasbar/kasgroupitem.cpp
@@ -83,8 +83,8 @@ KasGroupItem::KasGroupItem( KasTasker *parent )
setGroupItem( true );
setText( i18n("Group") );
- connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) );
- connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) );
+ connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) );
+ connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) );
connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) );
connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) );
}
@@ -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.at( i );
+ Task::Ptr t = items.tqat( 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 e30260f57..ec6f07493 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.at( i ); }
+ Task::Ptr task( uint i ) { return items.tqat( i ); }
int taskCount() const { return items.count(); }
TQPixmap icon();
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 851b7d915..28be059ae 100644
--- a/kicker/extensions/kasbar/kastasker.cpp
+++ b/kicker/extensions/kasbar/kastasker.cpp
@@ -315,7 +315,7 @@ void KasTasker::moveToMain( KasGroupItem *gi, Task::Ptr t )
void KasTasker::moveToMain( KasGroupItem *gi )
{
bool updates = isUpdatesEnabled();
- setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
int i = indexOf( gi );
@@ -327,7 +327,7 @@ void KasTasker::moveToMain( KasGroupItem *gi )
gi->hidePopup();
remove( gi );
- setUpdatesEnabled( updates );
+ tqsetUpdatesEnabled( updates );
updateLayout();
}
@@ -346,7 +346,7 @@ void KasTasker::removeStartup( Startup::Ptr s )
void KasTasker::refreshAll()
{
bool updates = isUpdatesEnabled();
- setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
clear();
@@ -365,7 +365,7 @@ void KasTasker::refreshAll()
addTask( t.data() );
}
- setUpdatesEnabled( updates );
+ tqsetUpdatesEnabled( updates );
updateLayout();
}
@@ -572,7 +572,7 @@ void KasTasker::readConfig( KConfig *conf )
}
bool updates = isUpdatesEnabled();
- setUpdatesEnabled( false );
+ tqsetUpdatesEnabled( false );
//
@@ -653,7 +653,7 @@ void KasTasker::readConfig( KConfig *conf )
// fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true );
// enablePopup = conf->readBoolEntry( "EnablePopup", true );
- setUpdatesEnabled( updates );
+ tqsetUpdatesEnabled( updates );
emit configChanged();
}
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index 64dda4185..bbc4f6654 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -173,14 +173,14 @@ void KasTaskItem::updateTask(bool geometryChangeOnly)
}
bool updates = kasbar()->isUpdatesEnabled();
- kasbar()->setUpdatesEnabled( false );
+ kasbar()->tqsetUpdatesEnabled( false );
setProgress( kasbar()->showProgress() ? 0 : -1 );
setText( task_->visibleIconicName() );
setModified( task_->isModified() );
setActive( task_->isActive() );
- kasbar()->setUpdatesEnabled( updates );
+ kasbar()->tqsetUpdatesEnabled( updates );
update();
}
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index 301011688..4853b8d88 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->at(m_idx))->item : 0;
+ return m_idx < int(m_list->count()) ? (*m_list->tqat(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->at(m_idx);
+ ContainerAreaLayout::ItemList::iterator b = m_list->tqat(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.at(index))->item : 0;
+ return index >= 0 && index < m_items.count() ? (*m_items.tqat(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.at(index);
- m_items.remove(m_items.at(index));
+ ContainerAreaLayoutItem *b = *m_items.tqat(index);
+ m_items.remove(m_items.tqat(index));
TQLayoutItem *item = b->item;
b->item = 0;
delete b;
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index d2952d93a..06fc689f6 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -344,7 +344,7 @@ void PanelKMenu::initialize()
if (clients.count() > 0) {
TQIntDictIterator<KickerClientMenu> it(clients);
while (it){
- if (it.current()->text.at(0) != '.')
+ if (it.current()->text.tqat(0) != '.')
insertItem(
it.current()->icon,
it.current()->text,
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index 3fa259189..66dd71503 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().at(0) == '.'))
+ if ((g->name().tqat(0) == '.'))
{
continue;
}
diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp
index 3c14a74aa..295651523 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.at(id) != m_containers.end())
+ if (m_containers.tqat(id) != m_containers.end())
{
- m_containerArea->removeContainer(*m_containers.at(id));
+ m_containerArea->removeContainer(*m_containers.tqat(id));
}
}
diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp
index 8f02abd67..678d6a78f 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.at(id) != containers.end())
+ if (containers.tqat(id) != containers.end())
{
- containerArea->removeContainer(*containers.at(id));
+ containerArea->removeContainer(*containers.tqat(id));
}
}
diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp
index e1d8d62c4..c28ae1162 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.at(id) != m_containers.end())
+ else if (m_containers.tqat(id) != m_containers.end())
{
- ExtensionManager::the()->removeContainer(*m_containers.at(id));
+ ExtensionManager::the()->removeContainer(*m_containers.tqat(id));
}
}
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 76aa6162e..9c4d09929 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().at(0) == '.'))
+ if ((g->name().tqat(0) == '.'))
{
continue;
}
@@ -445,7 +445,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
return;
// ignore dotfiles.
- if ((serviceName.at(0) == '.'))
+ if ((serviceName.tqat(0) == '.'))
return;
// item names may contain ampersands. To avoid them being converted
diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp
index 9d1305da3..ee36c9737 100644
--- a/kicker/libkicker/global.cpp
+++ b/kicker/libkicker/global.cpp
@@ -470,9 +470,8 @@ void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int al
if (pix.isNull() || last_color != color || last_alpha != alpha)
{
TQImage img(16, 16, 32);
- img.setAlphaBuffer(false);
- img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
img.setAlphaBuffer(true);
+ img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF));
pix.convertFromImage(img);
last_color = color;
last_alpha = alpha;
diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp
index 936d8a536..3b68c0529 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.at(0) == '.'))
+ if ((serviceName.tqat(0) == '.'))
{
return;
}
@@ -290,7 +290,7 @@ void PrefMenu::initialize()
}
// Ignore dotfiles.
- if ((g->name().at(0) == '.'))
+ if ((g->name().tqat(0) == '.'))
{
continue;
}
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp
index b2159c196..c1204598a 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.at(i) : list.at(numContainers - i - 1);
+ it = forward ? list.tqat(i) : list.tqat(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.at(i) : list.at(numContainers - i - 1);
+ it = forward ? list.tqat(i) : list.tqat(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.at(i) : list.at(numContainers - i - 1);
+ it = forward ? list.tqat(i) : list.tqat(numContainers - i - 1);
if (it == list.end())
{
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 345fcb1f9..749c33c03 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.at(currentFrame) != frames.end())
+ if (!frames.isEmpty() && taskBar->showIcon() && frames.tqat(currentFrame) != frames.end())
{
- TQPixmap *pm = *frames.at(currentFrame);
+ TQPixmap *pm = *frames.tqat(currentFrame);
// draw pixmap
if ( pm && !pm->isNull() ) {
@@ -586,9 +586,9 @@ void TaskContainer::drawButton(TQPainter *p)
// draw button background
if (drawButton)
{
- tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, p,
- TQRect(0, 0, width(), height()),
- colors);
+ tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p,
+ TQRect(1, 1, width()-2, height()-2),
+ colors, sunken ? TQStyle::Style_Down : TQStyle::Style_Raised);
}
// shift button label on sunken buttons
@@ -684,11 +684,11 @@ void TaskContainer::drawButton(TQPainter *p)
}
else
{
- textPen = p->pen();
+ textPen = TQPen(colors.buttonText()); // textPen = p->pen();
}
}
- int availableWidth = width() - (br.x() * 2) - textPos;
+ int availableWidth = width() - (br.x() * 2) - textPos - 2;
if (m_filteredTasks.count() > 1)
{
availableWidth -= 8;
@@ -721,7 +721,12 @@ void TaskContainer::drawButton(TQPainter *p)
TQImage img = pm->convertToImage();
TQImage timg = tpm.convertToImage();
KImageEffect::blend(img, timg, *taskBar->blendGradient(size()), KImageEffect::Red);
+
+ // End painting before assigning the pixmap
+ QPaintDevice* opd = p->device();
+ p->end();
pm->convertFromImage(img);
+ p->tqbegin(opd ,this);
}
else
{
@@ -739,9 +744,9 @@ void TaskContainer::drawButton(TQPainter *p)
}
}
- if (!frames.isEmpty() && m_startup && frames.at(currentFrame) != frames.end())
+ if (!frames.isEmpty() && m_startup && frames.tqat(currentFrame) != frames.end())
{
- TQPixmap *anim = *frames.at(currentFrame);
+ TQPixmap *anim = *frames.tqat(currentFrame);
if (anim && !anim->isNull())
{
@@ -841,7 +846,7 @@ TQString TaskContainer::name()
}
// strip trailing crap
- while (i > 0 && !match.at(i).isLetterOrNumber())
+ while (i > 0 && !match.tqat(i).isLetterOrNumber())
{
--i;
}
diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index eed255b64..fd344f0d2 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.at(indexOf(m_lastDragId), &ok);
+ Task::Ptr t = m_tasks.tqat(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.at(index, &ok);
+ Task::Ptr task = m_tasks.tqat(index, &ok);
if (ok)
{
Task::List tasks;