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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/utils
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-12-06 17:07:38
Message-ID: 20101206170738.0C919AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204298 by mutz:

Kleo::FileDialog: also remove unused 'selectedFilter' argument

 M  +9 -9      filedialog.cpp  
 M  +4 -4      filedialog.h  


--- trunk/KDE/kdepim/kleopatra/utils/filedialog.cpp #1204297:1204298
@@ -67,9 +67,9 @@
 #endif // QT_NO_FILEDIALOG
 }
 
-QString FileDialog::getOpenFileName( QWidget * parent, const QString & caption, \
const QString & dirID, const QString & filter, QString * selectedFilter ) { +QString \
FileDialog::getOpenFileName( QWidget * parent, const QString & caption, const QString \
& dirID, const QString & filter ) {  #ifndef QT_NO_FILEDIALOG
-    const QString fname = QFileDialog::getOpenFileName( parent, caption, dir( dirID \
), filter, selectedFilter ); +    const QString fname = QFileDialog::getOpenFileName( \
parent, caption, dir( dirID ), filter );  update( fname, dirID );
     return fname;
 #else
@@ -77,9 +77,9 @@
 #endif // QT_NO_FILEDIALOG
 }
 
-QStringList FileDialog::getOpenFileNames( QWidget * parent, const QString & caption, \
const QString & dirID, const QString & filter, QString * selectedFilter ) { \
+QStringList FileDialog::getOpenFileNames( QWidget * parent, const QString & caption, \
const QString & dirID, const QString & filter ) {  #ifndef QT_NO_FILEDIALOG
-    const QStringList files = QFileDialog::getOpenFileNames( parent, caption, dir( \
dirID ), filter, selectedFilter ); +    const QStringList files = \
QFileDialog::getOpenFileNames( parent, caption, dir( dirID ), filter );  if ( \
!files.empty() )  update( files.front(), dirID );
     return files;
@@ -88,9 +88,9 @@
 #endif // QT_NO_FILEDIALOG
 }
 
-QString FileDialog::getSaveFileName( QWidget * parent, const QString & caption, \
const QString & dirID, const QString & filter, QString * selectedFilter ) { +QString \
FileDialog::getSaveFileName( QWidget * parent, const QString & caption, const QString \
& dirID, const QString & filter ) {  #ifndef QT_NO_FILEDIALOG
-    const QString fname = QFileDialog::getSaveFileName( parent, caption, dir( dirID \
), filter, selectedFilter ); +    const QString fname = QFileDialog::getSaveFileName( \
parent, caption, dir( dirID ), filter );  update( fname, dirID );
     return fname;
 #else
@@ -98,11 +98,11 @@
 #endif // QT_NO_FILEDIALOG
 }
 
-QString FileDialog::getSaveFileNameEx( QWidget * parent, const QString & caption, \
const QString & dirID, const QString & proposedFileName, const QString & filter, \
QString * selectedFilter ) { +QString FileDialog::getSaveFileNameEx( QWidget * \
parent, const QString & caption, const QString & dirID, const QString & \
proposedFileName, const QString & filter ) {  #ifndef QT_NO_FILEDIALOG
     if ( proposedFileName.isEmpty() )
-        return getSaveFileName( parent, caption, dirID, filter, selectedFilter );
-    const QString fname = QFileDialog::getSaveFileName( parent, caption, QDir( dir( \
dirID ) ).filePath( proposedFileName ), filter, selectedFilter ); +        return \
getSaveFileName( parent, caption, dirID, filter ); +    const QString fname = \
QFileDialog::getSaveFileName( parent, caption, QDir( dir( dirID ) ).filePath( \
proposedFileName ), filter );  update( fname, dirID );
     return fname;
 #else
--- trunk/KDE/kdepim/kleopatra/utils/filedialog.h #1204297:1204298
@@ -39,10 +39,10 @@
 namespace FileDialog {
 
     QString getExistingDirectory( QWidget * parent=0, const QString & \
                caption=QString(), const QString & dirID=QString() );
-    QString getOpenFileName( QWidget * parent=0, const QString & caption=QString(), \
const QString & dirID=QString(), const QString & filter=QString(), QString * \
                selectedFilter=0 );
-    QStringList getOpenFileNames( QWidget * parent=0, const QString & \
caption=QString(), const QString & dirID=QString(), const QString & filter=QString(), \
                QString * selectedFilter=0 );
-    QString getSaveFileName( QWidget * parent=0, const QString & caption=QString(), \
const QString & dirID=QString(), const QString & filter=QString(), QString * \
                selectedFilter=0 );
-    QString getSaveFileNameEx( QWidget * parent=0, const QString & \
caption=QString(), const QString & dirID=QString(), const QString & \
proposedFileName=QString(), const QString & filter=QString(), QString * \
selectedFilter=0 ); +    QString getOpenFileName( QWidget * parent=0, const QString & \
caption=QString(), const QString & dirID=QString(), const QString & filter=QString() \
); +    QStringList getOpenFileNames( QWidget * parent=0, const QString & \
caption=QString(), const QString & dirID=QString(), const QString & filter=QString() \
); +    QString getSaveFileName( QWidget * parent=0, const QString & \
caption=QString(), const QString & dirID=QString(), const QString & filter=QString() \
); +    QString getSaveFileNameEx( QWidget * parent=0, const QString & \
caption=QString(), const QString & dirID=QString(), const QString & \
proposedFileName=QString(), const QString & filter=QString() );  
 }
 }


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