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

List:       kde-commits
Subject:    KDE/kdelibs/kio/kfile
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-04 8:45:56
Message-ID: 20101104084556.A1C72AC89B () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192898 by ervin:

Remove deprecated symbols from the build (if KDE_NO_DEPRECATED is defined). And, port \
the rest away from deprecated API.

 M  +10 -0     kurlrequester.cpp  
 M  +12 -1     kurlrequester.h  


--- trunk/KDE/kdelibs/kio/kfile/kurlrequester.cpp #1192897:1192898
@@ -176,7 +176,11 @@
     KComboBox *combo;
     KFile::Modes fileDialogMode;
     QString fileDialogFilter;
+#ifndef KDE_NO_DEPRECATED
     KEditListBox::CustomEditor editor;
+#else
+    KEditListWidget::CustomEditor editor;
+#endif
     KUrlDragPushButton *myButton;
     KFileDialog *myFileDialog;
     KUrlCompletion *myCompletion;
@@ -263,10 +267,12 @@
     d->setText( url.pathOrUrl() );
 }
 
+#ifndef KDE_NO_DEPRECATED
 void KUrlRequester::setPath( const QString& path )
 {
     d->setText( path );
 }
+#endif
 
 void KUrlRequester::setText(const QString& text)
 {
@@ -493,7 +499,11 @@
     d->fileDialogModality = modality;
 }
 
+#ifndef KDE_NO_DEPRECATED
 const KEditListBox::CustomEditor &KUrlRequester::customEditor()
+#else
+const KEditListWidget::CustomEditor &KUrlRequester::customEditor()
+#endif
 {
     setSizePolicy(QSizePolicy( QSizePolicy::Preferred,
                                QSizePolicy::Fixed));
--- trunk/KDE/kdelibs/kio/kfile/kurlrequester.h #1192897:1192898
@@ -19,12 +19,17 @@
 #ifndef KURLREQUESTER_H
 #define KURLREQUESTER_H
 
-#include <keditlistbox.h>
 #include <kfile.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 #include <khbox.h>
 
+#ifndef KDE_NO_DEPRECATED
+#include <keditlistbox.h>
+#else
+#include <keditlistwidget.h>
+#endif
+
 class KComboBox;
 class KFileDialog;
 class KLineEdit;
@@ -182,7 +187,11 @@
      * KEditListBox *editListBox = new KEditListBox( i18n("Some Title"), \
                req->customEditor(), someWidget );
      * \endcode
      */
+#ifndef KDE_NO_DEPRECATED
     const KEditListBox::CustomEditor &customEditor();
+#else
+    const KEditListWidget::CustomEditor &customEditor();
+#endif
 
     /**
      * @returns the message set with setClickMessage
@@ -230,7 +239,9 @@
      *
      * @deprecated Use setUrl(KUrl(path)) instead.
      */
+#ifndef KDE_NO_DEPRECATED
     KDE_DEPRECATED void setPath(const QString& path);
+#endif
 
     /**
      * Sets the current text in the lineedit or combobox.


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