summaryrefslogtreecommitdiffstats
path: root/kicker/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'kicker/extensions')
-rw-r--r--kicker/extensions/dockbar/dockbarextension.cpp10
-rw-r--r--kicker/extensions/dockbar/dockbarextension.h2
-rw-r--r--kicker/extensions/kasbar/kasaboutdlg.cpp2
-rw-r--r--kicker/extensions/kasbar/kasbar.cpp30
-rw-r--r--kicker/extensions/kasbar/kasbar.h6
-rw-r--r--kicker/extensions/kasbar/kasbarextension.cpp8
-rw-r--r--kicker/extensions/kasbar/kasbarextension.h2
-rw-r--r--kicker/extensions/kasbar/kasclockitem.cpp4
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.cpp2
-rw-r--r--kicker/extensions/kasbar/kasgroupitem.h2
-rw-r--r--kicker/extensions/kasbar/kasitem.cpp8
-rw-r--r--kicker/extensions/kasbar/kasitem.h6
-rw-r--r--kicker/extensions/kasbar/kasloaditem.cpp4
-rw-r--r--kicker/extensions/kasbar/kasresources.cpp4
-rw-r--r--kicker/extensions/kasbar/kasresources.h2
-rw-r--r--kicker/extensions/kasbar/kastasker.cpp12
-rw-r--r--kicker/extensions/kasbar/kastaskitem.cpp14
-rw-r--r--kicker/extensions/kasbar/kastaskpopup.cpp2
-rw-r--r--kicker/extensions/sidebar/sidebarextension.cpp14
-rw-r--r--kicker/extensions/sidebar/sidebarextension.h2
-rw-r--r--kicker/extensions/taskbar/taskbarextension.cpp10
-rw-r--r--kicker/extensions/taskbar/taskbarextension.h2
22 files changed, 74 insertions, 74 deletions
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp
index da20a2a61..2a4944c20 100644
--- a/kicker/extensions/dockbar/dockbarextension.cpp
+++ b/kicker/extensions/dockbar/dockbarextension.cpp
@@ -60,7 +60,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
twin_module = new KWinModule(TQT_TQOBJECT(this));
connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
setMinimumSize(DockContainer::sz(), DockContainer::sz());
- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
loadContainerConfig();
}
@@ -77,7 +77,7 @@ DockBarExtension::~DockBarExtension()
if (dragging_container) delete dragging_container;
}
-TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const
+TQSize DockBarExtension::sizeHint(Position p, TQSize) const
{
if (p == Left || p == Right)
return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count());
@@ -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/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h
index 4a5dff41f..0952d259e 100644
--- a/kicker/extensions/dockbar/dockbarextension.h
+++ b/kicker/extensions/dockbar/dockbarextension.h
@@ -40,7 +40,7 @@ public:
virtual ~DockBarExtension();
- TQSize tqsizeHint(Position, TQSize maxSize) const;
+ TQSize sizeHint(Position, TQSize maxSize) const;
Position preferedPosition() const { return Right; }
protected slots:
diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp
index 35028d9e0..f0daf7655 100644
--- a/kicker/extensions/kasbar/kasaboutdlg.cpp
+++ b/kicker/extensions/kasbar/kasaboutdlg.cpp
@@ -57,7 +57,7 @@
#include <tqvbox.h>
#include <tqlabel.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tdeversion.h>
#include <klocale.h>
diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp
index 3d63c8c4e..89fcad751 100644
--- a/kicker/extensions/kasbar/kasbar.cpp
+++ b/kicker/extensions/kasbar/kasbar.cpp
@@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
rootPix( 0 ),
enableTint_( false ),
tintAmount_( 0.1 ),
- tintColour_( tqcolorGroup().mid() ),
+ tintColour_( colorGroup().mid() ),
useMask_( true ),
res(0)
{
@@ -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 )
@@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
rootPix( 0 ),
enableTint_( false ),
tintAmount_( 0.1 ),
- tintColour_( tqcolorGroup().mid() ),
+ tintColour_( colorGroup().mid() ),
useMask_( true ),
res(0)
{
@@ -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 );
}
}
@@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach )
emit detachedChanged( detached );
}
-TQSize KasBar::tqsizeHint( Orientation o, TQSize sz )
+TQSize KasBar::sizeHint( Orientation o, TQSize sz )
{
if ( o == Qt::Horizontal )
setBoxesPerLine( sz.width() / itemExtent() );
@@ -414,7 +414,7 @@ void KasBar::updateLayout()
if ( !isUpdatesEnabled() )
return;
bool updates = isUpdatesEnabled();
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
// This is for testing a rectangular layout
// boxesPerLine_ = (uint) ceil(sqrt( items.count() ));
@@ -443,32 +443,32 @@ void KasBar::updateLayout()
resize( sz );
}
- tqsetUpdatesEnabled( updates );
+ setUpdatesEnabled( updates );
- TQWidget *top = tqtopLevelWidget();
+ TQWidget *top = topLevelWidget();
TQRegion mask;
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 201fcc882..d16eb44bf 100644
--- a/kicker/extensions/kasbar/kasbar.h
+++ b/kicker/extensions/kasbar/kasbar.h
@@ -62,7 +62,7 @@
#include <tqwidget.h>
#include <tqpoint.h>
#include <tqptrlist.h>
-#include <tqlayout.h>
+#include <layout.h>
#include "kasresources.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; }
@@ -152,7 +152,7 @@ public:
bool isDrag() const { return inDrag; }
- TQSize tqsizeHint( Qt::Orientation, TQSize max );
+ TQSize sizeHint( Qt::Orientation, TQSize max );
//
// Look and feel options
diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp
index c63d6e277..385a79131 100644
--- a/kicker/extensions/kasbar/kasbarextension.cpp
+++ b/kicker/extensions/kasbar/kasbarextension.cpp
@@ -51,7 +51,7 @@
/*
** Bug reports and questions can be sent to kde-devel@kde.org
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <dcopclient.h>
#include <kapplication.h>
@@ -141,7 +141,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ )
{
updateGeometry();
resize( kasbar->size() );
- tqrepaint( true );
+ repaint( true );
}
TQSize KasBarExtension::detachedSize()
@@ -153,7 +153,7 @@ TQSize KasBarExtension::detachedSize()
}
-TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const
+TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const
{
Orientation o = Qt::Horizontal;
@@ -167,7 +167,7 @@ TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const
return TQSize( 0, kasbar->itemExtent()/2 );
}
- return kasbar->tqsizeHint( o, maxSize );
+ return kasbar->sizeHint( o, maxSize );
}
void KasBarExtension::positionChange( Position /* position */)
diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h
index e5e3142df..7fbb4fbc6 100644
--- a/kicker/extensions/kasbar/kasbarextension.h
+++ b/kicker/extensions/kasbar/kasbarextension.h
@@ -76,7 +76,7 @@ public:
virtual ~KasBarExtension();
- TQSize tqsizeHint( Position, TQSize maxSize ) const;
+ TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const { return Right; }
virtual void positionChange( Position position );
diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp
index 959734c22..51dac687d 100644
--- a/kicker/extensions/kasbar/kasclockitem.cpp
+++ b/kicker/extensions/kasbar/kasclockitem.cpp
@@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent )
lcd = new LCD( parent );
lcd->hide();
- lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
+ lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
lcd->setBackgroundMode( NoBackground );
lcd->setFrameStyle( TQFrame::NoFrame );
lcd->setSegmentStyle( TQLCDNumber::Flat );
@@ -89,7 +89,7 @@ void KasClockItem::paint( TQPainter *p )
p->save();
p->translate( 3, 15 );
- lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() );
+ lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() );
lcd->draw( p );
p->restore();
diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp
index 31615acbf..7e23ce7fd 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 d8bd83b54..323148713 100644
--- a/kicker/extensions/kasbar/kasitem.cpp
+++ b/kicker/extensions/kasbar/kasitem.cpp
@@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p )
if ( !frame )
return;
- qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2);
+ qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2);
TQPen pen;
@@ -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 66cecf9ac..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 );
@@ -218,7 +218,7 @@ protected:
TQFontMetrics fontMetrics() const { return kas->fontMetrics(); }
/** Gets the color group from the parent. */
- const TQColorGroup &tqcolorGroup() const { return kas->tqcolorGroup(); }
+ const TQColorGroup &colorGroup() const { return kas->colorGroup(); }
/** Factory method that creates a popup widget for the item. */
virtual KasPopup *createPopup();
diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp
index 459bd6639..6fa1f9b2a 100644
--- a/kicker/extensions/kasbar/kasloaditem.cpp
+++ b/kicker/extensions/kasbar/kasloaditem.cpp
@@ -95,7 +95,7 @@ void KasLoadItem::paint( TQPainter *p )
KasItem::paint( p );
- TQColor light = kasbar()->tqcolorGroup().highlight();
+ TQColor light = kasbar()->colorGroup().highlight();
TQColor dark = light.dark();
KPixmap pix;
@@ -103,7 +103,7 @@ void KasLoadItem::paint( TQPainter *p )
KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient );
p->drawPixmap( 2, extent()-2-h, pix );
- p->setPen( kasbar()->tqcolorGroup().mid() );
+ p->setPen( kasbar()->colorGroup().mid() );
for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) {
int ypos = (int) floor((extent()-2) - (dh*maxValue*pos));
p->drawLine( 2, ypos, extent()-3, ypos );
diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp
index 3450b1549..78b25e8c0 100644
--- a/kicker/extensions/kasbar/kasresources.cpp
+++ b/kicker/extensions/kasbar/kasresources.cpp
@@ -308,7 +308,7 @@ KPixmap KasResources::activeBg()
if ( actBg.isNull() ) {
actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() );
KPixmapEffect::gradient( actBg,
- kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(),
+ kasbar->colorGroup().light(), kasbar->colorGroup().mid(),
KPixmapEffect::DiagonalGradient );
}
@@ -320,7 +320,7 @@ KPixmap KasResources::inactiveBg()
if ( inactBg.isNull() ) {
inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() );
KPixmapEffect::gradient( inactBg,
- kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(),
+ kasbar->colorGroup().mid(), kasbar->colorGroup().dark(),
KPixmapEffect::DiagonalGradient );
}
diff --git a/kicker/extensions/kasbar/kasresources.h b/kicker/extensions/kasbar/kasresources.h
index bada9786b..a023bd182 100644
--- a/kicker/extensions/kasbar/kasresources.h
+++ b/kicker/extensions/kasbar/kasresources.h
@@ -59,7 +59,7 @@
#include <tqbitmap.h>
#include <tqcolor.h>
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpen.h>
#include <kpixmap.h>
diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp
index 28be059ae..851b7d915 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();
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
int i = indexOf( gi );
@@ -327,7 +327,7 @@ void KasTasker::moveToMain( KasGroupItem *gi )
gi->hidePopup();
remove( gi );
- tqsetUpdatesEnabled( updates );
+ setUpdatesEnabled( updates );
updateLayout();
}
@@ -346,7 +346,7 @@ void KasTasker::removeStartup( Startup::Ptr s )
void KasTasker::refreshAll()
{
bool updates = isUpdatesEnabled();
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
clear();
@@ -365,7 +365,7 @@ void KasTasker::refreshAll()
addTask( t.data() );
}
- tqsetUpdatesEnabled( updates );
+ setUpdatesEnabled( updates );
updateLayout();
}
@@ -572,7 +572,7 @@ void KasTasker::readConfig( KConfig *conf )
}
bool updates = isUpdatesEnabled();
- tqsetUpdatesEnabled( false );
+ setUpdatesEnabled( false );
//
@@ -653,7 +653,7 @@ void KasTasker::readConfig( KConfig *conf )
// fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true );
// enablePopup = conf->readBoolEntry( "EnablePopup", true );
- tqsetUpdatesEnabled( updates );
+ setUpdatesEnabled( updates );
emit configChanged();
}
diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp
index cc10b6410..51fb450a6 100644
--- a/kicker/extensions/kasbar/kastaskitem.cpp
+++ b/kicker/extensions/kasbar/kastaskitem.cpp
@@ -56,12 +56,12 @@
#include <tqbitmap.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqmetaobject.h>
#include <tqpainter.h>
#include <tqregexp.h>
#include <tqtabwidget.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqtimer.h>
#include <tqvbox.h>
@@ -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 );
@@ -173,14 +173,14 @@ void KasTaskItem::updateTask(bool geometryChangeOnly)
}
bool updates = kasbar()->isUpdatesEnabled();
- kasbar()->tqsetUpdatesEnabled( false );
+ kasbar()->setUpdatesEnabled( false );
setProgress( kasbar()->showProgress() ? 0 : -1 );
setText( task_->visibleIconicName() );
setModified( task_->isModified() );
setActive( task_->isActive() );
- kasbar()->tqsetUpdatesEnabled( updates );
+ kasbar()->setUpdatesEnabled( updates );
update();
}
@@ -422,7 +422,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool
taskprops->addColumn( i18n("Value") );
// Create List Items
- TQMetaObject *mo = target->tqmetaObject();
+ TQMetaObject *mo = target->metaObject();
for ( int i = 0; i < mo->numProperties( recursive ); i++ ) {
const TQMetaProperty *p = mo->property(i, recursive);
@@ -456,7 +456,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data )
TQWidget *KasTaskItem::createX11Props( TQWidget *parent )
{
TQVBox *vb2 = new TQVBox( parent );
- vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+ vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
vb2->setSpacing( KDialog::spacingHint() );
vb2->setMargin( KDialog::marginHint() );
diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp
index 9a59e1603..25c096a65 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, tqcolorGroup().mid(),
+ Qt::black, colorGroup().mid(),
KPixmapEffect::DiagonalGradient );
connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );
diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 3e29403f4..3485eca21 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -22,7 +22,7 @@
#include <klocale.h>
#include <kparts/part.h>
#include <kparts/componentfactory.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <konq_historymgr.h>
#include <krun.h>
#include <kurl.h>
@@ -94,7 +94,7 @@ void SidebarExtension::needLayoutUpdate(bool exp) {
m_currentWidth=24;
m_resizeHandle->hide();
}
- tqtopLevelWidget()->setFixedWidth(m_currentWidth);
+ topLevelWidget()->setFixedWidth(m_currentWidth);
emit updateLayout();
}
@@ -117,7 +117,7 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
return true;
} else if (e->type()==TQEvent::MouseButtonRelease) {
m_resizing=false;
- m_expandedSize=tqtopLevelWidget()->width();
+ m_expandedSize=topLevelWidget()->width();
needLayoutUpdate(true);
return true;
} else if (e->type()==TQEvent::MouseMove) {
@@ -126,14 +126,14 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
if (p==Left) {
int diff=((TQMouseEvent*)e)->globalX()-m_x;
if (abs(diff)>3) {
- tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff);
+ topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff);
m_x=((TQMouseEvent*)e)->globalX();
}
} else if (p==Right) {
int diff=((TQMouseEvent*)e)->globalX()-m_x;
if (abs(diff)>3) {
- tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff);
- tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y());
+ topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff);
+ topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y());
m_x=((TQMouseEvent*)e)->globalX();
}
}
@@ -148,7 +148,7 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const {
return KPanelExtension::Left;
}
-TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const
+TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const
{
return TQSize(m_currentWidth,maxSize.height());
}
diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h
index 9f28854b9..4d0d1646b 100644
--- a/kicker/extensions/sidebar/sidebarextension.h
+++ b/kicker/extensions/sidebar/sidebarextension.h
@@ -36,7 +36,7 @@ public:
virtual ~SidebarExtension();
- TQSize tqsizeHint( Position, TQSize maxSize ) const;
+ TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const;
virtual void positionChange( Position position );
diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp
index 56e6ea3ce..e3269a5d1 100644
--- a/kicker/extensions/taskbar/taskbarextension.cpp
+++ b/kicker/extensions/taskbar/taskbarextension.cpp
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtimer.h>
#include <tqwmatrix.h>
@@ -123,17 +123,17 @@ void TaskBarExtension::preferences()
m_container->preferences();
}
-TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const
+TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const
{
if (p == Left || p == Right)
maxSize.setWidth(sizeInPixels());
else
maxSize.setHeight(sizeInPixels());
-// kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl;
+// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl;
// kdDebug(1210) << " width: " << size.width() << endl;
// kdDebug(1210) << "height: " << size.height() << endl;
- return m_container->tqsizeHint(p, maxSize);
+ return m_container->sizeHint(p, maxSize);
}
void TaskBarExtension::configure()
@@ -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/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h
index 92c065beb..2848e80c7 100644
--- a/kicker/extensions/taskbar/taskbarextension.h
+++ b/kicker/extensions/taskbar/taskbarextension.h
@@ -49,7 +49,7 @@ public:
int actions = 0, TQWidget *parent = 0, const char *name = 0 );
~TaskBarExtension();
- TQSize tqsizeHint( Position, TQSize maxSize ) const;
+ TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const { return Bottom; }
protected: