Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / bookmarkssettingspage.cpp

diff --git a/src/bookmarkssettingspage.cpp b/src/bookmarkssettingspage.cpp
index 8ee77a52cfae5c81489a4bdc53cf29e914dc8f80..89caede0c738b7172660be3c086c4a435925482f 100644 (file)
--- a/src/bookmarkssettingspage.cpp
+++ b/src/bookmarkssettingspage.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.,                                       *
  *   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 "bookmarkssettingspage.h"
  ***************************************************************************/
 
 #include "bookmarkssettingspage.h"


@@ -25,7 +25,7 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlineedit.h>

-#include <q3vbox.h>
+

 //Added by qt3to4:
 #include <QPixmap>
 #include <Q3VBoxLayout>
 //Added by qt3to4:
 #include <QPixmap>
 #include <Q3VBoxLayout>


@@ -37,22 +37,25 @@
 #include <k3listview.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <k3listview.h>
 #include <klocale.h>
 #include <kpushbutton.h>

+#include <kvbox.h>

 
 #include "dolphinsettings.h"
 #include "editbookmarkdialog.h"
 
 
 #include "dolphinsettings.h"
 #include "editbookmarkdialog.h"
 

-BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
+BookmarksSettingsPage::BookmarksSettingsPage(DolphinMainWindow* mainWindow,
+                                             QWidget*parent) :

     SettingsPageBase(parent),
     SettingsPageBase(parent),

+    m_mainWindow(mainWindow),

     m_addButton(0),
     m_removeButton(0),
     m_moveUpButton(0),
     m_moveDownButton(0)
 {
     m_addButton(0),
     m_removeButton(0),
     m_moveUpButton(0),
     m_moveDownButton(0)
 {

-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(parent, 2, KDialog::spacingHint());
+    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 2, KDialog::spacingHint());

 
     const int spacing = KDialog::spacingHint();
 
 
     const int spacing = KDialog::spacingHint();
 

-    Q3HBox* hBox = new Q3HBox(parent);
+    KHBox* hBox = new KHBox(this);

     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     hBox->setSpacing(spacing);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     hBox->setSpacing(spacing);
     hBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);


@@ -72,7 +75,7 @@ BookmarksSettingsPage::BookmarksSettingsPage(QWidget*parent) :
     connect(m_listView, SIGNAL(doubleClicked(Q3ListViewItem*, const QPoint&, int)),
             this, SLOT(slotBookmarkDoubleClicked(Q3ListViewItem*, const QPoint&, int)));
 
     connect(m_listView, SIGNAL(doubleClicked(Q3ListViewItem*, const QPoint&, int)),
             this, SLOT(slotBookmarkDoubleClicked(Q3ListViewItem*, const QPoint&, int)));
 

-    Q3VBox* buttonBox = new Q3VBox(hBox);
+    KVBox* buttonBox = new KVBox(hBox);

     buttonBox->setSpacing(spacing);
 
     const QSizePolicy buttonSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
     buttonBox->setSpacing(spacing);
 
     const QSizePolicy buttonSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);