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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: KEditListBox -> KEditListWidget
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2013-05-23 9:35:30
Message-ID: 20130523093530.BD645A605B () git ! kde ! org
[Download RAW message or body]

Git commit 6a84168910cbf15c4f4807df3f472d4856fe41cd by Anne-Marie Mahfouf.
Committed on 23/05/2013 at 11:28.
Pushed by annma into branch 'frameworks'.

KEditListBox -> KEditListWidget

M  +0    -1    kdeui/dialogs/kconfigdialogmanager.cpp
M  +0    -8    kio/kfile/kurlrequester.cpp
M  +1    -8    kio/kfile/kurlrequester.h
M  +0    -5    kio/tests/kurlrequestertest_gui.cpp

http://commits.kde.org/kdelibs/6a84168910cbf15c4f4807df3f472d4856fe41cd

diff --git a/kdeui/dialogs/kconfigdialogmanager.cpp b/kdeui/dialogs/kconfigdialogmanager.cpp
index 405799b..87c3e48 100644
--- a/kdeui/dialogs/kconfigdialogmanager.cpp
+++ b/kdeui/dialogs/kconfigdialogmanager.cpp
@@ -134,7 +134,6 @@ void KConfigDialogManager::initMaps()
     s_changedMap()->insert( "KDatePicker", SIGNAL(dateSelected(QDate)));
     s_changedMap()->insert( "KDateWidget", SIGNAL(changed(QDate)));
     s_changedMap()->insert( "KDateTimeWidget", SIGNAL(valueChanged(QDateTime)));
-    s_changedMap()->insert( "KEditListBox", SIGNAL(changed()));
     s_changedMap()->insert( "KEditListWidget", SIGNAL(changed()));
     s_changedMap()->insert( "KListWidget", SIGNAL(itemSelectionChanged()));
     s_changedMap()->insert( "KLineEdit", SIGNAL(textChanged(QString)));
diff --git a/kio/kfile/kurlrequester.cpp b/kio/kfile/kurlrequester.cpp
index 97d592d..fa6b234 100644
--- a/kio/kfile/kurlrequester.cpp
+++ b/kio/kfile/kurlrequester.cpp
@@ -186,11 +186,7 @@ public:
     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;
@@ -528,11 +524,7 @@ void KUrlRequester::setFileDialogModality(Qt::WindowModality modality)
     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));
diff --git a/kio/kfile/kurlrequester.h b/kio/kfile/kurlrequester.h
index 9fe6ae4..0b07373 100644
--- a/kio/kfile/kurlrequester.h
+++ b/kio/kfile/kurlrequester.h
@@ -23,11 +23,8 @@
 #include <QPushButton>
 #include <QUrl>
 
-#ifndef KDE_NO_DEPRECATED
-#include <keditlistbox.h>
-#else
 #include <keditlistwidget.h>
-#endif
+
 
 class KComboBox;
 class KFileDialog;
@@ -190,11 +187,7 @@ public:
      * KEditListWidget *editListWidget = new KEditListWidget( req->customEditor(), someWidget );
      * \endcode
      */
-#ifndef KDE_NO_DEPRECATED
-    const KEditListBox::CustomEditor &customEditor();
-#else
     const KEditListWidget::CustomEditor &customEditor();
-#endif
 
     /**
      * @returns the message set with setClickMessage
diff --git a/kio/tests/kurlrequestertest_gui.cpp b/kio/tests/kurlrequestertest_gui.cpp
index f096cec..948085f 100644
--- a/kio/tests/kurlrequestertest_gui.cpp
+++ b/kio/tests/kurlrequestertest_gui.cpp
@@ -8,7 +8,6 @@
  */
 
 #include <qapplication.h>
-#include <keditlistbox.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdialog.h>
 #include <QDebug>
@@ -22,12 +21,8 @@ int main( int argc, char **argv )
     qDebug() << "Selected url:" << url;
 
     KUrlRequester *req = new KUrlRequester();
-#ifndef KDE_NO_DEPRECATED
-    KEditListBox *el = new KEditListBox( QLatin1String("Test"), req->customEditor() );
-#else
     KEditListWidget *el = new KEditListWidget( req->customEditor() );
     el->setWindowTitle( QLatin1String("Test") );
-#endif
     el->show();
 
     KUrlRequester *req1 = new KUrlRequester();

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