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
@@ -79,5 +79,5 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
     setTabPosition( p );
 
-    currentTab= 0x0;
+    currTab= 0x0;
 }
 
@@ -148,6 +148,6 @@ void OTabWidget::removePage( QWidget *childwidget )
             tabs.remove( tab );
             delete tab;
-            currentTab = tabs.current();
-            if ( !currentTab )
+            currTab = tabs.current();
+            if ( !currTab )
             {
                 widgetStack->setFrameStyle( QFrame::NoFrame );
@@ -251,5 +251,5 @@ void OTabWidget::setTabStyle( TabStyle s )
             {
                 currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) );
-                if ( tabinfo == currentTab )
+                if ( tabinfo == currTab )
                     currtab->setText( tabinfo->label() );
                 else
@@ -336,7 +336,7 @@ 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();
         }
@@ -355,5 +355,5 @@ void OTabWidget::selectTab( OTabInfo *tab )
     emit currentChanged( tab->control() );
 
-    currentTab = tab;
+    currTab = tab;
 }
 
@@ -399,9 +399,9 @@ void OTabWidget::resizeEvent( QResizeEvent * )
 }
 
-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
@@ -196,9 +196,8 @@ public:
 
 /**
- * @fn getCurrentTab( )
+ * @fn currentTab( )
  * @brief returns current tab id.
  */
- //FIXME TT coding style currentTab() -zecke
-    int getCurrentTab();
+    int currentTab();
 
 
@@ -213,5 +212,5 @@ protected:
 private:
     OTabInfoList  tabs;
-    OTabInfo     *currentTab;
+    OTabInfo     *currTab;
 
     TabStyle    tabBarStyle;
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
@@ -348,5 +348,5 @@ void  AdvancedFm::currentPathComboChanged()
 void  AdvancedFm::fillCombo(const QString &currentPath)
 {
-//    qDebug("%d",TabWidget->getCurrentTab());
+//    qDebug("%d",TabWidget->currentTab());
   if ( whichTab == 1)
     {
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
@@ -709,5 +709,5 @@ void AdvancedFm::fileBeamFinished( Ir *)
 void AdvancedFm::selectAll()
 {
-//    if (TabWidget->getCurrentTab() == 0) {
+//    if (TabWidget->currentTab() == 0) {
   QListView *thisView = CurrentView();
   thisView->selectAll(true);