mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Port to QDebug*. KVBox--
This commit is contained in:
parent
5ed011357c
commit
a76cb4c67f
|
@ -24,7 +24,7 @@
|
||||||
#include "kfileitemmodel.h"
|
#include "kfileitemmodel.h"
|
||||||
#include "private/kpixmapmodifier.h"
|
#include "private/kpixmapmodifier.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
#include <KIconLoader>
|
#include <KIconLoader>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "kitemlistview.h"
|
#include "kitemlistview.h"
|
||||||
|
|
||||||
#include <kmimetype.h>
|
#include <kmimetype.h>
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <KLocale>
|
#include <KLocale>
|
||||||
#include <KIO/MetaData>
|
#include <KIO/MetaData>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
#include <KConfig>
|
#include <KConfig>
|
||||||
#include <KConfigGroup>
|
#include <KConfigGroup>
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <KFileItem>
|
#include <KFileItem>
|
||||||
#include <KIconLoader>
|
#include <KIconLoader>
|
||||||
#include <KJobWidgets>
|
#include <KJobWidgets>
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
#include <QStyleOption>
|
#include <QStyleOption>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replaces the default viewport of KItemListContainer by a
|
* Replaces the default viewport of KItemListContainer by a
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "kitemlistcontroller.h"
|
#include "kitemlistcontroller.h"
|
||||||
|
|
||||||
#include <KGlobalSettings>
|
#include <KGlobalSettings>
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
#include "kitemlistview.h"
|
#include "kitemlistview.h"
|
||||||
#include "kitemlistselectionmanager.h"
|
#include "kitemlistselectionmanager.h"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <QGraphicsSceneResizeEvent>
|
#include <QGraphicsSceneResizeEvent>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QStyleOptionGraphicsItem>
|
#include <QStyleOptionGraphicsItem>
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) :
|
KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) :
|
||||||
QGraphicsWidget(parent, 0),
|
QGraphicsWidget(parent, 0),
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include "kitemlistselectionmanager.h"
|
#include "kitemlistselectionmanager.h"
|
||||||
|
|
||||||
#include "kitemmodelbase.h"
|
#include "kitemmodelbase.h"
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
|
KItemListSelectionManager::KItemListSelectionManager(QObject* parent) :
|
||||||
QObject(parent),
|
QObject(parent),
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include "kitemlistview.h"
|
#include "kitemlistview.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include "kitemlistcontainer.h"
|
#include "kitemlistcontainer.h"
|
||||||
#include "kitemlistcontroller.h"
|
#include "kitemlistcontroller.h"
|
||||||
#include "kitemlistheader.h"
|
#include "kitemlistheader.h"
|
||||||
|
@ -41,6 +41,7 @@
|
||||||
#include <QStyle>
|
#include <QStyle>
|
||||||
#include <QStyleOptionRubberBand>
|
#include <QStyleOptionRubberBand>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
#include <QElapsedTimer>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
@ -542,7 +543,7 @@ void KItemListView::endTransaction()
|
||||||
--m_activeTransactions;
|
--m_activeTransactions;
|
||||||
if (m_activeTransactions < 0) {
|
if (m_activeTransactions < 0) {
|
||||||
m_activeTransactions = 0;
|
m_activeTransactions = 0;
|
||||||
kWarning() << "Mismatch between beginTransaction()/endTransaction()";
|
qWarning() << "Mismatch between beginTransaction()/endTransaction()";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_activeTransactions == 0) {
|
if (m_activeTransactions == 0) {
|
||||||
|
@ -1005,7 +1006,7 @@ void KItemListView::slotItemsInserted(const KItemRangeList& itemRanges)
|
||||||
const int index = range.index + previouslyInsertedCount;
|
const int index = range.index + previouslyInsertedCount;
|
||||||
const int count = range.count;
|
const int count = range.count;
|
||||||
if (index < 0 || count <= 0) {
|
if (index < 0 || count <= 0) {
|
||||||
kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
|
qWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
previouslyInsertedCount += count;
|
previouslyInsertedCount += count;
|
||||||
|
@ -1113,7 +1114,7 @@ void KItemListView::slotItemsRemoved(const KItemRangeList& itemRanges)
|
||||||
const int index = range.index;
|
const int index = range.index;
|
||||||
const int count = range.count;
|
const int count = range.count;
|
||||||
if (index < 0 || count <= 0) {
|
if (index < 0 || count <= 0) {
|
||||||
kWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
|
qWarning() << "Invalid item range (index:" << index << ", count:" << count << ")";
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include <qgraphicsscene.h>
|
#include <qgraphicsscene.h>
|
||||||
#include <qgraphicsview.h>
|
#include <qgraphicsview.h>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
|
|
||||||
KItemListView* KItemListViewAccessible::view() const
|
KItemListView* KItemListViewAccessible::view() const
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#include "private/kitemlistselectiontoggle.h"
|
#include "private/kitemlistselectiontoggle.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
#include <KGlobalSettings>
|
#include <KGlobalSettings>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "kstandarditem.h"
|
#include "kstandarditem.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include "kstandarditemmodel.h"
|
#include "kstandarditemmodel.h"
|
||||||
|
|
||||||
KStandardItem::KStandardItem(KStandardItem* parent) :
|
KStandardItem::KStandardItem(KStandardItem* parent) :
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "kstandarditemlistview.h"
|
#include "kstandarditemlistview.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <KIconLoader>
|
#include <KIconLoader>
|
||||||
#include "kstandarditemlistwidget.h"
|
#include "kstandarditemlistwidget.h"
|
||||||
#include "kstandarditemlistgroupheader.h"
|
#include "kstandarditemlistgroupheader.h"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <KIconLoader>
|
#include <KIconLoader>
|
||||||
#include <kratingpainter.h>
|
#include <kratingpainter.h>
|
||||||
#include <KStringHandler>
|
#include <KStringHandler>
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
#include "private/kfileitemclipboard.h"
|
#include "private/kfileitemclipboard.h"
|
||||||
#include "private/kitemlistroleeditor.h"
|
#include "private/kitemlistroleeditor.h"
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "kstandarditemmodel.h"
|
#include "kstandarditemmodel.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include "kstandarditem.h"
|
#include "kstandarditem.h"
|
||||||
|
|
||||||
KStandardItemModel::KStandardItemModel(QObject* parent) :
|
KStandardItemModel::KStandardItemModel(QObject* parent) :
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include "kbaloorolesprovider.h"
|
#include "kbaloorolesprovider.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <KGlobal>
|
#include <KGlobal>
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QStyleOptionHeader>
|
#include <QStyleOptionHeader>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
KItemListHeaderWidget::KItemListHeaderWidget(QGraphicsWidget* parent) :
|
KItemListHeaderWidget::KItemListHeaderWidget(QGraphicsWidget* parent) :
|
||||||
QGraphicsWidget(parent),
|
QGraphicsWidget(parent),
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "kitemlistroleeditor.h"
|
#include "kitemlistroleeditor.h"
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <kio/global.h>
|
#include <kio/global.h>
|
||||||
#include <QKeyEvent>
|
#include <QKeyEvent>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include <KIconLoader>
|
#include <KIconLoader>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
|
KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) :
|
||||||
QGraphicsWidget(parent, 0),
|
QGraphicsWidget(parent, 0),
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <QScrollBar>
|
#include <QScrollBar>
|
||||||
#include <QWheelEvent>
|
#include <QWheelEvent>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
|
KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
|
||||||
QObject* parent) :
|
QObject* parent) :
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <kitemviews/kitemlistview.h>
|
#include <kitemviews/kitemlistview.h>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
#include <KGlobalSettings>
|
#include <KGlobalSettings>
|
||||||
|
|
||||||
#include <QGraphicsWidget>
|
#include <QGraphicsWidget>
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include <QPixmap>
|
#include <QPixmap>
|
||||||
#include <QSize>
|
#include <QSize>
|
||||||
|
|
||||||
#include <KDebug>
|
#include <QDebug>
|
||||||
|
|
||||||
#include <config-X11.h> // for HAVE_XRENDER
|
#include <config-X11.h> // for HAVE_XRENDER
|
||||||
#if defined(Q_WS_X11) && defined(HAVE_XRENDER)
|
#if defined(Q_WS_X11) && defined(HAVE_XRENDER)
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <KCModuleProxy>
|
#include <KCModuleProxy>
|
||||||
#include <KDialog>
|
#include <KDialog>
|
||||||
#include <KVBox>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
|
@ -31,8 +31,10 @@ TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
|
||||||
const int spacing = KDialog::spacingHint();
|
const int spacing = KDialog::spacingHint();
|
||||||
|
|
||||||
QVBoxLayout* topLayout = new QVBoxLayout(this);
|
QVBoxLayout* topLayout = new QVBoxLayout(this);
|
||||||
KVBox* vBox = new KVBox(this);
|
QWidget* vBox = new QWidget(this);
|
||||||
vBox->setSpacing(spacing);
|
QVBoxLayout *vBoxVBoxLayout = new QVBoxLayout(vBox);
|
||||||
|
vBoxVBoxLayout->setMargin(0);
|
||||||
|
vBoxVBoxLayout->setSpacing(spacing);
|
||||||
|
|
||||||
m_proxy = new KCModuleProxy("kcmtrash");
|
m_proxy = new KCModuleProxy("kcmtrash");
|
||||||
topLayout->addWidget(m_proxy);
|
topLayout->addWidget(m_proxy);
|
||||||
|
@ -40,7 +42,9 @@ TrashSettingsPage::TrashSettingsPage(QWidget* parent) :
|
||||||
// Add a dummy widget with no restriction regarding
|
// Add a dummy widget with no restriction regarding
|
||||||
// a vertical resizing. This assures that the dialog layout
|
// a vertical resizing. This assures that the dialog layout
|
||||||
// is not stretched vertically.
|
// is not stretched vertically.
|
||||||
new QWidget(vBox);
|
QWidget *w = new QWidget(vBox);
|
||||||
|
vBoxVBoxLayout->addWidget(w);
|
||||||
|
|
||||||
topLayout->addWidget(vBox);
|
topLayout->addWidget(vBox);
|
||||||
|
|
||||||
loadSettings();
|
loadSettings();
|
||||||
|
|
Loading…
Reference in a new issue