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

List:       kde-commits
Subject:    kdenox/konq-embed/dropin
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-03-30 16:17:28
Message-ID: 1143735448.157574.29064.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 524542 by eva:

Qtopia:
- in Qtopia QT_NO_FILEDIALOG is set, but we still want to use the
  QPEFileSelectorWrapper
- file save dialog still todo


 M  +8 -16     kfiledialog.cpp  


--- trunk/kdenox/konq-embed/dropin/kfiledialog.cpp #524541:524542
@@ -25,13 +25,6 @@
 #include <qlayout.h>
 #include <qconfig.h>
 
-#if defined(QT_NO_FILEDIALOG)
-QString 
-KFileDialog::getOpenFileName(const QString &, const QString &, QWidget *, const QString &) 
-{
-    return QString::null; // sorry bud :)
-}
-#else
 QString KFileDialog::getOpenFileName( const QString &dir,
                                       const QString &filter,
                                       QWidget *parent, const QString &caption )
@@ -50,19 +43,15 @@
 
     return result;
 #else
+#if defined(QT_NO_FILEDIALOG)
+    return QString::null; // sorry bud :)
+#else
     return QFileDialog::getOpenFileName( dir, filter, parent, 0, caption );
+#endif //QT_NO_FILEDIALOG
 #endif
 }
-#endif //QT_NO_FILEDIALOG
 
 
-#if defined(QT_NO_FILEDIALOG)
-QString 
-KFileDialog::getSaveFileName(const QString &, const QString &, QWidget *, const QString &)
-{
-    return QString::null; // sorry bud :)
-}
-#else
 QString KFileDialog::getSaveFileName( const QString &dir,
                                       const QString &filter,
                                       QWidget *parent, const QString &caption )
@@ -81,6 +70,9 @@
 
     return result;
 #else
+#if defined(QT_NO_FILEDIALOG)
+    return QString::null; // sorry bud :)
+#else
     QFileDialog *qpefd = new QFileDialog( dir, filter, parent, 0, true );
     qpefd->setCaption( caption );
     qpefd->showMaximized();
@@ -93,9 +85,9 @@
     delete qpefd;
     return result;
 //    return QFileDialog::getSaveFileName( dir, filter, parent, 0, caption );
+#endif // QT_NO_FILEDIALOG
 #endif
 }
-#endif // QT_NO_FILEDIALOG
 
 #if defined(_QT_QPE_) || defined(Q_WS_WIN32)
 
[prev in list] [next in list] [prev in thread] [next in thread]