From 79c17bd8cd5a4058555d8fa6fb37d3d1fb4eb1ce Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 16 Feb 2014 14:07:26 -0600 Subject: [PATCH] Fix unintended renaming --- amarok/src/multitabbar.cpp | 8 ++++---- amarok/src/multitabbar.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp index a121fe34..86ddd6f9 100644 --- a/amarok/src/multitabbar.cpp +++ b/amarok/src/multitabbar.cpp @@ -419,7 +419,7 @@ int MultiTabBarInternal::appendTab( const TQPixmap &pic , int id, const TQString tab->showActiveTabText( m_showActiveTabTexts ); tab->setVisible( Amarok::config( "BrowserBar" )->readBoolEntry( identifier, true ) ); - if ( m_style == MultiTabBar::KONTQSBC ) { + if ( m_style == MultiTabBar::KONQSBC ) { if ( m_expandedTabSize < tab->neededSize() ) { m_expandedTabSize = tab->neededSize(); for ( uint i = 0;i < m_tabs.count();i++ ) @@ -801,7 +801,7 @@ void MultiTabBarTab::setState( bool b ) void MultiTabBarTab::updateState() { - if ( m_style != MultiTabBar::KONTQSBC ) { + if ( m_style != MultiTabBar::KONQSBC ) { if ( ( m_style == MultiTabBar::KDEV3 ) || ( m_style == MultiTabBar::KDEV3ICON ) || ( m_style == MultiTabBar::AMAROK ) || ( isOn() ) ) { TQPushButton::setText( m_text ); } else { @@ -858,7 +858,7 @@ void MultiTabBarTab::drawButtonLabel( TQPainter *p ) void MultiTabBarTab::drawButton( TQPainter *paint ) { if ( m_style == MultiTabBar::AMAROK ) drawButtonAmarok( paint ); - else if ( m_style != MultiTabBar::KONTQSBC ) drawButtonStyled( paint ); + else if ( m_style != MultiTabBar::KONQSBC ) drawButtonStyled( paint ); else drawButtonClassic( paint ); } @@ -1161,7 +1161,7 @@ MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *parent, const char *name setPosition( ( bm == MultiTabBar::Vertical ) ? MultiTabBar::Right : MultiTabBar::Bottom ); setStyle( VSNET ); // setStyle(KDEV3); - //setStyle(KONTQSBC); + //setStyle(KONQSBC); m_l->insertWidget( 0, m_internal ); m_l->insertWidget( 0, m_btnTabSep = new TQFrame( this ) ); m_btnTabSep->setFixedHeight( 4 ); diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h index c03516f6..82f2926c 100644 --- a/amarok/src/multitabbar.h +++ b/amarok/src/multitabbar.h @@ -68,10 +68,10 @@ class MultiTabBar: public TQWidget /** * VSNET == Visual Studio .Net like (only show the text of active tabs * KDEV3 == Kdevelop 3 like (always show the text) - * KONTQSBC == konqy's classic sidebar style (unthemed), this one is disabled + * KONQSBC == konqy's classic sidebar style (unthemed), this one is disabled * at the moment, but will be renabled soon too */ - enum MultiTabBarStyle{VSNET = 0, KDEV3 = 1, KONTQSBC = 2, KDEV3ICON = 3, AMAROK = 4, STYLELAST = 0xffff}; + enum MultiTabBarStyle{VSNET = 0, KDEV3 = 1, KONQSBC = 2, KDEV3ICON = 3, AMAROK = 4, STYLELAST = 0xffff}; MultiTabBar( MultiTabBarMode bm, TQWidget *parent = 0, const char *name = 0 ); virtual ~MultiTabBar();