diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kbfxbutton.cpp | 18 | ||||
| -rw-r--r-- | src/kbfxplasmacanvasgroup.cpp | 12 | ||||
| -rw-r--r-- | src/kbfxplasmacanvasitem.cpp | 6 | ||||
| -rw-r--r-- | src/kbfxplasmacanvasstack.cpp | 4 | ||||
| -rw-r--r-- | src/kbfxplasmacanvasview.cpp | 12 | ||||
| -rw-r--r-- | src/kbfxplasmaindexview.cpp | 2 | ||||
| -rw-r--r-- | src/kbfxspinx.cpp | 18 | ||||
| -rw-r--r-- | src/kbfxspinxscrollbar.cpp | 2 | ||||
| -rw-r--r-- | src/kbfxtooltip.cpp | 12 |
9 files changed, 41 insertions, 45 deletions
diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp index 9ae3410..9a9b21a 100644 --- a/src/kbfxbutton.cpp +++ b/src/kbfxbutton.cpp @@ -24,7 +24,7 @@ #include "kbfxbutton.h" -bool KbfxButton::m_sizeHeight = TRUE; +bool KbfxButton::m_sizeHeight = true; int KbfxButton::m_size = 0; KbfxButton::KbfxButton ( TQWidget * parent, const char *name) : @@ -38,7 +38,7 @@ KbfxButton::KbfxButton ( TQWidget * parent, const char *name) : m_fadeTime = ConfigInit().m_fadeTime; /* Init normal size first */ - m_kicker_auto_adjust = TRUE; + m_kicker_auto_adjust = true; loadSkins(); m_kicker_auto_adjust = ConfigInit().m_ToolBarResize; @@ -128,7 +128,7 @@ TQCString KbfxButton::findPanel() void KbfxButton::readjust( bool _how ) { - /* _how = TRUE is for height, _how = FALSE is for width readjust */ + /* _how = true is for height, _how = false is for width readjust */ TQCString _panel = findPanel(); int _tmp_size; if ( _how ) @@ -154,7 +154,7 @@ void KbfxButton::readjust( bool _how ) void KbfxButton::enterEvent ( TQEvent * e ) { e = e; - if ( m_toggle == true ) + if ( m_toggle ) { // m_current_skin = m_pressed_skin; // no fade code m_fadePix = m_pressed_skin; @@ -239,7 +239,7 @@ void KbfxButton::mousePressEvent ( TQMouseEvent * e ) e->accept(); if ( e->button() == TQt::LeftButton ) { - if ( m_toggle == false ) + if ( !m_toggle ) { // m_current_skin = m_pressed_skin; // no fade code m_toggle = true; @@ -371,17 +371,17 @@ void KbfxButton::dropEvent ( TQDropEvent * e ) { _tmp = ( *it ); kdDebug() << "KBFX button dropped file: " << _tmp << endl; - if ( _tmp.contains ( "hover", FALSE ) > 0 ) + if ( _tmp.contains ( "hover", false ) > 0 ) { _hover = _tmp; _hover_pix = TQImage ( _tmp ); } - if ( _tmp.contains ( "normal", FALSE ) > 0 ) + if ( _tmp.contains ( "normal", false ) > 0 ) { _normal = _tmp; _normal_pix = TQImage ( _tmp ); } - if ( _tmp.contains ( "pressed", FALSE ) > 0 ) + if ( _tmp.contains ( "pressed", false ) > 0 ) { _pressed = _tmp; _pressed_pix = TQImage ( _tmp ); @@ -409,7 +409,7 @@ void KbfxButton::dropEvent ( TQDropEvent * e ) ConfigInit().writeThemerc ( ConfigInit().m_SpinxThemeName ); /* Init normal size first */ - m_kicker_auto_adjust = TRUE; + m_kicker_auto_adjust = true; loadSkins(); m_kicker_auto_adjust = ConfigInit().m_ToolBarResize; } diff --git a/src/kbfxplasmacanvasgroup.cpp b/src/kbfxplasmacanvasgroup.cpp index 15c47b3..1a28f08 100644 --- a/src/kbfxplasmacanvasgroup.cpp +++ b/src/kbfxplasmacanvasgroup.cpp @@ -41,7 +41,7 @@ KbfxPlasmaCanvasGroup::~KbfxPlasmaCanvasGroup () // delete (*it); // itemListMap ().remove (*it); if ( ( *it ) != 0 ) - if ( deleteItem ( ( *it ) ) == false ) + if ( !deleteItem ( ( *it ) ) ) { tqDebug ( "Deleting failed" ); } @@ -104,7 +104,7 @@ KbfxPlasmaCanvasGroup::addItem ( KbfxPlasmaCanvasAbstractItem * it ) } for ( ItemListIter itr ( m_itemList ); *itr; ++itr ) { - if ( ( *itr )->lookup ( it->name() ) == true ) + if ( ( *itr )->lookup ( it->name() ) ) { tqDebug ( "Adding Failed Due to Item already exisits" ); return false; @@ -190,7 +190,7 @@ KbfxPlasmaCanvasGroup::showAll() { for ( ItemListIter it ( m_itemList ); *it; ++it ) { - if ( ( *it )->type() == KbfxPlasmaCanvasAbstractItem::SEPARATOR || m_shaded == false ) + if ( ( *it )->type() == KbfxPlasmaCanvasAbstractItem::SEPARATOR || !m_shaded ) ( *it )->show(); } @@ -201,7 +201,7 @@ KbfxPlasmaCanvasGroup::show() { for ( ItemListIter it ( m_itemList ); *it; ++it ) { - if ( ( *it )->type() == KbfxPlasmaCanvasAbstractItem::SEPARATOR || m_shaded == false ) + if ( ( *it )->type() == KbfxPlasmaCanvasAbstractItem::SEPARATOR || !m_shaded ) ( *it )->show(); } m_visible = true; @@ -210,7 +210,7 @@ KbfxPlasmaCanvasGroup::show() void KbfxPlasmaCanvasGroup::shade () { - if ( m_shaded == false ) + if ( !m_shaded ) { emit this->groupShade ( this->groupID() ); @@ -223,7 +223,7 @@ KbfxPlasmaCanvasGroup::shade () m_shaded = true; return; } - else if ( m_shaded == true ) + else if ( m_shaded ) { int _shadeby = 0; int _firstItemHeight=0; diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp index 0c18256..b65959e 100644 --- a/src/kbfxplasmacanvasitem.cpp +++ b/src/kbfxplasmacanvasitem.cpp @@ -266,7 +266,7 @@ KbfxPlasmaCanvasItem::drawContent ( TQPainter * pe ) m_height = cp->height(); m_width = cp->width(); //Draw the Background - if ( m_skined == true ) + if ( m_skined ) { pe->drawPixmap ( this->boundingRect (), *cp ); @@ -314,9 +314,9 @@ KbfxPlasmaCanvasItem::drawContent ( TQPainter * pe ) if ( this->type() == EXECUTABLE ) { pe->setPen ( m_fontAppNameColor ); - if ( m_noComments == false ) + if ( !m_noComments ) { - if ( m_isCurrent && m_boldFonts == true ) { _font->setBold ( true );pe->setFont ( *_font ); } + if ( m_isCurrent && m_boldFonts ) { _font->setBold ( true );pe->setFont ( *_font ); } pe->drawText ( *rectTop, TQt::AlignLeft| TQt::AlignBottom ,TQString ( m_labelText ), -1, &tmp ); pe->setPen ( m_lineColor ); pe->drawLine ( m_margin, ( int ) y() + rectTop->height(), ( int ) cp->width() - 2, ( int ) y() + rectTop->height() ); diff --git a/src/kbfxplasmacanvasstack.cpp b/src/kbfxplasmacanvasstack.cpp index 839867d..8278939 100644 --- a/src/kbfxplasmacanvasstack.cpp +++ b/src/kbfxplasmacanvasstack.cpp @@ -28,7 +28,7 @@ KbfxPlasmaCanvasStack::KbfxPlasmaCanvasStack() m_count = 0; m_height = 0; m_width = 0; - m_groupChain.setAutoDelete ( TRUE ); + m_groupChain.setAutoDelete ( true ); m_name = "Unset:Faulty plugin"; } @@ -84,7 +84,7 @@ bool KbfxPlasmaCanvasStack::contains ( TQString name ) { //FIXME:Depricated Data Structure Needs fixing - if ( m_dict.contains ( name ) == true ) + if ( m_dict.contains ( name ) ) return true; else return false; diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index 6814372..c79faaa 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -26,7 +26,7 @@ KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( TQWidget * parent, TQCanvasView ( parent, name,fl ) { - viewport ()->setMouseTracking ( TRUE ); + viewport ()->setMouseTracking ( true ); viewport ()->setAcceptDrops ( true ); this->setVScrollBarMode ( TQScrollView::AlwaysOff ); this->setHScrollBarMode ( TQScrollView::AlwaysOff ); @@ -340,7 +340,7 @@ KbfxPlasmaCanvasView::expandAll () { if ( m_currentView != 0 ) { - if ( ConfigInit ().m_startHidden == false ) + if ( !ConfigInit().m_startHidden ) m_currentView->unfoldGroupAll (); scroll ( 0, 0 ); } @@ -500,9 +500,7 @@ KbfxPlasmaCanvasView::search_R ( const TQString name ) if ( appGroup->count () <= 0 ) continue; - if ( visualGroup->addItem ( box ) == false ) - {} - + visualGroup->addItem( box ); KbfxDataGroup::Data dat = appGroup->getData (); KbfxDataGroup::Data::Iterator it; @@ -524,9 +522,7 @@ KbfxPlasmaCanvasView::search_R ( const TQString name ) ( KbfxPlasmaCanvasItem * ) boxwrapper-> item ( KbfxPlasmaCanvasItem::EXECUTABLE ); box->setSource ( * ( it.data () ) ); - if ( visualGroup->addItem ( box ) == true ) - { - } + visualGroup->addItem ( box ); } visualGroup->move ( 0, m_scrollbar_top->height () ); diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index cba3b69..12b2fea 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -30,7 +30,7 @@ KbfxPlasmaIndexView::KbfxPlasmaIndexView ( TQWidget * parent, const char *name, m_itemStack = new KbfxPlasmaCanvasStack (); m_pluginLoaded = ""; m_itemStack->addGroup ( m_itemGroupList ); - viewport ()->setMouseTracking ( TRUE ); + viewport ()->setMouseTracking ( true ); m_currentPos = TQPoint ( 0, 0 ); m_mousePollTimer = new TQTimer ( this ); diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp index 7c02679..7eec040 100644 --- a/src/kbfxspinx.cpp +++ b/src/kbfxspinx.cpp @@ -23,7 +23,7 @@ #include "kbfxspinx.h" -bool KbfxSpinx::m_horizontal_position = TRUE; +bool KbfxSpinx::m_horizontal_position = true; KbfxSpinx::KbfxSpinx ( const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name ) : KPanelApplet ( configFile, type, actions, parent, name ),DCOPObject ( "KBFXInterface" ) @@ -81,7 +81,7 @@ void KbfxSpinx::createKbfx() l_path.append(l_user->loginName()); l_path.append("/"); l_watch->addDir(l_path); - l_watch->startScan( TRUE, FALSE); + l_watch->startScan( true, false); connect ( l_watch, TQ_SIGNAL ( dirty(const TQString&) ), this, TQ_SLOT ( dirtyReaload(const TQString&) ) ); delete l_user; @@ -220,7 +220,7 @@ void KbfxSpinx::showKmenu() if ( !m_dcopClient-> call ( "kicker", "kicker", "popupKMenu(TQPoint)", data, replytype, rdata, - FALSE, -1 ) ) + false, -1 ) ) { kdWarning () << "**KBFX-APPLET-FATAL_ERROR:Could not send DCOP command" @@ -261,13 +261,13 @@ int KbfxSpinx::widthForHeight ( int height ) const if ( width_for_height != height || !m_horizontal_position ) { if ( m_kicker_auto_adjust ) - kbfxBtn->readjust( TRUE ); // Readjust for height - KbfxButton::m_sizeHeight = TRUE; + kbfxBtn->readjust( true ); // Readjust for height + KbfxButton::m_sizeHeight = true; KbfxButton::m_size = height; kbfxBtn->loadSkins(); width_for_height = height; } - m_horizontal_position = TRUE; + m_horizontal_position = true; return kbfxBtn->width(); } @@ -277,13 +277,13 @@ int KbfxSpinx::heightForWidth ( int width ) const if ( height_for_width != width || m_horizontal_position) { if ( m_kicker_auto_adjust ) - kbfxBtn->readjust( FALSE ); // Readjust for width - KbfxButton::m_sizeHeight = FALSE; + kbfxBtn->readjust( false ); // Readjust for width + KbfxButton::m_sizeHeight = false; KbfxButton::m_size = width; kbfxBtn->loadSkins(); height_for_width = width; } - m_horizontal_position = FALSE; + m_horizontal_position = false; return kbfxBtn->height(); } diff --git a/src/kbfxspinxscrollbar.cpp b/src/kbfxspinxscrollbar.cpp index eb6a174..e3abce8 100644 --- a/src/kbfxspinxscrollbar.cpp +++ b/src/kbfxspinxscrollbar.cpp @@ -61,7 +61,7 @@ KbfxSpinxScrollBar::paintEvent ( TQPaintEvent * pe ) p.drawPixmap ( TQRect ( 0, 0, m_normal.width (), m_normal.height () ), m_normal ); p.setPen ( TQColor ( 255,255,255 ) ); - if ( m_pressed == false ) + if ( !m_pressed ) p.setBrush ( TQColor ( 255,255,255 ) ); else p.setBrush ( TQColor ( 0,0,0 ) ); diff --git a/src/kbfxtooltip.cpp b/src/kbfxtooltip.cpp index 7c0b1aa..6ff2d89 100644 --- a/src/kbfxtooltip.cpp +++ b/src/kbfxtooltip.cpp @@ -165,9 +165,9 @@ KbfxToolTip::setStartPos ( int _x_, int _y_ ) if ( _animate ) { _logo_move_x = 0; - _hide_timer->start ( 10000, TRUE ); - _move_timer->start ( _agent_anim->speed (), FALSE ); - _update_timer->start ( 2, FALSE ); + _hide_timer->start ( 10000, true ); + _move_timer->start ( _agent_anim->speed (), false ); + _update_timer->start ( 2, false ); } move ( _x, _y ); @@ -283,21 +283,21 @@ KbfxToolTip::paintEvent ( TQPaintEvent * pe ) TQPixmap ( TQImage (ConfigInit ().m_SpinxTooltipLogo ) ) ); } - let->setBold ( TRUE ); + let->setBold ( true ); let->setPointSize ( 10 ); p.setFont ( *let ); p.setPen ( TQColor ( 61, 94, 129 ) ); p.drawText ( _dude_box.width () + 15, 30, TQString("KBFX") ); p.setPen ( TQColor ( 0, 0, 0 ) ); - let->setBold ( FALSE ); + let->setBold ( false ); let->setPointSize ( 8 ); p.setFont ( *let ); p.drawText ( ( _animate ) ? _dude_box.width () + 50 : _dude_box.width () + 4, _dude_box.height () + 30, TQString ( "Version " ).append ( APPLICATION_VERSION ) ); p.setPen ( ConfigInit ().m_fontTooltipColor ); - let->setBold ( TRUE ); + let->setBold ( true ); let->setPointSize ( 8 ); p.setFont ( *let ); |
