[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/frameworks] utilities/queuemanager/basetools/decorate: KLineEdit -> QLineEdit
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2014-12-29 10:25:29
Message-ID: E1Y5XVx-0006Vg-A0 () scm ! kde ! org
[Download RAW message or body]

Git commit 1f826ba7b1f349a2e4a1f64bb864ab28b4eaa91d by Gilles Caulier.
Committed on 29/12/2014 at 10:25.
Pushed by cgilles into branch 'frameworks'.

KLineEdit -> QLineEdit

M  +5    -6    utilities/queuemanager/basetools/decorate/watermark.cpp

http://commits.kde.org/digikam/1f826ba7b1f349a2e4a1f64bb864ab28b4eaa91d

diff --git a/utilities/queuemanager/basetools/decorate/watermark.cpp \
b/utilities/queuemanager/basetools/decorate/watermark.cpp index 0ef713c..9b2f716 \
                100644
--- a/utilities/queuemanager/basetools/decorate/watermark.cpp
+++ b/utilities/queuemanager/basetools/decorate/watermark.cpp
@@ -41,15 +41,14 @@
 #include <QStyle>
 #include <QFontComboBox>
 #include <QComboBox>
+#include <QLineEdit>
 
 // KDE includes
 
 #include <kcolorbutton.h>
 #include <kurlrequester.h>
-#include <klineedit.h>
 #include <klocalizedstring.h>
 #include <kfiledialog.h>
-#include <kglobal.h>
 
 // Libkdcraw includes
 
@@ -111,7 +110,7 @@ public:
     QCheckBox*     useBackgroundCheckBox;
 
     KUrlRequester* imageFileUrlRequester;
-    KLineEdit*     textEdit;
+    QLineEdit*     textEdit;
 
     QComboBox*     comboBox;
     QFontComboBox* fontChooserWidget;
@@ -190,9 +189,9 @@ void WaterMark::registerSettingsWidget()
     d->textSettingsGroupBox->setLayout(textSettingsGroupBoxLayout);
 
     QLabel* const textEditLabel = new QLabel(vbox);
-    d->textEdit                 = new KLineEdit(vbox);
-    d->textEdit->setClearButtonShown(true);
-    d->textEdit->setClickMessage(i18n("Enter your watermark string here."));
+    d->textEdit                 = new QLineEdit(vbox);
+    d->textEdit->setClearButtonEnabled(true);
+    d->textEdit->setPlaceholderText(i18n("Enter your watermark string here."));
     textEditLabel->setText(i18n("Watermark text:"));
     textSettingsGroupBoxLayout->addWidget(textEditLabel);
     textSettingsGroupBoxLayout->addWidget(d->textEdit);


[prev in list] [next in list] [prev in thread] [next in thread]