andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Port away from KLineEdit, KPushButton and KComboBox.

This commit is contained in:
Andrius Štikonas 2014-05-14 01:01:34 +01:00
parent f2f5295f1b
commit 14e9ecb779
21 changed files with 50 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/advancedpagewidget.cpp
View File

@ -23,6 +23,8 @@
#include "util/helpers.h"
#include <QComboBox>
#include <config.h>
AdvancedPageWidget::AdvancedPageWidget(QWidget* parent) :

6
src/config/advancedpagewidget.h
View File

@ -28,7 +28,7 @@
#include <QWidget>
class QString;
class KComboBox;
class QComboBox;
class AdvancedPageWidget : public QWidget, public Ui::ConfigurePageAdvanced
{
@ -36,8 +36,8 @@ class AdvancedPageWidget : public QWidget, public Ui::ConfigurePageAdvanced
AdvancedPageWidget(QWidget* parent);
public:
KComboBox& comboBackend() { return *m_ComboBackend; }
const KComboBox& comboBackend() const { return *m_ComboBackend; }
QComboBox& comboBackend() { return *m_ComboBackend; }
const QComboBox& comboBackend() const { return *m_ComboBackend; }
QString backend() const;
void setBackend(const QString& name);

11
src/config/configurepageadvanced.ui
View File

@ -62,7 +62,7 @@
</widget>
</item>
<item>
<widget class="KComboBox" name="m_ComboBackend"/>
<widget class="QComboBox" name="m_ComboBackend"/>
</item>
</layout>
</widget>
@ -90,7 +90,7 @@
</widget>
</item>
<item>
<widget class="KComboBox" name="kcfg_preferredUnit">
<widget class="QComboBox" name="kcfg_preferredUnit">
<item>
<property name="text">
<string>Byte</string>
@ -133,13 +133,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

17
src/config/configurepagegeneral.ui
View File

@ -101,7 +101,7 @@
</widget>
</item>
<item>
<widget class="KComboBox" name="kcfg_minLogLevel">
<widget class="QComboBox" name="kcfg_minLogLevel">
<item>
<property name="text">
<string>Debug</string>
@ -150,7 +150,7 @@
</widget>
</item>
<item>
<widget class="KComboBox" name="m_ComboDefaultFileSystem"/>
<widget class="QComboBox" name="m_ComboDefaultFileSystem"/>
</item>
</layout>
</widget>
@ -193,19 +193,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KButtonGroup</class>
<extends>QGroupBox</extends>
<header>kbuttongroup.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

5
src/config/generalpagewidget.h
View File

@ -28,7 +28,6 @@
#include <QWidget>
class QString;
class KComboBox;
class GeneralPageWidget : public QWidget, public Ui::ConfigurePageGeneral
{
@ -36,8 +35,8 @@ class GeneralPageWidget : public QWidget, public Ui::ConfigurePageGeneral
GeneralPageWidget(QWidget* parent);
public:
KComboBox& comboDefaultFileSystem() { return *m_ComboDefaultFileSystem; }
const KComboBox& comboDefaultFileSystem() const { return *m_ComboDefaultFileSystem; }
QComboBox& comboDefaultFileSystem() { return *m_ComboDefaultFileSystem; }
const QComboBox& comboDefaultFileSystem() const { return *m_ComboDefaultFileSystem; }
FileSystem::Type defaultFileSystem() const;
void setDefaultFileSystem(FileSystem::Type t);

1
src/fs/luks.cpp
View File

@ -25,6 +25,7 @@
#include "util/capacity.h"
#include "util/externalcommand.h"
#include <QPointer>
#include <QString>
#include <QUuid>

8
src/gui/decryptluksdialog.h
View File

@ -44,11 +44,11 @@ class DecryptLuksDialog : public KDialog
const QString& m_DeviceNode;
public:
KLineEdit& luksName() { return widget().luksName(); }
const KLineEdit& luksName() const { return widget().luksName(); }
QLineEdit& luksName() { return widget().luksName(); }
const QLineEdit& luksName() const { return widget().luksName(); }
KLineEdit& luksPassphrase() { return widget().luksPassphrase(); }
const KLineEdit& luksPassphrase() const { return widget().luksPassphrase(); }
QLineEdit& luksPassphrase() { return widget().luksPassphrase(); }
const QLineEdit& luksPassphrase() const { return widget().luksPassphrase(); }
};

11
src/gui/decryptluksdialogwidget.h
View File

@ -25,8 +25,7 @@
#include <QWidget>
#include <QLabel>
#include <KLineEdit>
#include <QLineEdit>
class DecryptLuksDialogWidget : public QWidget, public Ui::DecryptLuksDialogWidgetBase
{
@ -36,11 +35,11 @@ class DecryptLuksDialogWidget : public QWidget, public Ui::DecryptLuksDialogWidg
DecryptLuksDialogWidget(QWidget* parent);
public:
KLineEdit& luksName() { return *m_LineEditName; }
const KLineEdit& luksName() const { return *m_LineEditName; }
QLineEdit& luksName() { return *m_LineEditName; }
const QLineEdit& luksName() const { return *m_LineEditName; }
KLineEdit& luksPassphrase() { return *m_LineEditPassphrase; }
const KLineEdit& luksPassphrase() const { return *m_LineEditPassphrase; }
QLineEdit& luksPassphrase() { return *m_LineEditPassphrase; }
const QLineEdit& luksPassphrase() const { return *m_LineEditPassphrase; }
};
#endif

15
src/gui/decryptluksdialogwidgetbase.ui
View File

@ -27,7 +27,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="KLineEdit" name="m_LineEditName"/>
<widget class="QLineEdit" name="m_LineEditName"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_Pass">
@ -40,9 +40,9 @@
</widget>
</item>
<item row="3" column="1">
<widget class="KLineEdit" name="m_LineEditPassphrase">
<property name="passwordMode">
<bool>true</bool>
<widget class="QLineEdit" name="m_LineEditPassphrase">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
@ -66,13 +66,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

2
src/gui/devicepropswidget.h
View File

@ -55,7 +55,7 @@ class DevicePropsWidget : public QWidget, public Ui::DevicePropsWidgetBase
QLabel& smartStatusText() { Q_ASSERT(m_LabelSmartStatusText); return *m_LabelSmartStatusText; }
QLabel& smartStatusIcon() { Q_ASSERT(m_LabelSmartStatusIcon); return *m_LabelSmartStatusIcon; }
KPushButton& buttonSmartMore() { Q_ASSERT(m_ButtonSmartMore); return *m_ButtonSmartMore; }
QPushButton& buttonSmartMore() { Q_ASSERT(m_ButtonSmartMore); return *m_ButtonSmartMore; }
void hideTypeRadioButtons();
};

