Commit dfaae31d authored by Michal Humpula's avatar Michal Humpula

migrate from KTabWidget to QTabWidget

parent bf5acc6f
......@@ -89,28 +89,26 @@
#include <kvbox.h>
#include <kactioncollection.h>
#include <kplugininfo.h>
#include <ktabwidget.h>
//#include <knewstuff/knewstuff.h>
#include <QtCore/QFile>
#include <QtCore/QMap>
#include <QtCore/QStringList>
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtGui/QKeyEvent>
#include <QtGui/QPainter>
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDialog>
#include <QtCore/QFile>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLayout>
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QtGui/QPainter>
#include <QtWidgets/QRadioButton>
#include <QtWidgets/QSlider>
#include <QtCore/QStringList>
#include <QtWidgets/QTabBar>
#include <QtWidgets/QTabWidget>
#include <QtCore/QTextCodec>
#include <QtCore/QTextStream>
#include <QtWidgets/QToolButton>
#include <QtWidgets/QWhatsThis>
#include <QtGui/QKeyEvent>
#include <QtXml/QDomDocument>
// trailing slash is important
......@@ -147,7 +145,7 @@ KateIndentConfigTab::KateIndentConfigTab(QWidget *parent)
: KateConfigPage(parent)
{
// This will let us have more separation between this page and
// the KTabWidget edge (ereslibre)
// the QTabWidget edge (ereslibre)
QVBoxLayout *layout = new QVBoxLayout;
QWidget *newWidget = new QWidget(this);
......@@ -268,7 +266,7 @@ KateCompletionConfigTab::KateCompletionConfigTab(QWidget *parent)
: KateConfigPage(parent)
{
// This will let us have more separation between this page and
// the KTabWidget edge (ereslibre)
// the QTabWidget edge (ereslibre)
QVBoxLayout *layout = new QVBoxLayout;
QWidget *newWidget = new QWidget(this);
......@@ -331,7 +329,7 @@ KateViInputModeConfigTab::KateViInputModeConfigTab(QWidget *parent)
: KateConfigPage(parent)
{
// This will let us have more separation between this page and
// the KTabWidget edge (ereslibre)
// the QTabWidget edge (ereslibre)
QVBoxLayout *layout = new QVBoxLayout;
QWidget *newWidget = new QWidget(this);
......@@ -491,7 +489,7 @@ KateSpellCheckConfigTab::KateSpellCheckConfigTab(QWidget *parent)
: KateConfigPage(parent)
{
// This will let us have more separation between this page and
// the KTabWidget edge (ereslibre)
// the QTabWidget edge (ereslibre)
QVBoxLayout *layout = new QVBoxLayout;
QWidget *newWidget = new QWidget(this);
......@@ -549,7 +547,7 @@ KateNavigationConfigTab::KateNavigationConfigTab(QWidget *parent)
: KateConfigPage(parent)
{
// This will let us having more separation between this page and
// the KTabWidget edge (ereslibre)
// the QTabWidget edge (ereslibre)
QVBoxLayout *layout = new QVBoxLayout;
QWidget *newWidget = new QWidget(this);
......@@ -683,7 +681,7 @@ KateEditConfigTab::KateEditConfigTab(QWidget *parent)
{
QVBoxLayout *layout = new QVBoxLayout;
layout->setMargin(0);
KTabWidget *tabWidget = new KTabWidget(this);
QTabWidget *tabWidget = new QTabWidget(this);
// add all tabs
tabWidget->insertTab(0, editConfigTab, i18n("General"));
......@@ -882,7 +880,7 @@ KateSaveConfigTab::KateSaveConfigTab( QWidget *parent )
// initialize, add and work with as we do with modeConfigPage (ereslibre)
QVBoxLayout *layout = new QVBoxLayout;
layout->setMargin(0);
KTabWidget *tabWidget = new KTabWidget(this);
QTabWidget *tabWidget = new QTabWidget(this);
QWidget *tmpWidget = new QWidget(tabWidget);
QVBoxLayout *internalLayout = new QVBoxLayout;
......
......@@ -44,7 +44,6 @@
#include <QtWidgets/QCheckBox>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLayout>
#include <QtWidgets/QPushButton>
......@@ -60,7 +59,7 @@ ModeConfigPage::ModeConfigPage( QWidget *parent )
m_lastType = -1;
// This will let us have more separation between this page and
// the KTabWidget edge (ereslibre)
// the QTabWidget edge (ereslibre)
QVBoxLayout *layout = new QVBoxLayout;
QWidget *newWidget = new QWidget(this);
......
......@@ -40,12 +40,12 @@
#include <kfontchooser.h>
#include <kmessagebox.h>
#include <khbox.h>
#include <ktabwidget.h>
#include <kcombobox.h>
#include <kglobal.h>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QProgressDialog>
#include <QtWidgets/QTabWidget>
//END
......@@ -915,23 +915,23 @@ KateSchemaConfigPage::KateSchemaConfigPage( QWidget *parent)
qobject_cast<QBoxLayout *>(hbHl->layout())->addStretch();
m_tabWidget = new KTabWidget ( this );
layout->addWidget (m_tabWidget);
QTabWidget *tabWidget = new QTabWidget(this);
layout->addWidget (tabWidget);
m_colorTab = new KateSchemaConfigColorTab();
m_tabWidget->addTab (m_colorTab, i18n("Colors"));
tabWidget->addTab (m_colorTab, i18n("Colors"));
connect(m_colorTab, SIGNAL(changed()), SLOT(slotChanged()));
m_fontTab = new KateSchemaConfigFontTab();
m_tabWidget->addTab (m_fontTab, i18n("Font"));
tabWidget->addTab (m_fontTab, i18n("Font"));
connect(m_fontTab, SIGNAL(changed()), SLOT(slotChanged()));
m_defaultStylesTab = new KateSchemaConfigDefaultStylesTab(m_colorTab);
m_tabWidget->addTab (m_defaultStylesTab, i18n("Default Text Styles"));
tabWidget->addTab (m_defaultStylesTab, i18n("Default Text Styles"));
connect(m_defaultStylesTab, SIGNAL(changed()), SLOT(slotChanged()));
m_highlightTab = new KateSchemaConfigHighlightTab(m_defaultStylesTab, m_colorTab);
m_tabWidget->addTab(m_highlightTab, i18n("Highlighting Text Styles"));
tabWidget->addTab(m_highlightTab, i18n("Highlighting Text Styles"));
connect(m_highlightTab, SIGNAL(changed()), SLOT(slotChanged()));
hbHl = new KHBox( this );
......
......@@ -33,8 +33,6 @@
class KateStyleTreeWidget;
class KComboBox;
class KTabWidget;
class KateSchemaConfigColorTab : public QWidget
{
......@@ -204,7 +202,6 @@ class KateSchemaConfigPage : public KateConfigPage
private:
QString m_currentSchema;
class KTabWidget *m_tabWidget;
class QPushButton *btndel;
class KComboBox *defaultSchemaCombo;
class KComboBox *schemaCombo;
......
......@@ -117,7 +117,7 @@
</layout>
</item>
<item>
<widget class="KTabWidget" name="editorTabs">
<widget class="QTabWidget" name="editorTabs">
<property name="currentIndex">
<number>0</number>
</property>
......@@ -146,12 +146,6 @@
<extends>QWidget</extends>
<header>kshortcutwidget.h</header>
</customwidget>
<customwidget>
<class>KTabWidget</class>
<extends>QTabWidget</extends>
<header>ktabwidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>snippetPrefixEdit</tabstop>
......
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