aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe Saraiva <[email protected]>2015-05-16 17:09:01 -0300
committerFilipe Saraiva <[email protected]>2015-05-16 17:09:01 -0300
commit8711f0596f03658de1627a2862c1893cb766e8bc (patch)
treeff318e684ea49db25d16b965d2e6bc68f2630a31
parente9e462ef3914be01a3e375be610b56d2b479686a (diff)
Port KTabWidget to QTabWidget
REVIEW: 123725
-rw-r--r--src/assistants/advancedplot/advancedplotdialog.ui10
-rw-r--r--src/backends/qalculate/plotassistant/qalculateplotdialog.ui9
-rw-r--r--src/backends/qalculate/settings.ui9
-rw-r--r--src/cantor.cpp4
-rw-r--r--src/cantor.h4
5 files changed, 7 insertions, 29 deletions
diff --git a/src/assistants/advancedplot/advancedplotdialog.ui b/src/assistants/advancedplot/advancedplotdialog.ui
index 7aa31a8..5a21791 100644
--- a/src/assistants/advancedplot/advancedplotdialog.ui
+++ b/src/assistants/advancedplot/advancedplotdialog.ui
@@ -47,18 +47,10 @@
</widget>
</item>
<item>
- <widget class="KTabWidget" name="directivesTabs"/>
+ <widget class="QTabWidget" name="directivesTabs"/>
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KTabWidget</class>
- <extends>QTabWidget</extends>
- <header>ktabwidget.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/src/backends/qalculate/plotassistant/qalculateplotdialog.ui b/src/backends/qalculate/plotassistant/qalculateplotdialog.ui
index 6da4a79..e77fe06 100644
--- a/src/backends/qalculate/plotassistant/qalculateplotdialog.ui
+++ b/src/backends/qalculate/plotassistant/qalculateplotdialog.ui
@@ -15,7 +15,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="KTabWidget" name="ktabwidget">
+ <widget class="QTabWidget" name="qtabwidget">
<property name="currentIndex">
<number>0</number>
</property>
@@ -625,15 +625,8 @@
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
- <customwidget>
- <class>KTabWidget</class>
- <extends>QTabWidget</extends>
- <header>ktabwidget.h</header>
- <container>1</container>
- </customwidget>
</customwidgets>
<tabstops>
- <tabstop>ktabwidget</tabstop>
<tabstop>functionTable</tabstop>
<tabstop>addButton</tabstop>
<tabstop>removeButton</tabstop>
diff --git a/src/backends/qalculate/settings.ui b/src/backends/qalculate/settings.ui
index f0baddf..7911ba7 100644
--- a/src/backends/qalculate/settings.ui
+++ b/src/backends/qalculate/settings.ui
@@ -12,7 +12,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="KTabWidget" name="ktabwidget">
+ <widget class="QTabWidget" name="qtabwidget">
<property name="currentIndex">
<number>0</number>
</property>
@@ -627,19 +627,12 @@
<header>kcombobox.h</header>
</customwidget>
<customwidget>
- <class>KTabWidget</class>
- <extends>QTabWidget</extends>
- <header>ktabwidget.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
<class>KIntNumInput</class>
<extends>QWidget</extends>
<header>knuminput.h</header>
</customwidget>
</customwidgets>
<tabstops>
- <tabstop>ktabwidget</tabstop>
<tabstop>kcfg_base</tabstop>
<tabstop>kcfg_fractionFormat</tabstop>
<tabstop>kcfg_minExp</tabstop>
diff --git a/src/cantor.cpp b/src/cantor.cpp
index 78dad16..25d15b6 100644
--- a/src/cantor.cpp
+++ b/src/cantor.cpp
@@ -32,7 +32,7 @@
#include <KStatusBar>
#include <QIcon>
#include <KLocale>
-#include <KTabWidget>
+#include <QTabWidget>
#include <KConfigDialog>
#include <KTextEdit>
#include <QTextBrowser>
@@ -70,7 +70,7 @@ CantorShell::CantorShell()
createGUI(0);
- m_tabWidget=new KTabWidget(this);
+ m_tabWidget=new QTabWidget(this);
m_tabWidget->setTabsClosable(true);
m_tabWidget->setMovable(true);
m_tabWidget->setDocumentMode(true);
diff --git a/src/cantor.h b/src/cantor.h
index b675e35..a1e4f4c 100644
--- a/src/cantor.h
+++ b/src/cantor.h
@@ -27,7 +27,7 @@
#include <KParts/ReadWritePart>
-class KTabWidget;
+class QTabWidget;
class KTextEdit;
/**
@@ -98,7 +98,7 @@ private:
private:
QList<KParts::ReadWritePart *> m_parts;
KParts::ReadWritePart* m_part;
- KTabWidget* m_tabWidget;
+ QTabWidget* m_tabWidget;
QList<QDockWidget*> m_panels;
QDockWidget* m_helpDocker;
};