diff options
Diffstat (limited to 'kicker/extensions')
25 files changed, 124 insertions, 124 deletions
diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 5ebce58c4..d3b625f80 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -60,7 +60,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, kwin_module = new KWinModule(this); connect( kwin_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()); @@ -87,7 +87,7 @@ TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const void DockBarExtension::resizeEvent(TQResizeEvent*) { - tqlayoutContainers(); + layoutContainers(); } @@ -167,7 +167,7 @@ void DockBarExtension::windowAdded(WId win) saveContainerConfig(); } -void DockBarExtension::tqlayoutContainers() +void DockBarExtension::layoutContainers() { int i = 0; for (DockContainer::Vector::const_iterator it = containers.constBegin(); @@ -212,7 +212,7 @@ void DockBarExtension::embedWindow(WId win, TQString command, TQString resName, } container->embed(win); - tqlayoutContainers(); + layoutContainers(); emit updateLayout(); if (ncmd) container->askNewCommand(); @@ -246,7 +246,7 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) void DockBarExtension::removeContainer(DockContainer* c) { - DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), c); + DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), c); if (it == containers.end()) { @@ -255,7 +255,7 @@ void DockBarExtension::removeContainer(DockContainer* c) containers.erase(it); delete c; - tqlayoutContainers(); + layoutContainers(); } void DockBarExtension::embeddedWindowDestroyed(DockContainer* c) @@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) it != containers.constEnd(); ++it, ++i) { - if ((*it)->tqgeometry().tqcontains(p)) + if ((*it)->geometry().contains(p)) { return i; } @@ -360,7 +360,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { releaseMouse(); original_container->embed(dragging_container->embeddedWinId()); delete dragging_container; dragging_container = 0; - tqlayoutContainers(); + layoutContainers(); saveContainerConfig(); } } @@ -387,7 +387,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { if (dragging_container) { dragging_container->move(e->globalPos() - mclic_dock_pos); - // change tqlayout of other containers + // change layout of other containers TQPoint dragpos(dragging_container->pos()), barpos(mapToGlobal(pos())); int pdrag1,pdrag2,psz; @@ -403,7 +403,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { pdrag1 = dragged_container_original_pos; - DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), original_container); + DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), original_container); if (it == containers.end()) { @@ -418,6 +418,6 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { containers.erase(it); containers.insert(target, original_container); - tqlayoutContainers(); + layoutContainers(); } } diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 5c0263586..e735ec708 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: @@ -55,7 +55,7 @@ protected: void removeContainer(DockContainer*); void saveContainerConfig(); void loadContainerConfig(); - void tqlayoutContainers(); + void layoutContainers(); int findContainerAtPoint(const TQPoint&); void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index ce43d0ba1..09408fc4a 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -26,7 +26,7 @@ - Improved the about dialog. - - Made tqmasking of the containing toplevel optional. + - Made masking of the containing toplevel optional. - Fixed positioning of the clock display in small mode. @@ -149,7 +149,7 @@ 2004-09-03 Friday 22:32 rich * - Added support for the XShape extension, the unused space is now - tqmasked so that when you have a non-rectangular bar (by using + masked so that when you have a non-rectangular bar (by using the 'Boxes per line' setting) the unused space is truly unused. To make this better, I need to make it so that the box is always populated from the screen edge outwards. @@ -164,7 +164,7 @@ - Added a context menu item to attach and detach the bar. - - Improved tqrepaint performance. + - Improved repaint performance. - Increased version number. @@ -211,7 +211,7 @@ * - Improved the handling of inactive desktop grouping. - Fixed a problem with popups not being deleted when their - associated item was tqinvalidated. + associated item was invalidated. 2004-08-07 Saturday 03:00 rich @@ -436,7 +436,7 @@ 2003-10-23 Thursday 21:41 bwalter - * Use tqtopLevelWidget() instead of parent()->parent()... + * Use topLevelWidget() instead of parent()->parent()... 2003-10-22 Wednesday 22:15 bwalter @@ -481,11 +481,11 @@ 2003-09-30 Tuesday 22:25 rich - * - More improvements to bg tqrepainting (much more efficient). + * - More improvements to bg repainting (much more efficient). - Fixed startup animation problem #39582 - - Fixed erase problem introduced by the tqrepaint changes in my + - Fixed erase problem introduced by the repaint changes in my last commit. CCMAIL: 39582-done@bugs.kde.org @@ -498,7 +498,7 @@ - Removed redundant reload of configuration info. - Reworked painting - Double buffering is now handled by KasBar - not the items. - Items now longer force an immediate tqrepaint, + not the items. - Items now longer force an immediate repaint, they use update instead. - Fixes #53735 CCMAIL: 53735-done@bugs.kde.org @@ -531,7 +531,7 @@ 2003-03-29 Saturday 20:29 binner - * Fixed a tqlayout problem and solution for "only drawing last icon + * Fixed a layout problem and solution for "only drawing last icon from a group". 2003-02-09 Sunday 09:51 mfranz @@ -608,7 +608,7 @@ 2002-08-09 Friday 23:57 rich - * - Fixed tqrepaint problem with startup items + * - Fixed repaint problem with startup items 2002-07-29 Monday 22:03 coolo @@ -743,11 +743,11 @@ 2001-07-17 Tuesday 19:59 rich * Added some extra guards around KRootPixmap calls and readded the - tqrepaint I removed earlier + repaint I removed earlier 2001-07-17 Tuesday 17:03 rich - * Remove redundant tqrepaint + * Remove redundant repaint 2001-07-17 Tuesday 16:47 rich @@ -818,7 +818,7 @@ 2001-05-14 Monday 00:40 rich * Added new about dialog Fixed some flicker problems Improved - thumbnail heuristics Improved transparent mode tqrepaints + thumbnail heuristics Improved transparent mode repaints 2001-04-27 Friday 19:07 rich @@ -916,7 +916,7 @@ 2001-03-06 Tuesday 12:32 faure - * ran includetqmocs to get this to compile (am_edit was trying to + * ran includemocs to get this to compile (am_edit was trying to compile a .moc.cpp into a .moc ... there's still something fishy in am_edit...) @@ -929,7 +929,7 @@ 2000-12-17 Sunday 12:00 elter - * Fixed totally broken kasbar tqsizeHint. + * Fixed totally broken kasbar sizeHint. 2000-12-17 Sunday 11:53 elter diff --git a/kicker/extensions/kasbar/DESIGN b/kicker/extensions/kasbar/DESIGN index c107a4cb6..6d2de25e6 100644 --- a/kicker/extensions/kasbar/DESIGN +++ b/kicker/extensions/kasbar/DESIGN @@ -13,7 +13,7 @@ The division of labour between the classes is like this: * KasBar, KasItem, KasPopup These classes implement the KasBar widget. KasBar provides the - tqlayout and smart redraws while the KasItem class is an abstract + layout and smart redraws while the KasItem class is an abstract interface for the items forming the bars contents. The KasPopup class provides a self positioning widget that should be subclassed to provide useful information. diff --git a/kicker/extensions/kasbar/Doxyfile b/kicker/extensions/kasbar/Doxyfile index f0db9df8b..8c82cae8b 100644 --- a/kicker/extensions/kasbar/Doxyfile +++ b/kicker/extensions/kasbar/Doxyfile @@ -227,7 +227,7 @@ SORT_MEMBER_DOCS = YES DISTRIBUTE_GROUP_DOC = NO # The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to tqreplace tabs by spaces in code fragments. +# Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 @@ -329,7 +329,7 @@ WARN_IF_DOC_ERROR = YES # The WARN_FORMAT tag determines the format of the warning messages that # doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be tqreplaced by the file and line number from which the +# tags, which will be replaced by the file and line number from which the # warning originated and the warning text. WARN_FORMAT = "$file:$line: $text" @@ -351,7 +351,7 @@ WARN_LOGFILE = INPUT = . ../../taskmanager -# If the value of the INPUT tag tqcontains directories, you can use the +# If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: @@ -370,14 +370,14 @@ RECURSIVE = NO # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = *tqmoc* +EXCLUDE = *moc* # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories # that are symbolic links (a Unix filesystem feature) are excluded from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag tqcontains directories, you can use the +# If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude # certain files from those directories. @@ -389,7 +389,7 @@ EXCLUDE_PATTERNS = EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag tqcontains directories, you can use the +# If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank all files are included. @@ -468,7 +468,7 @@ VERBATIM_HEADERS = YES # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index # of all compounds will be generated. Enable this if the project -# tqcontains a lot of classes, structs, unions or interfaces. +# contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO @@ -704,7 +704,7 @@ RTF_HYPERLINKS = NO # Load stylesheet definitions from file. Syntax is similar to doxygen's # config file, i.e. a series of assigments. You only have to provide -# tqreplacements, missing definitions are set to their default value. +# replacements, missing definitions are set to their default value. RTF_STYLESHEET_FILE = diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 4175f01b7..bf2b64ba3 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 == Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -416,7 +416,7 @@ void KasBar::updateLayout() bool updates = isUpdatesEnabled(); setUpdatesEnabled( false ); -// This is for testing a rectangular tqlayout +// This is for testing a rectangular layout // boxesPerLine_ = (uint) ceil(sqrt( items.count() )); // Work out the number of rows and columns @@ -445,8 +445,8 @@ void KasBar::updateLayout() setUpdatesEnabled( updates ); - TQWidget *top = tqtopLevelWidget(); - TQRegion tqmask; + TQWidget *top = topLevelWidget(); + TQRegion mask; KasItem *i; if ( orient == Horizontal ) { @@ -458,7 +458,7 @@ void KasBar::updateLayout() i->setPos( x, (items.at() / c) * itemExtent() ); i->update(); - tqmask = tqmask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { @@ -470,12 +470,12 @@ void KasBar::updateLayout() i->setPos( (items.at() % r) * itemExtent(), y ); i->update(); - tqmask = tqmask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } if ( useMask_ ) - top->setMask( tqmask ); + top->setMask( mask ); else top->clearMask(); update(); @@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev) TQPainter p( &offscreen ); paintBackground( &p, TQRect(TQPoint(0,0),size()) ); TQWidget::resizeEvent(ev); - emit tqlayoutChanged(); + emit layoutChanged(); } @@ -646,7 +646,7 @@ void KasBar::updateItem( KasItem *i ) update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); } -void KasBar::tqrepaintItem(KasItem *i, bool erase ) +void KasBar::repaintItem(KasItem *i, bool erase ) { if ( !i ) return; @@ -658,7 +658,7 @@ void KasBar::tqrepaintItem(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) @@ -670,7 +670,7 @@ KasItem* KasBar::itemAt(const TQPoint &p) cr.setTopLeft( i->pos() ); cr.setSize( TQSize( itemExtent(), itemExtent() ) ); - if(cr.tqcontains(p)) + if(cr.contains(p)) return i; } @@ -687,12 +687,12 @@ void KasBar::setBackground( const TQPixmap &newBg ) updateLayout(); } -void KasBar::setMasked( bool tqmask ) +void KasBar::setMasked( bool mask ) { - if ( useMask_ == tqmask ) + if ( useMask_ == mask ) return; - useMask_ = tqmask; + useMask_ = mask; } void KasBar::setPaintInactiveFrames( bool enable ) diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 4cd10dc7c..8ff745475 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -84,7 +84,7 @@ class KDE_EXPORT KasBar : public QWidget Q_PROPERTY( uint boxesPerLine READ boxesPerLine ) Q_PROPERTY( Direction direction READ direction ) Q_PROPERTY( Orientation orientation READ orientation ) - Q_PROPERTY( bool tqmasked READ isMasked ) + Q_PROPERTY( bool masked READ isMasked ) Q_ENUMS( Direction ) friend class KasItem; @@ -152,7 +152,7 @@ public: bool isDrag() const { return inDrag; } - TQSize tqsizeHint( Orientation, TQSize max ); + TQSize sizeHint( Orientation, TQSize max ); // // Look and feel options @@ -188,7 +188,7 @@ public: void updateItem( KasItem *i ); /** Redraws the specified item. */ - void tqrepaintItem(KasItem *i, bool erase = true ); + void repaintItem(KasItem *i, bool erase = true ); /** Returns the item at p or 0. */ KasItem* itemAt(const TQPoint &p); @@ -229,7 +229,7 @@ public slots: void setBackground( const TQPixmap &pix ); - void setMasked( bool tqmask ); + void setMasked( bool mask ); void setPaintInactiveFrames( bool enable ); @@ -251,7 +251,7 @@ signals: void directionChanged(); /** Emitted when kasbar wants to resize. This happens when a new window is added. */ - void tqlayoutChanged(); + void layoutChanged(); /** Emitted when the item size is changed. */ void itemSizeChanged( int ); @@ -279,7 +279,7 @@ protected: /** Calls the paint methods for the items in the rectangle specified by the event. */ void paintEvent(TQPaintEvent *ev); - /** Forces the widget to re-tqlayout it's contents. */ + /** Forces the widget to re-layout it's contents. */ void resizeEvent(TQResizeEvent *ev); private: diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 14f1b02f1..3bc3dcd1b 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( tqlayoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); + connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); @@ -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 = 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 f5fbe25b0..f025af857 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 ); @@ -75,7 +75,7 @@ KasPopup *KasClockItem::createPopup() void KasClockItem::updateTime() { - setText( KGlobal::locale()->formatDate( TQDate::tqcurrentDate(), true /* shortFormat */ ) ); + setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); update(); @@ -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 a86c08303..6e03e8e3c 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( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) ); - connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 1ed9b2ed9..8fd795363 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,15 +547,15 @@ 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->tqrepaintItem( this, erase ); + kas->repaintItem( this, erase ); } void KasItem::update() diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 61efc85e9..c16a5f6d3 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -170,8 +170,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 ); @@ -217,7 +217,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 e36d2d18d..7b6939760 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/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 9dfe480f2..7538dfbb2 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -96,21 +96,21 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int y = pos.y(); if ( kasbar->orientation() == Horizontal ) { - if ( y < ( tqApp->desktop()->height() / 2 ) ) + if ( y < ( qApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else y = y - h; - if ( (x + w) > tqApp->desktop()->width() ) + if ( (x + w) > qApp->desktop()->width() ) x = x - w + kasbar->itemExtent(); } else { - if ( x < ( tqApp->desktop()->width() / 2 ) ) + if ( x < ( qApp->desktop()->width() / 2 ) ) x = x + kasbar->itemExtent(); else x = x - w; - if ( (y + h) > tqApp->desktop()->height() ) + if ( (y + h) > qApp->desktop()->height() ) y = y - h + kasbar->itemExtent(); } diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 8886f671d..e81b0aacb 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -408,7 +408,7 @@ void KasPrefsDialog::addAdvancedPage() notifierCheck->setChecked( kasbar->notifierEnabled() ); connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); - // tqStatus advanced + // Status advanced modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); TQWhatsThis::add( modifiedCheck, i18n( "Enables the display of a floppy disk state icon for windows containing " 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/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index bb36ae522..a087f40ff 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -207,7 +207,7 @@ KPopupMenu *KasTasker::contextMenu() if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) ); } } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 121e0f1eb..c9ec7bdd0 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -165,9 +165,9 @@ void KasTaskItem::checkAttention() setAttention( task_->demandsAttention() ); } -void KasTaskItem::updateTask(bool tqgeometryChangeOnly) +void KasTaskItem::updateTask(bool geometryChangeOnly) { - if (tqgeometryChangeOnly) + if (geometryChangeOnly) { return; } @@ -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); @@ -445,7 +445,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) if ( pos >= 0 ) { TQVariant val = data->property( re.cap(1).latin1() ); TQString v = val.asString(); - s.tqreplace( pos, re.matchedLength(), v ); + s.replace( pos, re.matchedLength(), v ); pos = pos + v.length(); } } @@ -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/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h index 5118a4263..b2b166ef5 100644 --- a/kicker/extensions/kasbar/kastaskitem.h +++ b/kicker/extensions/kasbar/kastaskitem.h @@ -90,7 +90,7 @@ class KasTaskItem : public KasItem TQString expandMacros( const TQString &format, TQObject *data ); public slots: - void updateTask(bool tqgeometryChangeOnly); + void updateTask(bool geometryChangeOnly); /** Create a thumbnail for this task (does nothing if they're disabled). */ void refreshThumbnail(); 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 424414a3a..401c67fbd 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -50,8 +50,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile, { kdDebug() << "SidebarExtension: Created '" << name << "', '" << configFile << "'" << endl; new KonqHistoryManager(0,"SidebarExtensionHistoryManager"); - m_tqlayout=new TQHBoxLayout(this); - m_tqlayout->activate(); + m_layout=new TQHBoxLayout(this); + m_layout->activate(); m_sbWrapper=new TQVBox(this); KParts::ReadOnlyPart *p=KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>( "konq_sidebar", @@ -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,24 +148,24 @@ 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()); } void SidebarExtension::positionChange( Position position ) { if (position == Right) { - m_tqlayout->remove(m_sbWrapper); - m_tqlayout->remove(m_resizeHandle); + m_layout->remove(m_sbWrapper); + m_layout->remove(m_resizeHandle); - m_tqlayout->add(m_resizeHandle); - m_tqlayout->add(m_sbWrapper); + m_layout->add(m_resizeHandle); + m_layout->add(m_sbWrapper); } else if (position == Left) { - m_tqlayout->remove(m_sbWrapper); - m_tqlayout->remove(m_resizeHandle); + m_layout->remove(m_sbWrapper); + m_layout->remove(m_resizeHandle); - m_tqlayout->add(m_sbWrapper); - m_tqlayout->add(m_resizeHandle); + m_layout->add(m_sbWrapper); + m_layout->add(m_resizeHandle); } diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 7dea6b0fb..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 ); @@ -55,7 +55,7 @@ private: TQFrame *m_resizeHandle; bool m_resizing; int m_expandedSize; - TQHBoxLayout *m_tqlayout; + TQHBoxLayout *m_layout; TQVBox *m_sbWrapper; }; diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 99a131926..e0deb768e 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -57,11 +57,11 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, m_bgFilename(0), m_rootPixmap(0) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); m_container = new TaskBarContainer(false, this); m_container->setBackgroundOrigin(AncestorOrigin); positionChange(position()); - tqlayout->addWidget(m_container); + layout->addWidget(m_container); connect(m_container, TQT_SIGNAL(containerCountChanged()), TQT_SIGNAL(updateLayout())); @@ -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: |