David's patches come in faster than light: removed code duplication, as a proper...

[dolphin.git] / src / editbookmarkdialog.cpp

diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp
index d467db15d289cbec4b2a0e2cc944652b55d27843..35d0f6e736733c034041883ae772680403d8f80c 100644 (file)
--- a/src/editbookmarkdialog.cpp
+++ b/src/editbookmarkdialog.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
 #include "editbookmarkdialog.h"
@@ -31,7 +31,8 @@
 #include <kurl.h>
 #include <kfiledialog.h>
 #include <kicondialog.h>
-#include <q3hbox.h>
+#include <kvbox.h>
+
 
 EditBookmarkDialog::~EditBookmarkDialog()
 {
@@ -39,7 +40,7 @@ EditBookmarkDialog::~EditBookmarkDialog()
 
 KBookmark EditBookmarkDialog::getBookmark(const QString& title,
                                           const QString& name,
-                                          const KURL& url,
+                                          const KUrl& url,
                                           const QString& icon)
 {
     EditBookmarkDialog dialog(title, name, url, icon);
@@ -47,27 +48,36 @@ KBookmark EditBookmarkDialog::getBookmark(const QString& title,
     return dialog.m_bookmark;
 }
 
-void EditBookmarkDialog::slotOk()
+void EditBookmarkDialog::slotButtonClicked(int button)
 {
-    m_bookmark = KBookmark::standaloneBookmark(m_name->text(),
-                                               KURL(m_location->text()),
-                                               m_iconName);
+    if (button==Ok) {
+        m_bookmark = KBookmark::standaloneBookmark(m_name->text(),
+                                                   KUrl(m_location->text()),
+                                                   m_iconName);
+    }
 
-    KDialogBase::slotOk();
+    KDialog::slotButtonClicked(button);
 }
 
 EditBookmarkDialog::EditBookmarkDialog(const QString& title,
                                        const QString& name,
-                                       const KURL& url,
+                                       const KUrl& url,
                                        const QString& icon) :
-    KDialogBase(Plain, title, Ok|Cancel, Ok),
+    KDialog(),
     m_iconButton(0),
     m_name(0),
     m_location(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(plainPage(), 0, spacingHint());
+    setCaption(title);
+    setButtons(Ok|Cancel);
+    setDefaultButton(Ok);
+
+    QWidget *page = new QWidget(this);
+    setMainWidget(page);
+
+    Q3VBoxLayout* topLayout = new Q3VBoxLayout(page, 0, spacingHint());
 
-    Q3Grid* grid = new Q3Grid(2, Qt::Horizontal, plainPage());
+    Q3Grid* grid = new Q3Grid(2, Qt::Horizontal, page);
     grid->setSpacing(spacingHint());
 
     // create icon widgets
@@ -87,10 +97,10 @@ EditBookmarkDialog::EditBookmarkDialog(const QString& title,
     // create location widgets
     new QLabel(i18n("Location:"), grid);
 
-    Q3HBox* locationBox = new Q3HBox(grid);
+    KHBox* locationBox = new KHBox(grid);
     locationBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     locationBox->setSpacing(spacingHint());
-    m_location = new QLineEdit(url.prettyURL(), locationBox);
+    m_location = new QLineEdit(url.prettyUrl(), locationBox);
     m_location->setMinimumWidth(320);
 
     QPushButton* selectLocationButton = new QPushButton(SmallIcon("folder"), QString::null, locationBox);
@@ -103,7 +113,7 @@ EditBookmarkDialog::EditBookmarkDialog(const QString& title,
 
 void EditBookmarkDialog::selectIcon()
 {
-    const QString iconName(KIconDialog::getIcon(KIcon::Small, KIcon::FileSystem));
+    const QString iconName(KIconDialog::getIcon(K3Icon::Small, K3Icon::FileSystem));
     if (!iconName.isEmpty()) {
         m_iconName = iconName;
         m_iconButton->setIconSet(SmallIcon(iconName));
@@ -113,9 +123,9 @@ void EditBookmarkDialog::selectIcon()
 void EditBookmarkDialog::selectLocation()
 {
     const QString location(m_location->text());
-    KURL url(KFileDialog::getExistingURL(location));
+    KUrl url(KFileDialog::getExistingUrl(location));
     if (!url.isEmpty()) {
-        m_location->setText(url.prettyURL());
+        m_location->setText(url.prettyUrl());
     }
 }