less Qt 3 compant classes

svn path=/trunk/KDE/kdebase/apps/; revision=645548

diff --git a/src/protocolcombo.cpp b/src/protocolcombo.cpp
index 94f4e359c05cc8ea5ff0e2f3e30dae39eec2c289..3fbf3de55df7e3b1d772d09fdf87aad95165ffd1 100644 (file)
--- a/src/protocolcombo.cpp
+++ b/src/protocolcombo.cpp
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <q3popupmenu.h>
+#include <QMenu>
 
 #include <kdebug.h>
 #include <kprotocolinfo.h>
@@ -34,7 +34,7 @@ ProtocolCombo::ProtocolCombo(const QString& protocol, UrlNavigator* parent)
     qSort(m_protocols);
     QStringList::iterator it = m_protocols.begin();
     QStringList::iterator itEnd = m_protocols.end();
-    Q3PopupMenu* menu = new Q3PopupMenu(this);
+    QMenu* menu = new QMenu(this);
     while (it != itEnd)
     {
         //kDebug() << "info for " << *it << " "

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 6c14e702051cb66495ba84cfc220fac06148a5b6..ce844e0d4379397dafd2ef2f3c0aa0917ea7d184 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -23,7 +23,7 @@
 #include "iconsviewsettingspage.h"
 #include "detailsviewsettingspage.h"
 
-#include <Q3VBoxLayout>
+#include <QVBoxLayout>
 #include <QTabWidget>
 #include <QLayout>
 #include <QLabel>
@@ -39,7 +39,9 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
     m_iconsPage(0),
     m_detailsPage(0)
 {
-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 0, KDialog::spacingHint());
+    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    topLayout->setMargin(0);
+    topLayout->setSpacing(KDialog::spacingHint()));
 
     QTabWidget* tabWidget = new QTabWidget(this);