-rw-r--r-- | libopie/otabwidget.cpp | 20 | ||||
-rw-r--r-- | libopie/otabwidget.h | 7 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 2 |
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 | |||
79 | setTabPosition( p ); | 79 | setTabPosition( p ); |
80 | 80 | ||
81 | currentTab= 0x0; | 81 | currTab= 0x0; |
82 | } | 82 | } |
83 | 83 | ||
@@ -148,6 +148,6 @@ void OTabWidget::removePage( QWidget *childwidget ) | |||
148 | tabs.remove( tab ); | 148 | tabs.remove( tab ); |
149 | delete tab; | 149 | delete tab; |
150 | currentTab = tabs.current(); | 150 | currTab = tabs.current(); |
151 | if ( !currentTab ) | 151 | if ( !currTab ) |
152 | { | 152 | { |
153 | widgetStack->setFrameStyle( QFrame::NoFrame ); | 153 | widgetStack->setFrameStyle( QFrame::NoFrame ); |
@@ -251,5 +251,5 @@ void OTabWidget::setTabStyle( TabStyle s ) | |||
251 | { | 251 | { |
252 | currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) ); | 252 | currtab->iconset = new QIconSet( loadSmooth( tabinfo->icon() ) ); |
253 | if ( tabinfo == currentTab ) | 253 | if ( tabinfo == currTab ) |
254 | currtab->setText( tabinfo->label() ); | 254 | currtab->setText( tabinfo->label() ); |
255 | else | 255 | else |
@@ -336,7 +336,7 @@ void OTabWidget::selectTab( OTabInfo *tab ) | |||
336 | if ( tabBarStyle == IconTab ) | 336 | if ( tabBarStyle == IconTab ) |
337 | { | 337 | { |
338 | if ( currentTab ) | 338 | if ( currTab ) |
339 | { | 339 | { |
340 | tabBar->tab( currentTab->id() )->setText( QString::null ); | 340 | tabBar->tab( currTab->id() )->setText( QString::null ); |
341 | setUpLayout(); | 341 | setUpLayout(); |
342 | } | 342 | } |
@@ -355,5 +355,5 @@ void OTabWidget::selectTab( OTabInfo *tab ) | |||
355 | emit currentChanged( tab->control() ); | 355 | emit currentChanged( tab->control() ); |
356 | 356 | ||
357 | currentTab = tab; | 357 | currTab = tab; |
358 | } | 358 | } |
359 | 359 | ||
@@ -399,9 +399,9 @@ void OTabWidget::resizeEvent( QResizeEvent * ) | |||
399 | } | 399 | } |
400 | 400 | ||
401 | int OTabWidget::getCurrentTab() | 401 | int OTabWidget::currentTab() |
402 | { | 402 | { |
403 | if ( currentTab ) | 403 | if ( currTab ) |
404 | { | 404 | { |
405 | return currentTab->id(); | 405 | return currTab->id(); |
406 | } | 406 | } |
407 | return -1; | 407 | 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: | |||
196 | 196 | ||
197 | /** | 197 | /** |
198 | * @fn getCurrentTab( ) | 198 | * @fn currentTab( ) |
199 | * @brief returns current tab id. | 199 | * @brief returns current tab id. |
200 | */ | 200 | */ |
201 | //FIXME TT coding style currentTab() -zecke | 201 | int currentTab(); |
202 | int getCurrentTab(); | ||
203 | 202 | ||
204 | 203 | ||
@@ -213,5 +212,5 @@ protected: | |||
213 | private: | 212 | private: |
214 | OTabInfoList tabs; | 213 | OTabInfoList tabs; |
215 | OTabInfo *currentTab; | 214 | OTabInfo *currTab; |
216 | 215 | ||
217 | TabStyle tabBarStyle; | 216 | 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() | |||
348 | void AdvancedFm::fillCombo(const QString ¤tPath) | 348 | void AdvancedFm::fillCombo(const QString ¤tPath) |
349 | { | 349 | { |
350 | // qDebug("%d",TabWidget->getCurrentTab()); | 350 | // qDebug("%d",TabWidget->currentTab()); |
351 | if ( whichTab == 1) | 351 | if ( whichTab == 1) |
352 | { | 352 | { |
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 *) | |||
709 | void AdvancedFm::selectAll() | 709 | void AdvancedFm::selectAll() |
710 | { | 710 | { |
711 | // if (TabWidget->getCurrentTab() == 0) { | 711 | // if (TabWidget->currentTab() == 0) { |
712 | QListView *thisView = CurrentView(); | 712 | QListView *thisView = CurrentView(); |
713 | thisView->selectAll(true); | 713 | thisView->selectAll(true); |