diff options
| -rw-r--r-- | src/sidebar.cpp | 14 | ||||
| -rw-r--r-- | src/sidebar.h | 17 |
2 files changed, 14 insertions, 17 deletions
diff --git a/src/sidebar.cpp b/src/sidebar.cpp index 278aafeb6..d67f68180 100644 --- a/src/sidebar.cpp +++ b/src/sidebar.cpp @@ -19,28 +19,26 @@ #include "sidebar.h" -#include <qlayout.h> -#include <qpixmap.h> -//Added by qt3to4: -#include <Q3VBoxLayout> +#include <QVBoxLayout> +#include <QComboBox> + #include <kiconloader.h> #include <klocale.h> -#include <qcombobox.h> #include "dolphinsettings.h" #include "sidebarsettings.h" #include "bookmarkssidebarpage.h" #include "infosidebarpage.h" -#include <assert.h> - Sidebar::Sidebar(QWidget* parent) : QWidget(parent), m_pagesSelector(0), m_page(0), m_layout(0) { - m_layout = new Q3VBoxLayout(this); + m_layout = new QVBoxLayout(this); + m_layout->setMargin(0); + m_layout->setSpacing(0); m_pagesSelector = new QComboBox(this); m_pagesSelector->insertItem(i18n("Information")); diff --git a/src/sidebar.h b/src/sidebar.h index fe5bf8f68..772d2d4f9 100644 --- a/src/sidebar.h +++ b/src/sidebar.h @@ -21,9 +21,8 @@ #ifndef _SIDEBAR_H_ #define _SIDEBAR_H_ -#include <qwidget.h> -//Added by qt3to4: -#include <Q3VBoxLayout> +#include <QWidget> +#include <QVBoxLayout> class KUrl; class QComboBox; @@ -46,11 +45,11 @@ public: virtual QSize sizeHint() const; signals: - /** - * The user selected an item on sidebar widget and item has - * Url property, so inform the parent togo to this Url; - */ - void urlChanged(const KUrl& url); + /** + * The user selected an item on sidebar widget and item has + * Url property, so inform the parent togo to this Url; + */ + void urlChanged(const KUrl& url); private slots: void createPage(int index); @@ -60,7 +59,7 @@ private: QComboBox* m_pagesSelector; SidebarPage* m_page; - Q3VBoxLayout* m_layout; + QVBoxLayout* m_layout; }; #endif // _SIDEBAR_H_ |