OTabWidget::getCurrentTab() is now OTabWidget::currentTab()

4 files changed, 15 insertions, 16 deletions

diff --git a/libopie/otabwidget.cpp b/libopie/otabwidget.cpp
index a1fd2c0..05aafd4 100644
--- a/libopie/otabwidget.cpp
+++ b/libopie/otabwidget.cpp
@@ -75,13 +75,13 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
     tabBarStack->addWidget( tabList, 1 );
     connect( tabList, SIGNAL( activated( int ) ), this, SLOT( slotTabListSelected( int ) ) );
 
     setTabStyle( s );
     setTabPosition( p );
 
-    currentTab= 0x0;
+    currTab= 0x0;
 }
 
 OTabWidget::~OTabWidget()
 {
 }
 
@@ -144,14 +144,14 @@ void OTabWidget::removePage( QWidget *childwidget )
             {
                 tabList->removeItem( i );
             }
             widgetStack->removeWidget( childwidget );
             tabs.remove( tab );
             delete tab;
-            currentTab = tabs.current();
-            if ( !currentTab )
+            currTab = tabs.current();
+            if ( !currTab )
             {
                 widgetStack->setFrameStyle( QFrame::NoFrame );
             }
 
             setUpLayout();
         }
@@ -247,13 +247,13 @@ void OTabWidget::setTabStyle( TabStyle s )
         for (  OTabInfo *tabinfo = tabs.first(); tabinfo; tabinfo = tabs.next() )
         {
             currtab = tabBar->tab( tabinfo->id() );
             if ( tabBarStyle == IconTab )
             {
                 currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) );
-                if ( tabinfo == currentTab )
+                if ( tabinfo == currTab )
                     currtab->setText( tabinfo->label() );
                 else
                     currtab->setText( QString::null );
             }
             else
             {
@@ -332,15 +332,15 @@ QPixmap OTabWidget::loadSmooth( const QString &name )
 }
 
 void OTabWidget::selectTab( OTabInfo *tab )
 {
     if ( tabBarStyle == IconTab )
     {
-        if ( currentTab )
+        if ( currTab )
         {
-            tabBar->tab( currentTab->id() )->setText( QString::null );
+            tabBar->tab( currTab->id() )->setText( QString::null );
             setUpLayout();
         }
         tabBar->tab( tab->id() )->setText( tab->label() );
         tabBar->setCurrentTab( tab->id() );
         setUpLayout();
         tabBar->update();
@@ -351,13 +351,13 @@ void OTabWidget::selectTab( OTabInfo *tab )
     }
 
     widgetStack->raiseWidget( tab->control() );
 
     emit currentChanged( tab->control() );
 
-    currentTab = tab;
+    currTab = tab;
 }
 
 void OTabWidget::setUpLayout()
 {
     tabBar->layoutTabs();
     QSize t( tabBarStack->sizeHint() );
@@ -395,15 +395,15 @@ QSize OTabWidget::sizeHint() const
 
 void OTabWidget::resizeEvent( QResizeEvent * )
 {
     setUpLayout();
 }
 
-int OTabWidget::getCurrentTab()
+int OTabWidget::currentTab()
 {
-    if ( currentTab )
+    if ( currTab )
     {
-        return currentTab->id();
+        return currTab->id();
     }
     return -1;
 }
 
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index 23fe774..bcd9a85 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -192,30 +192,29 @@ public:
  * @fn sizeHint()
  * @brief Reimplemented for internal purposes.
  */
     QSize sizeHint() const;
 
 /**
- * @fn getCurrentTab( )
+ * @fn currentTab( )
  * @brief returns current tab id.
  */
- //FIXME TT coding style currentTab() -zecke
-    int getCurrentTab();
+    int currentTab();
 
 
 protected:
 
 /**
  * @fn resizeEvent( QResizeEvent * )
  * @brief Reimplemented for internal purposes.
  */
     void resizeEvent( QResizeEvent * );
 
 private:
     OTabInfoList  tabs;
-    OTabInfo     *currentTab;
+    OTabInfo     *currTab;
 
     TabStyle    tabBarStyle;
     TabPosition tabBarPosition;
 
     QWidgetStack *tabBarStack;
     OTabBar      *tabBar;
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 1a5e131..41e83c7 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -344,13 +344,13 @@ void  AdvancedFm::currentPathComboChanged()
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
     }
 }
 
 void  AdvancedFm::fillCombo(const QString &currentPath)
 {
-//    qDebug("%d",TabWidget->getCurrentTab());
+//    qDebug("%d",TabWidget->currentTab());
   if ( whichTab == 1)
     {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( localDirPathStringList.grep( currentPath,TRUE).isEmpty() )
         {
           currentPathCombo->clear();
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index eac13f6..93203cd 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -705,13 +705,13 @@ void AdvancedFm::fileBeamFinished( Ir *)
 {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 }
 
 void AdvancedFm::selectAll()
 {
-//    if (TabWidget->getCurrentTab() == 0) {
+//    if (TabWidget->currentTab() == 0) {
   QListView *thisView = CurrentView();
   thisView->selectAll(true);
   thisView->setSelected( thisView->firstChild(),false);
 //     } else {
 //         Remote_View->selectAll(true);
 //         Remote_View->setSelected( Remote_View->firstChild(),false);