KLineEdit to QLineEdit

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 637d46a015246a31def8c4510de27ca3ff86ca5c..81aa1e81062bb263b8fac90cc4c82cf5801f2c9b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -53,7 +53,7 @@
 #include <kdualaction.h>
 #include <KDialog>
 #include <KJobWidgets>
 #include <kdualaction.h>
 #include <KDialog>
 #include <KJobWidgets>

-#include <KLineEdit>
+#include <QLineEdit>

 #include <KToolBar>
 #include <KIO/NetAccess>
 #include <KIO/JobUiDelegate>
 #include <KToolBar>
 #include <KIO/NetAccess>
 #include <KIO/JobUiDelegate>

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 4a43dbd23944027f1c955dddbb812e719b1dd6cf..82d5f549ea87d6b3ea458b3a46f2c342261d105b 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -27,7 +27,7 @@
 
 #include <QIcon>
 #include <KLocalizedString>
 
 #include <QIcon>
 #include <KLocalizedString>

-#include <KLineEdit>
+#include <QLineEdit>

 
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)
 
 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
     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->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);
 
             this, &FilterBar::filterChanged);
     setFocusProxy(m_filterInput);
 

diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h
index dd9b8b8bb9626209e2dbf1c046cdea9bf2f0278a..a275d1ea4cf114c96216ef9e40d2bc9aa76dd4b9 100644 (file)
--- a/src/filterbar/filterbar.h
+++ b/src/filterbar/filterbar.h
@@ -24,7 +24,7 @@
 
 #include <QWidget>
 
 
 #include <QWidget>
 

-class KLineEdit;
+class QLineEdit;

 class QToolButton;
 
 /**
 class QToolButton;
 
 /**


@@ -78,7 +78,7 @@ protected:
     virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
 
 private:
     virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE;
 
 private:

-    KLineEdit* m_filterInput;
+    QLineEdit* m_filterInput;

     QToolButton* m_lockButton;
 };
 
     QToolButton* m_lockButton;
 };
 

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 59085e4745886c064b04f9650d64e684dae4b062..93a4d21f40ef25fc390ccc858a099a10dce583b4 100644 (file)
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -28,7 +28,6 @@
 #include <KFile>
 #include <KGlobal>
 #include <KIconButton>
 #include <KFile>
 #include <KGlobal>
 #include <KIconButton>

-#include <KLineEdit>

 #include <KLocalizedString>
 #include <QMimeDatabase>
 #include <KUrlRequester>
 #include <KLocalizedString>
 #include <QMimeDatabase>
 #include <KUrlRequester>


@@ -39,6 +38,7 @@
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
 #include <QPushButton>

+#include <QLineEdit>

 
 PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
     QDialog(parent),
 
 PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
     QDialog(parent),


@@ -137,17 +137,17 @@ void PlacesItemEditDialog::initialize()
     QFormLayout* formLayout = new QFormLayout();
     vBox->addLayout( formLayout );
 
     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);
     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));
 
     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);
 
     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 f2bba546bf45cf3c86c63850eca7d0cf77ba1f58..8a0dc0471ff7437914c2572059b67aa5b10f88b2 100644 (file)
--- a/src/panels/places/placesitemeditdialog.h
+++ b/src/panels/places/placesitemeditdialog.h
@@ -28,8 +28,8 @@
 #include <QUrl>
 
 class KIconButton;
 #include <QUrl>
 
 class KIconButton;

-class KLineEdit;

 class KUrlRequester;
 class KUrlRequester;

+class QLineEdit;

 class QCheckBox;
 class QPushButton;
 
 class QCheckBox;
 class QPushButton;
 


@@ -69,7 +69,7 @@ private:
     bool m_allowGlobal;
 
     KUrlRequester* m_urlEdit;
     bool m_allowGlobal;
 
     KUrlRequester* m_urlEdit;

-    KLineEdit* m_textEdit;
+    QLineEdit* m_textEdit;

     KIconButton* m_iconButton;
     QCheckBox* m_appLocal;
     QPushButton *m_okButton;
     KIconButton* m_iconButton;
     QCheckBox* m_appLocal;
     QPushButton *m_okButton;

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 65d35539cb7a84528072cbb18bcdf9c7ed98eafc..fe298312f7ac7d6a9a84e66dbdbb527e18bdd6b4 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -23,7 +23,7 @@
 #include "dolphinfacetswidget.h"
 
 #include <QIcon>
 #include "dolphinfacetswidget.h"
 
 #include <QIcon>

-#include <KLineEdit>
+#include <QLineEdit>

 #include <KLocalizedString>
 #include <KSeparator>
 
 #include <KLocalizedString>
 #include <KSeparator>
 


@@ -346,13 +346,13 @@ void DolphinSearchBox::init()
     connect(m_searchInput, &Baloo::QueryBuilder::textChanged,
             this, &DolphinSearchBox::slotSearchTextChanged);
 #else
     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->installEventFilter(this);

-    m_searchInput->setClearButtonShown(true);
+    m_searchInput->setClearButtonEnabled(true);

     m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));
     m_searchInput->setFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont));

-    connect(m_searchInput, &KLineEdit::returnPressed,
+    connect(m_searchInput, &QLineEdit::returnPressed,

             this, &DolphinSearchBox::slotReturnPressed);
             this, &DolphinSearchBox::slotReturnPressed);

-    connect(m_searchInput, &KLineEdit::textChanged,
+    connect(m_searchInput, &QLineEdit::textChanged,

             this, &DolphinSearchBox::slotSearchTextChanged);
 #endif
     setFocusProxy(m_searchInput);
             this, &DolphinSearchBox::slotSearchTextChanged);
 #endif
     setFocusProxy(m_searchInput);

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index b4ca9ac2c8a377217bf1fbbe65906740050c53f8..f7bcbc68500afd7abae21ccd8eaffe51fc5120e5 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -27,7 +27,7 @@
 #include <KDialog>
 #include <KFileDialog>
 #include <KLocalizedString>
 #include <KDialog>
 #include <KFileDialog>
 #include <KLocalizedString>

-#include <KLineEdit>
+#include <QLineEdit>

 #include <KMessageBox>
 #include <KVBox>
 
 #include <KMessageBox>
 #include <KVBox>
 


@@ -61,8 +61,8 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     homeUrlBox->setSpacing(spacing);
 
     new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
     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);
 
 
     QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme("folder-open"), QString(), homeUrlBox);
 


@@ -102,7 +102,7 @@ StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
 
     loadSettings();
 
 
     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);
     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 aeb5d6333e2f18b4e8d36429a57b1d68ca5e7770..9bcc3113171bbef5b5fdae186254a5bbe383cec0 100644 (file)
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -22,7 +22,7 @@
 #include <settings/settingspagebase.h>
 #include <QUrl>
 
 #include <settings/settingspagebase.h>
 #include <QUrl>
 

-class KLineEdit;
+class QLineEdit;

 class QCheckBox;
 
 /**
 class QCheckBox;
 
 /**


@@ -56,7 +56,7 @@ private:
 
 private:
     QUrl m_url;
 
 private:
     QUrl m_url;

-    KLineEdit* m_homeUrl;
+    QLineEdit* m_homeUrl;

 
     QCheckBox* m_splitView;
     QCheckBox* m_editableUrl;
 
     QCheckBox* m_splitView;
     QCheckBox* m_editableUrl;

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 7fdb486e1a7734f14c8154169474be1441c41458..c5001af08c782fdbb4d9435bc4f245255f32a0a9 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -19,7 +19,6 @@
 
 #include "renamedialog.h"
 
 
 #include "renamedialog.h"
 

-#include <KLineEdit>

 #include <KLocalizedString>
 #include <KJobWidgets>
 #include <KIO/CopyJob>
 #include <KLocalizedString>
 #include <KJobWidgets>
 #include <KIO/CopyJob>


@@ -35,6 +34,7 @@
 #include <QMimeDatabase>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QMimeDatabase>
 #include <QDialogButtonBox>
 #include <QPushButton>

+#include <QLineEdit>

 #include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 #include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :


@@ -88,9 +88,9 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
                                page);
     }
 
                                page);
     }
 

-    m_lineEdit = new KLineEdit(page);
+    m_lineEdit = new QLineEdit(page);

     mainLayout->addWidget(m_lineEdit);
     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) {
 
     int selectionLength = m_newName.length();
     if (m_renameOneItem) {

diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index 045161ae4c6bee5896dbb91a34539c1b587f052f..86318c5c4b3ddd329a1c2d598e264c5818a17284 100644 (file)
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -24,11 +24,11 @@
 
 #include <QDialog>
 #include <KFileItem>
 
 #include <QDialog>
 #include <KFileItem>

+#include <QString>

 
 

-class KLineEdit;
+class QLineEdit;

 class KIntSpinBox;
 class QPushButton;
 class KIntSpinBox;
 class QPushButton;

-#include <QString>

 
 /**
  * @brief Dialog for renaming a variable number of files.
 
 /**
  * @brief Dialog for renaming a variable number of files.


@@ -61,7 +61,7 @@ private:
 private:
     bool m_renameOneItem;
     QString m_newName;
 private:
     bool m_renameOneItem;
     QString m_newName;

-    KLineEdit* m_lineEdit;
+    QLineEdit* m_lineEdit;

     KFileItemList m_items;
     bool m_allExtensionsDifferent;
     KIntSpinBox* m_spinBox;
     KFileItemList m_items;
     bool m_allExtensionsDifferent;
     KIntSpinBox* m_spinBox;