[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/view
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-09-22 15:49:39
Message-ID: 20100922154939.8FA00AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1178276 by mutz:

TabWidget: compile w/o QInputDialog

 M  +8 -0      tabwidget.cpp  
 M  +2 -0      tabwidget.h  


--- trunk/KDE/kdepim/kleopatra/view/tabwidget.cpp #1178275:1178276
@@ -275,9 +275,11 @@
     void slotPageStringFilterChanged( const QString & filter );
     void slotPageHierarchyChanged( bool on );
 
+#ifndef QT_NO_INPUTDIALOG
     void slotRenameCurrentTab() {
         renamePage( currentPage() );
     }
+#endif // QT_NO_INPUTDIALOG
     void slotNewTab();
     void slotDuplicateCurrentTab() {
         duplicatePage( currentPage() );
@@ -301,7 +303,9 @@
         collapseAll( currentPage() );
     }
 
+#ifndef QT_NO_INPUTDIALOG
     void renamePage( Page * page );
+#endif
     void duplicatePage( Page * page );
     void closePage( Page * page );
     void movePageLeft( Page * page );
@@ -450,8 +454,10 @@
     if ( contextMenuPage == current || action == newAction )
         return; // performed through signal/slot connections...
 
+#ifndef QT_NO_INPUTDIALOG
     if ( action == otherPageActions[Rename] )
         renamePage( contextMenuPage );
+#endif // QT_NO_INPUTDIALOG
     else if ( action == otherPageActions[Duplicate] )
         duplicatePage( contextMenuPage );
     else if ( action == otherPageActions[Close] )
@@ -522,6 +528,7 @@
     tabWidget.setCurrentIndex( tabWidget.count()-1 );
 }
 
+#ifndef QT_NO_INPUTDIALOG
 void TabWidget::Private::renamePage( Page * page ) {
     if ( !page )
         return;
@@ -531,6 +538,7 @@
         return;
     page->setTitle( text );
 }
+#endif
 
 void TabWidget::Private::duplicatePage( Page * page ) {
     if ( !page )
--- trunk/KDE/kdepim/kleopatra/view/tabwidget.h #1178275:1178276
@@ -104,7 +104,9 @@
         Q_PRIVATE_SLOT( d, void slotPageKeyFilterChanged( const boost::shared_ptr<Kleo::KeyFilter> & ) )
         Q_PRIVATE_SLOT( d, void slotPageStringFilterChanged( const QString & ) )
         Q_PRIVATE_SLOT( d, void slotPageHierarchyChanged( bool ) )
+#ifndef QT_NO_INPUTDIALOG
         Q_PRIVATE_SLOT( d, void slotRenameCurrentTab() )
+#endif // QT_NO_INPUTDIALOG
         Q_PRIVATE_SLOT( d, void slotNewTab() )
         Q_PRIVATE_SLOT( d, void slotDuplicateCurrentTab() )
         Q_PRIVATE_SLOT( d, void slotCloseCurrentTab() )
[prev in list] [next in list] [prev in thread] [next in thread]