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

List:       kde-commits
Subject:    [koffice] libs/widgets: Revert KCombobox change.
From:       "Dr.Robert Marmorstein" <robert () narnia ! homeunix ! com>
Date:       2011-07-23 19:50:00
Message-ID: 20110723195000.2681DA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 5192212e862f235925761da5862aca23dd379b4c by Dr. Robert Marmorstein.
Committed on 23/07/2011 at 21:49.
Pushed by robertm into branch 'master'.

Revert KCombobox change.

This introduced an infinite recursion, since the KComboBox emits an
event caught by the very function that emits it!

M  +3    -3    libs/widgets/KoZoomInput.cpp

http://commits.kde.org/koffice/5192212e862f235925761da5862aca23dd379b4c

diff --git a/libs/widgets/KoZoomInput.cpp b/libs/widgets/KoZoomInput.cpp
index fc6ea75..d2a9157 100644
--- a/libs/widgets/KoZoomInput.cpp
+++ b/libs/widgets/KoZoomInput.cpp
@@ -20,7 +20,7 @@
 
 #include <KDE/KDebug>
 #include <KDE/KLocale>
-#include <KDE/KComboBox>
+#include <QtGui/QComboBox>
 
 #include <QtGui/QLabel>
 #include <QtGui/QHBoxLayout>
@@ -36,7 +36,7 @@
 class KoZoomInput::Private
 {
     public:
-        KComboBox* combo;
+        QComboBox* combo;
         QLabel* label;
         bool inside;
 };
@@ -69,7 +69,7 @@ KoZoomInput::KoZoomInput(QWidget* parent)
     icon->setPixmap(pixmap);
     layout->addWidget(icon);
     addWidget(first);
-    d->combo = new KComboBox(this);
+    d->combo = new QComboBox(this);
     d->combo->setMaxVisibleItems(15);
     d->combo->setEditable(true);
     d->combo->installEventFilter(this);

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