[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kde-baseapps/frameworks] konqueror/src: kdebug->qdebug
From: David Faure <faure () kde ! org>
Date: 2016-04-30 10:07:06
Message-ID: E1awRnm-0005xm-4y () scm ! kde ! org
[Download RAW message or body]
Git commit 20ca480160f42fd610601056e461ebbfd646473a by David Faure.
Committed on 30/04/2016 at 09:57.
Pushed by dfaure into branch 'frameworks'.
kdebug->qdebug
M +2 -2 konqueror/src/KonqMainWindowAdaptor.cpp
M +4 -4 konqueror/src/KonquerorAdaptor.cpp
M +1 -1 konqueror/src/delayedinitializer.cpp
M +2 -2 konqueror/src/konq_statusbarmessagelabel.cpp
M +4 -4 konqueror/src/konqactions.cpp
M +3 -3 konqueror/src/konqbookmarkbar.cpp
M +7 -7 konqueror/src/konqcombo.cpp
M +1 -1 konqueror/src/konqextensionmanager.cpp
M +11 -11 konqueror/src/konqfactory.cpp
M +9 -9 konqueror/src/konqframe.cpp
M +10 -10 konqueror/src/konqframecontainer.cpp
M +2 -2 konqueror/src/konqframestatusbar.cpp
M +3 -3 konqueror/src/konqguiclients.cpp
M +3 -3 konqueror/src/konqhistorymanager.cpp
M +5 -12 konqueror/src/konqhistorysettings.cpp
M +1 -1 konqueror/src/konqhistoryview.cpp
M +5 -5 konqueror/src/konqmain.cpp
M +96 -96 konqueror/src/konqmainwindow.cpp
M +2 -2 konqueror/src/konqmisc.cpp
M +3 -3 konqueror/src/konqprofiledlg.cpp
M +6 -6 konqueror/src/konqrun.cpp
M +1 -1 konqueror/src/konqsessiondlg.cpp
M +4 -4 konqueror/src/konqsessionmanager.cpp
M +4 -4 konqueror/src/konqsettings.cpp
M +13 -13 konqueror/src/konqtabs.cpp
M +1 -1 konqueror/src/konqundomanager.cpp
M +42 -42 konqueror/src/konqview.cpp
M +81 -81 konqueror/src/konqviewmanager.cpp
http://commits.kde.org/kde-baseapps/20ca480160f42fd610601056e461ebbfd646473a
diff --git a/konqueror/src/KonqMainWindowAdaptor.cpp \
b/konqueror/src/KonqMainWindowAdaptor.cpp index 8d2a719..575e5a2 100644
--- a/konqueror/src/KonqMainWindowAdaptor.cpp
+++ b/konqueror/src/KonqMainWindowAdaptor.cpp
@@ -22,7 +22,7 @@
#include "KonqViewAdaptor.h"
#include "konqview.h"
-#include <kdebug.h>
+#include <QDebug>
#include <kstartupinfo.h>
KonqMainWindowAdaptor::KonqMainWindowAdaptor(KonqMainWindow *mainWindow)
@@ -69,7 +69,7 @@ void KonqMainWindowAdaptor::reload()
QDBusObjectPath KonqMainWindowAdaptor::currentView()
{
- kDebug();
+ qDebug();
KonqView *view = m_pMainWindow->currentView();
if (!view) {
return QDBusObjectPath();
diff --git a/konqueror/src/KonquerorAdaptor.cpp b/konqueror/src/KonquerorAdaptor.cpp
index 08d2ed0..ed32937 100644
--- a/konqueror/src/KonquerorAdaptor.cpp
+++ b/konqueror/src/KonquerorAdaptor.cpp
@@ -28,7 +28,7 @@
#include "konqsettings.h"
#include <kapplication.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kwindowsystem.h>
#include <QtCore/QFile>
@@ -112,7 +112,7 @@ QDBusObjectPath \
KonquerorAdaptor::createBrowserWindowFromProfile(const QString & #ifdef Q_WS_X11
QX11Info::setAppUserTime(0);
#endif
- kDebug() << path << "," << filename;
+ qDebug() << path << "," << filename;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile(path, filename);
if (!res) {
return QDBusObjectPath("/");
@@ -230,10 +230,10 @@ bool KonquerorAdaptor::processCanBeReused(int screen)
return true;
}
foreach (KonqMainWindow *window, *windows) {
- kDebug() << "processCanBeReused: count=" << window->viewCount();
+ qDebug() << "processCanBeReused: count=" << window->viewCount();
const KonqMainWindow::MapViews &views = window->viewMap();
foreach (KonqView *view, views) {
- kDebug() << "processCanBeReused: part=" << view->service()->entryPath() \
<< ", URL=" << view->url(); + qDebug() << "processCanBeReused: part=" << \
view->service()->entryPath() << ", URL=" << view->url(); if \
(!allowed_parts.contains(view->service()->entryPath())) { return false;
}
diff --git a/konqueror/src/delayedinitializer.cpp \
b/konqueror/src/delayedinitializer.cpp index 73cb1ac..31275ad 100644
--- a/konqueror/src/delayedinitializer.cpp
+++ b/konqueror/src/delayedinitializer.cpp
@@ -19,7 +19,7 @@
#include "delayedinitializer.h"
#include <QtCore/QTimer>
-#include <kdebug.h>
+#include <QDebug>
#include <QtCore/QEvent>
DelayedInitializer::DelayedInitializer(int eventType, QObject *parent)
diff --git a/konqueror/src/konq_statusbarmessagelabel.cpp \
b/konqueror/src/konq_statusbarmessagelabel.cpp index 9455a4b..2e52bae 100644
--- a/konqueror/src/konq_statusbarmessagelabel.cpp
+++ b/konqueror/src/konq_statusbarmessagelabel.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <QIcon>
#include <KLocalizedString>
-#include <kdebug.h>
+#include <QDebug>
#include <QFontMetrics>
#include <QPainter>
@@ -237,7 +237,7 @@ void KonqStatusBarMessageLabel::paintEvent(QPaintEvent * /* event \
*/)
// Vertical centering
const QRect textRect = QStyle::alignedRect(Qt::LeftToRight, Qt::AlignLeft | \
Qt::AlignVCenter, sz, availTextRect);
- //kDebug() << d->m_text << " sz=" << sz << textRect;
+ //qDebug() << d->m_text << " sz=" << sz << textRect;
// What about wordwrap here?
diff --git a/konqueror/src/konqactions.cpp b/konqueror/src/konqactions.cpp
index 793684e..030e8fd 100644
--- a/konqueror/src/konqactions.cpp
+++ b/konqueror/src/konqactions.cpp
@@ -23,7 +23,7 @@
#include "konqsettingsxt.h"
#include "konqpixmapprovider.h"
-#include <kdebug.h>
+#include <QDebug>
#include <QIcon>
#include <kmenu.h>
#include <kglobal.h>
@@ -43,7 +43,7 @@ void KonqActions::fillHistoryPopup(const QList<HistoryEntry *> \
&history, int his {
Q_ASSERT(popup); // kill me if this 0... :/
- //kDebug() << "fillHistoryPopup position: " << history.at();
+ //qDebug() << "fillHistoryPopup position: " << history.at();
int index = 0;
if (onlyBack || onlyForward) { // this if() is always true nowadays.
index += historyIndex; // Jump to current item
@@ -63,7 +63,7 @@ void KonqActions::fillHistoryPopup(const QList<HistoryEntry *> \
&history, int his
const QString iconName = \
KonqPixmapProvider::self()->iconNameFor(history[index]->url);
QAction *action = new QAction(QIcon::fromTheme(iconName), text, popup);
action->setData(index - historyIndex);
- //kDebug() << text << index - historyIndex;
+ //qDebug() << text << index - historyIndex;
popup->addAction(action);
if (++i > 10) {
break;
@@ -74,7 +74,7 @@ void KonqActions::fillHistoryPopup(const QList<HistoryEntry *> \
&history, int his ++index;
}
}
- //kDebug() << "After fillHistoryPopup position: " << history.at();
+ //qDebug() << "After fillHistoryPopup position: " << history.at();
}
///////////////////////////////
diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
index 53cf8f5..d35eaf1 100644
--- a/konqueror/src/konqbookmarkbar.cpp
+++ b/konqueror/src/konqbookmarkbar.cpp
@@ -30,7 +30,7 @@
#include <kactionmenu.h>
#include <kconfig.h>
#include <kglobal.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kconfiggroup.h>
#include <kio/global.h>
#include <kbookmarkmanager.h>
@@ -125,7 +125,7 @@ void KBookmarkBar::clear()
void KBookmarkBar::slotBookmarksChanged(const QString &group)
{
KBookmarkGroup tb = getToolbar(); // heavy for non cached toolbar version
- kDebug(7043) << "KBookmarkBar::slotBookmarksChanged( " << group << " )";
+ qDebug() << "KBookmarkBar::slotBookmarksChanged( " << group << " )";
if (tb.isNull()) {
return;
@@ -318,7 +318,7 @@ bool KBookmarkBar::eventFilter(QObject *, QEvent *e)
return false;
}
if (list.count() > 1)
- kWarning(7043) << "Sorry, currently you can only drop one address "
+ qWarning() << "Sorry, currently you can only drop one address "
"onto the bookmark bar!";
KBookmark toInsert = list.first();
diff --git a/konqueror/src/konqcombo.cpp b/konqueror/src/konqcombo.cpp
index 587d0d8..fc4d6fc 100644
--- a/konqueror/src/konqcombo.cpp
+++ b/konqueror/src/konqcombo.cpp
@@ -37,7 +37,7 @@
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kcompletionbox.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kiconloader.h>
#include <kicontheme.h>
#include <klineedit.h>
@@ -203,7 +203,7 @@ void KonqCombo::slotTextEdited(const QString &text)
void KonqCombo::setURL(const QString &url)
{
- //kDebug() << url << "returnPressed=" << m_returnPressed;
+ //qDebug() << url << "returnPressed=" << m_returnPressed;
setTemporary(url);
if (m_returnPressed) { // Really insert...
@@ -224,7 +224,7 @@ void KonqCombo::setTemporary(const QString &text)
void KonqCombo::setTemporary(const QString &url, const QPixmap &pix)
{
- //kDebug() << url << "temporary=" << temporary;
+ //qDebug() << url << "temporary=" << temporary;
// Insert a temporary item when we don't have one yet
if (count() == 0) {
@@ -242,7 +242,7 @@ void KonqCombo::setTemporary(const QString &url, const QPixmap \
&pix)
void KonqCombo::removeDuplicates(int index)
{
- //kDebug() << "starting index= " << index;
+ //qDebug() << "starting index= " << index;
QString url(temporaryItem());
if (url.endsWith('/')) {
@@ -265,7 +265,7 @@ void KonqCombo::removeDuplicates(int index)
// called via DBUS in all instances
void KonqCombo::insertPermanent(const QString &url)
{
- //kDebug() << "url=" << url;
+ //qDebug() << "url=" << url;
saveState();
setTemporary(url);
m_permanent = true;
@@ -286,7 +286,7 @@ void KonqCombo::applyPermanent()
QString item = temporaryItem();
insertItem(KonqPixmapProvider::self()->pixmapFor(item), item, 1, \
titleOfURL(item));
- //kDebug() << url;
+ //qDebug() << url;
// Remove all duplicates starting from index = 2
removeDuplicates(2);
@@ -312,7 +312,7 @@ void KonqCombo::updateItem(const QPixmap &pix, const QString &t, \
int index, cons return;
}
- // kDebug() << "item=" << t << "index=" << index;
+ // qDebug() << "item=" << t << "index=" << index;
setItemText(index, t);
setItemIcon(index, pix);
diff --git a/konqueror/src/konqextensionmanager.cpp \
b/konqueror/src/konqextensionmanager.cpp index ec78ef9..f94acde 100644
--- a/konqueror/src/konqextensionmanager.cpp
+++ b/konqueror/src/konqextensionmanager.cpp
@@ -23,7 +23,7 @@
// KDE
#include <kxmlguifactory.h>
#include <kconfig.h>
-#include <kdebug.h>
+#include <QDebug>
#include <KLocalizedString>
#include <kcomponentdata.h>
#include <kparts/plugin.h>
diff --git a/konqueror/src/konqfactory.cpp b/konqueror/src/konqfactory.cpp
index 1775695..e5ccff8 100644
--- a/konqueror/src/konqfactory.cpp
+++ b/konqueror/src/konqfactory.cpp
@@ -32,7 +32,7 @@
// KDE
#include <k4aboutdata.h>
-#include <kdebug.h>
+#include <QDebug>
#include <KLocalizedString>
#include <kmessagebox.h>
#include <kmimetypetrader.h>
@@ -70,7 +70,7 @@ KParts::ReadOnlyPart *KonqViewFactory::create(QWidget \
*parentWidget, QObject *pa
KParts::ReadOnlyPart *part = \
m_factory->create<KParts::ReadOnlyPart>(parentWidget, parent, QString(), m_args);
if (!part) {
- kError() << "No KParts::ReadOnlyPart created from" << m_libName;
+ qWarning() << "No KParts::ReadOnlyPart created from" << m_libName;
} else {
QFrame *frame = qobject_cast<QFrame *>(part->widget());
if (frame) {
@@ -102,7 +102,7 @@ KonqViewFactory KonqFactory::createView(const QString \
&serviceType, KService::List *appServiceOffers,
bool forceAutoEmbed)
{
- kDebug() << "Trying to create view for" << serviceType << serviceName;
+ qDebug() << "Trying to create view for" << serviceType << serviceName;
// We need to get those in any case
KService::List offers, appOffers;
@@ -129,7 +129,7 @@ KonqViewFactory KonqFactory::createView(const QString \
&serviceType,
if (! forceAutoEmbed) {
if (! KonqFMSettings::settings()->shouldEmbed(serviceType)) {
- kDebug() << "KonqFMSettings says: don't embed this servicetype";
+ qDebug() << "KonqFMSettings says: don't embed this servicetype";
return KonqViewFactory();
}
}
@@ -141,7 +141,7 @@ KonqViewFactory KonqFactory::createView(const QString \
&serviceType, KService::List::const_iterator it = offers.constBegin();
for (; it != offers.constEnd() && !service; ++it) {
if ((*it)->desktopEntryName() == serviceName) {
- kDebug() << "Found requested service" << serviceName;
+ qDebug() << "Found requested service" << serviceName;
service = *it;
}
}
@@ -149,7 +149,7 @@ KonqViewFactory KonqFactory::createView(const QString \
&serviceType,
KonqViewFactory viewFactory;
if (service) {
- kDebug() << "Trying to open lib for requested service " << \
service->desktopEntryName(); + qDebug() << "Trying to open lib for requested \
service " << service->desktopEntryName(); viewFactory = tryLoadingService(service);
// If this fails, then return an error.
// When looking for konq_sidebartng or konq_aboutpage, we don't want to end \
up @@ -160,13 +160,13 @@ KonqViewFactory KonqFactory::createView(const QString \
&serviceType, service = (*it);
// Allowed as default ?
QVariant prop = service->property("X-KDE-BrowserView-AllowAsDefault");
- kDebug() << service->desktopEntryName() << " : \
X-KDE-BrowserView-AllowAsDefault is valid : " << prop.isValid(); + \
qDebug() << service->desktopEntryName() << " : X-KDE-BrowserView-AllowAsDefault is \
valid : " << prop.isValid(); if (!prop.isValid() || prop.toBool()) { // defaults \
to true
- //kDebug() << "Trying to open lib for service " << service->name();
+ //qDebug() << "Trying to open lib for service " << service->name();
viewFactory = tryLoadingService(service);
// If this works, we exit the loop.
} else {
- kDebug() << "Not allowed as default " << \
service->desktopEntryName(); + qDebug() << "Not allowed as default " \
<< service->desktopEntryName(); }
}
}
@@ -177,9 +177,9 @@ KonqViewFactory KonqFactory::createView(const QString \
&serviceType,
if (viewFactory.isNull()) {
if (offers.isEmpty()) {
- kWarning() << "no part was associated with" << serviceType;
+ qWarning() << "no part was associated with" << serviceType;
} else {
- kWarning() << "no part could be loaded"; // full error was shown to \
user already + qWarning() << "no part could be loaded"; // full error \
was shown to user already }
return viewFactory;
}
diff --git a/konqueror/src/konqframe.cpp b/konqueror/src/konqframe.cpp
index fd10237..c655446 100644
--- a/konqueror/src/konqframe.cpp
+++ b/konqueror/src/konqframe.cpp
@@ -35,7 +35,7 @@
// KDE
#include <kactioncollection.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kiconloader.h>
#include <KLocalizedString>
#include <ksqueezedtextlabel.h>
@@ -89,7 +89,7 @@ KonqFrameBase::FrameType frameTypeFromString(const QString &str)
KonqFrame::KonqFrame(QWidget *parent, KonqFrameContainerBase *parentContainer)
: QWidget(parent)
{
- //kDebug() << "KonqFrame::KonqFrame()";
+ //qDebug() << "KonqFrame::KonqFrame()";
m_pLayout = 0L;
m_pView = 0L;
@@ -105,7 +105,7 @@ KonqFrame::KonqFrame(QWidget *parent, KonqFrameContainerBase \
*parentContainer)
KonqFrame::~KonqFrame()
{
- //kDebug() << this;
+ //qDebug() << this;
}
bool KonqFrame::isActivePart()
@@ -144,11 +144,11 @@ KParts::ReadOnlyPart *KonqFrame::attach(const KonqViewFactory \
&viewFactory) m_pPart = factory.create(this, 0);
if (!m_pPart) {
- kWarning() << "No part was created!";
+ qWarning() << "No part was created!";
return 0;
}
if (!m_pPart->widget()) {
- kWarning() << "The part" << m_pPart << "didn't create a widget!";
+ qWarning() << "The part" << m_pPart << "didn't create a widget!";
delete m_pPart;
m_pPart = 0;
return 0;
@@ -163,7 +163,7 @@ KParts::ReadOnlyPart *KonqFrame::attach(const KonqViewFactory \
&viewFactory)
void KonqFrame::attachWidget(QWidget *widget)
{
- //kDebug() << "KonqFrame::attachInternal()";
+ //qDebug() << "KonqFrame::attachInternal()";
delete m_pLayout;
m_pLayout = new QVBoxLayout(this);
@@ -199,7 +199,7 @@ void KonqFrame::setView(KonqView *child)
void KonqFrame::setTitle(const QString &title, QWidget * /*sender*/)
{
- //kDebug() << "KonqFrame::setTitle( " << title << " )";
+ //qDebug() << "KonqFrame::setTitle( " << title << " )";
m_title = title;
if (m_pParentContainer) {
m_pParentContainer->setTitle(title, this);
@@ -208,7 +208,7 @@ void KonqFrame::setTitle(const QString &title, QWidget * \
/*sender*/)
void KonqFrame::setTabIcon(const QUrl &url, QWidget * /*sender*/)
{
- //kDebug() << "KonqFrame::setTabIcon( " << url << " )";
+ //qDebug() << "KonqFrame::setTabIcon( " << url << " )";
if (m_pParentContainer) {
m_pParentContainer->setTabIcon(url, this);
}
@@ -241,7 +241,7 @@ void KonqFrame::activateChild()
m_pView->mainWindow()->viewManager()->setActivePart(part());
if (!m_pView->isLoading() && (m_pView->url().isEmpty() || m_pView->url() == \
QUrl("about:blank"))) {
- //kDebug() << "SET FOCUS on the location bar";
+ //qDebug() << "SET FOCUS on the location bar";
m_pView->mainWindow()->focusLocationBar(); // #84867 usability \
improvement }
}
diff --git a/konqueror/src/konqframecontainer.cpp \
b/konqueror/src/konqframecontainer.cpp index d508fb7..50f8504 100644
--- a/konqueror/src/konqframecontainer.cpp
+++ b/konqueror/src/konqframecontainer.cpp
@@ -18,7 +18,7 @@
*/
#include "konqframecontainer.h"
-#include <kdebug.h>
+#include <QDebug>
#include <kglobalsettings.h>
#include <kconfig.h>
#include <math.h> // pow()
@@ -142,7 +142,7 @@ void KonqFrameContainer::swapChildren()
void KonqFrameContainer::setTitle(const QString &title, QWidget *sender)
{
- //kDebug() << title << sender;
+ //qDebug() << title << sender;
if (m_pParentContainer && activeChild() && (sender == \
activeChild()->asQWidget())) { m_pParentContainer->setTitle(title, this);
}
@@ -150,7 +150,7 @@ void KonqFrameContainer::setTitle(const QString &title, QWidget \
*sender)
void KonqFrameContainer::setTabIcon(const QUrl &url, QWidget *sender)
{
- //kDebug() << url << sender;
+ //qDebug() << url << sender;
if (m_pParentContainer && activeChild() && (sender == \
activeChild()->asQWidget())) { m_pParentContainer->setTabIcon(url, this);
}
@@ -158,7 +158,7 @@ void KonqFrameContainer::setTabIcon(const QUrl &url, QWidget \
*sender)
void KonqFrameContainer::insertChildFrame(KonqFrameBase *frame, int index)
{
- //kDebug() << this << frame;
+ //qDebug() << this << frame;
if (frame) {
QSplitter::insertWidget(index, frame->asQWidget());
// Insert before existing child? Move first to second.
@@ -168,23 +168,23 @@ void KonqFrameContainer::insertChildFrame(KonqFrameBase *frame, \
int index) if (!m_pFirstChild) {
m_pFirstChild = frame;
frame->setParentContainer(this);
- //kDebug() << "Setting as first child";
+ //qDebug() << "Setting as first child";
} else if (!m_pSecondChild) {
m_pSecondChild = frame;
frame->setParentContainer(this);
- //kDebug() << "Setting as second child";
+ //qDebug() << "Setting as second child";
} else {
- kWarning() << this << "already has two children..."
+ qWarning() << this << "already has two children..."
<< m_pFirstChild << "and" << m_pSecondChild;
}
} else {
- kWarning() << "KonqFrameContainer" << this << ": insertChildFrame(NULL)!";
+ qWarning() << "KonqFrameContainer" << this << ": insertChildFrame(NULL)!";
}
}
void KonqFrameContainer::childFrameRemoved(KonqFrameBase *frame)
{
- //kDebug() << this << "Child" << frame << "removed";
+ //qDebug() << this << "Child" << frame << "removed";
if (m_pFirstChild == frame) {
m_pFirstChild = m_pSecondChild;
@@ -192,7 +192,7 @@ void KonqFrameContainer::childFrameRemoved(KonqFrameBase *frame)
} else if (m_pSecondChild == frame) {
m_pSecondChild = 0;
} else {
- kWarning() << this << "Can't find this child:" << frame;
+ qWarning() << this << "Can't find this child:" << frame;
}
}
diff --git a/konqueror/src/konqframestatusbar.cpp \
b/konqueror/src/konqframestatusbar.cpp index d1aa210..e5bf34d 100644
--- a/konqueror/src/konqframestatusbar.cpp
+++ b/konqueror/src/konqframestatusbar.cpp
@@ -18,7 +18,7 @@
*/
#include "konqframestatusbar.h"
-#include <kdebug.h>
+#include <QDebug>
#include "konqframe.h"
#include "konqview.h"
#include <kiconloader.h>
@@ -214,7 +214,7 @@ void KonqFrameStatusBar::message(const QString &msg)
void KonqFrameStatusBar::slotDisplayStatusText(const QString &text)
{
- //kDebug() << text;
+ //qDebug() << text;
m_pStatusLabel->setMessage(text, KonqStatusBarMessageLabel::Default);
m_savedMessage = text;
}
diff --git a/konqueror/src/konqguiclients.cpp b/konqueror/src/konqguiclients.cpp
index 5e7bb73..11ece05 100644
--- a/konqueror/src/konqguiclients.cpp
+++ b/konqueror/src/konqguiclients.cpp
@@ -22,7 +22,7 @@
// KDE
#include <ktoggleaction.h>
-#include <kdebug.h>
+#include <QDebug>
#include <QIcon>
#include <kiconloader.h>
#include <KLocalizedString>
@@ -132,7 +132,7 @@ ToggleViewGUIClient::ToggleViewGUIClient(KonqMainWindow \
*mainWindow) for (; cIt != cEnd; ++cIt) {
QString description = i18n("Show %1", (*cIt)->name());
QString name = (*cIt)->desktopEntryName();
- //kDebug() << "ToggleViewGUIClient: name=" << name;
+ //qDebug() << "ToggleViewGUIClient: name=" << name;
KToggleAction *action = new KToggleAction(description, this);
mainWindow->actionCollection()->addAction(name.toLatin1(), action);
@@ -218,7 +218,7 @@ void ToggleViewGUIClient::slotToggleView(bool toggle)
viewManager->setActivePart(childView->part());
}
- kDebug() << "ToggleViewGUIClient::slotToggleView setToggleView(true) on " << \
childView; + qDebug() << "ToggleViewGUIClient::slotToggleView \
setToggleView(true) on " << childView; childView->setToggleView(true);
m_mainWindow->viewCountChanged();
diff --git a/konqueror/src/konqhistorymanager.cpp \
b/konqueror/src/konqhistorymanager.cpp index de2e9dd..1168c80 100644
--- a/konqueror/src/konqhistorymanager.cpp
+++ b/konqueror/src/konqhistorymanager.cpp
@@ -23,7 +23,7 @@
#include <QtDBus/QtDBus>
#include <QTimer>
-#include <kdebug.h>
+#include <QDebug>
#include <kconfig.h>
#include <kcompletion.h>
@@ -89,7 +89,7 @@ void KonqHistoryManager::addToHistory(bool pending, const QUrl \
&_url, const QString &typedUrl,
const QString &title)
{
- //kDebug() << _url << "Typed URL:" << typedUrl << ", Title:" << title;
+ //qDebug() << _url << "Typed URL:" << typedUrl << ", Title:" << title;
if (filterOut(_url)) { // we only want remote URLs
return;
@@ -169,7 +169,7 @@ void KonqHistoryManager::insert(const QString &url)
void KonqHistoryManager::removePending(const QUrl &url)
{
- // kDebug() << "Removing pending..." << url;
+ // qDebug() << "Removing pending..." << url;
if (url.isLocalFile()) {
return;
diff --git a/konqueror/src/konqhistorysettings.cpp \
b/konqueror/src/konqhistorysettings.cpp index e7e2556..27c7ce1 100644
--- a/konqueror/src/konqhistorysettings.cpp
+++ b/konqueror/src/konqhistorysettings.cpp
@@ -21,17 +21,16 @@
#include "konqhistorysettings.h"
// KDE
-#include <kapplication.h>
#include <kconfig.h>
#include <ksharedconfig.h>
-#include <kglobal.h>
#include <kconfiggroup.h>
-struct KonqHistorySettingsSingleton {
+class KonqHistorySettingsSingleton {
+public:
KonqHistorySettings self;
};
-K_GLOBAL_STATIC(KonqHistorySettingsSingleton, globalHistorySettings)
+Q_GLOBAL_STATIC(KonqHistorySettingsSingleton, globalHistorySettings)
KonqHistorySettings *KonqHistorySettings::self()
{
return &globalHistorySettings->self;
@@ -58,13 +57,7 @@ KonqHistorySettings::~KonqHistorySettings()
void KonqHistorySettings::readSettings(bool reparse)
{
- KSharedConfigPtr config;
-
- if (KGlobal::mainComponent().componentName() == QLatin1String("konqueror")) {
- config = KSharedConfig::openConfig();
- } else {
- config = KSharedConfig::openConfig("konquerorrc");
- }
+ KSharedConfigPtr config = KSharedConfig::openConfig(); // read konquerorrc
if (reparse) {
config->reparseConfiguration();
@@ -89,7 +82,7 @@ void KonqHistorySettings::readSettings(bool reparse)
void KonqHistorySettings::applySettings()
{
- KConfigGroup config(KSharedConfig::openConfig("konquerorrc"), \
"HistorySettings"); + KConfigGroup config(KSharedConfig::openConfig(), \
"HistorySettings"); // write to konquerorrc
config.writeEntry("Value youngerThan", m_valueYoungerThan);
config.writeEntry("Value olderThan", m_valueOlderThan);
diff --git a/konqueror/src/konqhistoryview.cpp b/konqueror/src/konqhistoryview.cpp
index a7cc586..3d745b4 100644
--- a/konqueror/src/konqhistoryview.cpp
+++ b/konqueror/src/konqhistoryview.cpp
@@ -33,7 +33,7 @@
#include <kactioncollection.h>
#include <QAction>
-#include <kdebug.h>
+#include <QDebug>
#include <QIcon>
#include <klineedit.h>
#include <KLocalizedString>
diff --git a/konqueror/src/konqmain.cpp b/konqueror/src/konqmain.cpp
index c61d77b..8c184b4 100644
--- a/konqueror/src/konqmain.cpp
+++ b/konqueror/src/konqmain.cpp
@@ -28,7 +28,7 @@
#include <ktemporaryfile.h>
#include <KLocalizedString>
#include <kstandarddirs.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kcmdlineargs.h>
#include <QtCore/QFile>
@@ -73,7 +73,7 @@ static bool tryPreload()
// KonqMainWindow ctor sets always the preloaded flag to false, so create \
the window before this KonqMainWindow::setPreloadedFlag(true);
KonqMainWindow::setPreloadedWindow(win);
- kDebug() << "Konqy preloaded :" << \
QDBusConnection::sessionBus().baseService(); + qDebug() << "Konqy preloaded :" \
<< QDBusConnection::sessionBus().baseService(); return true;
} else {
return false; // no preloading
@@ -125,7 +125,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
if (className == QLatin1String("KonqMainWindow")) {
(new KonqMainWindow())->restore(n);
} else {
- kWarning() << "Unknown class" << className << "in session saved \
data!"; + qWarning() << "Unknown class" << className << "in session \
saved data!"; }
++n;
}
@@ -150,7 +150,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
QDirIterator it(sessionPath, QDir::Readable | QDir::Files);
if (!it.hasNext()) {
- kError() << "session" << session << "not found or empty";
+ qWarning() << "session" << session << "not found or empty";
return -1;
}
@@ -210,7 +210,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
KonqMainWindow *mainwin = 0;
if (args->isSet("profile")) {
const QString profile = args->getOption("profile");
- //kDebug() << "main() -> createBrowserWindowFromProfile mimeType=" \
<< urlargs.mimeType(); + //qDebug() << "main() -> \
createBrowserWindowFromProfile mimeType=" << urlargs.mimeType();
mainwin = KonqMisc::createBrowserWindowFromProfile(QString(), \
profile, firstUrl, req); } else {
mainwin = KonqMisc::createNewWindow(firstUrl, req);
diff --git a/konqueror/src/konqmainwindow.cpp b/konqueror/src/konqmainwindow.cpp
index 954841e..82834ea 100644
--- a/konqueror/src/konqmainwindow.cpp
+++ b/konqueror/src/konqmainwindow.cpp
@@ -95,7 +95,7 @@
#include <ktoolbar.h>
#include <konqbookmarkmenu.h>
#include <kcmultidialog.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kdesktopfile.h>
#include <kedittoolbar.h>
#include <klocalizedstring.h>
@@ -327,7 +327,7 @@ KonqMainWindow::KonqMainWindow(const QUrl &initialURL, const \
QString &xmluiFile) resize(700, 480);
}
- //kDebug() << this << "done";
+ //qDebug() << this << "done";
if (s_initialMemoryUsage == -1) {
s_initialMemoryUsage = current_memory_usage();
@@ -340,7 +340,7 @@ KonqMainWindow::KonqMainWindow(const QUrl &initialURL, const \
QString &xmluiFile)
KonqMainWindow::~KonqMainWindow()
{
- //kDebug() << this;
+ //qDebug() << this;
delete m_pViewManager;
m_pViewManager = 0;
@@ -377,7 +377,7 @@ KonqMainWindow::~KonqMainWindow()
delete m_pUndoManager;
decInstancesCount();
- //kDebug() << this << "done";
+ //qDebug() << this << "done";
}
void KonqMainWindow::incInstancesCount()
@@ -482,7 +482,7 @@ QString KonqMainWindow::detectNameFilter(QUrl &url)
if (!KIO::NetAccess::exists(url, KIO::NetAccess::DestinationSide, this)) \
{ nameFilter = fileName;
url = url.adjusted(QUrl::RemoveFilename | QUrl::RemoveQuery);
- kDebug() << "Found wildcard. nameFilter=" << nameFilter << " New \
url=" << url; + qDebug() << "Found wildcard. nameFilter=" << \
nameFilter << " New url=" << url; }
}
}
@@ -498,7 +498,7 @@ void KonqMainWindow::openFilteredUrl(const QString &url, const \
KonqOpenURLReques }
QUrl filteredURL(KonqMisc::konqFilteredURL(this, url, m_currentDir));
- kDebug() << "url" << url << "filtered into" << filteredURL;
+ qDebug() << "url" << url << "filtered into" << filteredURL;
if (filteredURL.isEmpty()) { // initially empty, or error (e.g. ~unknown_user)
return;
@@ -542,7 +542,7 @@ void KonqMainWindow::openUrl(KonqView *_view, const QUrl &_url,
bool trustedSource)
{
#ifndef NDEBUG // needed for req.debug()
- kDebug() << "url=" << _url << "mimeType=" << _mimeType
+ qDebug() << "url=" << _url << "mimeType=" << _mimeType
<< "_req=" << _req.debug() << "view=" << _view;
#endif
@@ -675,7 +675,7 @@ void KonqMainWindow::openUrl(KonqView *_view, const QUrl &_url,
}
}
- //kDebug() << "trying openView for" << url << "( mimeType" << mimeType << ")";
+ //qDebug() << "trying openView for" << url << "( mimeType" << mimeType << ")";
if ((!mimeType.isEmpty() && mimeType != "application/octet-stream") ||
url.url() == "about:" || url.url().startsWith("about:konqueror") || \
url.url() == "about:plugins") {
KService::Ptr offer = KMimeTypeTrader::self()->preferredService(mimeType, \
"Application"); @@ -687,10 +687,10 @@ void KonqMainWindow::openUrl(KonqView *_view, \
const QUrl &_url,
// Built-in view ?
if (!openView(mimeType, url, view /* can be 0 */, req)) {
- //kDebug() << "openView returned false";
+ //qDebug() << "openView returned false";
// Are we following another view ? Then forget about this URL. Otherwise \
fire app. if (!req.followMode) {
- //kDebug() << "we were not following. Fire app.";
+ //qDebug() << "we were not following. Fire app.";
// The logic below is similar to BrowserRun::handleNonEmbeddable(),
// but we don't have a BrowserRun instance here, and since it uses
// some virtual methods [like save, for KHTMLRun], we can't just
@@ -720,7 +720,7 @@ void KonqMainWindow::openUrl(KonqView *_view, const QUrl &_url,
}
QList<QUrl> lst;
lst.append(url);
- //kDebug() << "Got offer" << (offer ? offer->name() : \
QString("0")); + //qDebug() << "Got offer" << (offer ? \
offer->name() : QString("0"));
const bool allowExecution = trustedSource || \
KParts::BrowserRun::allowExecution(mimeType, url); if (allowExecution) {
const bool isExecutable = KonqRun::isExecutable(mimeType);
@@ -748,11 +748,11 @@ void KonqMainWindow::openUrl(KonqView *_view, const QUrl &_url,
if (earlySetLocationBarURL) {
// Show it for now in the location bar, but we'll need to store it in \
the view
// later on (can't do it yet since either view == 0 or \
updateHistoryEntry will be called).
- kDebug() << "url=" << url;
+ qDebug() << "url=" << url;
setLocationBarURL(url);
}
- kDebug() << "Creating new konqrun for" << url << "req.typedUrl=" << \
req.typedUrl; + qDebug() << "Creating new konqrun for" << url << \
"req.typedUrl=" << req.typedUrl;
KonqRun *run = new KonqRun(this, view /* can be 0 */, url, req, \
trustedSource);
@@ -796,7 +796,7 @@ bool KonqMainWindow::openView(QString mimeType, const QUrl &_url, \
KonqView *chil
// Contract: the caller of this method should ensure the view is stopped first.
#ifndef NDEBUG
- kDebug() << mimeType << _url << "childView=" << childView << "req:" << \
req.debug(); + qDebug() << mimeType << _url << "childView=" << childView << "req:" \
<< req.debug(); #endif
bool bOthersFollowed = false;
@@ -857,7 +857,7 @@ bool KonqMainWindow::openView(QString mimeType, const QUrl &_url, \
KonqView *chil }
// Related to KonqFactory::createView
if (!forceAutoEmbed && !KonqFMSettings::settings()->shouldEmbed(mimeType)) {
- kDebug() << "KonqFMSettings says: don't embed this servicetype";
+ qDebug() << "KonqFMSettings says: don't embed this servicetype";
return false;
}
// Do we even have a part to embed? Otherwise don't ask, since we'd ask twice.
@@ -865,7 +865,7 @@ bool KonqMainWindow::openView(QString mimeType, const QUrl &_url, \
KonqView *chil KService::List partServiceOffers;
KonqFactory::getOffers(mimeType, &partServiceOffers);
if (partServiceOffers.isEmpty()) {
- kDebug() << "No part available for" << mimeType;
+ qDebug() << "No part available for" << mimeType;
return false;
}
}
@@ -911,7 +911,7 @@ bool KonqMainWindow::openView(QString mimeType, const QUrl &_url, \
KonqView *chil KConfigGroup urlProperties(&config, "URL properties");
HTMLAllowed = urlProperties.readEntry("HTMLAllowed", \
m_bHTMLAllowed);
//serviceName = urlProperties.readEntry( "ViewMode", serviceName );
- //kDebug() << "serviceName=" << serviceName;
+ //qDebug() << "serviceName=" << serviceName;
}
QString indexFile;
if (HTMLAllowed &&
@@ -983,10 +983,10 @@ bool KonqMainWindow::openView(QString mimeType, const QUrl \
&_url, KonqView *chil }
if (ok) {
- //kDebug() << "req.nameFilter= " << req.nameFilter;
- //kDebug() << "req.typedUrl= " << req.typedUrl;
- //kDebug() << "Browser extension? " << (childView->browserExtension() ? \
"YES" : "NO");
- //kDebug() << "Referrer: " << req.args.metaData()["referrer"];
+ //qDebug() << "req.nameFilter= " << req.nameFilter;
+ //qDebug() << "req.typedUrl= " << req.typedUrl;
+ //qDebug() << "Browser extension? " << (childView->browserExtension() ? \
"YES" : "NO"); + //qDebug() << "Referrer: " << \
req.args.metaData()["referrer"]; childView->setTypedURL(req.typedUrl);
if (childView->part()) {
childView->part()->setArguments(req.args);
@@ -1002,7 +1002,7 @@ bool KonqMainWindow::openView(QString mimeType, const QUrl \
&_url, KonqView *chil
childView->openUrl(url, originalURL, req.nameFilter, req.tempFile);
}
}
- //kDebug() << "ok=" << ok << "bOthersFollowed=" << bOthersFollowed
+ //qDebug() << "ok=" << ok << "bOthersFollowed=" << bOthersFollowed
// << "returning" << (ok || bOthersFollowed);
return ok || bOthersFollowed;
}
@@ -1026,7 +1026,7 @@ static KonqView *findChildView(KParts::ReadOnlyPart \
*callingPart, const QString
void KonqMainWindow::slotOpenURLRequest(const QUrl &url, const \
KParts::OpenUrlArguments &args, const KParts::BrowserArguments &browserArgs) {
- //kDebug() << "frameName=" << browserArgs.frameName;
+ //qDebug() << "frameName=" << browserArgs.frameName;
KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart \
*>(sender()->parent()); QString frameName = browserArgs.frameName;
@@ -1084,7 +1084,7 @@ void KonqMainWindow::slotOpenURLRequest(const QUrl &url, const \
KParts::OpenUrlAr //Called by slotOpenURLRequest
void KonqMainWindow::openUrlRequestHelper(KonqView *childView, const QUrl &url, \
const KParts::OpenUrlArguments &args, const KParts::BrowserArguments &browserArgs) {
- //kDebug() << "url=" << url;
+ //qDebug() << "url=" << url;
KonqOpenURLRequest req;
req.args = args;
req.browserArgs = browserArgs;
@@ -1114,7 +1114,7 @@ bool KonqMainWindow::makeViewsFollow(const QUrl &url,
}
bool res = false;
- //kDebug() << senderView->metaObject()->className() << "url=" << url << \
"serviceType=" << serviceType; + //qDebug() << \
senderView->metaObject()->className() << "url=" << url << "serviceType=" << \
serviceType; KonqOpenURLRequest req;
req.forceAutoEmbed = true;
req.followMode = true;
@@ -1140,7 +1140,7 @@ bool KonqMainWindow::makeViewsFollow(const QUrl &url,
continue;
}
- kDebug() << "sending openUrl to view" << \
view->part()->metaObject()->className() << "url=" << url; + qDebug() << \
"sending openUrl to view" << view->part()->metaObject()->className() << "url=" << \
url;
// XXX duplicate code from ::openUrl
if (view == m_currentView) {
@@ -1164,7 +1164,7 @@ bool KonqMainWindow::makeViewsFollow(const QUrl &url,
// This happens in views locked to a directory mode,
// like sidebar and konsolepart (#52161).
const bool ignore = view->isLockedViewMode() && view->showsDirectory();
- //kDebug() << "View " << view->service()->name()
+ //qDebug() << "View " << view->service()->name()
// << " supports dirs: " << view->showsDirectory()
// << " is locked-view-mode:" << view->isLockedViewMode()
// << " ignore=" << ignore;
@@ -1205,7 +1205,7 @@ void KonqMainWindow::slotCreateNewWindow(const QUrl &url,
{
// NOTE: 'part' may be null
- kDebug() << "url=" << url << "args.mimeType()=" << args.mimeType()
+ qDebug() << "url=" << url << "args.mimeType()=" << args.mimeType()
<< "browserArgs.frameName=" << browserArgs.frameName;
// If we are a popup window, forward the request the proxy window.
@@ -1230,7 +1230,7 @@ void KonqMainWindow::slotCreateNewWindow(const QUrl &url,
if (findChildView(ro_part, browserArgs.frameName, mainWindow, hostExtension, \
part)) {
// Found a view. If url isn't empty, we should open it - but this never \
happens currently
// findChildView put the resulting part in 'part', so we can just return \
now
- //kDebug() << "frame=" << browserArgs.frameName << "-> found part=" << \
part << part->name(); + //qDebug() << "frame=" << browserArgs.frameName << \
"-> found part=" << part << part->name(); return;
}
}
@@ -1244,7 +1244,7 @@ void KonqMainWindow::slotCreateNewWindow(const QUrl &url,
!isPopupWindow(windowArgs);
}
}
- kDebug() << "createTab=" << createTab << "part=" << part;
+ qDebug() << "createTab=" << createTab << "part=" << part;
if (createTab && !m_isPopupWithProxyWindow) {
@@ -1600,7 +1600,7 @@ void KonqMainWindow::slotOpenFile()
void KonqMainWindow::slotIconsChanged()
{
- kDebug();
+ qDebug();
if (m_combo) {
m_combo->updatePixmaps();
}
@@ -1889,7 +1889,7 @@ void KonqMainWindow::slotConfigure()
\
m_configureDialog->addModule(KCModuleInfo(QString(fmModules[i]) + ".desktop"), \
fileManagementGroup); }
} else {
- kWarning() << "Unable to load the \"File Management\" configuration \
module"; + qWarning() << "Unable to load the \"File Management\" \
configuration module"; }
}
@@ -1916,7 +1916,7 @@ void KonqMainWindow::slotConfigure()
\
m_configureDialog->addModule(KCModuleInfo(QString(webModules[i]) + ".desktop"), \
webGroup); }
} else {
- kWarning() << "Unable to load the \"Web Browsing\" configuration \
module"; + qWarning() << "Unable to load the \"Web Browsing\" \
configuration module"; }
}
@@ -2056,7 +2056,7 @@ void KonqMainWindow::applyKonqMainWindowSettings()
if (act) {
act->trigger();
} else {
- kWarning() << "Unknown toggable view in ToggableViewsShown " << *togIt;
+ qWarning() << "Unknown toggable view in ToggableViewsShown " << *togIt;
}
}
}
@@ -2081,7 +2081,7 @@ void KonqMainWindow::slotViewCompleted(KonqView *view)
void KonqMainWindow::slotPartActivated(KParts::Part *part)
{
- kDebug() << part << (part ? part->componentData().componentName() : "");
+ qDebug() << part << (part ? part->componentData().componentName() : "");
KonqView *newView = 0;
KonqView *oldView = m_currentView;
@@ -2092,7 +2092,7 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
if (newView->isPassiveMode()) {
// Passive view. Don't connect anything, don't change m_currentView
// Another view will become the current view very soon
- //kDebug() << "Passive mode - return";
+ //qDebug() << "Passive mode - return";
return;
}
}
@@ -2102,19 +2102,19 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
if (oldView) {
ext = oldView->browserExtension();
if (ext) {
- //kDebug() << "Disconnecting extension for view" << oldView;
+ //qDebug() << "Disconnecting extension for view" << oldView;
disconnectExtension(ext);
}
}
- kDebug() << "New current view" << newView;
+ qDebug() << "New current view" << newView;
m_currentView = newView;
if (newView) {
m_paShowStatusBar->setChecked(newView->frame()->statusbar()->isVisible());
}
if (!part) {
- //kDebug() << "No part activated - returning";
+ //qDebug() << "No part activated - returning";
unplugViewModeActions();
createGUI(0);
KParts::MainWindow::setCaption(QString());
@@ -2126,7 +2126,7 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
if (ext) {
connectExtension(ext);
} else {
- kDebug() << "No Browser Extension for the new part";
+ qDebug() << "No Browser Extension for the new part";
// Disable all browser-extension actions
KParts::BrowserExtension::ActionSlotMap *actionSlotMap = \
KParts::BrowserExtension::actionSlotMapPtr(); @@ -2207,7 +2207,7 @@ void \
KonqMainWindow::slotPartActivated(KParts::Part *part) \
oldView->frame()->statusbar()->updateActiveStatus(); }
- //kDebug() << "setting location bar url to"
+ //qDebug() << "setting location bar url to"
// << m_currentView->locationBarURL() << "m_currentView=" << \
m_currentView;
// Make sure the location bar gets updated when the view(tab) is changed.
@@ -2223,7 +2223,7 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
void KonqMainWindow::insertChildView(KonqView *childView)
{
- //kDebug() << childView;
+ //qDebug() << childView;
m_mapViews.insert(childView->part(), childView);
connect(childView, SIGNAL(viewCompleted(KonqView*)),
@@ -2235,7 +2235,7 @@ void KonqMainWindow::insertChildView(KonqView *childView)
// Called by KonqViewManager, internal
void KonqMainWindow::removeChildView(KonqView *childView)
{
- //kDebug() << childView;
+ //qDebug() << childView;
disconnect(childView, SIGNAL(viewCompleted(KonqView*)),
this, SLOT(slotViewCompleted(KonqView*)));
@@ -2249,20 +2249,20 @@ void KonqMainWindow::removeChildView(KonqView *childView)
// find it in the map - can't use the key since childView->part() might be 0
- //kDebug() << "Searching map";
+ //qDebug() << "Searching map";
while (it != end && it.value() != childView) {
++it;
}
- //kDebug() << "Verifying search results";
+ //qDebug() << "Verifying search results";
if (it == m_mapViews.end()) {
- kWarning() << "KonqMainWindow::removeChildView childView " << childView << " \
not in map !"; + qWarning() << "KonqMainWindow::removeChildView childView " << \
childView << " not in map !"; return;
}
- //kDebug() << "Removing view" << childView;
+ //qDebug() << "Removing view" << childView;
m_mapViews.erase(it);
@@ -2309,7 +2309,7 @@ KonqView *KonqMainWindow::childView(KParts::ReadOnlyPart *view)
KonqView *KonqMainWindow::childView(KParts::ReadOnlyPart *callingPart, const QString \
&name, KParts::BrowserHostExtension *&hostExtension, KParts::ReadOnlyPart **part) {
- //kDebug() << "this=" << this << "looking for" << name;
+ //qDebug() << "this=" << this << "looking for" << name;
QList<KonqView *> views = m_mapViews.values();
KonqView *callingView = m_mapViews.value(callingPart);
if (callingView) {
@@ -2321,21 +2321,21 @@ KonqView *KonqMainWindow::childView(KParts::ReadOnlyPart \
*callingPart, const QSt
Q_FOREACH (KonqView *view, views) {
QString viewName = view->viewName();
- //kDebug() << " - viewName=" << viewName
+ //qDebug() << " - viewName=" << viewName
// << "frame names:" << view->frameNames();
// First look for a hostextension containing this frame name
KParts::BrowserHostExtension *ext = \
KParts::BrowserHostExtension::childObject(view->part()); if (ext) {
ext = ext->findFrameParent(callingPart, name);
- kDebug() << "BrowserHostExtension found part" << ext;
+ qDebug() << "BrowserHostExtension found part" << ext;
if (!ext) {
continue; // Don't use this window
}
}
if (!viewName.isEmpty() && viewName == name) {
- kDebug() << "found existing view by name:" << view;
+ qDebug() << "found existing view by name:" << view;
hostExtension = 0;
if (part) {
*part = view->part();
@@ -2351,7 +2351,7 @@ KonqView *KonqMainWindow::childView(KParts::ReadOnlyPart \
*callingPart, const QSt while (frameIt.hasNext()) {
KParts::ReadOnlyPart *item = frameIt.next();
if (item->objectName() == name) {
- kDebug() << "found a frame of name" << name << ":" << item;
+ qDebug() << "found a frame of name" << name << ":" << item;
hostExtension = ext;
if (part) {
*part = item;
@@ -2390,7 +2390,7 @@ int KonqMainWindow::mainViewsCount() const
const MapViews::ConstIterator end = m_mapViews.constEnd();
for (; it != end; ++it) {
if (!it.value()->isPassiveMode() && !it.value()->isToggleView()) {
- //kDebug() << res << it.value() << it.value()->part()->widget();
+ //qDebug() << res << it.value() << it.value()->part()->widget();
++res;
}
}
@@ -3139,7 +3139,7 @@ void KonqMainWindow::slotMakeCompletion(const QString &text)
if (m_pURLCompletion) {
m_urlCompletionStarted = true; // flag for slotMatch()
- // kDebug() << "Local Completion object found!";
+ // qDebug() << "Local Completion object found!";
QString completion = m_pURLCompletion->makeCompletion(text);
m_currentDir.clear();
@@ -3165,7 +3165,7 @@ void KonqMainWindow::slotMakeCompletion(const QString &text)
}
}
}
- // kDebug() << "Current dir:" << m_currentDir << "Current text:" << text;
+ // qDebug() << "Current dir:" << m_currentDir << "Current text:" << text;
}
void KonqMainWindow::slotSubstringcompletion(const QString &text)
@@ -3240,7 +3240,7 @@ void KonqMainWindow::slotMatch(const QString &match)
void KonqMainWindow::slotCtrlTabPressed()
{
KonqView *view = m_pViewManager->chooseNextView(m_currentView);
- //kDebug() << m_currentView->url() << "->" << view->url();
+ //qDebug() << m_currentView->url() << "->" << view->url();
if (view) {
m_pViewManager->setActivePart(view->part());
KonqFrameTabs *tabs = m_pViewManager->tabContainer();
@@ -3264,7 +3264,7 @@ bool KonqMainWindow::eventFilter(QObject *obj, QEvent *ev)
{
if ((ev->type() == QEvent::FocusIn || ev->type() == QEvent::FocusOut) &&
m_combo && m_combo->lineEdit() && m_combo == obj) {
- //kDebug() << obj << obj->metaObject()->className() << obj->name();
+ //qDebug() << obj << obj->metaObject()->className() << obj->name();
QFocusEvent *focusEv = static_cast<QFocusEvent *>(ev);
if (focusEv->reason() == Qt::PopupFocusReason) {
@@ -3277,9 +3277,9 @@ bool KonqMainWindow::eventFilter(QObject *obj, QEvent *ev)
}
if (ev->type() == QEvent::FocusIn) {
- //kDebug() << "ComboBox got the focus...";
+ //qDebug() << "ComboBox got the focus...";
if (m_bLocationBarConnected) {
- //kDebug() << "Was already connected...";
+ //qDebug() << "Was already connected...";
return KParts::MainWindow::eventFilter(obj, ev);
}
m_bLocationBarConnected = true;
@@ -3304,9 +3304,9 @@ bool KonqMainWindow::eventFilter(QObject *obj, QEvent *ev)
slotClipboardDataChanged();
} else if (ev->type() == QEvent::FocusOut) {
- //kDebug() << "ComboBox lost focus...";
+ //qDebug() << "ComboBox lost focus...";
if (!m_bLocationBarConnected) {
- //kDebug() << "Was already disconnected...";
+ //qDebug() << "Was already disconnected...";
return KParts::MainWindow::eventFilter(obj, ev);
}
m_bLocationBarConnected = false;
@@ -3364,7 +3364,7 @@ void KonqMainWindow::slotCheckComboSelection()
QLineEdit *edit = comboEdit();
if (edit) {
const bool hasSelection = edit->hasSelectedText();
- //kDebug() << "m_combo->lineEdit()->hasMarkedText():" << hasSelection;
+ //qDebug() << "m_combo->lineEdit()->hasMarkedText():" << hasSelection;
m_paCopy->setEnabled(hasSelection);
m_paCut->setEnabled(hasSelection);
}
@@ -3484,7 +3484,7 @@ void KonqMainWindow::setLocationBarURL(const QString &url)
// or if the user had time to edit the url since the last call to openUrl \
(#64868) QLineEdit *edit = comboEdit();
if (edit && url != edit->text() && !edit->isModified()) {
- //kDebug() << "url=" << url;
+ //qDebug() << "url=" << url;
m_combo->setURL(url);
updateWindowIcon();
}
@@ -3935,7 +3935,7 @@ void KonqMainWindow::initActions()
// a single actionCollection.
actionCollection()->addAction("add_bookmark", \
m_bookmarksActionCollection->takeAction(addBookmark)); } else {
- kDebug() << "Action add_bookmark not found!";
+ qDebug() << "Action add_bookmark not found!";
}
m_paShowMenuBar = KStandardAction::showMenubar(this, SLOT(slotShowMenuBar()), \
this); @@ -4028,7 +4028,7 @@ void KonqMainWindow::initActions()
void KonqExtendedBookmarkOwner::openBookmark(const KBookmark &bm, Qt::MouseButtons \
mb, Qt::KeyboardModifiers km) {
- kDebug() << bm.url() << km << mb;
+ qDebug() << bm.url() << km << mb;
const QString url = bm.url().url();
@@ -4259,7 +4259,7 @@ void KonqMainWindow::connectExtension(KParts::BrowserExtension \
*ext)
for (; it != itEnd; ++it) {
QAction *act = actionCollection()->action(it.key().data());
- //kDebug() << it.key();
+ //qDebug() << it.key();
if (act) {
// Does the extension have a slot with the name of this action ?
if (ext->metaObject()->indexOfSlot(it.key() + "()") != -1) {
@@ -4276,7 +4276,7 @@ void KonqMainWindow::connectExtension(KParts::BrowserExtension \
*ext) }
} else {
- kError() << "Error in BrowserExtension::actionSlotMap(), unknown action \
: " << it.key(); + qWarning() << "Error in \
BrowserExtension::actionSlotMap(), unknown action : " << it.key(); }
}
@@ -4290,9 +4290,9 @@ void \
KonqMainWindow::disconnectExtension(KParts::BrowserExtension *ext)
for (; it != itEnd; ++it) {
QAction *act = actionCollection()->action(it.key().data());
- //kDebug() << it.key();
+ //qDebug() << it.key();
if (act && ext->metaObject()->indexOfSlot(it.key() + "()") != -1) {
- //kDebug() << act << act->name();
+ //qDebug() << act << act->name();
act->disconnect(ext);
}
}
@@ -4302,7 +4302,7 @@ void KonqMainWindow::enableAction(const char *name, bool \
enabled) {
QAction *act = actionCollection()->action(name);
if (!act) {
- kWarning() << "Unknown action " << name << " - can't enable";
+ qWarning() << "Unknown action " << name << " - can't enable";
} else {
if (m_bLocationBarConnected && (
act == m_paCopy || act == m_paCut || act == m_paPaste))
@@ -4310,7 +4310,7 @@ void KonqMainWindow::enableAction(const char *name, bool \
enabled) {
return;
}
- //kDebug() << name << enabled;
+ //qDebug() << name << enabled;
act->setEnabled(enabled);
}
@@ -4326,9 +4326,9 @@ void KonqMainWindow::setActionText(const char *name, const \
QString &text) {
QAction *act = actionCollection()->action(name);
if (!act) {
- kWarning() << "Unknown action " << name << "- can't enable";
+ qWarning() << "Unknown action " << name << "- can't enable";
} else {
- //kDebug() << name << " text=" << text;
+ //qDebug() << name << " text=" << text;
act->setText(text);
}
}
@@ -4347,7 +4347,7 @@ void KonqMainWindow::currentProfileChanged()
void KonqMainWindow::enableAllActions(bool enable)
{
- //kDebug() << enable;
+ //qDebug() << enable;
KParts::BrowserExtension::ActionSlotMap *actionSlotMap = \
KParts::BrowserExtension::actionSlotMapPtr();
const QList<QAction *> actions = actionCollection()->actions();
@@ -4438,7 +4438,7 @@ void KonqMainWindow::setCaption(const QString &caption)
// We can't change it there (in case of apps removing all parts altogether)
// but here we never do that.
if (!caption.isEmpty() && m_currentView) {
- //kDebug() << caption;
+ //qDebug() << caption;
// Keep an unmodified copy of the caption (before squeezing and \
KComponentData::makeStdCaption are applied) m_currentView->setCaption(caption);
@@ -4616,7 +4616,7 @@ void KonqMainWindow::slotPopupMenu(const QPoint &global, const \
KFileItemList &it KonqView *m_oldView = m_currentView;
KonqView *currentView = childView(static_cast<KParts::ReadOnlyPart \
*>(sender()->parent()));
- //kDebug() << "m_oldView=" << m_oldView << "new currentView=" << currentView << \
"passive:" << currentView->isPassiveMode(); + //qDebug() << "m_oldView=" << \
m_oldView << "new currentView=" << currentView << "passive:" << \
currentView->isPassiveMode();
if ((m_oldView != currentView) && currentView->isPassiveMode()) {
// Make this view active only temporarily (because it's passive)
@@ -4634,7 +4634,7 @@ void KonqMainWindow::slotPopupMenu(const QPoint &global, const \
KFileItemList &it
// but KonqViewManager delays the GUI-rebuilding with a single-shot timer.
// Right after the popup shows up, currentView _will_ be m_currentView.
- //kDebug() << "current view=" << m_currentView << \
m_currentView->part()->metaObject()->className(); + //qDebug() << "current view=" \
<< m_currentView << m_currentView->part()->metaObject()->className();
// This action collection is used to pass actions to KonqPopupMenu.
// It has to be a KActionCollection instead of a KActionPtrList because we need
@@ -4681,7 +4681,7 @@ void KonqMainWindow::slotPopupMenu(const QPoint &global, const \
KFileItemList &it // ## should use the new currentView->isHierarchicalView() \
instead? // Would this be correct for the konqlistview tree view?
QUrl viewURL = currentView->isToggleView() ? QUrl() : currentView->url();
- kDebug() << "viewURL=" << viewURL;
+ qDebug() << "viewURL=" << viewURL;
bool openedForViewURL = false;
//bool dirsSelected = false;
@@ -4696,7 +4696,7 @@ void KonqMainWindow::slotPopupMenu(const QPoint &global, const \
KFileItemList &it
devicesFile = firstURL.scheme().indexOf("device", 0, Qt::CaseInsensitive) == \
0; //dirsSelected = S_ISDIR( items.first()->mode() );
}
- //kDebug() << "viewURL=" << viewURL;
+ //qDebug() << "viewURL=" << viewURL;
QUrl url = viewURL;
bool isIntoTrash = url.scheme() == "trash" || \
url.url().startsWith("system:/trash"); @@ -4829,7 +4829,7 @@ void \
KonqMainWindow::slotPopupMenu(const QPoint &global, const KFileItemList &it
// Restore current view if current is passive
if ((m_oldView != currentView) && (currentView == m_currentView) && \
currentView->isPassiveMode()) {
- //kDebug() << "restoring active view" << m_oldView;
+ //qDebug() << "restoring active view" << m_oldView;
if (m_currentView->browserExtension()) {
disconnectExtension(m_currentView->browserExtension());
}
@@ -4905,7 +4905,7 @@ void KonqMainWindow::slotReconfigure()
void KonqMainWindow::reparseConfiguration()
{
- kDebug();
+ qDebug();
KonqSettings::self()->load();
m_pViewManager->applyConfiguration();
@@ -5228,7 +5228,7 @@ void KonqMainWindow::closeEvent(QCloseEvent *e)
void KonqMainWindow::addClosedWindowToUndoList()
{
- kDebug();
+ qDebug();
// 1. We get the current title
int numTabs = m_pViewManager->tabContainer()->childFrameList().count();
@@ -5246,7 +5246,7 @@ void KonqMainWindow::addClosedWindowToUndoList()
m_paClosedItems->setEnabled(true);
m_pUndoManager->addClosedWindowItem(closedWindowItem);
- kDebug() << "done";
+ qDebug() << "done";
}
void KonqMainWindow::updateWindowIcon()
@@ -5286,7 +5286,7 @@ void KonqMainWindow::goURL()
*/
void KonqMainWindow::slotAddClosedUrl(KonqFrameBase *tab)
{
- kDebug();
+ qDebug();
QString title(i18n("no name")), url("about:blank");
// Did the tab contain a single frame, or a splitter?
@@ -5324,7 +5324,7 @@ void KonqMainWindow::slotAddClosedUrl(KonqFrameBase *tab)
m_paClosedItems->setEnabled(true);
m_pUndoManager->addClosedTabItem(closedTabItem);
- kDebug() << "done";
+ qDebug() << "done";
}
void KonqMainWindow::slotLocationLabelActivated()
@@ -5358,7 +5358,7 @@ void KonqMainWindow::slotAddWebSideBar(const QUrl &url, const \
QString &name) return;
}
- kDebug() << "Requested to add URL" << url << " [" << name << "] to the \
sidebar!"; + qDebug() << "Requested to add URL" << url << " [" << name << "] to \
the sidebar!";
QAction *a = m_toggleViewGUIClient->action("konq_sidebartng");
if (!a) {
@@ -5623,12 +5623,12 @@ QStringList KonqMainWindow::historyPopupCompletionItems(const \
QString &s) #ifndef NDEBUG
void KonqMainWindow::dumpViewList()
{
- kDebug() << m_mapViews.count() << "views:";
+ qDebug() << m_mapViews.count() << "views:";
MapViews::Iterator end = m_mapViews.end();
for (MapViews::Iterator it = m_mapViews.begin(); it != end; ++it) {
KonqView *view = it.value();
- kDebug() << view << view->part();
+ qDebug() << view << view->part();
}
}
#endif
@@ -5826,7 +5826,7 @@ bool KonqMainWindow::event(QEvent *e)
for (; it != end; ++it) {
// Don't resend to sender
if (it.key() != ev->part()) {
- //kDebug() << "Sending event to view" << \
it.key()->metaObject()->className(); + //qDebug() << "Sending event to \
view" << it.key()->metaObject()->className(); QApplication::sendEvent(it.key(), e);
}
}
@@ -5863,7 +5863,7 @@ bool KonqMainWindow::stayPreloaded()
return false;
}
KonqMainWindow::setPreloadedFlag(true);
- kDebug() << "Konqy kept for preloading:" << \
QDBusConnection::sessionBus().baseService(); + qDebug() << "Konqy kept for \
preloading:" << QDBusConnection::sessionBus().baseService(); \
KonqMainWindow::setPreloadedWindow(this); return true;
#else
@@ -5884,25 +5884,25 @@ bool KonqMainWindow::checkPreloadResourceUsage()
isatty(STDIN_FILENO) ||
#endif
isatty(STDOUT_FILENO) || isatty(STDERR_FILENO)) {
- kDebug() << "Running from tty, not keeping for preloading";
+ qDebug() << "Running from tty, not keeping for preloading";
return false;
}
int limit;
int usage = current_memory_usage(&limit);
- kDebug() << "Memory usage increase: " << (usage - s_initialMemoryUsage)
+ qDebug() << "Memory usage increase: " << (usage - s_initialMemoryUsage)
<< " (" << usage << "/" << s_initialMemoryUsage << "), increase limit: \
" << limit; int max_allowed_usage = s_initialMemoryUsage + limit;
if (usage > max_allowed_usage) { // too much memory used?
- kDebug() << "Not keeping for preloading due to high memory usage";
+ qDebug() << "Not keeping for preloading due to high memory usage";
return false;
}
// working memory usage test ( usage != 0 ) makes others less strict
if (++s_preloadUsageCount > (usage != 0 ? 100 : 10)) { // reused too many times?
- kDebug() << "Not keeping for preloading due to high usage count";
+ qDebug() << "Not keeping for preloading due to high usage count";
return false;
}
if (time(NULL) > s_startupTime + 60 * 60 * (usage != 0 ? 4 : 1)) { // running \
for too long?
- kDebug() << "Not keeping for preloading due to long usage time";
+ qDebug() << "Not keeping for preloading due to long usage time";
return false;
}
return true;
@@ -5931,7 +5931,7 @@ static int current_memory_usage(int *limit)
}
}
}
- kWarning() << "Couldn't read VmSize from /proc/*/statm.";
+ qWarning() << "Couldn't read VmSize from /proc/*/statm.";
#endif
// Check malloc() usage - very imprecise, but better than nothing.
int usage_sum = 0;
diff --git a/konqueror/src/konqmisc.cpp b/konqueror/src/konqmisc.cpp
index 7f0de7d..ace26e9 100644
--- a/konqueror/src/konqmisc.cpp
+++ b/konqueror/src/konqmisc.cpp
@@ -26,7 +26,7 @@
#include "konqview.h"
#include <kapplication.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kurifilter.h>
#include <KLocalizedString>
#include <kstandarddirs.h>
@@ -78,7 +78,7 @@ KonqMainWindow *KonqMisc::createSimpleWindow(const QUrl &url, const \
KParts::Open
KonqMainWindow *KonqMisc::createNewWindow(const QUrl &url, const KonqOpenURLRequest \
&req, bool openUrl) {
- //kDebug() << "url=" << url;
+ //qDebug() << "url=" << url;
// For HTTP or html files, use the web browsing profile, otherwise use \
filemanager profile const QString profileName = url.isEmpty() || // e.g. in \
window.open
(!(KProtocolManager::supportsListing(url)) || // \
e.g. any HTTP url
diff --git a/konqueror/src/konqprofiledlg.cpp b/konqueror/src/konqprofiledlg.cpp
index 12aeae9..893f8c6 100644
--- a/konqueror/src/konqprofiledlg.cpp
+++ b/konqueror/src/konqprofiledlg.cpp
@@ -27,7 +27,7 @@
#include <kvbox.h>
#include <QListWidgetItem>
-#include <kdebug.h>
+#include <QDebug>
#include <kstandardguiitem.h>
#include <kio/global.h>
#include <kstandarddirs.h>
@@ -155,7 +155,7 @@ void KonqProfileDlg::loadAllProfiles(const QString \
&preselectProfile) for (; eIt != eEnd; ++eIt) {
QListWidgetItem *item = new KonqProfileItem(d->m_pListView, eIt.key());
QString filename = eIt.value().mid(eIt.value().lastIndexOf('/') + 1);
- kDebug() << filename;
+ qDebug() << filename;
if (filename == preselectProfile) {
profileFound = true;
d->m_pProfileNameLineEdit->setText(eIt.key());
@@ -182,7 +182,7 @@ void KonqProfileDlg::slotSave()
}
}
- kDebug() << "Saving as " << name;
+ qDebug() << "Saving as " << name;
d->m_pViewManager->saveViewProfileToFile(name, \
d->m_pProfileNameLineEdit->text(),
d->m_cbSaveURLs->isChecked() ? KonqFrameBase::saveURLs : \
KonqFrameBase::None);
diff --git a/konqueror/src/konqrun.cpp b/konqueror/src/konqrun.cpp
index 304afee..b10e969 100644
--- a/konqueror/src/konqrun.cpp
+++ b/konqueror/src/konqrun.cpp
@@ -21,7 +21,7 @@
#include "konqrun.h"
// KDE
-#include <kdebug.h>
+#include <QDebug>
#include <kmessagebox.h>
#include <KLocalizedString>
#include <kio/job.h>
@@ -43,7 +43,7 @@ KonqRun::KonqRun(KonqMainWindow *mainWindow, KonqView *_childView,
!req.args.reload() || req.userRequestedReload),
m_pMainWindow(mainWindow), m_pView(_childView), m_bFoundMimeType(false), \
m_req(req) {
- //kDebug() << "KonqRun::KonqRun() " << this;
+ //qDebug() << "KonqRun::KonqRun() " << this;
Q_ASSERT(!m_pMainWindow.isNull());
if (m_pView) {
m_pView->setLoading(true);
@@ -52,7 +52,7 @@ KonqRun::KonqRun(KonqMainWindow *mainWindow, KonqView *_childView,
KonqRun::~KonqRun()
{
- //kDebug() << "KonqRun::~KonqRun() " << this;
+ //qDebug() << "KonqRun::~KonqRun() " << this;
if (m_pView && m_pView->run() == this) {
m_pView->setRun(0);
}
@@ -60,7 +60,7 @@ KonqRun::~KonqRun()
void KonqRun::foundMimeType(const QString &_type)
{
- //kDebug() << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug();
+ //qDebug() << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug();
QString mimeType = _type; // this ref comes from the job, we lose it when using \
KIO again
@@ -137,7 +137,7 @@ void KonqRun::foundMimeType(const QString &_type)
}
if (!hasFinished()) {
- kDebug() << "Nothing special to do in KonqRun, falling back to KRun";
+ qDebug() << "Nothing special to do in KonqRun, falling back to KRun";
KRun::foundMimeType(mimeType);
}
}
@@ -206,7 +206,7 @@ void KonqRun::scanFile()
void KonqRun::slotRedirection(KIO::Job *job, const QUrl &redirectedToURL)
{
QUrl redirectFromURL = static_cast<KIO::TransferJob *>(job)->url();
- kDebug() << redirectFromURL << "->" << redirectedToURL;
+ qDebug() << redirectFromURL << "->" << redirectedToURL;
KonqHistoryManager::kself()->confirmPending(redirectFromURL);
if (redirectedToURL.scheme() == "mailto") {
diff --git a/konqueror/src/konqsessiondlg.cpp b/konqueror/src/konqsessiondlg.cpp
index 5c5e751..3ee1757 100644
--- a/konqueror/src/konqsessiondlg.cpp
+++ b/konqueror/src/konqsessiondlg.cpp
@@ -28,7 +28,7 @@
#include <QtCore/QFileInfo>
#include <QtCore/QDirIterator>
-#include <kdebug.h>
+#include <QDebug>
#include <kio/copyjob.h>
#include <ktempdir.h>
#include <kio/renamedialog.h>
diff --git a/konqueror/src/konqsessionmanager.cpp \
b/konqueror/src/konqsessionmanager.cpp index 7e032f7..16ecd5f 100644
--- a/konqueror/src/konqsessionmanager.cpp
+++ b/konqueror/src/konqsessionmanager.cpp
@@ -27,7 +27,7 @@
#include "konqsettingsxt.h"
#include <kglobal.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kio/deletejob.h>
#include <kstandarddirs.h>
#include <kvbox.h>
@@ -151,7 +151,7 @@ SessionRestoreDialog::SessionRestoreDialog(const QStringList \
&sessionFilePaths,
// Collect info from the sessions to restore
Q_FOREACH (const QString &sessionFile, sessionFilePaths) {
- kDebug() << sessionFile;
+ qDebug() << sessionFile;
QTreeWidgetItem *windowItem = 0;
KConfig config(sessionFile, KConfig::SimpleConfig);
const QList<KConfigGroup> groups = windowConfigGroups(config);
@@ -168,7 +168,7 @@ SessionRestoreDialog::SessionRestoreDialog(const QStringList \
&sessionFilePaths, }
const QString url = group.readEntry(prefix + "Url", \
QString());
const QString title = group.readEntry(prefix + "Title", \
QString());
- kDebug() << viewId << url << title;
+ qDebug() << viewId << url << title;
const QString displayText = (title.trimmed().isEmpty() ? url \
: title); if (!displayText.isEmpty()) {
if (!windowItem) {
@@ -418,7 +418,7 @@ void KonqSessionManager::enableAutosave()
delete m_sessionConfig;
m_sessionConfig = new KConfig(filePath, KConfig::SimpleConfig);
- //kDebug() << "config filename:" << m_sessionConfig->name();
+ //qDebug() << "config filename:" << m_sessionConfig->name();
m_autosaveEnabled = true;
m_autoSaveTimer.start();
diff --git a/konqueror/src/konqsettings.cpp b/konqueror/src/konqsettings.cpp
index 86888c3..10608a6 100644
--- a/konqueror/src/konqsettings.cpp
+++ b/konqueror/src/konqsettings.cpp
@@ -24,7 +24,7 @@
#include <kglobal.h>
#include <kmimetype.h>
#include <kdesktopfile.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kconfiggroup.h>
class KonqEmbedSettingsSingleton
@@ -83,7 +83,7 @@ bool KonqFMSettings::shouldEmbed(const QString &_mimeType) const
{
KMimeType::Ptr mime = KMimeType::mimeType(_mimeType, KMimeType::ResolveAliases);
if (!mime) {
- kWarning() << "Unknown mimetype" << _mimeType;
+ qWarning() << "Unknown mimetype" << _mimeType;
return false; // unknown mimetype!
}
const QString mimeType = mime->name();
@@ -92,7 +92,7 @@ bool KonqFMSettings::shouldEmbed(const QString &_mimeType) const
// 1 - in the filetypesrc config file (written by the configuration module)
QMap<QString, QString>::const_iterator it = \
m_embedMap.find(QString::fromLatin1("embed-") + mimeType); if (it != \
m_embedMap.end()) {
- kDebug() << mimeType << it.value();
+ qDebug() << mimeType << it.value();
return it.value() == QLatin1String("true");
}
// 2 - in the configuration for the group if nothing was found in the mimetype
@@ -102,7 +102,7 @@ bool KonqFMSettings::shouldEmbed(const QString &_mimeType) const
const QString mimeTypeGroup = mimeType.left(mimeType.indexOf('/'));
it = m_embedMap.find(QString::fromLatin1("embed-") + mimeTypeGroup);
if (it != m_embedMap.end()) {
- kDebug() << mimeType << "group setting:" << it.value();
+ qDebug() << mimeType << "group setting:" << it.value();
return it.value() == QLatin1String("true");
}
// 2 bis - configuration for group of parent mimetype, if different
diff --git a/konqueror/src/konqtabs.cpp b/konqueror/src/konqtabs.cpp
index d2c2a8c..851e0cc 100644
--- a/konqueror/src/konqtabs.cpp
+++ b/konqueror/src/konqtabs.cpp
@@ -31,7 +31,7 @@
#include <kapplication.h>
#include <kcolorscheme.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kiconloader.h>
#include <KLocalizedString>
#include <kstringhandler.h>
@@ -68,7 +68,7 @@ KonqFrameTabs::KonqFrameTabs(QWidget *parent, \
KonqFrameContainerBase *parentCont
"navigate through tabs. The text on the tab shows \
the content "
"currently open in it; place your mouse over the tab \
to see the full title, in "
"case it has been shortened to fit the tab \
width."));
- //kDebug() << "KonqFrameTabs::KonqFrameTabs()";
+ //qDebug() << "KonqFrameTabs::KonqFrameTabs()";
m_pParentContainer = parentContainer;
m_pActiveChild = 0L;
@@ -143,7 +143,7 @@ KonqFrameTabs::KonqFrameTabs(QWidget *parent, \
KonqFrameContainerBase *parentCont
KonqFrameTabs::~KonqFrameTabs()
{
- //kDebug() << "KonqFrameTabs::~KonqFrameTabs() " << this << " - " << \
className(); + //qDebug() << "KonqFrameTabs::~KonqFrameTabs() " << this << " - " \
<< className(); qDeleteAll(m_childFrameList);
m_childFrameList.clear();
}
@@ -173,12 +173,12 @@ void KonqFrameTabs::copyHistory(KonqFrameBase *other)
{
if (!other) {
- kDebug() << "The Frame does not exist";
+ qDebug() << "The Frame does not exist";
return;
}
if (other->frameType() != KonqFrameBase::Tabs) {
- kDebug() << "Frame types are not the same";
+ qDebug() << "Frame types are not the same";
return;
}
@@ -189,7 +189,7 @@ void KonqFrameTabs::copyHistory(KonqFrameBase *other)
void KonqFrameTabs::setTitle(const QString &title, QWidget *sender)
{
- // kDebug() << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )";
+ // qDebug() << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )";
// Make sure that '&' is displayed correctly
QString tabText(title);
setTabText(indexOf(sender), tabText.replace('&', "&&"));
@@ -197,7 +197,7 @@ void KonqFrameTabs::setTitle(const QString &title, QWidget \
*sender)
void KonqFrameTabs::setTabIcon(const QUrl &url, QWidget *sender)
{
- //kDebug() << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )";
+ //qDebug() << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )";
QIcon iconSet = QIcon::fromTheme(KonqPixmapProvider::self()->iconNameFor(url));
const int pos = indexOf(sender);
if (tabIcon(pos).pixmap(iconSize()).serialNumber() != \
iconSet.pixmap(iconSize()).serialNumber()) { @@ -215,14 +215,14 @@ void \
KonqFrameTabs::activateChild()
void KonqFrameTabs::insertChildFrame(KonqFrameBase *frame, int index)
{
- //kDebug() << "KonqFrameTabs " << this << ": insertChildFrame " << frame;
+ //qDebug() << "KonqFrameTabs " << this << ": insertChildFrame " << frame;
if (!frame) {
- kWarning() << "KonqFrameTabs " << this << ": insertChildFrame(0) !";
+ qWarning() << "KonqFrameTabs " << this << ": insertChildFrame(0) !";
return;
}
- //kDebug() << "Adding frame";
+ //qDebug() << "Adding frame";
//QTabWidget docs say that inserting tabs while already shown causes
//flicker...
@@ -256,7 +256,7 @@ void KonqFrameTabs::insertChildFrame(KonqFrameBase *frame, int \
index)
void KonqFrameTabs::childFrameRemoved(KonqFrameBase *frame)
{
- //kDebug() << "KonqFrameTabs::RemoveChildFrame " << this << ". Child " << frame \
<< " removed"; + //qDebug() << "KonqFrameTabs::RemoveChildFrame " << this << ". \
Child " << frame << " removed"; if (frame) {
removeTab(indexOf(frame->asQWidget()));
m_childFrameList.removeAll(frame);
@@ -264,10 +264,10 @@ void KonqFrameTabs::childFrameRemoved(KonqFrameBase *frame)
updateTabBarVisibility();
}
} else {
- kWarning() << "KonqFrameTabs " << this << ": childFrameRemoved(0L) !";
+ qWarning() << "KonqFrameTabs " << this << ": childFrameRemoved(0L) !";
}
- //kDebug() << "KonqFrameTabs::RemoveChildFrame finished";
+ //qDebug() << "KonqFrameTabs::RemoveChildFrame finished";
}
void KonqFrameTabs::moveTabBackward(int index)
diff --git a/konqueror/src/konqundomanager.cpp b/konqueror/src/konqundomanager.cpp
index 43b882b..6d50800 100644
--- a/konqueror/src/konqundomanager.cpp
+++ b/konqueror/src/konqundomanager.cpp
@@ -24,7 +24,7 @@
#include "konqclosedwindowsmanager.h"
#include <QAction>
#include <kio/fileundomanager.h>
-#include <kdebug.h>
+#include <QDebug>
#include <KLocalizedString>
KonqUndoManager::KonqUndoManager(QWidget *parent)
diff --git a/konqueror/src/konqview.cpp b/konqueror/src/konqview.cpp
index 7529102..d680dcb 100644
--- a/konqueror/src/konqview.cpp
+++ b/konqueror/src/konqview.cpp
@@ -33,7 +33,7 @@
#include <kio/job.h>
#include <kio/jobuidelegate.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kcursor.h>
#include <kmessagebox.h>
#include <KLocalizedString>
@@ -123,7 +123,7 @@ KonqView::KonqView(KonqViewFactory &viewFactory,
KonqView::~KonqView()
{
- //kDebug() << "part=" << m_pPart;
+ //qDebug() << "part=" << m_pPart;
// We did so ourselves for passive views
if (m_pPart != 0L) {
@@ -143,13 +143,13 @@ KonqView::~KonqView()
m_lstHistory.clear();
setRun(0L);
- //kDebug() << this << "done";
+ //qDebug() << this << "done";
}
void KonqView::openUrl(const QUrl &url, const QString &locationBarURL,
const QString &nameFilter, bool tempFile)
{
- kDebug() << "url=" << url << "locationBarURL=" << locationBarURL;
+ qDebug() << "url=" << url << "locationBarURL=" << locationBarURL;
setPartMimeType();
@@ -173,7 +173,7 @@ void KonqView::openUrl(const QUrl &url, const QString \
&locationBarURL, }
#ifdef DEBUG_HISTORY
- kDebug() << "m_bLockedLocation=" << m_bLockedLocation << \
"browserArgs.lockHistory()=" << browserArgs.lockHistory(); + qDebug() << \
"m_bLockedLocation=" << m_bLockedLocation << "browserArgs.lockHistory()=" << \
browserArgs.lockHistory(); #endif
if (browserArgs.lockHistory()) {
lockHistory();
@@ -220,7 +220,7 @@ void KonqView::openUrl(const QUrl &url, const QString \
&locationBarURL, if (url.isLocalFile()) {
m_tempFile = url.toLocalFile();
} else {
- kWarning() << "Tempfile option is set, but URL is remote:" << url;
+ qWarning() << "Tempfile option is set, but URL is remote:" << url;
}
}
@@ -233,7 +233,7 @@ void KonqView::openUrl(const QUrl &url, const QString \
&locationBarURL,
KonqHistoryManager::kself()->addPending(url, locationBarURL, QString());
#ifdef DEBUG_HISTORY
- kDebug() << "Current position:" << historyIndex();
+ qDebug() << "Current position:" << historyIndex();
#endif
#ifdef KActivities_FOUND
@@ -247,7 +247,7 @@ void KonqView::openUrl(const QUrl &url, const QString \
&locationBarURL,
void KonqView::switchView(KonqViewFactory &viewFactory)
{
- //kDebug();
+ //qDebug();
KParts::ReadOnlyPart *oldPart = m_pPart;
KParts::ReadOnlyPart *part = m_pKonqFrame->attach(viewFactory); // creates the \
part if (!part) {
@@ -274,7 +274,7 @@ void KonqView::switchView(KonqViewFactory &viewFactory)
prop = m_service->property("X-KDE-BrowserView-FollowActive");
if (prop.isValid() && prop.toBool()) {
- //kDebug() << "X-KDE-BrowserView-FollowActive -> setFollowActive";
+ //qDebug() << "X-KDE-BrowserView-FollowActive -> setFollowActive";
setFollowActive(true);
}
@@ -285,7 +285,7 @@ void KonqView::switchView(KonqViewFactory &viewFactory)
// Honor "non-removeable passive mode" (like the dirtree)
prop = m_service->property("X-KDE-BrowserView-PassiveMode");
if (prop.isValid() && prop.toBool()) {
- kDebug() << "X-KDE-BrowserView-PassiveMode -> setPassiveMode";
+ qDebug() << "X-KDE-BrowserView-PassiveMode -> setPassiveMode";
setPassiveMode(true); // set as passive
}
@@ -305,7 +305,7 @@ void KonqView::switchView(KonqViewFactory &viewFactory)
prop = m_service->property("X-KDE-BrowserView-HierarchicalView");
if (prop.isValid() && prop.toBool()) {
- kDebug() << "X-KDE-BrowserView-HierarchicalView -> setHierarchicalView";
+ qDebug() << "X-KDE-BrowserView-HierarchicalView -> setHierarchicalView";
setHierarchicalView(true); // set as hierarchial
} else {
setHierarchicalView(false);
@@ -331,7 +331,7 @@ bool KonqView::changePart(const QString &mimeType,
// Caller should call stop first.
Q_ASSERT(!m_bLoading);
- //kDebug() << "mimeType=" << mimeType
+ //qDebug() << "mimeType=" << mimeType
// << "requested serviceName=" << serviceName
// << "current service name=" << m_service->desktopEntryName();
@@ -341,7 +341,7 @@ bool KonqView::changePart(const QString &mimeType,
}
if (isLockedViewMode()) {
- //kDebug() << "This view's mode is locked - can't change";
+ //qDebug() << "This view's mode is locked - can't change";
return false; // we can't do that if our view mode is locked
}
@@ -361,7 +361,7 @@ bool KonqView::changePart(const QString &mimeType,
// Check if that's already the kind of part we have -> no need to recreate it
// Note: we should have an operator== for KService...
if (m_service && m_service->entryPath() == service->entryPath()) {
- kDebug() << "Reusing service. Service type set to" << m_serviceType;
+ qDebug() << "Reusing service. Service type set to" << m_serviceType;
if (m_pMainWindow->currentView() == this) {
m_pMainWindow->updateViewModeActions();
}
@@ -376,7 +376,7 @@ bool KonqView::changePart(const QString &mimeType,
void KonqView::connectPart()
{
- //kDebug();
+ //qDebug();
connect(m_pPart, SIGNAL(started(KIO::Job*)),
this, SLOT(slotStarted(KIO::Job*)));
connect(m_pPart, SIGNAL(completed()),
@@ -519,12 +519,12 @@ void KonqView::slotResizeTopLevelWidget(int w, int h)
void KonqView::slotStarted(KIO::Job *job)
{
- //kDebug() << job;
+ //qDebug() << job;
setLoading(true);
if (job) {
// Manage passwords properly...
- kDebug(7035) << "Window ID =" << m_pMainWindow->window()->winId();
+ //qDebug() << "Window ID =" << m_pMainWindow->window()->winId();
KJobWidgets::setWindow(job, m_pMainWindow->window());
connect(job, SIGNAL(percent(KJob*,ulong)), this, \
SLOT(slotPercent(KJob*,ulong))); @@ -540,7 +540,7 @@ void \
KonqView::slotRequestFocus(KParts::ReadOnlyPart *)
void KonqView::setLoading(bool loading, bool hasPending /*= false*/)
{
- //kDebug() << "loading=" << loading << "hasPending=" << hasPending;
+ //qDebug() << "loading=" << loading << "hasPending=" << hasPending;
m_bLoading = loading;
m_bPendingRedirection = hasPending;
if (m_pMainWindow->currentView() == this) {
@@ -550,7 +550,7 @@ void KonqView::setLoading(bool loading, bool hasPending /*= \
false*/) if (loading) {
QWidget *partWidget = (m_pPart ? m_pPart->widget() : 0);
if (partWidget && !partWidget->hasFocus()) {
- //kDebug() << "SET FOCUS on the widget";
+ //qDebug() << "SET FOCUS on the widget";
partWidget->setFocus();
}
}
@@ -581,7 +581,7 @@ void KonqView::slotCompleted()
void KonqView::slotCompleted(bool hasPending)
{
- //kDebug() << "hasPending=" << hasPending;
+ //qDebug() << "hasPending=" << hasPending;
m_pKonqFrame->statusbar()->slotLoadingProgress(-1);
if (! m_bLockHistory) {
@@ -610,7 +610,7 @@ void KonqView::slotCompleted(bool hasPending)
void KonqView::slotCanceled(const QString &errorMsg)
{
- //kDebug();
+ //qDebug();
// The errorMsg comes from the ReadOnlyPart (usually from its kio job, but not \
necessarily). // It should probably be used in a KMessageBox
// Let's use the statusbar for now
@@ -639,10 +639,10 @@ void KonqView::setLocationBarURL(const QUrl &locationBarURL)
void KonqView::setLocationBarURL(const QString &locationBarURL)
{
- //kDebug() << locationBarURL << "this=" << this;
+ //qDebug() << locationBarURL << "this=" << this;
m_sLocationBarURL = locationBarURL;
if (m_pMainWindow->currentView() == this) {
- //kDebug() << "is current view" << this;
+ //qDebug() << "is current view" << this;
m_pMainWindow->setLocationBarURL(m_sLocationBarURL);
m_pMainWindow->setPageSecurity(m_pageSecurity);
}
@@ -706,7 +706,7 @@ void KonqView::setCaption(const QString &caption)
void KonqView::slotOpenURLNotify()
{
#ifdef DEBUG_HISTORY
- kDebug();
+ qDebug();
#endif
updateHistoryEntry(true);
createHistoryEntry();
@@ -721,7 +721,7 @@ void KonqView::createHistoryEntry()
HistoryEntry *current = currentHistoryEntry();
if (current) {
#ifdef DEBUG_HISTORY
- kDebug() << "Truncating history";
+ qDebug() << "Truncating history";
#endif
while (current != m_lstHistory.last()) {
delete m_lstHistory.takeLast();
@@ -729,12 +729,12 @@ void KonqView::createHistoryEntry()
}
// Append a new entry
#ifdef DEBUG_HISTORY
- kDebug() << "Append a new entry";
+ qDebug() << "Append a new entry";
#endif
appendHistoryEntry(new HistoryEntry);
setHistoryIndex(m_lstHistory.count() - 1); // made current
#ifdef DEBUG_HISTORY
- kDebug() << "at=" << historyIndex() << "count=" << m_lstHistory.count();
+ qDebug() << "at=" << historyIndex() << "count=" << m_lstHistory.count();
#endif
}
@@ -766,19 +766,19 @@ void KonqView::updateHistoryEntry(bool saveLocationBarURL)
}
#ifdef DEBUG_HISTORY
- kDebug() << "Saving part URL:" << m_pPart->url() << "in history position" << \
historyIndex(); + qDebug() << "Saving part URL:" << m_pPart->url() << "in history \
position" << historyIndex(); #endif
current->url = m_pPart->url();
if (saveLocationBarURL) {
#ifdef DEBUG_HISTORY
- kDebug() << "Saving location bar URL:" << m_sLocationBarURL << "in history \
position" << historyIndex(); + qDebug() << "Saving location bar URL:" << \
m_sLocationBarURL << "in history position" << historyIndex(); #endif
current->locationBarURL = m_sLocationBarURL;
current->pageSecurity = m_pageSecurity;
}
#ifdef DEBUG_HISTORY
- kDebug() << "Saving title:" << m_caption << "in history position" << \
historyIndex(); + qDebug() << "Saving title:" << m_caption << "in history \
position" << historyIndex(); #endif
current->title = m_caption;
current->strServiceType = m_serviceType;
@@ -805,7 +805,7 @@ void KonqView::go(int steps)
{
if (!steps) { // [WildFox] i bet there are sites on the net with stupid devs who \
do that :) #ifdef DEBUG_HISTORY
- kDebug() << "go(0) -> reload";
+ qDebug() << "go(0) -> reload";
#endif
// [David] and you're right. And they expect that it reloads, apparently.
// [George] I'm going to make nspluginviewer rely on this too. :-)
@@ -815,7 +815,7 @@ void KonqView::go(int steps)
int newPos = historyIndex() + steps;
#ifdef DEBUG_HISTORY
- kDebug() << "steps=" << steps
+ qDebug() << "steps=" << steps
<< "newPos=" << newPos
<< "m_lstHistory.count()=" << m_lstHistory.count();
#endif
@@ -828,7 +828,7 @@ void KonqView::go(int steps)
setHistoryIndex(newPos); // sets current item
#ifdef DEBUG_HISTORY
- kDebug() << "New position" << historyIndex();
+ qDebug() << "New position" << historyIndex();
#endif
restoreHistory();
@@ -840,14 +840,14 @@ void KonqView::restoreHistory()
// the pointer points to will change with the following calls
#ifdef DEBUG_HISTORY
- kDebug() << "Restoring servicetype/name, and location bar URL from history:" << \
h.locationBarURL; + qDebug() << "Restoring servicetype/name, and location bar URL \
from history:" << h.locationBarURL; #endif
setLocationBarURL(h.locationBarURL);
setPageSecurity(h.pageSecurity);
m_sTypedURL.clear();
if (!changePart(h.strServiceType, h.strServiceName)) {
- kWarning() << "Couldn't change view mode to" << h.strServiceType << \
h.strServiceName; + qWarning() << "Couldn't change view mode to" << \
h.strServiceType << h.strServiceName; return /*false*/;
}
@@ -856,7 +856,7 @@ void KonqView::restoreHistory()
aboutToOpenURL(h.url);
if (h.reload == false && browserExtension()) {
- //kDebug() << "Restoring view from stream";
+ //qDebug() << "Restoring view from stream";
QDataStream stream(h.buffer);
browserExtension()->restoreState(stream);
@@ -874,7 +874,7 @@ void KonqView::restoreHistory()
}
#ifdef DEBUG_HISTORY
- kDebug() << "New position (2)" << historyIndex();
+ qDebug() << "New position (2)" << historyIndex();
#endif
}
@@ -935,7 +935,7 @@ void KonqView::setRun(KonqRun *run)
void KonqView::stop()
{
- //kDebug();
+ //qDebug();
m_bAborted = false;
finishedWithCurrentURL();
if (m_bLoading || m_bPendingRedirection) {
@@ -943,7 +943,7 @@ void KonqView::stop()
// we decided to keep it :)
KonqHistoryManager::kself()->confirmPending(url(), m_sTypedURL);
- //kDebug() << "m_pPart->closeUrl()";
+ //qDebug() << "m_pPart->closeUrl()";
m_pPart->closeUrl();
m_bAborted = true;
m_pKonqFrame->statusbar()->slotLoadingProgress(-1);
@@ -969,7 +969,7 @@ void KonqView::stop()
void KonqView::finishedWithCurrentURL()
{
if (!m_tempFile.isEmpty()) {
- kDebug() << "######### Deleting tempfile after use:" << m_tempFile;
+ qDebug() << "######### Deleting tempfile after use:" << m_tempFile;
QFile::remove(m_tempFile);
m_tempFile.clear();
}
@@ -1110,7 +1110,7 @@ bool KonqView::callExtensionURLMethod(const char *methodName, \
const QUrl &value)
void KonqView::setViewName(const QString &name)
{
- //kDebug() << this << "name=" << name;
+ //qDebug() << this << "name=" << name;
if (m_pPart) {
m_pPart->setObjectName(name);
}
@@ -1195,7 +1195,7 @@ bool KonqView::eventFilter(QObject *obj, QEvent *e)
if (!m_pPart) {
return false;
}
-// kDebug() << "--" << obj->className() << "--" << e->type() << "--" ;
+// qDebug() << "--" << obj->className() << "--" << e->type() << "--" ;
if (e->type() == QEvent::DragEnter && m_bURLDropHandling && obj == \
m_pPart->widget()) { QDragEnterEvent *ev = static_cast<QDragEnterEvent *>(e);
const QMimeData *mimeData = ev->mimeData();
diff --git a/konqueror/src/konqviewmanager.cpp b/konqueror/src/konqviewmanager.cpp
index f484342..e13c632 100644
--- a/konqueror/src/konqviewmanager.cpp
+++ b/konqueror/src/konqviewmanager.cpp
@@ -41,7 +41,7 @@
#include <kactionmenu.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
-#include <kdebug.h>
+#include <QDebug>
#include <kapplication.h>
#include <kglobalsettings.h>
#include <ktemporaryfile.h>
@@ -72,12 +72,12 @@ KonqViewManager::KonqViewManager(KonqMainWindow *mainWindow)
KonqView *KonqViewManager::createFirstView(const QString &mimeType, const QString \
&serviceName) {
- //kDebug() << serviceName;
+ //qDebug() << serviceName;
KService::Ptr service;
KService::List partServiceOffers, appServiceOffers;
KonqViewFactory newViewFactory = createView(mimeType, serviceName, service, \
partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/); if \
(newViewFactory.isNull()) {
- kDebug() << "No suitable factory found.";
+ qDebug() << "No suitable factory found.";
return 0;
}
@@ -99,7 +99,7 @@ KonqView *KonqViewManager::splitView(KonqView *currentView,
bool newOneFirst, bool forceAutoEmbed)
{
#ifdef DEBUG_VIEWMGR
- kDebug();
+ qDebug();
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@@ -131,7 +131,7 @@ KonqView *KonqViewManager::splitView(KonqView *currentView,
KonqFrameContainer *newContainer = parentContainer->splitChildFrame(splitFrame, \
orientation);
- //kDebug() << "Create new child";
+ //qDebug() << "Create new child";
KonqView *newView = setupView(newContainer, newViewFactory, service, \
partServiceOffers, appServiceOffers, serviceType, false);
#ifndef DEBUG
@@ -162,7 +162,7 @@ KonqView *KonqViewManager::splitView(KonqView *currentView,
#ifdef DEBUG_VIEWMGR
m_pMainWindow->dumpViewList();
printFullHierarchy();
- kDebug() << "done";
+ qDebug() << "done";
#endif
return newView;
@@ -174,7 +174,7 @@ KonqView *KonqViewManager::splitMainContainer(KonqView \
*currentView, const QString &serviceName,
bool newOneFirst)
{
- //kDebug();
+ //qDebug();
KService::Ptr service;
KService::List partServiceOffers, appServiceOffers;
@@ -206,7 +206,7 @@ KonqView *KonqViewManager::splitMainContainer(KonqView \
*currentView, #ifdef DEBUG_VIEWMGR
m_pMainWindow->dumpViewList();
printFullHierarchy();
- kDebug() << "done";
+ qDebug() << "done";
#endif
return childView;
@@ -215,7 +215,7 @@ KonqView *KonqViewManager::splitMainContainer(KonqView \
*currentView, KonqView *KonqViewManager::addTab(const QString &serviceType, const \
QString &serviceName, bool passiveMode, bool openAfterCurrentPage, int pos) {
#ifdef DEBUG_VIEWMGR
- kDebug() << "------------- KonqViewManager::addTab starting -------------";
+ qDebug() << "------------- KonqViewManager::addTab starting -------------";
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@@ -252,7 +252,7 @@ KonqView *KonqViewManager::addTab(const QString &serviceType, \
const QString &ser #ifdef DEBUG_VIEWMGR
m_pMainWindow->dumpViewList();
printFullHierarchy();
- kDebug() << "------------- KonqViewManager::addTab done -------------";
+ qDebug() << "------------- KonqViewManager::addTab done -------------";
#endif
return childView;
@@ -285,7 +285,7 @@ KonqView *KonqViewManager::addTabFromHistory(KonqView \
*currentView, int steps, b void KonqViewManager::duplicateTab(int tabIndex, bool \
openAfterCurrentPage) {
#ifdef DEBUG_VIEWMGR
- kDebug() << tabIndex;
+ qDebug() << tabIndex;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@@ -319,7 +319,7 @@ void KonqViewManager::duplicateTab(int tabIndex, bool \
openAfterCurrentPage) KonqMainWindow *KonqViewManager::breakOffTab(int tab, const \
QSize &windowSize) {
#ifdef DEBUG_VIEWMGR
- kDebug() << "tab=" << tab;
+ qDebug() << "tab=" << tab;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@@ -409,7 +409,7 @@ void KonqViewManager::removeTab(KonqFrameBase *currentFrame, bool \
emitAboutToRem {
Q_ASSERT(currentFrame);
#ifdef DEBUG_VIEWMGR
- kDebug() << currentFrame;
+ qDebug() << currentFrame;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@@ -557,11 +557,11 @@ void KonqViewManager::updatePixmaps()
void KonqViewManager::openClosedTab(const KonqClosedTabItem &closedTab)
{
- kDebug();
+ qDebug();
loadRootItem(closedTab.configGroup(), m_tabContainer, QUrl(), true, QUrl(), \
QString(), false, closedTab.pos());
int pos = (closedTab.pos() < m_tabContainer->count()) ? closedTab.pos() : \
m_tabContainer->count() - 1;
- kDebug() << "pos, m_tabContainer->count():" << pos << m_tabContainer->count() - \
1; + qDebug() << "pos, m_tabContainer->count():" << pos << m_tabContainer->count() \
- 1;
m_tabContainer->setCurrentIndex(pos);
}
@@ -569,7 +569,7 @@ void KonqViewManager::openClosedTab(const KonqClosedTabItem \
&closedTab) void KonqViewManager::removeView(KonqView *view)
{
#ifdef DEBUG_VIEWMGR
- kDebug() << view;
+ qDebug() << view;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@@ -581,19 +581,19 @@ void KonqViewManager::removeView(KonqView *view)
KonqFrame *frame = view->frame();
KonqFrameContainerBase *parentContainer = frame->parentContainer();
- kDebug() << "view=" << view << "frame=" << frame << "parentContainer=" << \
parentContainer; + qDebug() << "view=" << view << "frame=" << frame << \
"parentContainer=" << parentContainer;
if (parentContainer->frameType() == KonqFrameBase::Container) {
setActivePart(0);
- kDebug() << "parentContainer is a KonqFrameContainer";
+ qDebug() << "parentContainer is a KonqFrameContainer";
KonqFrameContainerBase *grandParentContainer = \
parentContainer->parentContainer();
- kDebug() << "grandParentContainer=" << grandParentContainer;
+ qDebug() << "grandParentContainer=" << grandParentContainer;
KonqFrameBase *otherFrame = static_cast<KonqFrameContainer \
*>(parentContainer)->otherChild(frame); if (!otherFrame) {
- kWarning() << "This shouldn't happen!";
+ qWarning() << "This shouldn't happen!";
return;
}
@@ -610,10 +610,10 @@ void KonqViewManager::removeView(KonqView *view)
m_pMainWindow->removeChildView(view);
- //kDebug() << "--- Deleting view" << view;
+ //qDebug() << "--- Deleting view" << view;
grandParentContainer->replaceChildFrame(parentContainer, otherFrame);
- //kDebug() << "--- Removing otherFrame from parentContainer";
+ //qDebug() << "--- Removing otherFrame from parentContainer";
parentContainer->childFrameRemoved(otherFrame);
delete view; // This deletes the view, which deletes the part, which deletes \
its widget @@ -628,27 +628,27 @@ void KonqViewManager::removeView(KonqView *view)
grandParentContainer->activateChild();
m_pMainWindow->viewCountChanged();
} else if (parentContainer->frameType() == KonqFrameBase::Tabs) {
- kDebug() << "parentContainer" << parentContainer << "is a KonqFrameTabs";
+ qDebug() << "parentContainer" << parentContainer << "is a KonqFrameTabs";
removeTab(frame);
} else if (parentContainer->frameType() == KonqFrameBase::MainWindow) {
- kDebug() << "parentContainer is a KonqMainWindow. This shouldn't be \
removeable, not removing."; + qDebug() << "parentContainer is a \
KonqMainWindow. This shouldn't be removeable, not removing."; } else {
- kDebug() << "Unrecognized frame type, not removing.";
+ qDebug() << "Unrecognized frame type, not removing.";
}
#ifdef DEBUG_VIEWMGR
printFullHierarchy();
m_pMainWindow->dumpViewList();
- kDebug() << "done";
+ qDebug() << "done";
#endif
}
// reimplemented from PartManager
void KonqViewManager::removePart(KParts::Part *part)
{
- //kDebug() << part;
+ //qDebug() << part;
// This is called when a part auto-deletes itself (case 1), or when
// the "delete view" above deletes, in turn, the part (case 2)
@@ -659,7 +659,7 @@ void KonqViewManager::removePart(KParts::Part *part)
KonqView *view = m_pMainWindow->childView(static_cast<KParts::ReadOnlyPart \
*>(part)); if (view) { // the child view still exists, so we are in case 1
- kDebug() << "Found a child view";
+ qDebug() << "Found a child view";
// Make sure that deleting the frame won't delete the part's widget;
// that's already taken care of by the part.
@@ -669,9 +669,9 @@ void KonqViewManager::removePart(KParts::Part *part)
view->partDeleted(); // tell the child view that the part auto-deletes \
itself
if (m_pMainWindow->mainViewsCount() == 1) {
- kDebug() << "Deleting last view -> closing the window";
+ qDebug() << "Deleting last view -> closing the window";
clear();
- kDebug() << "Closing m_pMainWindow" << m_pMainWindow;
+ qDebug() << "Closing m_pMainWindow" << m_pMainWindow;
m_pMainWindow->close(); // will delete it
return;
} else { // normal case
@@ -679,7 +679,7 @@ void KonqViewManager::removePart(KParts::Part *part)
}
}
- //kDebug() << part << "done";
+ //qDebug() << part << "done";
}
void KonqViewManager::slotPassiveModePartDeleted()
@@ -688,9 +688,9 @@ void KonqViewManager::slotPassiveModePartDeleted()
// so we have to handle suicidal ones ourselves
KParts::ReadOnlyPart *part = const_cast<KParts::ReadOnlyPart \
*>(static_cast<const KParts::ReadOnlyPart *>(sender()));
disconnect(part, SIGNAL(destroyed()), this, SLOT(slotPassiveModePartDeleted()));
- kDebug() << "part=" << part;
+ qDebug() << "part=" << part;
KonqView *view = m_pMainWindow->childView(part);
- kDebug() << "view=" << view;
+ qDebug() << "view=" << view;
if (view != 0L) { // the child view still exists, so the part suicided
view->partDeleted(); // tell the child view that the part deleted itself
removeView(view);
@@ -714,7 +714,7 @@ void KonqViewManager::viewCountChanged()
void KonqViewManager::clear()
{
- //kDebug();
+ //qDebug();
setActivePart(0);
if (m_pMainWindow->childFrame() == 0) {
@@ -723,18 +723,18 @@ void KonqViewManager::clear()
const QList<KonqView *> viewList = KonqViewCollector::collect(m_pMainWindow);
if (!viewList.isEmpty()) {
- //kDebug() << viewList.count() << "items";
+ //qDebug() << viewList.count() << "items";
foreach (KonqView *view, viewList) {
m_pMainWindow->removeChildView(view);
- //kDebug() << "Deleting" << view;
+ //qDebug() << "Deleting" << view;
delete view;
}
}
KonqFrameBase *frame = m_pMainWindow->childFrame();
Q_ASSERT(frame);
- //kDebug() << "deleting mainFrame ";
+ //qDebug() << "deleting mainFrame ";
m_pMainWindow->childFrameRemoved(frame); // will set childFrame() to NULL
delete frame;
// tab container was deleted by the above
@@ -744,7 +744,7 @@ void KonqViewManager::clear()
KonqView *KonqViewManager::chooseNextView(KonqView *view)
{
- //kDebug() << view;
+ //qDebug() << view;
int it = 0;
const QList<KonqView *> viewList = KonqViewCollector::collect(m_pMainWindow);
@@ -758,7 +758,7 @@ KonqView *KonqViewManager::chooseNextView(KonqView *view)
// the view should always be in the list
if (it == -1) {
- kWarning() << "View" << view << "is not in list!";
+ qWarning() << "View" << view << "is not in list!";
it = 0;
}
@@ -766,9 +766,9 @@ KonqView *KonqViewManager::chooseNextView(KonqView *view)
const int startIndex = it;
const int end = viewList.count();
- //kDebug() << "count=" << end;
+ //qDebug() << "count=" << end;
while (true) {
- //kDebug() << "going next";
+ //qDebug() << "going next";
if (++it == end) { // move to next
// end reached: restart from begin (but only once)
if (!rewinded) {
@@ -787,10 +787,10 @@ KonqView *KonqViewManager::chooseNextView(KonqView *view)
if (nextView && !nextView->isPassiveMode()) {
return nextView;
}
- //kDebug() << "nextView=" << nextView << "passive=" << \
nextView->isPassiveMode(); + //qDebug() << "nextView=" << nextView << \
"passive=" << nextView->isPassiveMode(); }
- //kDebug() << "returning 0";
+ //qDebug() << "returning 0";
return 0; // no next view found
}
@@ -837,7 +837,7 @@ KonqView *KonqViewManager::setupView(KonqFrameContainerBase \
*parentContainer, bool openAfterCurrentPage,
int pos)
{
- //kDebug() << "passiveMode=" << passiveMode;
+ //qDebug() << "passiveMode=" << passiveMode;
QString sType = serviceType;
@@ -845,14 +845,14 @@ KonqView *KonqViewManager::setupView(KonqFrameContainerBase \
*parentContainer, sType = m_pMainWindow->currentView()->serviceType();
}
- //kDebug() << "creating KonqFrame with parent=" << parentContainer;
+ //qDebug() << "creating KonqFrame with parent=" << parentContainer;
KonqFrame *newViewFrame = new KonqFrame(parentContainer->asQWidget(), \
parentContainer);
newViewFrame->setGeometry(0, 0, m_pMainWindow->width(), \
m_pMainWindow->height());
- //kDebug() << "Creating KonqView";
+ //qDebug() << "Creating KonqView";
KonqView *v = new KonqView(viewFactory, newViewFrame,
m_pMainWindow, service, partServiceOffers, \
appServiceOffers, sType, passiveMode);
- //kDebug() << "KonqView created - v=" << v << "v->part()=" << v->part();
+ //qDebug() << "KonqView created - v=" << v << "v->part()=" << v->part();
QObject::connect(v, \
SIGNAL(sigPartChanged(KonqView*,KParts::ReadOnlyPart*,KParts::ReadOnlyPart*)),
m_pMainWindow, \
SLOT(slotPartChanged(KonqView*,KParts::ReadOnlyPart*,KParts::ReadOnlyPart*))); @@ \
-884,7 +884,7 @@ KonqView *KonqViewManager::setupView(KonqFrameContainerBase \
*parentContainer, m_pMainWindow->viewCountChanged();
}
- //kDebug() << "done";
+ //qDebug() << "done";
return v;
}
@@ -937,11 +937,11 @@ void KonqViewManager::setCurrentProfile(const QString \
&profileFileName)
// We'll use the profile for saving window settings - so ensure we can save to \
it
const QString localPath = KStandardDirs::locateLocal("data", \
QString::fromLatin1("konqueror/profiles/") + profileFileName);
- kDebug() << profileFileName << "localPath=" << localPath;
+ qDebug() << profileFileName << "localPath=" << localPath;
KSharedConfigPtr cfg = KSharedConfig::openConfig(localPath, \
KConfig::SimpleConfig); if (!QFile::exists(localPath)) {
const QString globalFile = KStandardDirs::locate("data", \
QString::fromLatin1("konqueror/profiles/") + profileFileName);
- kDebug() << "globalFile=" << globalFile;
+ qDebug() << "globalFile=" << globalFile;
if (!globalFile.isEmpty()) {
KSharedConfigPtr globalCfg = KSharedConfig::openConfig(globalFile, \
KConfig::SimpleConfig); globalCfg->copyTo(localPath, cfg.data());
@@ -974,7 +974,7 @@ void KonqViewManager::loadViewProfileFromConfig(const \
KSharedConfigPtr &_cfg, const QString rootItem = profileGroup.readEntry("RootItem", \
"empty"); const QString childrenKey = rootItem + "_Children";
if (profileGroup.readEntry(childrenKey, QStringList()) == (QStringList() << \
"View1" << "View2")) {
- kDebug() << "Activating special tabwidget-insertion-hack";
+ qDebug() << "Activating special tabwidget-insertion-hack";
profileGroup.writeEntry(childrenKey, QStringList() << "View1" << "Tabs1");
profileGroup.writeEntry("Tabs1_Children", "View2");
}
@@ -1009,7 +1009,7 @@ void KonqViewManager::loadViewProfileFromGroup(const \
KConfigGroup &profileGroup, m_pMainWindow->action("clear_location")->trigger();
}
- //kDebug() << "after loadRootItem";
+ //qDebug() << "after loadRootItem";
// Set an active part first so that we open the URL in the current view
// (to set the location bar correctly and asap)
@@ -1054,7 +1054,7 @@ void KonqViewManager::loadViewProfileFromGroup(const \
KConfigGroup &profileGroup, }
}
- //kDebug() << "done";
+ //qDebug() << "done";
}
void KonqViewManager::setActivePart(KParts::Part *part, QWidget *)
@@ -1065,13 +1065,13 @@ void KonqViewManager::setActivePart(KParts::Part *part, \
QWidget *) void KonqViewManager::doSetActivePart(KParts::ReadOnlyPart *part)
{
if (part) {
- kDebug() << part << part->url();
+ qDebug() << part << part->url();
}
KParts::Part *mainWindowActivePart = m_pMainWindow->currentView()
? m_pMainWindow->currentView()->part() : 0;
if (part == activePart() && mainWindowActivePart == part) {
- //kDebug() << "Part is already active!";
+ //qDebug() << "Part is already active!";
return;
}
@@ -1097,9 +1097,9 @@ void KonqViewManager::doSetActivePart(KParts::ReadOnlyPart \
*part)
void KonqViewManager::slotActivePartChanged(KParts::Part *newPart)
{
- //kDebug() << newPart;
+ //qDebug() << newPart;
if (newPart == 0L) {
- //kDebug() << "newPart = 0L , returning";
+ //qDebug() << "newPart = 0L , returning";
return;
}
// Send event to mainwindow - this is useful for plugins (like searchbar)
@@ -1108,7 +1108,7 @@ void KonqViewManager::slotActivePartChanged(KParts::Part \
*newPart)
KonqView *view = m_pMainWindow->childView(static_cast<KParts::ReadOnlyPart \
*>(newPart)); if (view == 0L) {
- kDebug() << "No view associated with this part";
+ qDebug() << "No view associated with this part";
return;
}
if (view->frame()->parentContainer() == 0L) {
@@ -1118,7 +1118,7 @@ void KonqViewManager::slotActivePartChanged(KParts::Part \
*newPart) view->frame()->statusbar()->updateActiveStatus();
view->frame()->parentContainer()->setActiveChild(view->frame());
}
- //kDebug() << "done";
+ //qDebug() << "done";
}
void KonqViewManager::emitActivePartChanged()
@@ -1200,7 +1200,7 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase * }
#ifdef DEBUG_VIEWMGR
- kDebug() << "begin name=" << name << "openUrl=" << openUrl;
+ qDebug() << "begin name=" << name << "openUrl=" << openUrl;
#endif
if (name.startsWith("View") || name == "empty") {
@@ -1225,7 +1225,7 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase * }
}
}
- //kDebug() << "serviceType" << serviceType << serviceName;
+ //qDebug() << "serviceType" << serviceType << serviceName;
KService::Ptr service;
KService::List partServiceOffers, appServiceOffers;
@@ -1233,13 +1233,13 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase * KonqFactory konqFactory;
KonqViewFactory viewFactory = konqFactory.createView(serviceType, \
serviceName, &service, &partServiceOffers, &appServiceOffers, true \
/*forceAutoEmbed*/); if (viewFactory.isNull()) {
- kWarning() << "Profile Loading Error: View creation failed";
+ qWarning() << "Profile Loading Error: View creation failed";
return; //ugh..
}
bool passiveMode = \
cfg.readEntry(QString::fromLatin1("PassiveMode").prepend(prefix), false);
- //kDebug() << "Creating View Stuff; parent=" << parent;
+ //qDebug() << "Creating View Stuff; parent=" << parent;
if (parent == m_pMainWindow) {
parent = tabContainer();
}
@@ -1277,7 +1277,7 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase * }
if (!url.isEmpty()) {
- //kDebug() << "calling openUrl" << url;
+ //qDebug() << "calling openUrl" << url;
//childView->openUrl( url, url.prettyUrl() );
// We need view-follows-view (for the dirtree, for instance)
KonqOpenURLRequest req;
@@ -1286,24 +1286,24 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase * }
m_pMainWindow->openView(serviceType, url, childView, req);
}
- //else kDebug() << "url is empty";
+ //else qDebug() << "url is empty";
}
}
// Do this after opening the URL, so that it's actually possible to open it \
:)
childView->setLockedLocation(cfg.readEntry(QString::fromLatin1("LockedLocation").prepend(prefix), \
false)); } else if (name.startsWith("Container")) {
- //kDebug() << "Item is Container";
+ //qDebug() << "Item is Container";
//load container config
QString ostr = \
cfg.readEntry(QString::fromLatin1("Orientation").prepend(prefix), \
QString());
- //kDebug() << "Orientation:" << ostr;
+ //qDebug() << "Orientation:" << ostr;
Qt::Orientation o;
if (ostr == "Vertical") {
o = Qt::Vertical;
} else if (ostr == "Horizontal") {
o = Qt::Horizontal;
} else {
- kWarning() << "Profile Loading Error: No orientation specified in" << \
name; + qWarning() << "Profile Loading Error: No orientation specified in" \
<< name; o = Qt::Horizontal;
}
@@ -1314,7 +1314,7 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase *
QStringList childList = \
cfg.readEntry(QString::fromLatin1("Children").prepend(prefix), QStringList()); if \
(childList.count() < 2) {
- kWarning() << "Profile Loading Error: Less than two children in" << \
name; + qWarning() << "Profile Loading Error: Less than two children in" \
<< name; // fallback to defaults
loadItem(cfg, parent, "InitialView", defaultURL, openUrl, forcedUrl, \
forcedService); } else {
@@ -1329,7 +1329,7 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase *
loadItem(cfg, newContainer, childList.at(0), defaultURL, openUrl, \
forcedUrl, forcedService);
loadItem(cfg, newContainer, childList.at(1), defaultURL, openUrl, \
forcedUrl, forcedService);
- //kDebug() << "setSizes" << sizes;
+ //qDebug() << "setSizes" << sizes;
newContainer->setSizes(sizes);
if (index == 1) {
@@ -1341,7 +1341,7 @@ void KonqViewManager::loadItem(const KConfigGroup &cfg, \
KonqFrameContainerBase * newContainer->show();
}
} else if (name.startsWith("Tabs")) {
- //kDebug() << "Item is a Tabs";
+ //qDebug() << "Item is a Tabs";
int index = \
cfg.readEntry(QString::fromLatin1("activeChildIndex").prepend(prefix), 0); if \
(!m_tabContainer) { @@ -1368,14 +1368,14 @@ void KonqViewManager::loadItem(const \
KConfigGroup &cfg, KonqFrameContainerBase * m_tabContainer->setCurrentIndex(index);
m_tabContainer->show();
} else {
- kWarning() << "Profile Loading Error: Unknown current item index" << \
index; + qWarning() << "Profile Loading Error: Unknown current item index" \
<< index; }
} else {
- kWarning() << "Profile Loading Error: Unknown item" << name;
+ qWarning() << "Profile Loading Error: Unknown item" << name;
}
- //kDebug() << "end" << name;
+ //qDebug() << "end" << name;
}
void KonqViewManager::setProfiles(KActionMenu *profiles)
@@ -1546,7 +1546,7 @@ public:
} else {
className = frame->part()->widget()->metaObject()->className();
}
- kDebug() << m_spaces << frame
+ qDebug() << m_spaces << frame
<< "parent=" << frame->parentContainer()
<< (frame->isHidden() ? "hidden" : "shown")
<< "containing view" << frame->childView()
@@ -1556,7 +1556,7 @@ public:
}
virtual bool visit(KonqFrameContainer *container)
{
- kDebug() << m_spaces << container
+ qDebug() << m_spaces << container
<< (container->isHidden() ? "hidden" : "shown")
<< (container->orientation() == Qt::Horizontal ? "horizontal" : \
"vertical") << "sizes=" << container->sizes()
@@ -1564,7 +1564,7 @@ public:
<< "activeChild=" << container->activeChild();
if (!container->activeChild()) {
- kDebug() << "WARNING:" << container << "has a null active child!";
+ qDebug() << "WARNING:" << container << "has a null active child!";
}
m_spaces += " ";
@@ -1572,11 +1572,11 @@ public:
}
virtual bool visit(KonqFrameTabs *tabs)
{
- kDebug() << m_spaces << "KonqFrameTabs" << tabs
+ qDebug() << m_spaces << "KonqFrameTabs" << tabs
<< "visible=" << tabs->isVisible()
<< "activeChild=" << tabs->activeChild();
if (!tabs->activeChild()) {
- kDebug() << "WARNING:" << tabs << "has a null active child!";
+ qDebug() << "WARNING:" << tabs << "has a null active child!";
}
m_spaces += " ";
return true;
@@ -1605,7 +1605,7 @@ private:
void KonqViewManager::printFullHierarchy()
{
- kDebug() << "currentView=" << m_pMainWindow->currentView();
+ qDebug() << "currentView=" << m_pMainWindow->currentView();
KonqDebugFrameVisitor visitor;
m_pMainWindow->accept(&visitor);
}
@@ -1631,7 +1631,7 @@ bool KonqViewManager::isTabBarVisible() const
void KonqViewManager::createTabContainer(QWidget *parent, KonqFrameContainerBase \
*parentContainer) {
#ifdef DEBUG_VIEWMGR
- kDebug() << "createTabContainer" << parent << parentContainer;
+ qDebug() << "createTabContainer" << parent << parentContainer;
#endif
m_tabContainer = new KonqFrameTabs(parent, parentContainer, this);
// Delay the opening of the URL for #106641
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic