summaryrefslogtreecommitdiffstats
path: root/kicker/extensions/kasbar
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/extensions/kasbar
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/extensions/kasbar')
-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
7 files changed, 22 insertions, 22 deletions
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();
}