7
src/gui/devicepropswidgetbase.ui
View File

@ -298,7 +298,7 @@
</widget>
</item>
<item>
<widget class="KPushButton" name="m_ButtonSmartMore">
<widget class="QPushButton" name="m_ButtonSmartMore">
<property name="text">
<string>More...</string>
</property>
@ -325,11 +325,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
<customwidget>
<class>PartTableWidget</class>
<extends>QWidget</extends>

10
src/gui/editmountpointdialogwidget.h
View File

@ -28,13 +28,11 @@
class Partition;
class KPushButton;
class KLineEdit;
class KComboBox;
class QWidget;
class QSpinBox;
class QCheckBox;
class QLineEdit;
class QPushButton;
class QStringList;
class QFile;
@ -49,9 +47,9 @@ class EditMountPointDialogWidget : public QWidget, public Ui::EditMountPointDial
~EditMountPointDialogWidget();
public:
KPushButton& buttonMore() { return *m_ButtonMore; }
QPushButton& buttonMore() { return *m_ButtonMore; }
QLabel& labelName() { return *m_LabelNameValue; }
KLineEdit& editPath() { return *m_EditPath; }
QLineEdit& editPath() { return *m_EditPath; }
QSpinBox& spinDumpFreq() { return *m_SpinDumpFreq; }
QSpinBox& spinPassNumber() { return *m_SpinPassNumber; }
QLabel& labelType() { return *m_LabelTypeValue; }

18
src/gui/editmountpointdialogwidgetbase.ui
View File

@ -25,7 +25,7 @@
</widget>
</item>
<item row="5" column="1" colspan="5">
<widget class="KLineEdit" name="m_EditPath">
<widget class="QLineEdit" name="m_EditPath">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>3</horstretch>
@ -35,7 +35,7 @@
</widget>
</item>
<item row="5" column="6">
<widget class="KPushButton" name="m_ButtonSelect">
<widget class="QPushButton" name="m_ButtonSelect">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
@ -137,7 +137,7 @@
</spacer>
</item>
<item row="11" column="6">
<widget class="KPushButton" name="m_ButtonMore">
<widget class="QPushButton" name="m_ButtonMore">
<property name="text">
<string>More...</string>
</property>
@ -315,18 +315,6 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

2
src/gui/filesystemsupportdialog.h
View File

@ -25,7 +25,7 @@
#include <kdialog.h>
class KPushButton;
class QPushButton;
class FileSystemSupportDialogWidget;

4
src/gui/filesystemsupportdialogwidget.h
View File

@ -31,8 +31,8 @@ class FileSystemSupportDialogWidget : public QWidget, public Ui::FileSystemSuppo
public:
QTreeWidget& tree() { Q_ASSERT(m_Tree); return *m_Tree; }
const QTreeWidget& tree() const { Q_ASSERT(m_Tree); return *m_Tree; }
KPushButton& buttonRescan() { Q_ASSERT(m_ButtonRescan); return *m_ButtonRescan; }
const KPushButton& buttonRescan() const { Q_ASSERT(m_ButtonRescan); return *m_ButtonRescan; }
QPushButton& buttonRescan() { Q_ASSERT(m_ButtonRescan); return *m_ButtonRescan; }
const QPushButton& buttonRescan() const { Q_ASSERT(m_ButtonRescan); return *m_ButtonRescan; }
};
#endif

