From 02c08351489ed7b649e6409bf529773bab5136d8 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Mon, 10 Nov 2014 09:08:04 +0100 Subject: [PATCH] KLineEdit to QLineEdit --- src/dolphinmainwindow.cpp | 2 +- src/filterbar/filterbar.cpp | 8 ++++---- src/filterbar/filterbar.h | 4 ++-- src/panels/places/placesitemeditdialog.cpp | 8 ++++---- src/panels/places/placesitemeditdialog.h | 4 ++-- src/search/dolphinsearchbox.cpp | 10 +++++----- src/settings/startup/startupsettingspage.cpp | 8 ++++---- src/settings/startup/startupsettingspage.h | 4 ++-- src/views/renamedialog.cpp | 6 +++--- src/views/renamedialog.h | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 637d46a01..81aa1e810 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index 4a43dbd23..82d5f549e 100644 --- a/src/filterbar/filterbar.cpp +++ b/src/filterbar/filterbar.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include FilterBar::FilterBar(QWidget* parent) : QWidget(parent) @@ -51,10 +51,10 @@ FilterBar::FilterBar(QWidget* parent) : QLabel* filterLabel = new QLabel(i18nc("@label:textbox", "Filter:"), this); // Create filter editor - m_filterInput = new KLineEdit(this); + m_filterInput = new QLineEdit(this); m_filterInput->setLayoutDirection(Qt::LeftToRight); - m_filterInput->setClearButtonShown(true); - connect(m_filterInput, &KLineEdit::textChanged, + m_filterInput->setClearButtonEnabled(true); + connect(m_filterInput, &QLineEdit::textChanged, this, &FilterBar::filterChanged); setFocusProxy(m_filterInput); diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h index dd9b8b8bb..a275d1ea4 100644 --- a/src/filterbar/filterbar.h +++ b/src/filterbar/filterbar.h @@ -24,7 +24,7 @@ #include -class KLineEdit; +class QLineEdit; class QToolButton; /** @@ -78,7 +78,7 @@ protected: virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; private: - KLineEdit* m_filterInput; + QLineEdit* m_filterInput; QToolButton* m_lockButton; }; diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 59085e474..93a4d21f4 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,7 @@ #include #include #include +#include PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) : QDialog(parent), @@ -137,17 +137,17 @@ void PlacesItemEditDialog::initialize() QFormLayout* formLayout = new QFormLayout(); vBox->addLayout( formLayout ); - m_textEdit = new KLineEdit(mainWidget); + m_textEdit = new QLineEdit(mainWidget); formLayout->addRow(i18nc("@label", "Label:"), m_textEdit); m_textEdit->setText(m_text); - m_textEdit->setClickMessage(i18n("Enter descriptive label here")); + m_textEdit->setPlaceholderText(i18n("Enter descriptive label here")); m_urlEdit = new KUrlRequester(m_url, mainWidget); m_urlEdit->setMode(KFile::Directory); formLayout->addRow(i18nc("@label", "Location:"), m_urlEdit); // Provide room for at least 40 chars (average char width is half of height) m_urlEdit->setMinimumWidth(m_urlEdit->fontMetrics().height() * (40 / 2)); - connect(m_urlEdit->lineEdit(), &KLineEdit::textChanged, this, &PlacesItemEditDialog::slotUrlChanged); + connect(m_urlEdit, &KUrlRequester::textChanged, this, &PlacesItemEditDialog::slotUrlChanged); m_iconButton = new KIconButton(mainWidget); formLayout->addRow(i18nc("@label", "Choose an icon:"), m_iconButton); diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h index f2bba546b..8a0dc0471 100644 --- a/src/panels/places/placesitemeditdialog.h +++ b/src/panels/places/placesitemeditdialog.h @@ -28,8 +28,8 @@ #include class KIconButton; -class KLineEdit; class KUrlRequester; +class QLineEdit; class QCheckBox; class QPushButton; @@ -69,7 +69,7 @@ private: bool m_allowGlobal; KUrlRequester* m_urlEdit; - KLineEdit* m_textEdit; + QLineEdit* m_textEdit; KIconButton* m_iconButton; QCheckBox* m_appLocal; QPushButton *m_okButton; diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 65d35539c..fe298312f 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -23,7 +23,7 @@ #include "dolphinfacetswidget.h" #include -#include +#include #include #include @@ -346,13 +346,13 @@ void DolphinSearchBox::init() connect(m_searchInput, &Baloo::QueryBuilder::textChanged, this, &DolphinSearchBox::slotSearchTextChanged); #else - m_searchInput = new KLineEdit(this); + m_searchInput = new QLineEdit(this); m_searchInput->installEventFilter(this); - m_searchInput->setClearButtonShown(true); + m_searchInput->setClearButtonEnabled(true); m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont)); - connect(m_searchInput, &KLineEdit::returnPressed, + connect(m_searchInput, &QLineEdit::returnPressed, this, &DolphinSearchBox::slotReturnPressed); - connect(m_searchInput, &KLineEdit::textChanged, + connect(m_searchInput, &QLineEdit::textChanged, this, &DolphinSearchBox::slotSearchTextChanged); #endif setFocusProxy(m_searchInput); diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index b4ca9ac2c..f7bcbc685 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -61,8 +61,8 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : homeUrlBox->setSpacing(spacing); new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox); - m_homeUrl = new KLineEdit(homeUrlBox); - m_homeUrl->setClearButtonShown(true); + m_homeUrl = new QLineEdit(homeUrlBox); + m_homeUrl->setClearButtonEnabled(true); QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme("folder-open"), QString(), homeUrlBox); @@ -102,7 +102,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) : loadSettings(); - connect(m_homeUrl, &KLineEdit::textChanged, this, &StartupSettingsPage::slotSettingsChanged); + connect(m_homeUrl, &QLineEdit::textChanged, this, &StartupSettingsPage::slotSettingsChanged); connect(m_splitView, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); connect(m_editableUrl, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); connect(m_showFullPath, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged); diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h index aeb5d6333..9bcc31131 100644 --- a/src/settings/startup/startupsettingspage.h +++ b/src/settings/startup/startupsettingspage.h @@ -22,7 +22,7 @@ #include #include -class KLineEdit; +class QLineEdit; class QCheckBox; /** @@ -56,7 +56,7 @@ private: private: QUrl m_url; - KLineEdit* m_homeUrl; + QLineEdit* m_homeUrl; QCheckBox* m_splitView; QCheckBox* m_editableUrl; diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 7fdb486e1..c5001af08 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -19,7 +19,6 @@ #include "renamedialog.h" -#include #include #include #include @@ -35,6 +34,7 @@ #include #include #include +#include #include RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : @@ -88,9 +88,9 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : page); } - m_lineEdit = new KLineEdit(page); + m_lineEdit = new QLineEdit(page); mainLayout->addWidget(m_lineEdit); - connect(m_lineEdit, &KLineEdit::textChanged, this, &RenameDialog::slotTextChanged); + connect(m_lineEdit, &QLineEdit::textChanged, this, &RenameDialog::slotTextChanged); int selectionLength = m_newName.length(); if (m_renameOneItem) { diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h index 045161ae4..86318c5c4 100644 --- a/src/views/renamedialog.h +++ b/src/views/renamedialog.h @@ -24,11 +24,11 @@ #include #include +#include -class KLineEdit; +class QLineEdit; class KIntSpinBox; class QPushButton; -#include /** * @brief Dialog for renaming a variable number of files. @@ -61,7 +61,7 @@ private: private: bool m_renameOneItem; QString m_newName; - KLineEdit* m_lineEdit; + QLineEdit* m_lineEdit; KFileItemList m_items; bool m_allExtensionsDifferent; KIntSpinBox* m_spinBox; -- 2.47.3