don't use KUrl::upUrl() (thanks to David for the hint!)

[dolphin.git] / src / editbookmarkdialog.cpp

diff --git a/src/editbookmarkdialog.cpp b/src/editbookmarkdialog.cpp
index 0689c11dab69abd782d423019789e163f556203b..eed5af46212beff9cd2c54d90247b24b5ef218e2 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()
 {
@@ -82,7 +83,7 @@ EditBookmarkDialog::EditBookmarkDialog(const QString& title,
     // create icon widgets
     new QLabel(i18n("Icon:"), grid);
     m_iconName = icon;
-    m_iconButton = new QPushButton(SmallIcon(m_iconName), QString::null, grid);
+    m_iconButton = new QPushButton(KIcon(m_iconName), QString(), grid);
     m_iconButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     connect(m_iconButton, SIGNAL(clicked()),
             this, SLOT(selectIcon()));
@@ -96,13 +97,13 @@ 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->setMinimumWidth(320);
 
-    QPushButton* selectLocationButton = new QPushButton(SmallIcon("folder"), QString::null, locationBox);
+    QPushButton* selectLocationButton = new QPushButton(KIcon("folder"), QString(), locationBox);
     selectLocationButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     connect(selectLocationButton, SIGNAL(clicked()),
             this, SLOT(selectLocation()));
@@ -115,7 +116,7 @@ void EditBookmarkDialog::selectIcon()
     const QString iconName(KIconDialog::getIcon(K3Icon::Small, K3Icon::FileSystem));
     if (!iconName.isEmpty()) {
         m_iconName = iconName;
-        m_iconButton->setIconSet(SmallIcon(iconName));
+        m_iconButton->setIcon(KIcon(iconName));
     }
 }