9
src/gui/filesystemsupportdialogwidgetbase.ui
View File

@ -130,7 +130,7 @@ Some file systems need external tools to be installed for them to be supported.
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="KPushButton" name="m_ButtonRescan">
<widget class="QPushButton" name="m_ButtonRescan">
<property name="text">
<string comment="@action:button">Rescan Support</string>
</property>
@ -153,13 +153,6 @@ Some file systems need external tools to be installed for them to be supported.
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

1
src/gui/newdialog.cpp
View File

@ -32,6 +32,7 @@
#include <QtAlgorithms>
#include <kglobalsettings.h>
#include <KLocalizedString>
/** Creates a NewDialog

8
src/gui/partpropswidget.h
View File

@ -45,8 +45,8 @@ class PartPropsWidget : public QWidget, public Ui::PartPropsWidgetBase
QLabel& used() { Q_ASSERT(m_LabelUsed); return *m_LabelUsed; }
QLabel& textFileSystem() { Q_ASSERT(m_LabelFileSystem); return *m_LabelFileSystem; }
KComboBox& fileSystem() { Q_ASSERT(m_ComboFileSystem); return *m_ComboFileSystem; }
const KComboBox& fileSystem() const { Q_ASSERT(m_ComboFileSystem); return *m_ComboFileSystem; }
QComboBox& fileSystem() { Q_ASSERT(m_ComboFileSystem); return *m_ComboFileSystem; }
const QComboBox& fileSystem() const { Q_ASSERT(m_ComboFileSystem); return *m_ComboFileSystem; }
QCheckBox& checkRecreate() { Q_ASSERT(m_CheckRecreate); return *m_CheckRecreate; }
@ -59,8 +59,8 @@ class PartPropsWidget : public QWidget, public Ui::PartPropsWidgetBase
QLabel& uuid() { Q_ASSERT(m_LabelUuid); return *m_LabelUuid; }
QLabel& textLabel() { Q_ASSERT(m_LabelTextLabel); return *m_LabelTextLabel; }
KLineEdit& label() { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
const KLineEdit& label() const { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
QLineEdit& label() { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
const QLineEdit& label() const { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
QLabel& noSetLabel() { Q_ASSERT(m_LabelTextNoSetLabel); return *m_LabelTextNoSetLabel; }
QLabel& textFlags() { Q_ASSERT(m_LabelTextFlags); return *m_LabelTextFlags; }

14
src/gui/partpropswidgetbase.ui
View File

@ -57,7 +57,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="KComboBox" name="m_ComboFileSystem"/>
<widget class="QComboBox" name="m_ComboFileSystem"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="m_LabelTextLabel">
@ -73,7 +73,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="KLineEdit" name="m_EditLabel">
<widget class="QLineEdit" name="m_EditLabel">
</widget>
</item>
<item row="4" column="1">
@ -351,16 +351,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>PartWidget</class>
<extends>QWidget</extends>

6
src/gui/sizedialogwidget.h
View File

@ -49,11 +49,11 @@ class SizeDialogWidget : public QWidget, public Ui::SizeDialogWidgetBase
QRadioButton& radioExtended() { Q_ASSERT(m_RadioExtended); return *m_RadioExtended; }
QRadioButton& radioLogical() { Q_ASSERT(m_RadioLogical); return *m_RadioLogical; }
KComboBox& comboFileSystem() { Q_ASSERT(m_ComboFileSystem); return *m_ComboFileSystem; }
QComboBox& comboFileSystem() { Q_ASSERT(m_ComboFileSystem); return *m_ComboFileSystem; }
QLabel& textLabel() { Q_ASSERT(m_LabelTextLabel); return *m_LabelTextLabel; }
KLineEdit& label() { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
const KLineEdit& label() const { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
QLineEdit& label() { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
const QLineEdit& label() const { Q_ASSERT(m_EditLabel); return *m_EditLabel; }
QLabel& noSetLabel() { Q_ASSERT(m_LabelTextNoSetLabel); return *m_LabelTextNoSetLabel; }
void hideRole() { delete m_LabelRole; m_LabelRole = NULL; delete m_RadioPrimary; m_RadioPrimary = NULL; delete m_RadioExtended; m_RadioExtended = NULL; delete m_RadioLogical; m_RadioLogical = NULL; }

14
src/gui/sizedialogwidgetbase.ui
View File

@ -107,7 +107,7 @@
</widget>
</item>
<item row="3" column="1">
<widget class="KComboBox" name="m_ComboFileSystem"/>
<widget class="QComboBox" name="m_ComboFileSystem"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="m_LabelTextLabel">
@ -125,7 +125,7 @@
<item row="4" column="1">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="KLineEdit" name="m_EditLabel">
<widget class="QLineEdit" name="m_EditLabel">
</widget>
</item>
<item>
@ -298,16 +298,6 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget>
<class>PartResizerWidget</class>
<extends>QWidget</extends>