Commit 19319947 authored by Jonathan Marten's avatar Jonathan Marten

Port KTabWidget -> QTabWidget

Eliminates the runtime message:

  kmix/default check_and_warn_compat: QObject::connect: Connecting from
  QTabBar::tabCloseRequested(int) to COMPAT slot (KTabBar::closeRequest(int))
parent a1eb2c0d
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <qradiobutton.h> #include <qradiobutton.h>
#include <QCursor> #include <QCursor>
#include <QString> #include <QString>
#include <QTabWidget>
// include files for KDE // include files for KDE
#include <KConfigSkeleton> #include <KConfigSkeleton>
...@@ -47,7 +48,6 @@ ...@@ -47,7 +48,6 @@
#include <kglobal.h> #include <kglobal.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <KProcess> #include <KProcess>
#include <KTabWidget>
// KMix // KMix
#include "gui/guiprofile.h" #include "gui/guiprofile.h"
...@@ -293,7 +293,7 @@ void KMixWindow::initPrefDlg() ...@@ -293,7 +293,7 @@ void KMixWindow::initPrefDlg()
void KMixWindow::initWidgets() void KMixWindow::initWidgets()
{ {
m_wsMixers = new KTabWidget(); m_wsMixers = new QTabWidget();
m_wsMixers->setDocumentMode(true); m_wsMixers->setDocumentMode(true);
setCentralWidget(m_wsMixers); setCentralWidget(m_wsMixers);
m_wsMixers->setTabsClosable(false); m_wsMixers->setTabsClosable(false);
......
...@@ -32,7 +32,7 @@ class QLabel; ...@@ -32,7 +32,7 @@ class QLabel;
#include <QVBoxLayout> #include <QVBoxLayout>
class QPushButton; class QPushButton;
#include <QTimer> #include <QTimer>
class KTabWidget; class QTabWidget;
// KDE // KDE
class KAccel; class KAccel;
...@@ -115,7 +115,7 @@ private: ...@@ -115,7 +115,7 @@ private:
bool m_multiDriverMode; // Not officially supported. bool m_multiDriverMode; // Not officially supported.
bool m_autouseMultimediaKeys; // Due to message freeze, not in config dialog in KDE4.4 bool m_autouseMultimediaKeys; // Due to message freeze, not in config dialog in KDE4.4
KTabWidget *m_wsMixers; QTabWidget *m_wsMixers;
KMixDockWidget *m_dockWidget; KMixDockWidget *m_dockWidget;
DialogSelectMaster *m_dsm; DialogSelectMaster *m_dsm;
......
...@@ -26,15 +26,14 @@ ...@@ -26,15 +26,14 @@
#include <qpixmap.h> #include <qpixmap.h>
#include <QString> #include <QString>
#include <qtoolbutton.h> #include <qtoolbutton.h>
#include <qapplication.h> // for QApplication::revsreseLayout()
#include <QVBoxLayout> #include <QVBoxLayout>
#include <qtabwidget.h>
// KDE // KDE
#include <kconfig.h> #include <kconfig.h>
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <ktabwidget.h>
// KMix // KMix
#include "apps/kmix.h" #include "apps/kmix.h"
......
...@@ -38,7 +38,6 @@ class QString; ...@@ -38,7 +38,6 @@ class QString;
// KDE // KDE
class KActionCollection; class KActionCollection;
class KConfig; class KConfig;
//class KTabWidget;
// KMix // KMix
class GUIProfile; class GUIProfile;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment