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

List:       kde-commits
Subject:    [gwenview] lib: --kdelibs4support
From:       Lukáš Tinkl <lukas () kde ! org>
Date:       2014-10-31 21:28:18
Message-ID: E1XkJk2-0008DH-Fw () scm ! kde ! org
[Download RAW message or body]

Git commit 430fb9045967abe9352870675dd74ccd556b4db1 by Lukáš Tinkl.
Committed on 31/10/2014 at 20:49.
Pushed by lukas into branch 'master'.

--kdelibs4support

M  +6    -6    lib/crop/cropwidget.cpp
M  +2    -14   lib/crop/cropwidget.ui
M  +1    -1    lib/document/document.cpp
M  +1    -14   lib/print/printoptionspage.ui
M  +1    -8    lib/redeyereduction/redeyereductionwidget.ui

http://commits.kde.org/gwenview/430fb9045967abe9352870675dd74ccd556b4db1

diff --git a/lib/crop/cropwidget.cpp b/lib/crop/cropwidget.cpp
index 0b9fda0..2e5cf04 100644
--- a/lib/crop/cropwidget.cpp
+++ b/lib/crop/cropwidget.cpp
@@ -26,11 +26,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \
02110-1301, USA.  #include <QPushButton>
 #include <QtMath>
 #include <QDebug>
+#include <QLineEdit>
 
 // KDE
 #include <KDialog>
 #include <KGlobalSettings>
-#include <KLineEdit>
 #include <KLocalizedString>
 
 // Local
@@ -157,11 +157,11 @@ struct CropWidgetPrivate : public Ui_CropWidget
         ratioComboBox->setMaxVisibleItems(ratioComboBox->count());
         ratioComboBox->clearEditText();
 
-        KLineEdit* edit = qobject_cast<KLineEdit*>(ratioComboBox->lineEdit());
+        QLineEdit* edit = qobject_cast<QLineEdit*>(ratioComboBox->lineEdit());
         Q_ASSERT(edit);
         // Do not use i18n("%1:%2") because ':' should not be translated, it is
         // used to parse the ratio string.
-        edit->setClickMessage(QString("%1:%2").arg(i18n("Width")).arg(i18n("Height")));
 +        edit->setPlaceholderText(QString("%1:%2").arg(i18n("Width")).arg(i18n("Height")));
  }
 
     QRect cropRect() const
@@ -190,8 +190,8 @@ struct CropWidgetPrivate : public Ui_CropWidget
         cropButton->setIcon(QIcon::fromTheme("transform-crop-and-resize"));
         cropButton->setText(i18n("Crop"));
 
-        QObject::connect(dialogButtonBox, &KDialogButtonBox::accepted, q, \
                &CropWidget::cropRequested);
-        QObject::connect(dialogButtonBox, &KDialogButtonBox::rejected, q, \
&CropWidget::done); +        QObject::connect(dialogButtonBox, \
&QDialogButtonBox::accepted, q, &CropWidget::cropRequested); +        \
QObject::connect(dialogButtonBox, &QDialogButtonBox::rejected, q, &CropWidget::done); \
}  };
 
@@ -225,7 +225,7 @@ CropWidget::CropWidget(QWidget* parent, RasterImageView* \
imageView, CropTool* cr  
     d->initDialogButtonBox();
 
-    connect(d->ratioComboBox, &KComboBox::editTextChanged, this, \
&CropWidget::slotRatioComboBoxEditTextChanged); +    connect(d->ratioComboBox, \
&QComboBox::editTextChanged, this, &CropWidget::slotRatioComboBoxEditTextChanged);  
     // Don't do this before signals are connected, otherwise the tool won't get
     // initialized
diff --git a/lib/crop/cropwidget.ui b/lib/crop/cropwidget.ui
index efa5cf5..283a007 100644
--- a/lib/crop/cropwidget.ui
+++ b/lib/crop/cropwidget.ui
@@ -63,7 +63,7 @@
        </widget>
       </item>
       <item>
-       <widget class="KComboBox" name="ratioComboBox">
+       <widget class="QComboBox" name="ratioComboBox">
         <property name="editable">
          <bool>true</bool>
         </property>
@@ -161,7 +161,7 @@
     </spacer>
    </item>
    <item>
-    <widget class="KDialogButtonBox" name="dialogButtonBox">
+    <widget class="QDialogButtonBox" name="dialogButtonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
@@ -169,18 +169,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KDialogButtonBox</class>
-   <extends>QDialogButtonBox</extends>
-   <header>kdialogbuttonbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>ratioComboBox</tabstop>
   <tabstop>leftSpinBox</tabstop>
diff --git a/lib/document/document.cpp b/lib/document/document.cpp
index 570bd47..0ed83cf 100644
--- a/lib/document/document.cpp
+++ b/lib/document/document.cpp
@@ -129,7 +129,7 @@ void DocumentPrivate::downSampleImage(int invertedZoom)
         mDownSampledImageMap[invertedZoom] = mImage;
     }
     q->downSampledImageReady();
-};
+}
 
 //- DownSamplingJob ---------------------------------------
 void DownSamplingJob::doStart()
diff --git a/lib/print/printoptionspage.ui b/lib/print/printoptionspage.ui
index 3759843..6ccd02f 100644
--- a/lib/print/printoptionspage.ui
+++ b/lib/print/printoptionspage.ui
@@ -173,7 +173,7 @@
          </widget>
         </item>
         <item row="0" column="4">
-         <widget class="KComboBox" name="kcfg_PrintUnit">
+         <widget class="QComboBox" name="kcfg_PrintUnit">
           <property name="enabled">
            <bool>false</bool>
           </property>
@@ -263,19 +263,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KComboBox</class>
-   <extends>QComboBox</extends>
-   <header>kcombobox.h</header>
-  </customwidget>
- </customwidgets>
- <includes>
-  <include location="local">kcombobox.h</include>
-  <include location="local">knuminput.h</include>
-  <include location="local">knuminput.h</include>
-  <include location="local">kcombobox.h</include>
- </includes>
  <resources/>
  <connections>
   <connection>
diff --git a/lib/redeyereduction/redeyereductionwidget.ui \
b/lib/redeyereduction/redeyereductionwidget.ui index 04645b1..85a3c8b 100644
--- a/lib/redeyereduction/redeyereductionwidget.ui
+++ b/lib/redeyereduction/redeyereductionwidget.ui
@@ -67,7 +67,7 @@
     </widget>
    </item>
    <item>
-    <widget class="KDialogButtonBox" name="dialogButtonBox">
+    <widget class="QDialogButtonBox" name="dialogButtonBox">
      <property name="standardButtons">
       <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
      </property>
@@ -75,13 +75,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>KDialogButtonBox</class>
-   <extends>QDialogButtonBox</extends>
-   <header>kdialogbuttonbox.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>


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