summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/otabwidget.cpp20
-rw-r--r--libopie/otabwidget.h7
-rw-r--r--noncore/apps/advancedfm/advancedfm.cpp2
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp2
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
@@ -78,7 +78,7 @@ OTabWidget::OTabWidget( QWidget *parent, const char *name, TabStyle s, TabPositi
78 setTabStyle( s ); 78 setTabStyle( s );
79 setTabPosition( p ); 79 setTabPosition( p );
80 80
81 currentTab= 0x0; 81 currTab= 0x0;
82} 82}
83 83
84OTabWidget::~OTabWidget() 84OTabWidget::~OTabWidget()
@@ -147,8 +147,8 @@ void OTabWidget::removePage( QWidget *childwidget )
147 widgetStack->removeWidget( childwidget ); 147 widgetStack->removeWidget( 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 );
154 } 154 }
@@ -250,7 +250,7 @@ void OTabWidget::setTabStyle( TabStyle s )
250 if ( tabBarStyle == IconTab ) 250 if ( tabBarStyle == IconTab )
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
256 currtab->setText( QString::null ); 256 currtab->setText( QString::null );
@@ -335,9 +335,9 @@ void OTabWidget::selectTab( OTabInfo *tab )
335{ 335{
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 }
343 tabBar->tab( tab->id() )->setText( tab->label() ); 343 tabBar->tab( tab->id() )->setText( tab->label() );
@@ -354,7 +354,7 @@ void OTabWidget::selectTab( OTabInfo *tab )
354 354
355 emit currentChanged( tab->control() ); 355 emit currentChanged( tab->control() );
356 356
357 currentTab = tab; 357 currTab = tab;
358} 358}
359 359
360void OTabWidget::setUpLayout() 360void OTabWidget::setUpLayout()
@@ -398,11 +398,11 @@ void OTabWidget::resizeEvent( QResizeEvent * )
398 setUpLayout(); 398 setUpLayout();
399} 399}
400 400
401int OTabWidget::getCurrentTab() 401int 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;
408} 408}
diff --git a/libopie/otabwidget.h b/libopie/otabwidget.h
index 23fe774..bcd9a85 100644
--- a/libopie/otabwidget.h
+++ b/libopie/otabwidget.h
@@ -195,11 +195,10 @@ public:
195 QSize sizeHint() const; 195 QSize sizeHint() const;
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
205protected: 204protected:
@@ -212,7 +211,7 @@ protected:
212 211
213private: 212private:
214 OTabInfoList tabs; 213 OTabInfoList tabs;
215 OTabInfo *currentTab; 214 OTabInfo *currTab;
216 215
217 TabStyle tabBarStyle; 216 TabStyle tabBarStyle;
218 TabPosition tabBarPosition; 217 TabPosition tabBarPosition;
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
@@ -347,7 +347,7 @@ void AdvancedFm::currentPathComboChanged()
347 347
348void AdvancedFm::fillCombo(const QString &currentPath) 348void AdvancedFm::fillCombo(const QString &currentPath)
349{ 349{
350// qDebug("%d",TabWidget->getCurrentTab()); 350// qDebug("%d",TabWidget->currentTab());
351 if ( whichTab == 1) 351 if ( whichTab == 1)
352 { 352 {
353 currentPathCombo->lineEdit()->setText( currentPath); 353 currentPathCombo->lineEdit()->setText( currentPath);
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
@@ -708,7 +708,7 @@ void AdvancedFm::fileBeamFinished( Ir *)
708 708
709void AdvancedFm::selectAll() 709void 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);
714 thisView->setSelected( thisView->firstChild(),false); 714 thisView->setSelected( thisView->firstChild(),false);