Port to QDebug*. KVBox--

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 32d3903317adf346f43a892d9078e0f42d93e2ae..f5535a6532af4b0ebd1657e224fab35d3595c567 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -24,7 +24,7 @@
 #include "kfileitemmodel.h"
 #include "private/kpixmapmodifier.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <QIcon>
 #include <KIconLoader>
 

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index a304ea69c9ae8c2ca0f46123bfb118a37eed44ba..8b2c761551f36757ce790d63b40305983bfed56c 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -22,7 +22,7 @@
 #include "kitemlistview.h"
 
 #include <kmimetype.h>
-#include <KDebug>
+#include <QDebug>
 #include <KLocale>
 #include <KIO/MetaData>
 #include <QDateTime>

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 2353f106f190f43eb9de5dc2d721d39b7117fedb..df521e2fc5950e0a8c203e06f79e1b300ba09659 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -23,7 +23,7 @@
 
 #include <KConfig>
 #include <KConfigGroup>
-#include <KDebug>
+#include <QDebug>
 #include <KFileItem>
 #include <KIconLoader>
 #include <KJobWidgets>

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 46ac4745e70fa6ab9c3825fe7e6b5f67ed7846e7..6e995c25dbb3e7239ef10a4a90eff377c251b0bd 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -35,7 +35,7 @@
 #include <QStyle>
 #include <QStyleOption>
 
-#include <KDebug>
+#include <QDebug>
 
 /**
  * Replaces the default viewport of KItemListContainer by a

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 1cd06c7e16bba77860ae600d31310512151bb74e..812d1c94990ca5252ab585e0640f333f76b7a358 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -24,7 +24,7 @@
 #include "kitemlistcontroller.h"
 
 #include <KGlobalSettings>
-#include <KDebug>
+#include <QDebug>
 
 #include "kitemlistview.h"
 #include "kitemlistselectionmanager.h"

diff --git a/src/kitemviews/kitemlistgroupheader.cpp b/src/kitemviews/kitemlistgroupheader.cpp
index accaf9ecff3d1684d97e367ba4acc60fe5e9ec62..687d6ea3af772d3c4d6317f8fb145dd93758ec5e 100644 (file)
--- a/src/kitemviews/kitemlistgroupheader.cpp
+++ b/src/kitemviews/kitemlistgroupheader.cpp
@@ -27,7 +27,7 @@
 #include <QGraphicsSceneResizeEvent>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
-#include <KDebug>
+#include <QDebug>
 
 KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) :
     QGraphicsWidget(parent, 0),

diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index ba524a6bf4b72023ee3ad73b3c9fc9543d603da6..2057f56219075f2046f9806719299119a0665627 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -24,7 +24,7 @@
 #include "kitemlistselectionmanager.h"
 
 #include "kitemmodelbase.h"
-#include <KDebug>
+#include <QDebug>
 
 KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
     QObject(parent),

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index ea1ec3f3a5f09054389724e6bb4887da1085535d..0d0304afcb5accd3221881986ffe360280147342 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -22,7 +22,7 @@
 
 #include "kitemlistview.h"
 
-#include <KDebug>
+#include <QDebug>
 #include "kitemlistcontainer.h"
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
@@ -41,6 +41,7 @@
 #include <QStyle>
 #include <QStyleOptionRubberBand>
 #include <QTimer>
+#include <QElapsedTimer>
 
 #include <algorithm>
 
@@ -542,7 +543,7 @@ void KItemListView::endTransaction()
     --m_activeTransactions;
     if (m_activeTransactions < 0) {
         m_activeTransactions = 0;
-        kWarning() << "Mismatch between beginTransaction()/endTransaction()";
+        qWarning() << "Mismatch between beginTransaction()/endTransaction()";
     }
 
     if (m_activeTransactions == 0) {
@@ -1005,7 +1006,7 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
         const int index = range.index + previouslyInsertedCount;
         const int count = range.count;
         if (index < 0 || count <= 0) {
-            kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
+            qWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
             continue;
         }
         previouslyInsertedCount += count;
@@ -1113,7 +1114,7 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
         const int index = range.index;
         const int count = range.count;
         if (index < 0 || count <= 0) {
-            kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
+            qWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
             continue;
         }
 

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 8efa60fff64c3b8d8d0c7f4ae229c140970f8e5c..6345aaf50eed485bd41e41eb05f3943954c11e65 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -31,7 +31,7 @@
 #include <qgraphicsscene.h>
 #include <qgraphicsview.h>
 
-#include <KDebug>
+#include <QDebug>
 #include <QHash>
 
 KItemListView* KItemListViewAccessible::view() const

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index df19d49b12f537a304cafb9dd1f09114ba4871f9..db60cecdb38fdc28502a1bea52720bfdf6df4e4b 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -27,7 +27,7 @@
 
 #include "private/kitemlistselectiontoggle.h"
 
-#include <KDebug>
+#include <QDebug>
 
 #include <KGlobalSettings>
 #include <QApplication>

diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp
index 6cb5b049b45b4095bc6e28e9e7469abceaaa2830..d1897152844ac0ad0f7243d76b12d5a4de8fcfc4 100644 (file)
--- a/src/kitemviews/kstandarditem.cpp
+++ b/src/kitemviews/kstandarditem.cpp
@@ -19,7 +19,7 @@
 
 #include "kstandarditem.h"
 
-#include <KDebug>
+#include <QDebug>
 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :

diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index 1c07d53278ea1f643e9b24f714e600e2e827cd08..4ef5bed0933ea3956c39ce941a43f79f73b8a802 100644 (file)
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -19,7 +19,7 @@
 
 #include "kstandarditemlistview.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <KIconLoader>
 #include "kstandarditemlistwidget.h"
 #include "kstandarditemlistgroupheader.h"

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index ec48f19db25d93ae3fea6b05a438b00928fb772d..8d8691bb0db58e8bf50e0d3a365df8237c30adec 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -27,7 +27,7 @@
 #include <KIconLoader>
 #include <kratingpainter.h>
 #include <KStringHandler>
-#include <KDebug>
+#include <QDebug>
 
 #include "private/kfileitemclipboard.h"
 #include "private/kitemlistroleeditor.h"

diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index 060440aecbe75d4a292d36a4733f628301302b38..efbb40adcdaa20400bce01a0993bc1061d01863a 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -19,7 +19,7 @@
 
 #include "kstandarditemmodel.h"
 
-#include <KDebug>
+#include <QDebug>
 #include "kstandarditem.h"
 
 KStandardItemModel::KStandardItemModel(QObject* parent) :

diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 5ca56c58b34c2ab350ed6e50de27bc763ef77084..98e867582b4dde735d6d938644d456f8d3dfa54c 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -20,7 +20,7 @@
 
 #include "kbaloorolesprovider.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <KGlobal>
 #include <KLocalizedString>
 

diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index e820bd7892b142032172be04a366828c1c4e9e96..403d503b7f46dfe2f7048bfe17938451784174e1 100644 (file)
--- a/src/kitemviews/private/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -26,7 +26,7 @@
 #include <QPainter>
 #include <QStyleOptionHeader>
 
-#include <KDebug>
+#include <QDebug>
 
 KItemListHeaderWidget::KItemListHeaderWidget(QGraphicsWidget* parent) :
     QGraphicsWidget(parent),

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index 6e7e89c171d3f835614e27bb07fc7bd960dfd88c..dfa211cc0d38a05485aa1501302c419673bf5be4 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -19,7 +19,7 @@
 
 #include "kitemlistroleeditor.h"
 
-#include <KDebug>
+#include <QDebug>
 #include <kio/global.h>
 #include <QKeyEvent>
 

diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index 4daa55f9a9551f00656234a314545dc873843e41..8b5033b883d6ed748a67dab0d1e34d55e6aaf22b 100644 (file)
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -22,7 +22,7 @@
 #include <KIconLoader>
 #include <QPainter>
 
-#include <KDebug>
+#include <QDebug>
 
 KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
     QGraphicsWidget(parent, 0),

diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index 24eea0cefb8bbf75527920c947fd0e218eb0a502..697d3f5262579484d9d2488afcdc94ed7b0b5264 100644 (file)
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -25,7 +25,7 @@
 #include <QScrollBar>
 #include <QWheelEvent>
 
-#include <KDebug>
+#include <QDebug>
 
 KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
                                                  QObject* parent) :

diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
index 336ba38adb702f4caaa8c46a24633e285c2df76c..955eac6034110a313e92b176c1722a52caf0229e 100644 (file)
--- a/src/kitemviews/private/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -21,7 +21,7 @@
 
 #include <kitemviews/kitemlistview.h>
 
-#include <KDebug>
+#include <QDebug>
 #include <KGlobalSettings>
 
 #include <QGraphicsWidget>

diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 29aceb66b65a9521ec986ec6fc506684f4efc2aa..fff8fd6603a3e33e8750f8d6f37cbb6b52a7105f 100644 (file)
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -39,7 +39,7 @@
 #include <QPixmap>
 #include <QSize>
 
-#include <KDebug>
+#include <QDebug>
 
 #include <config-X11.h> // for HAVE_XRENDER
 #if defined(Q_WS_X11) && defined(HAVE_XRENDER)

diff --git a/src/settings/trash/trashsettingspage.cpp b/src/settings/trash/trashsettingspage.cpp
index bd01d56b5e54b110e90872bf02c76f638b7f8e76..aa4b5a22a573bbc97e49a16b59bc01e74359b8c3 100644 (file)
--- a/src/settings/trash/trashsettingspage.cpp
+++ b/src/settings/trash/trashsettingspage.cpp
@@ -21,7 +21,7 @@
 
 #include <KCModuleProxy>
 #include <KDialog>
-#include <KVBox>
+#include <QVBoxLayout>
 
 #include <QVBoxLayout>
 
@@ -31,8 +31,10 @@ TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
     const int spacing = KDialog::spacingHint();
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);
-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxVBoxLayout = new QVBoxLayout(vBox);
+    vBoxVBoxLayout->setMargin(0);
+    vBoxVBoxLayout->setSpacing(spacing);
 
     m_proxy = new KCModuleProxy("kcmtrash");
     topLayout->addWidget(m_proxy);
@@ -40,7 +42,9 @@ TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
-    new QWidget(vBox);
+    QWidget *w = new QWidget(vBox);
+    vBoxVBoxLayout->addWidget(w);
+    
     topLayout->addWidget(vBox);
 
     loadSettings();