kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove area "1202 (konqueror)", it's now "konqueror" automatically

Browse source 
(or kfmclient, it was a bug to use 1202 there)

svn path=/trunk/KDE/kdebase/apps/; revision=1011096
This commit is contained in:
David Faure 2009-08-13 22:50:41 +00:00
parent e320778b29
commit 331f9a9780
23 changed files with 272 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
konqueror/client/kfmclient.cpp
View file

@ -120,7 +120,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
version = atoi( getenv( "KDE_SESSION_VERSION" ));
if( version != 0 && version != KDE_VERSION_MAJOR )
{
kDebug( 1202 ) << "Forwarding to kfmclient from KDE version " << version;
kDebug() << "Forwarding to kfmclient from KDE version " << version;
char wrapper[ 10 ];
sprintf( wrapper, "kde%d", version );
char** newargv = new char*[ argc + 2 ];
@ -321,7 +321,7 @@ static bool krun_has_error = false;
bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, const QString & mimetype)
{
kDebug( 1202 ) << url << "mimetype=" << mimetype;
kDebug() << url << "mimetype=" << mimetype;
needInstance();
if (url.protocol().startsWith(QLatin1String("http")))
@ -389,7 +389,7 @@ bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, co
QString appId = konqyToReuse( url.url(), mimetype, QString() );
if( !appId.isEmpty())
{
kDebug( 1202 ) << "ClientApp::createNewWindow using existing konqueror";
kDebug() << "ClientApp::createNewWindow using existing konqueror";
org::kde::Konqueror::Main konq( appId, "/KonqMain", dbus );
konq.createNewWindow( url.url(), mimetype, startup_id_str, tempFile );
sendASNChange();
@ -420,7 +420,7 @@ bool ClientApp::createNewWindow(const KUrl & url, bool newTab, bool tempFile, co
#ifdef Q_WS_X11
KStartupInfo::resetStartupEnv();
#endif
kDebug( 1202 ) << "ClientApp::createNewWindow KProcess started";
kDebug() << "ClientApp::createNewWindow KProcess started";
//}
}
return true;

2
konqueror/preloader/preloader.cc
View file

@ -126,7 +126,7 @@ void KonqyPreloader::updateCount()
if( KToolInvocation::kdeinitExec( QLatin1String( "konqueror" ),
QStringList() << QLatin1String( "--preload" ), NULL, NULL, "0" ) == 0 )
{
kDebug( 1202 ) << "Preloading Konqueror instance";
kDebug() << "Preloading Konqueror instance";
check_always_preloaded_timer.start( 5000 );
}
// else do nothing, the launching failed

4
konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp
View file

@ -622,7 +622,7 @@ void KonqSidebarDirTreeModule::followURL( const KUrl & url )
kDebug() << "No parent found for url " << url.prettyUrl();
return;
}
kDebug(1202) << "Found parent " << uParent.prettyUrl();
kDebug() << "Found parent " << uParent.prettyUrl();
// That's the parent directory we found. Open if not open...
if ( !parentItem->isOpen() )
@ -635,7 +635,7 @@ void KonqSidebarDirTreeModule::followURL( const KUrl & url )
} else
{
m_selectAfterOpening = url;
kDebug(1202) << "KonqSidebarDirTreeModule::followURL: m_selectAfterOpening=" << m_selectAfterOpening.url();
kDebug() << "KonqSidebarDirTreeModule::followURL: m_selectAfterOpening=" << m_selectAfterOpening.url();
}
}
}

2
konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp
View file

@ -77,7 +77,7 @@ void KonqSidebarTreeTopLevelItem::drop( QDropEvent * ev )
tree()->addUrl(this, *it);
}
} else
kError(1202) << "No URL !? " << endl;
kError() << "No URL !? " << endl;
}
else // Top level item, not group
{

8
konqueror/src/KonquerorAdaptor.cpp
View file

@ -102,8 +102,8 @@ QDBusObjectPath KonquerorAdaptor::createBrowserWindowFromProfile( const QString&
#ifdef Q_WS_X11
QX11Info::setAppUserTime( 0 );
#endif
kDebug(1202) << "void KonquerorAdaptor::createBrowserWindowFromProfile( path, filename ) ";
kDebug(1202) << path << "," << filename;
kDebug() << "void KonquerorAdaptor::createBrowserWindowFromProfile( path, filename ) ";
kDebug() << path << "," << filename;
KonqMainWindow *res = KonqMisc::createBrowserWindowFromProfile( path, filename );
if ( !res )
return QDBusObjectPath("/");
@ -216,11 +216,11 @@ bool KonquerorAdaptor::processCanBeReused( int screen )
return true;
foreach ( KonqMainWindow* window, *windows )
{
kDebug(1202) << "processCanBeReused: count=" << window->viewCount();
kDebug() << "processCanBeReused: count=" << window->viewCount();
const KonqMainWindow::MapViews& views = window->viewMap();
foreach ( KonqView* view, views )
{
kDebug(1202) << "processCanBeReused: part=" << view->service()->entryPath() << ", URL=" << view->url().prettyUrl();
kDebug() << "processCanBeReused: part=" << view->service()->entryPath() << ", URL=" << view->url().prettyUrl();
if( !allowed_parts.contains( view->service()->entryPath()))
return false;
}

6
konqueror/src/konqactions.cpp
View file

@ -49,7 +49,7 @@ void KonqActions::fillHistoryPopup(const QList<HistoryEntry*> &history, int hist
{
assert ( popup ); // kill me if this 0... :/
//kDebug(1202) << "fillHistoryPopup position: " << history.at();
//kDebug() << "fillHistoryPopup position: " << history.at();
int index = 0;
if (onlyBack || onlyForward) // this if() is always true nowadays.
{
@ -67,13 +67,13 @@ void KonqActions::fillHistoryPopup(const QList<HistoryEntry*> &history, int hist
const QString iconName = KonqPixmapProvider::self()->iconNameFor(history[index]->url);
QAction* action = new QAction(KIcon(iconName), text, popup);
action->setData(index - historyIndex);
//kDebug(1202) << text << index - historyIndex;
//kDebug() << text << index - historyIndex;
popup->addAction(action);
if (++i > 10)
break;
if (!onlyForward) --index; else ++index;
}
//kDebug(1202) << "After fillHistoryPopup position: " << history.at();
//kDebug() << "After fillHistoryPopup position: " << history.at();
}
///////////////////////////////

8
konqueror/src/konqcloseditem.cpp
View file

@ -56,19 +56,19 @@ KonqClosedItem::KonqClosedItem(const QString& title, const QString& group, quint
KonqClosedItem::~KonqClosedItem()
{
m_configGroup.deleteGroup();
kDebug(1202) << "deleted group" << m_configGroup.name();
kDebug() << "deleted group" << m_configGroup.name();
}
KonqClosedTabItem::KonqClosedTabItem(const QString& url, const QString& title, int pos, quint64 serialNumber)
: KonqClosedItem(title, "Closed_Tab" + QString::number((qint64)this), serialNumber), m_url(url), m_pos(pos)
{
kDebug(1202) << m_configGroup.name();
kDebug() << m_configGroup.name();
}
KonqClosedTabItem::~KonqClosedTabItem()
{
m_configGroup.deleteGroup();
kDebug(1202) << "deleted group" << m_configGroup.name();
kDebug() << "deleted group" << m_configGroup.name();
}
QPixmap KonqClosedTabItem::icon() const {
@ -78,7 +78,7 @@ QPixmap KonqClosedTabItem::icon() const {
KonqClosedWindowItem::KonqClosedWindowItem(const QString& title, quint64 serialNumber, int numTabs)
: KonqClosedItem(title, "Closed_Window" + QString::number((qint64)this), serialNumber), m_numTabs(numTabs)
{
kDebug(1202) << m_configGroup.name();
kDebug() << m_configGroup.name();
}
KonqClosedWindowItem::~KonqClosedWindowItem()

12
konqueror/src/konqcombo.cpp
View file

@ -169,7 +169,7 @@ void KonqCombo::init( KCompletion *completion )
void KonqCombo::setURL( const QString& url )
{
//kDebug(1202) << url << "returnPressed=" << m_returnPressed;
//kDebug() << url << "returnPressed=" << m_returnPressed;
setTemporary( url );
if ( m_returnPressed ) { // Really insert...
@ -190,7 +190,7 @@ void KonqCombo::setTemporary( const QString& text )
void KonqCombo::setTemporary( const QString& url, const QPixmap& pix )
{
//kDebug(1202) << url << "temporary=" << temporary;
//kDebug() << url << "temporary=" << temporary;
// Insert a temporary item when we don't have one yet
if ( count() == 0 )
@ -208,7 +208,7 @@ void KonqCombo::setTemporary( const QString& url, const QPixmap& pix )
void KonqCombo::removeDuplicates( int index )
{
//kDebug(1202) << "starting index= " << index;
//kDebug() << "starting index= " << index;
QString url(temporaryItem());
if (url.endsWith('/'))
@ -229,7 +229,7 @@ void KonqCombo::removeDuplicates( int index )
// called via DBUS in all instances
void KonqCombo::insertPermanent( const QString& url )
{
//kDebug(1202) << "url=" << url;
//kDebug() << "url=" << url;
saveState();
setTemporary( url );
m_permanent = true;
@ -249,7 +249,7 @@ void KonqCombo::applyPermanent()
QString item = temporaryItem();
insertItem( KonqPixmapProvider::self()->pixmapFor( item ), item, 1, titleOfURL( item ) );
//kDebug(1202) << url;
//kDebug() << url;
// Remove all duplicates starting from index = 2
removeDuplicates( 2 );
@ -274,7 +274,7 @@ void KonqCombo::updateItem( const QPixmap& pix, const QString& t, int index, con
(!itemIcon(index).isNull() && itemIcon(index).pixmap(iconSize()).serialNumber() == pix.serialNumber()))
return;
// kDebug(1202) << "item=" << t << "index=" << index;
// kDebug() << "item=" << t << "index=" << index;
setItemText( index, t );
setItemIcon( index, pix );

20
konqueror/src/konqfactory.cpp
View file

@ -71,7 +71,7 @@ KParts::ReadOnlyPart *KonqViewFactory::create( QWidget *parentWidget, QObject *
KParts::ReadOnlyPart* part = m_factory->create<KParts::ReadOnlyPart>( parentWidget, parent, QString(), m_args );
if ( !part ) {
kError(1202) << "No KParts::ReadOnlyPart created from" << m_libName;
kError() << "No KParts::ReadOnlyPart created from" << m_libName;
} else {
QFrame* frame = qobject_cast<QFrame*>( part->widget() );
if ( frame ) {
@ -103,7 +103,7 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
KService::List *appServiceOffers,
bool forceAutoEmbed )
{
kDebug(1202) << "Trying to create view for" << serviceType << serviceName;
kDebug() << "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 ( ! KonqFMSettings::settings()->shouldEmbed( serviceType ) )
{
kDebug(1202) << "KonqFMSettings says: don't embed this servicetype";
kDebug() << "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(1202) << "Found requested service" << serviceName;
kDebug() << "Found requested service" << serviceName;
service = *it;
}
}
@ -149,7 +149,7 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
KonqViewFactory viewFactory;
if (service) {
kDebug(1202) << "Trying to open lib for requested service " << service->desktopEntryName();
kDebug() << "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(1202) << service->desktopEntryName() << " : X-KDE-BrowserView-AllowAsDefault is valid : " << prop.isValid();
kDebug() << service->desktopEntryName() << " : X-KDE-BrowserView-AllowAsDefault is valid : " << prop.isValid();
if ( !prop.isValid() || prop.toBool() ) { // defaults to true
//kDebug(1202) << "Trying to open lib for service " << service->name();
//kDebug() << "Trying to open lib for service " << service->name();
viewFactory = tryLoadingService(service);
// If this works, we exit the loop.
} else {
kDebug(1202) << "Not allowed as default " << service->desktopEntryName();
kDebug() << "Not allowed as default " << service->desktopEntryName();
}
}
}
@ -176,9 +176,9 @@ KonqViewFactory KonqFactory::createView( const QString &serviceType,
if (viewFactory.isNull()) {
if (offers.isEmpty())
kWarning(1202) << "no part was associated with" << serviceType;
kWarning() << "no part was associated with" << serviceType;
else
kWarning(1202) << "no part could be loaded"; // full error was shown to user already
kWarning() << "no part could be loaded"; // full error was shown to user already
return viewFactory;
}

10
konqueror/src/konqframe.cpp
View file

@ -84,7 +84,7 @@ KonqFrameBase::FrameType frameTypeFromString( const QString& str )
KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer )
: QWidget ( parent )
{
//kDebug(1202) << "KonqFrame::KonqFrame()";
//kDebug() << "KonqFrame::KonqFrame()";
m_pLayout = 0L;
m_pView = 0L;
@ -100,7 +100,7 @@ KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer )
KonqFrame::~KonqFrame()
{
//kDebug(1202) << "KonqFrame::~KonqFrame() " << this;
//kDebug() << "KonqFrame::~KonqFrame() " << this;
}
bool KonqFrame::isActivePart()
@ -148,7 +148,7 @@ void KonqFrame::copyHistory( KonqFrameBase *other )
void KonqFrame::attachWidget(QWidget* widget)
{
//kDebug(1202) << "KonqFrame::attachInternal()";
//kDebug() << "KonqFrame::attachInternal()";
delete m_pLayout;
m_pLayout = new QVBoxLayout( this );
@ -199,14 +199,14 @@ void KonqFrame::setView( KonqView* child )
void KonqFrame::setTitle( const QString &title , QWidget* /*sender*/)
{
//kDebug(1202) << "KonqFrame::setTitle( " << title << " )";
//kDebug() << "KonqFrame::setTitle( " << title << " )";
m_title = title;
if (m_pParentContainer) m_pParentContainer->setTitle( title , this);
}
void KonqFrame::setTabIcon( const KUrl &url, QWidget* /*sender*/ )
{
//kDebug(1202) << "KonqFrame::setTabIcon( " << url << " )";
//kDebug() << "KonqFrame::setTabIcon( " << url << " )";
if (m_pParentContainer) m_pParentContainer->setTabIcon( url, this );
}

18
konqueror/src/konqframecontainer.cpp
View file

@ -131,21 +131,21 @@ void KonqFrameContainer::swapChildren()
void KonqFrameContainer::setTitle( const QString &title , QWidget* sender)
{
//kDebug(1202) << title << sender;
//kDebug() << title << sender;
if (m_pParentContainer && activeChild() && (sender == activeChild()->asQWidget()))
m_pParentContainer->setTitle( title , this);
}
void KonqFrameContainer::setTabIcon( const KUrl &url, QWidget* sender )
{
//kDebug(1202) << url << sender;
//kDebug() << url << sender;
if (m_pParentContainer && activeChild() && (sender == activeChild()->asQWidget()))
m_pParentContainer->setTabIcon( url, this );
}
void KonqFrameContainer::insertChildFrame(KonqFrameBase* frame, int index)
{
//kDebug(1202) << this << frame;
//kDebug() << this << frame;
if (frame) {
QSplitter::insertWidget(index, frame->asQWidget());
// Insert before existing child? Move first to second.
@ -155,23 +155,23 @@ void KonqFrameContainer::insertChildFrame(KonqFrameBase* frame, int index)
if( !m_pFirstChild ) {
m_pFirstChild = frame;
frame->setParentContainer(this);
//kDebug(1202) << "Setting as first child";
//kDebug() << "Setting as first child";
} else if( !m_pSecondChild ) {
m_pSecondChild = frame;
frame->setParentContainer(this);
//kDebug(1202) << "Setting as second child";
//kDebug() << "Setting as second child";
} else {
kWarning(1202) << this << "already has two children..."
kWarning() << this << "already has two children..."
<< m_pFirstChild << "and" << m_pSecondChild;
}
} else {
kWarning(1202) << "KonqFrameContainer" << this << ": insertChildFrame(NULL)!" ;
kWarning() << "KonqFrameContainer" << this << ": insertChildFrame(NULL)!" ;
}
}
void KonqFrameContainer::childFrameRemoved(KonqFrameBase * frame)
{
//kDebug(1202) << this << "Child" << frame << "removed";
//kDebug() << this << "Child" << frame << "removed";
if( m_pFirstChild == frame ) {
m_pFirstChild = m_pSecondChild;
@ -179,7 +179,7 @@ void KonqFrameContainer::childFrameRemoved(KonqFrameBase * frame)
} else if( m_pSecondChild == frame ) {
m_pSecondChild = 0;
} else {
kWarning(1202) << this << "Can't find this child:" << frame ;
kWarning() << this << "Can't find this child:" << frame ;
}
}

2
konqueror/src/konqframestatusbar.cpp
View file

@ -216,7 +216,7 @@ void KonqFrameStatusBar::message( const QString &msg )
void KonqFrameStatusBar::slotDisplayStatusText(const QString& text)
{
//kDebug(1202) << text;
//kDebug() << text;
m_pStatusLabel->setText(text);
m_savedMessage = text;
}

2
konqueror/src/konqguiclients.cpp
View file

@ -134,7 +134,7 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow )
{
QString description = i18n( "Show %1" , (*cIt)->name() );
QString name = (*cIt)->desktopEntryName();
//kDebug(1202) << "ToggleViewGUIClient: name=" << name;
//kDebug() << "ToggleViewGUIClient: name=" << name;
KToggleAction *action = new KToggleAction( description, this );
mainWindow->actionCollection()->addAction( name.toLatin1(), action );
action->setCheckedState( KGuiItem(i18n( "Hide %1" , (*cIt)->name() )) );

4
konqueror/src/konqhistorymanager.cpp
View file

@ -91,7 +91,7 @@ void KonqHistoryManager::addToHistory( bool pending, const KUrl& _url,
const QString& typedUrl,
const QString& title )
{
//kDebug(1202) << _url << "Typed URL:" << typedUrl << ", Title:" << title;
//kDebug() << _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 KUrl& url )
{
// kDebug(1202) << "Removing pending..." << url;
// kDebug() << "Removing pending..." << url;
if ( url.isLocalFile() )
return;

8
konqueror/src/konqmain.cpp
View file

@ -140,7 +140,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
kurl.setFileName("");
}
}
kDebug(1202) << "main() -> createBrowserWindowFromProfile mimeType=" << urlargs.mimeType();
kDebug() << "main() -> createBrowserWindowFromProfile mimeType=" << urlargs.mimeType();
KonqMisc::createBrowserWindowFromProfile( profilePath, profile, kurl, urlargs, KParts::BrowserArguments(), false, filesToSelect );
}
else if (args->isSet("sessions"))
@ -190,7 +190,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
// KonqMainWindow ctor sets always the preloaded flag to false, so create the window before this
KonqMainWindow::setPreloadedFlag( true );
KonqMainWindow::setPreloadedWindow( win );
kDebug(1202) << "Konqy preloaded :" << QDBusConnection::sessionBus().baseService();
kDebug() << "Konqy preloaded :" << QDBusConnection::sessionBus().baseService();
}
else
{
@ -204,7 +204,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
const QString profile = KonqMisc::defaultProfileName();
KonqMisc::createBrowserWindowFromProfile( KonqMisc::defaultProfilePath(), profile );
}
kDebug(1202) << "main() -> no args";
kDebug() << "main() -> no args";
}
else
{
@ -232,7 +232,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
if (args->isSet("mimetype"))
{
urlargs.setMimeType( args->getOption("mimetype") );
kDebug(1202) << "main() : setting mimeType to " << urlargs.mimeType();
kDebug() << "main() : setting mimeType to " << urlargs.mimeType();
}
if (args->isSet("select"))
{

166
konqueror/src/konqmainwindow.cpp
View file

@ -300,7 +300,7 @@ KonqMainWindow::KonqMainWindow( const KUrl &initialURL, const QString& xmluiFile
if ( !initialGeometrySet() )
resize( 700, 480 );
//kDebug(1202) << this << "done";
//kDebug() << this << "done";
if( s_initialMemoryUsage == -1 )
{
@ -314,7 +314,7 @@ KonqMainWindow::KonqMainWindow( const KUrl &initialURL, const QString& xmluiFile
KonqMainWindow::~KonqMainWindow()
{
//kDebug(1202) << this;
//kDebug() << this;
delete m_pViewManager;
m_pViewManager = 0;
@ -351,7 +351,7 @@ KonqMainWindow::~KonqMainWindow()
delete m_pUndoManager;
decInstancesCount();
//kDebug(1202) << this << "done";
//kDebug() << this << "done";
}
void KonqMainWindow::incInstancesCount()
@ -455,7 +455,7 @@ QString KonqMainWindow::detectNameFilter( KUrl & url )
{
nameFilter = fileName;
url.setFileName( QString() );
kDebug(1202) << "Found wildcard. nameFilter=" << nameFilter << " New url=" << url;
kDebug() << "Found wildcard. nameFilter=" << nameFilter << " New url=" << url;
}
}
}
@ -470,7 +470,7 @@ void KonqMainWindow::openFilteredUrl(const QString & url, const KonqOpenURLReque
m_currentDir = m_currentView->url().path( KUrl::AddTrailingSlash );
KUrl filteredURL ( KonqMisc::konqFilteredURL( this, url, m_currentDir ) );
kDebug(1202) << "url" << url << "filtered into" << filteredURL;
kDebug() << "url" << url << "filtered into" << filteredURL;
if ( filteredURL.isEmpty() ) // initially empty, or error (e.g. ~unknown_user)
return;
@ -503,7 +503,7 @@ void KonqMainWindow::openUrl(KonqView *_view, const KUrl &_url,
bool trustedSource)
{
#ifndef NDEBUG // needed for req.debug()
kDebug(1202) << "url=" << _url << "mimeType=" << _mimeType
kDebug() << "url=" << _url << "mimeType=" << _mimeType
<< "_req=" << _req.debug() << "view=" << _view;
#endif
@ -618,7 +618,7 @@ void KonqMainWindow::openUrl(KonqView *_view, const KUrl &_url,
}
//kDebug(1202) << "trying openView for" << url << "( mimeType" << mimeType << ")";
//kDebug() << "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" )
{
@ -631,11 +631,11 @@ void KonqMainWindow::openUrl(KonqView *_view, const KUrl &_url,
// Built-in view ?
if ( !openView( mimeType, url, view /* can be 0 */, req ) )
{
//kDebug(1202) << "openView returned false";
//kDebug() << "openView returned false";
// Are we following another view ? Then forget about this URL. Otherwise fire app.
if ( !req.followMode )
{
//kDebug(1202) << "we were not following. Fire app.";
//kDebug() << "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
@ -661,7 +661,7 @@ void KonqMainWindow::openUrl(KonqView *_view, const KUrl &_url,
return;
KUrl::List lst;
lst.append(url);
//kDebug(1202) << "Got offer" << (offer ? offer->name() : QString("0"));
//kDebug() << "Got offer" << (offer ? offer->name() : QString("0"));
const bool allowExecution = trustedSource || KParts::BrowserRun::allowExecution( mimeType, url );
if ( allowExecution &&
( KonqRun::isExecutable( mimeType ) || !offer || !KRun::run( *offer, lst, this ) ) )
@ -685,11 +685,11 @@ void KonqMainWindow::openUrl(KonqView *_view, const KUrl &_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(1202) << "url=" << url;
kDebug() << "url=" << url;
setLocationBarURL( url );
}
kDebug(1202) << "Creating new konqrun for" << url << "req.typedUrl=" << req.typedUrl;
kDebug() << "Creating new konqrun for" << url << "req.typedUrl=" << req.typedUrl;
KonqRun * run = new KonqRun( this, view /* can be 0 */, url, req, trustedSource );
@ -721,7 +721,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
// Contract: the caller of this method should ensure the view is stopped first.
#ifndef NDEBUG
kDebug(1202) << mimeType << _url << "childView=" << childView << "req:" << req.debug();
kDebug() << mimeType << _url << "childView=" << childView << "req:" << req.debug();
#endif
bool bOthersFollowed = false;
@ -783,7 +783,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
forceAutoEmbed = true;
// Related to KonqFactory::createView
if (!forceAutoEmbed && !KonqFMSettings::settings()->shouldEmbed(mimeType)) {
kDebug(1202) << "KonqFMSettings says: don't embed this servicetype";
kDebug() << "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.
@ -791,7 +791,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
KService::List partServiceOffers;
KonqFactory::getOffers(mimeType, &partServiceOffers);
if (partServiceOffers.isEmpty()) {
kDebug(1202) << "No part available for" << mimeType;
kDebug() << "No part available for" << mimeType;
return false;
}
}
@ -841,7 +841,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
KConfigGroup urlProperties( &config, "URL properties" );
HTMLAllowed = urlProperties.readEntry( "HTMLAllowed", m_bHTMLAllowed);
//serviceName = urlProperties.readEntry( "ViewMode", serviceName );
//kDebug(1202) << "serviceName=" << serviceName;
//kDebug() << "serviceName=" << serviceName;
}
QString indexFile;
if ( HTMLAllowed &&
@ -916,10 +916,10 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
if (ok)
{
//kDebug(1202) << "req.nameFilter= " << req.nameFilter;
//kDebug(1202) << "req.typedUrl= " << req.typedUrl;
//kDebug(1202) << "Browser extension? " << (childView->browserExtension() ? "YES" : "NO");
//kDebug(1202) << "Referrer: " << req.args.metaData()["referrer"];
//kDebug() << "req.nameFilter= " << req.nameFilter;
//kDebug() << "req.typedUrl= " << req.typedUrl;
//kDebug() << "Browser extension? " << (childView->browserExtension() ? "YES" : "NO");
//kDebug() << "Referrer: " << req.args.metaData()["referrer"];
childView->setTypedURL( req.typedUrl );
if ( childView->part() )
childView->part()->setArguments( req.args );
@ -933,7 +933,7 @@ bool KonqMainWindow::openView( QString mimeType, const KUrl &_url, KonqView *chi
if ( !url.isEmpty() )
childView->openUrl( url, originalURL, req.nameFilter, req.tempFile );
}
//kDebug(1202) << "ok=" << ok << "bOthersFollowed=" << bOthersFollowed
//kDebug() << "ok=" << ok << "bOthersFollowed=" << bOthersFollowed
// << "returning" << (ok || bOthersFollowed);
return ok || bOthersFollowed;
}
@ -956,7 +956,7 @@ static KonqView * findChildView( KParts::ReadOnlyPart *callingPart, const QStrin
void KonqMainWindow::slotOpenURLRequest( const KUrl &url, const KParts::OpenUrlArguments& args, const KParts::BrowserArguments &browserArgs )
{
//kDebug(1202) << "frameName=" << browserArgs.frameName;
//kDebug() << "frameName=" << browserArgs.frameName;
KParts::ReadOnlyPart *callingPart = static_cast<KParts::ReadOnlyPart *>( sender()->parent() );
QString frameName = browserArgs.frameName;
@ -1013,7 +1013,7 @@ void KonqMainWindow::slotOpenURLRequest( const KUrl &url, const KParts::OpenUrlA
//Called by slotOpenURLRequest
void KonqMainWindow::openUrlRequestHelper( KonqView *childView, const KUrl &url, const KParts::OpenUrlArguments& args, const KParts::BrowserArguments &browserArgs )
{
//kDebug(1202) << "url=" << url;
//kDebug() << "url=" << url;
KonqOpenURLRequest req;
req.args = args;
req.browserArgs = browserArgs;
@ -1042,7 +1042,7 @@ bool KonqMainWindow::makeViewsFollow( const KUrl & url,
return false; // none of those features apply -> return
bool res = false;
//kDebug(1202) << senderView->metaObject()->className() << "url=" << url << "serviceType=" << serviceType;
//kDebug() << senderView->metaObject()->className() << "url=" << url << "serviceType=" << serviceType;
KonqOpenURLRequest req;
req.forceAutoEmbed = true;
req.followMode = true;
@ -1067,7 +1067,7 @@ bool KonqMainWindow::makeViewsFollow( const KUrl & url,
if (senderFrame && viewFrame && viewFrame != senderFrame)
continue;
kDebug(1202) << "sending openUrl to view" << view->part()->metaObject()->className() << "url=" << url;
kDebug() << "sending openUrl to view" << view->part()->metaObject()->className() << "url=" << url;
// XXX duplicate code from ::openUrl
if (view == m_currentView) {
@ -1091,7 +1091,7 @@ bool KonqMainWindow::makeViewsFollow( const KUrl & url,
// This happens in views locked to a directory mode,
// like sidebar and konsolepart (#52161).
const bool ignore = view->isLockedViewMode() && view->showsDirectory();
//kDebug(1202) << "View " << view->service()->name()
//kDebug() << "View " << view->service()->name()
// << " supports dirs: " << view->showsDirectory()
// << " is locked-view-mode:" << view->isLockedViewMode()
// << " ignore=" << ignore;
@ -1131,7 +1131,7 @@ void KonqMainWindow::slotCreateNewWindow( const KUrl &url,
{
// NOTE: 'part' may be null
kDebug(1202) << "url=" << url << "args.mimeType()=" << args.mimeType()
kDebug() << "url=" << url << "args.mimeType()=" << args.mimeType()
<< "browserArgs.frameName=" << browserArgs.frameName;
if ( part )
@ -1504,7 +1504,7 @@ void KonqMainWindow::slotFindClosed( KonqDirPart * dirPart )
void KonqMainWindow::slotIconsChanged()
{
kDebug(1202);
kDebug();
m_combo->updatePixmaps();
m_pViewManager->updatePixmaps();
updateWindowIcon();
@ -1934,7 +1934,7 @@ void KonqMainWindow::applyKonqMainWindowSettings()
if ( act )
act->trigger();
else
kWarning(1202) << "Unknown toggable view in ToggableViewsShown " << *togIt ;
kWarning() << "Unknown toggable view in ToggableViewsShown " << *togIt ;
}
}
@ -1963,7 +1963,7 @@ void KonqMainWindow::slotViewCompleted( KonqView * view )
void KonqMainWindow::slotPartActivated(KParts::Part *part)
{
//kDebug(1202) << part
//kDebug() << part
// << (part && part->componentData().isValid() && part->componentData().aboutData() ? part->componentData().aboutData()->appName() : "");
KonqView *newView = 0;
@ -1975,7 +1975,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(1202) << "Passive mode - return";
//kDebug() << "Passive mode - return";
return;
}
}
@ -1985,15 +1985,15 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
if (oldView) {
ext = oldView->browserExtension();
if (ext) {
//kDebug(1202) << "Disconnecting extension for view" << oldView;
//kDebug() << "Disconnecting extension for view" << oldView;
disconnectExtension( ext );
}
}
//kDebug(1202) << "New current view" << newView;
//kDebug() << "New current view" << newView;
m_currentView = newView;
if (!part) {
//kDebug(1202) << "No part activated - returning";
//kDebug() << "No part activated - returning";
unplugViewModeActions();
createGUI(0);
KParts::MainWindow::setCaption(QString());
@ -2005,7 +2005,7 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
if (ext) {
connectExtension(ext);
} else {
kDebug(1202) << "No Browser Extension for the new part";
kDebug() << "No Browser Extension for the new part";
// Disable all browser-extension actions
KParts::BrowserExtension::ActionSlotMap * actionSlotMap = KParts::BrowserExtension::actionSlotMapPtr();
@ -2083,7 +2083,7 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
if ( oldView && oldView->frame() )
oldView->frame()->statusbar()->updateActiveStatus();
//kDebug(1202) << "setting location bar url to"
//kDebug() << "setting location bar url to"
// << m_currentView->locationBarURL() << "m_currentView=" << m_currentView;
m_currentView->setLocationBarURL( m_currentView->locationBarURL() );
@ -2094,7 +2094,7 @@ void KonqMainWindow::slotPartActivated(KParts::Part *part)
void KonqMainWindow::insertChildView( KonqView *childView )
{
//kDebug(1202) << childView;
//kDebug() << childView;
m_mapViews.insert(childView->part(), childView);
connect(childView, SIGNAL(viewCompleted(KonqView *)),
@ -2108,7 +2108,7 @@ void KonqMainWindow::insertChildView( KonqView *childView )
// Called by KonqViewManager, internal
void KonqMainWindow::removeChildView( KonqView *childView )
{
//kDebug(1202) << childView;
//kDebug() << childView;
disconnect( childView, SIGNAL( viewCompleted( KonqView * ) ),
this, SLOT( slotViewCompleted( KonqView * ) ) );
@ -2122,20 +2122,20 @@ void KonqMainWindow::removeChildView( KonqView *childView )
// find it in the map - can't use the key since childView->part() might be 0
//kDebug(1202) << "Searching map";
//kDebug() << "Searching map";
while ( it != end && it.value() != childView )
++it;
//kDebug(1202) << "Verifying search results";
//kDebug() << "Verifying search results";
if ( it == m_mapViews.end() )
{
kWarning(1202) << "KonqMainWindow::removeChildView childView " << childView << " not in map !" ;
kWarning() << "KonqMainWindow::removeChildView childView " << childView << " not in map !" ;
return;
}
//kDebug(1202) << "Removing view" << childView;
//kDebug() << "Removing view" << childView;
m_mapViews.erase( it );
@ -2209,14 +2209,14 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q
if ( ext )
{
ext = ext->findFrameParent(callingPart, name);
kDebug(1202) << "BrowserHostExtension found part" << ext;
kDebug() << "BrowserHostExtension found part" << ext;
if (!ext)
continue; // Don't use this window
}
if ( !viewName.isEmpty() && viewName == name )
{
kDebug(1202) << "found existing view by name:" << view;
kDebug() << "found existing view by name:" << view;
hostExtension = 0;
if ( part )
*part = view->part();
@ -2234,7 +2234,7 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const Q
KParts::ReadOnlyPart *item = frameIt.next();
if ( item->objectName() == name )
{
kDebug(1202) << "found a frame of name" << name << ":" << item;
kDebug() << "found a frame of name" << name << ":" << item;
hostExtension = ext;
if ( part )
*part = item;
@ -2289,7 +2289,7 @@ int KonqMainWindow::mainViewsCount() const
const MapViews::ConstIterator end = m_mapViews.constEnd();
for (; it != end; ++it ) {
if ( !it.value()->isPassiveMode() && !it.value()->isToggleView() ) {
//kDebug(1202) << res << it.value() << it.value()->part()->widget();
//kDebug() << res << it.value() << it.value()->part()->widget();
++res;
}
}
@ -3086,7 +3086,7 @@ void KonqMainWindow::slotMakeCompletion( const QString& text )
{
m_urlCompletionStarted = true; // flag for slotMatch()
// kDebug(1202) << "Local Completion object found!";
// kDebug() << "Local Completion object found!";
QString completion = m_pURLCompletion->makeCompletion( text );
m_currentDir.clear();
@ -3112,7 +3112,7 @@ void KonqMainWindow::slotMakeCompletion( const QString& text )
m_currentDir = m_pURLCompletion->dir();
}
}
// kDebug(1202) << "Current dir:" << m_currentDir << "Current text:" << text;
// kDebug() << "Current dir:" << m_currentDir << "Current text:" << text;
}
void KonqMainWindow::slotSubstringcompletion( const QString& text )
@ -3198,7 +3198,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(1202) << obj << obj->metaObject()->className() << obj->name();
//kDebug() << obj << obj->metaObject()->className() << obj->name();
QFocusEvent * focusEv = static_cast<QFocusEvent*>(ev);
if (focusEv->reason() == Qt::PopupFocusReason)
@ -3216,10 +3216,10 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
if (ev->type()==QEvent::FocusIn)
{
//kDebug(1202) << "ComboBox got the focus...";
//kDebug() << "ComboBox got the focus...";
if (m_bLocationBarConnected)
{
//kDebug(1202) << "Was already connected...";
//kDebug() << "Was already connected...";
return KParts::MainWindow::eventFilter( obj, ev );
}
m_bLocationBarConnected = true;
@ -3245,10 +3245,10 @@ bool KonqMainWindow::eventFilter(QObject*obj,QEvent *ev)
}
else if ( ev->type()==QEvent::FocusOut)
{
//kDebug(1202) << "ComboBox lost focus...";
//kDebug() << "ComboBox lost focus...";
if (!m_bLocationBarConnected)
{
//kDebug(1202) << "Was already disconnected...";
//kDebug() << "Was already disconnected...";
return KParts::MainWindow::eventFilter( obj, ev );
}
m_bLocationBarConnected = false;
@ -3295,7 +3295,7 @@ void KonqMainWindow::slotClipboardDataChanged()
void KonqMainWindow::slotCheckComboSelection()
{
bool hasSelection = m_combo->lineEdit()->hasSelectedText();
//kDebug(1202) << "m_combo->lineEdit()->hasMarkedText():" << hasSelection;
//kDebug() << "m_combo->lineEdit()->hasMarkedText():" << hasSelection;
m_paCopy->setEnabled( hasSelection );
m_paCut->setEnabled( hasSelection );
}
@ -3402,7 +3402,7 @@ void KonqMainWindow::setLocationBarURL( const QString &url )
// Don't set the location bar URL if it hasn't changed
// or if the user had time to edit the url since the last call to openUrl (#64868)
if (url != m_combo->lineEdit()->text() && !m_combo->lineEdit()->isModified()) {
//kDebug(1202) << "url=" << url;
//kDebug() << "url=" << url;
m_combo->setURL( url );
updateWindowIcon();
}
@ -3925,7 +3925,7 @@ void KonqMainWindow::initActions()
void KonqExtendedBookmarkOwner::openBookmark(const KBookmark & bm, Qt::MouseButtons mb, Qt::KeyboardModifiers km)
{
kDebug(1202) << bm.url() << km << mb;
kDebug() << bm.url() << km << mb;
const QString url = bm.url().url();
@ -4162,7 +4162,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
for ( ; it != itEnd ; ++it )
{
QAction * act = actionCollection()->action( it.key().data() );
//kDebug(1202) << it.key();
//kDebug() << it.key();
if ( act )
{
// Does the extension have a slot with the name of this action ?
@ -4178,7 +4178,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext )
} else
act->setEnabled(false);
} else kError(1202) << "Error in BrowserExtension::actionSlotMap(), unknown action : " << it.key();
} else kError() << "Error in BrowserExtension::actionSlotMap(), unknown action : " << it.key();
}
}
@ -4192,10 +4192,10 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext )
for ( ; it != itEnd ; ++it )
{
QAction * act = actionCollection()->action( it.key().data() );
//kDebug(1202) << it.key();
//kDebug() << it.key();
if ( act && ext->metaObject()->indexOfSlot( it.key()+"()" ) != -1 )
{
//kDebug(1202) << act << act->name();
//kDebug() << act << act->name();
act->disconnect( ext );
}
}
@ -4205,14 +4205,14 @@ void KonqMainWindow::enableAction( const char * name, bool enabled )
{
QAction * act = actionCollection()->action( name );
if (!act)
kWarning(1202) << "Unknown action " << name << " - can't enable" ;
kWarning() << "Unknown action " << name << " - can't enable" ;
else
{
if ( m_bLocationBarConnected && (
act==m_paCopy || act==m_paCut || act==m_paPaste ) )
// Don't change action state while the location bar has focus.
return;
//kDebug(1202) << name << enabled;
//kDebug() << name << enabled;
act->setEnabled( enabled );
}
@ -4231,9 +4231,9 @@ void KonqMainWindow::setActionText(const char * name, const QString& text)
{
QAction * act = actionCollection()->action(name);
if (!act) {
kWarning(1202) << "Unknown action " << name << "- can't enable" ;
kWarning() << "Unknown action " << name << "- can't enable" ;
} else {
//kDebug(1202) << name << " text=" << text;
//kDebug() << name << " text=" << text;
act->setText(text);
}
}
@ -4255,7 +4255,7 @@ void KonqMainWindow::currentProfileChanged()
void KonqMainWindow::enableAllActions( bool enable )
{
//kDebug(1202) << enable;
//kDebug() << enable;
KParts::BrowserExtension::ActionSlotMap * actionSlotMap = KParts::BrowserExtension::actionSlotMapPtr();
const QList<QAction *> actions = actionCollection()->actions();
@ -4347,7 +4347,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(1202) << caption;
//kDebug() << caption;
// Keep an unmodified copy of the caption (before KComponentData::makeStdCaption is applied)
m_currentView->setCaption(caption);
@ -4519,7 +4519,7 @@ void KonqMainWindow::slotPopupMenu( const QPoint &global, const KFileItemList &i
// but KonqViewManager delays the GUI-rebuilding with a single-shot timer.
// Right after the popup shows up, currentView _will_ be m_currentView.
//kDebug(1202) << "current view=" << m_currentView << m_currentView->part()->metaObject()->className();
//kDebug() << "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
@ -4582,7 +4582,7 @@ void KonqMainWindow::slotPopupMenu( const QPoint &global, const KFileItemList &i
devicesFile = firstURL.protocol().indexOf("device", 0, Qt::CaseInsensitive) == 0;
//dirsSelected = S_ISDIR( items.first()->mode() );
}
//kDebug(1202) << "viewURL=" << viewURL;
//kDebug() << "viewURL=" << viewURL;
KUrl url = viewURL;
url.cleanPath();
@ -4800,7 +4800,7 @@ void KonqMainWindow::slotReconfigure()
void KonqMainWindow::reparseConfiguration()
{
kDebug(1202);
kDebug();
KonqSettings::self()->readConfig();
m_pViewManager->applyConfiguration();
@ -5115,7 +5115,7 @@ void KonqMainWindow::closeEvent( QCloseEvent *e )
void KonqMainWindow::addClosedWindowToUndoList()
{
kDebug(1202);
kDebug();
// 1. We get the current title
int numTabs = m_pViewManager->tabContainer()->childFrameList().count();
@ -5132,7 +5132,7 @@ void KonqMainWindow::addClosedWindowToUndoList()
m_paClosedItems->setEnabled(true);
m_pUndoManager->addClosedWindowItem( closedWindowItem );
kDebug(1202) << "done";
kDebug() << "done";
}
bool KonqMainWindow::queryExit()
@ -5178,7 +5178,7 @@ void KonqMainWindow::goURL()
*/
void KonqMainWindow::slotAddClosedUrl(KonqFrameBase *tab)
{
kDebug(1202);
kDebug();
QString title( i18n("no name") ), url("about:blank");
// Did the tab contain a single frame, or a splitter?
@ -5212,7 +5212,7 @@ void KonqMainWindow::slotAddClosedUrl(KonqFrameBase *tab)
m_paClosedItems->setEnabled(true);
m_pUndoManager->addClosedTabItem( closedTabItem );
kDebug(1202) << "done";
kDebug() << "done";
}
void KonqMainWindow::slotLocationLabelActivated()
@ -5242,7 +5242,7 @@ void KonqMainWindow::slotAddWebSideBar(const KUrl& url, const QString& name)
if (url.url().isEmpty() && name.isEmpty())
return;
kDebug(1202) << "Requested to add URL" << url << " [" << name << "] to the sidebar!";
kDebug() << "Requested to add URL" << url << " [" << name << "] to the sidebar!";
QAction *a = m_toggleViewGUIClient->action("konq_sidebartng");
if (!a) {
@ -5485,12 +5485,12 @@ QStringList KonqMainWindow::historyPopupCompletionItems( const QString& s)
#ifndef NDEBUG
void KonqMainWindow::dumpViewList()
{
kDebug(1202) << m_mapViews.count() << "views:";
kDebug() << 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(1202) << view << view->part();
kDebug() << view << view->part();
}
}
#endif
@ -5659,7 +5659,7 @@ bool KonqMainWindow::event( QEvent* e )
// Don't resend to sender
if (it.key() != ev->part())
{
//kDebug(1202) << "Sending event to view" << it.key()->metaObject()->className();
//kDebug() << "Sending event to view" << it.key()->metaObject()->className();
QApplication::sendEvent( it.key(), e );
}
}
@ -5692,7 +5692,7 @@ bool KonqMainWindow::stayPreloaded()
return false;
}
KonqMainWindow::setPreloadedFlag( true );
kDebug(1202) << "Konqy kept for preloading:" << QDBusConnection::sessionBus().baseService();
kDebug() << "Konqy kept for preloading:" << QDBusConnection::sessionBus().baseService();
KonqMainWindow::setPreloadedWindow( this );
return true;
#else
@ -5714,28 +5714,28 @@ bool KonqMainWindow::checkPreloadResourceUsage()
#endif
isatty( STDOUT_FILENO ) || isatty( STDERR_FILENO ))
{
kDebug(1202) << "Running from tty, not keeping for preloading";
kDebug() << "Running from tty, not keeping for preloading";
return false;
}
int limit;
int usage = current_memory_usage( &limit );
kDebug(1202) << "Memory usage increase: " << ( usage - s_initialMemoryUsage )
kDebug() << "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(1202) << "Not keeping for preloading due to high memory usage";
kDebug() << "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(1202) << "Not keeping for preloading due to high usage count";
kDebug() << "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(1202) << "Not keeping for preloading due to long usage time";
kDebug() << "Not keeping for preloading due to long usage time";
return false;
}
return true;

2
konqueror/src/konqmisc.cpp
View file

@ -102,7 +102,7 @@ KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString& _path,
bool forbidUseHTML, const QStringList& filesToSelect, bool tempFile, bool openUrl )
{
QString path(_path);
kDebug(1202) << "path=" << path << ", filename=" << filename << ", url=" << url;
kDebug() << "path=" << path << ", filename=" << filename << ", url=" << url;
Q_ASSERT(!path.isEmpty());
// Well the path can be empty when misusing DBUS calls....
if (path.isEmpty())

4
konqueror/src/konqprofiledlg.cpp
View file

@ -159,7 +159,7 @@ void KonqProfileDlg::loadAllProfiles(const QString & preselectProfile)
{
QListWidgetItem *item = new KonqProfileItem( d->m_pListView, eIt.key() );
QString filename = eIt.value().mid( eIt.value().lastIndexOf( '/' ) + 1 );
kDebug(1202) << filename;
kDebug() << filename;
if ( filename == preselectProfile )
{
profileFound = true;
@ -188,7 +188,7 @@ void KonqProfileDlg::slotSave()
}
}
kDebug(1202) << "Saving as " << name;
kDebug() << "Saving as " << name;
d->m_pViewManager->saveViewProfileToFile( name, d->m_pProfileNameLineEdit->text(),
d->m_cbSaveURLs->isChecked() ? KonqFrameBase::saveURLs : KonqFrameBase::None);

10
konqueror/src/konqrun.cpp
View file

@ -47,7 +47,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(1202) << "KonqRun::KonqRun() " << this;
//kDebug() << "KonqRun::KonqRun() " << this;
assert(!m_pMainWindow.isNull());
if (m_pView)
m_pView->setLoading(true);
@ -55,14 +55,14 @@ KonqRun::KonqRun(KonqMainWindow* mainWindow, KonqView *_childView,
KonqRun::~KonqRun()
{
//kDebug(1202) << "KonqRun::~KonqRun() " << this;
//kDebug() << "KonqRun::~KonqRun() " << this;
if (m_pView && m_pView->run() == this)
m_pView->setRun(0);
}
void KonqRun::foundMimeType(const QString & _type)
{
//kDebug(1202) << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug();
//kDebug() << "KonqRun::foundMimeType " << _type << " m_req=" << m_req.debug();
QString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
@ -134,7 +134,7 @@ void KonqRun::foundMimeType(const QString & _type)
return;
}
kDebug(1202) << "Nothing special to do in KonqRun, falling back to KRun";
kDebug() << "Nothing special to do in KonqRun, falling back to KRun";
KRun::foundMimeType(mimeType);
}
@ -207,7 +207,7 @@ void KonqRun::scanFile()
void KonqRun::slotRedirection(KIO::Job *job, const KUrl& redirectedToURL)
{
KUrl redirectFromURL = static_cast<KIO::TransferJob *>(job)->url();
kDebug(1202) << redirectFromURL << "->" << redirectedToURL;
kDebug() << redirectFromURL << "->" << redirectedToURL;
KonqHistoryManager::kself()->confirmPending(redirectFromURL);
if (redirectedToURL.protocol() == "mailto") {

4
konqueror/src/konqsettings.cpp
View file

@ -91,7 +91,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(1202) << mimeType << it.value();
kDebug() << mimeType << it.value();
return it.value() == QLatin1String("true");
}
// 2 - in the configuration for the group if nothing was found in the mimetype
@ -100,7 +100,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(1202) << mimeType << "group setting:" << it.value();
kDebug() << mimeType << "group setting:" << it.value();
return it.value() == QLatin1String("true");
}
// 2 bis - configuration for group of parent mimetype, if different

24
konqueror/src/konqtabs.cpp
View file

@ -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(1202) << "KonqFrameTabs::KonqFrameTabs()";
//kDebug() << "KonqFrameTabs::KonqFrameTabs()";
m_pParentContainer = parentContainer;
m_pActiveChild = 0L;
@ -139,7 +139,7 @@ KonqFrameTabs::KonqFrameTabs(QWidget* parent, KonqFrameContainerBase* parentCont
KonqFrameTabs::~KonqFrameTabs()
{
//kDebug(1202) << "KonqFrameTabs::~KonqFrameTabs() " << this << " - " << className();
//kDebug() << "KonqFrameTabs::~KonqFrameTabs() " << this << " - " << className();
qDeleteAll( m_childFrameList );
m_childFrameList.clear();
}
@ -170,12 +170,12 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other )
{
if( !other ) {
kDebug(1202) << "The Frame does not exist";
kDebug() << "The Frame does not exist";
return;
}
if(other->frameType() != KonqFrameBase::Tabs) {
kDebug(1202) << "Frame types are not the same";
kDebug() << "Frame types are not the same";
return;
}
@ -187,7 +187,7 @@ void KonqFrameTabs::copyHistory( KonqFrameBase *other )
void KonqFrameTabs::setTitle( const QString &title , QWidget* sender)
{
// kDebug(1202) << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )";
// kDebug() << "KonqFrameTabs::setTitle( " << title << " , " << sender << " )";
// Make sure that '&' is displayed correctly
QString tabText( title );
setTabText( indexOf( sender ), tabText.replace('&', "&&") );
@ -195,7 +195,7 @@ void KonqFrameTabs::setTitle( const QString &title , QWidget* sender)
void KonqFrameTabs::setTabIcon( const KUrl &url, QWidget* sender )
{
//kDebug(1202) << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )";
//kDebug() << "KonqFrameTabs::setTabIcon( " << url << " , " << sender << " )";
KIcon iconSet = KIcon( KonqPixmapProvider::self()->iconNameFor( url ) );
const int pos = indexOf(sender);
if (tabIcon(pos).pixmap(iconSize()).serialNumber() != iconSet.pixmap(iconSize()).serialNumber())
@ -212,14 +212,14 @@ void KonqFrameTabs::activateChild()
void KonqFrameTabs::insertChildFrame( KonqFrameBase* frame, int index )
{
//kDebug(1202) << "KonqFrameTabs " << this << ": insertChildFrame " << frame;
//kDebug() << "KonqFrameTabs " << this << ": insertChildFrame " << frame;
if (!frame) {
kWarning(1202) << "KonqFrameTabs " << this << ": insertChildFrame(0) !" ;
kWarning() << "KonqFrameTabs " << this << ": insertChildFrame(0) !" ;
return;
}
//kDebug(1202) << "Adding frame";
//kDebug() << "Adding frame";
//QTabWidget docs say that inserting tabs while already shown causes
//flicker...
@ -250,7 +250,7 @@ void KonqFrameTabs::insertChildFrame( KonqFrameBase* frame, int index )
void KonqFrameTabs::childFrameRemoved( KonqFrameBase * frame )
{
//kDebug(1202) << "KonqFrameTabs::RemoveChildFrame " << this << ". Child " << frame << " removed";
//kDebug() << "KonqFrameTabs::RemoveChildFrame " << this << ". Child " << frame << " removed";
if (frame) {
removeTab(indexOf(frame->asQWidget()));
m_childFrameList.removeAll(frame);
@ -260,9 +260,9 @@ void KonqFrameTabs::childFrameRemoved( KonqFrameBase * frame )
updateTabBarVisibility();
}
else
kWarning(1202) << "KonqFrameTabs " << this << ": childFrameRemoved(0L) !" ;
kWarning() << "KonqFrameTabs " << this << ": childFrameRemoved(0L) !" ;
//kDebug(1202) << "KonqFrameTabs::RemoveChildFrame finished";
//kDebug() << "KonqFrameTabs::RemoveChildFrame finished";
}
void KonqFrameTabs::moveTabBackward( int index )

74
konqueror/src/konqview.cpp
View file

@ -108,7 +108,7 @@ KonqView::KonqView( KonqViewFactory &viewFactory,
KonqView::~KonqView()
{
//kDebug(1202) << "part=" << m_pPart;
//kDebug() << "part=" << m_pPart;
if (KonqMainWindow::s_crashlog_file) {
QString part_url;
@ -136,13 +136,13 @@ KonqView::~KonqView()
m_lstHistory.clear();
setRun( 0L );
//kDebug(1202) << this << "done";
//kDebug() << this << "done";
}
void KonqView::openUrl( const KUrl &url, const QString & locationBarURL,
const QString & nameFilter, bool tempFile )
{
kDebug(1202) << "url=" << url << "locationBarURL=" << locationBarURL;
kDebug() << "url=" << url << "locationBarURL=" << locationBarURL;
setPartMimeType();
if (KonqMainWindow::s_crashlog_file) {
@ -183,7 +183,7 @@ void KonqView::openUrl( const KUrl &url, const QString & locationBarURL,
}
#ifdef DEBUG_HISTORY
kDebug(1202) << "m_bLockedLocation=" << m_bLockedLocation << "browserArgs.lockHistory()=" << browserArgs.lockHistory();
kDebug() << "m_bLockedLocation=" << m_bLockedLocation << "browserArgs.lockHistory()=" << browserArgs.lockHistory();
#endif
if ( browserArgs.lockHistory() )
lockHistory();
@ -223,7 +223,7 @@ void KonqView::openUrl( const KUrl &url, const QString & locationBarURL,
if ( url.isLocalFile() )
m_tempFile = url.toLocalFile();
else
kWarning(1202) << "Tempfile option is set, but URL is remote:" << url ;
kWarning() << "Tempfile option is set, but URL is remote:" << url ;
}
aboutToOpenURL( url, args );
@ -235,13 +235,13 @@ void KonqView::openUrl( const KUrl &url, const QString & locationBarURL,
KonqHistoryManager::kself()->addPending( url, locationBarURL, QString());
#ifdef DEBUG_HISTORY
kDebug(1202) << "Current position:" << historyIndex();
kDebug() << "Current position:" << historyIndex();
#endif
}
void KonqView::switchView( KonqViewFactory &viewFactory )
{
//kDebug(1202);
//kDebug();
if ( m_pPart )
m_pPart->widget()->hide();
@ -268,7 +268,7 @@ void KonqView::switchView( KonqViewFactory &viewFactory )
prop = m_service->property( "X-KDE-BrowserView-FollowActive");
if (prop.isValid() && prop.toBool())
{
//kDebug(1202) << "X-KDE-BrowserView-FollowActive -> setFollowActive";
//kDebug() << "X-KDE-BrowserView-FollowActive -> setFollowActive";
setFollowActive(true);
}
@ -281,7 +281,7 @@ void KonqView::switchView( KonqViewFactory &viewFactory )
prop = m_service->property( "X-KDE-BrowserView-PassiveMode");
if ( prop.isValid() && prop.toBool() )
{
kDebug(1202) << "X-KDE-BrowserView-PassiveMode -> setPassiveMode";
kDebug() << "X-KDE-BrowserView-PassiveMode -> setPassiveMode";
setPassiveMode( true ); // set as passive
}
@ -331,7 +331,7 @@ bool KonqView::changePart(const QString &mimeType,
// Caller should call stop first.
assert( !m_bLoading );
//kDebug(1202) << "mimeType=" << mimeType
//kDebug() << "mimeType=" << mimeType
// << "requested serviceName=" << serviceName
// << "current service name=" << m_service->desktopEntryName();
@ -341,7 +341,7 @@ bool KonqView::changePart(const QString &mimeType,
}
if (isLockedViewMode()) {
//kDebug(1202) << "This view's mode is locked - can't change";
//kDebug() << "This view's mode is locked - can't change";
return false; // we can't do that if our view mode is locked
}
@ -366,7 +366,7 @@ bool KonqView::changePart(const QString &mimeType,
// Note: we should have an operator== for KService...
if ( m_service && m_service->entryPath() == service->entryPath() )
{
kDebug( 1202 ) << "Reusing service. Service type set to" << m_serviceType;
kDebug() << "Reusing service. Service type set to" << m_serviceType;
if ( m_pMainWindow->currentView() == this )
m_pMainWindow->updateViewModeActions();
}
@ -384,7 +384,7 @@ bool KonqView::changePart(const QString &mimeType,
// each time we change the view mode.
// We don't do it in switchView either because it's called from the constructor too,
// where the location bar url isn't set yet.
//kDebug(1202) << "Giving focus to new part" << m_pPart;
//kDebug() << "Giving focus to new part" << m_pPart;
m_pMainWindow->viewManager()->setActivePart( m_pPart );
}
return true;
@ -392,7 +392,7 @@ bool KonqView::changePart(const QString &mimeType,
void KonqView::connectPart()
{
//kDebug(1202);
//kDebug();
connect( m_pPart, SIGNAL( started( KIO::Job * ) ),
this, SLOT( slotStarted( KIO::Job * ) ) );
connect( m_pPart, SIGNAL( completed() ),
@ -547,7 +547,7 @@ void KonqView::slotResizeTopLevelWidget( int w, int h )
void KonqView::slotStarted( KIO::Job * job )
{
//kDebug(1202) << job;
//kDebug() << job;
setLoading( true );
if (job)
@ -569,7 +569,7 @@ void KonqView::slotRequestFocus( KParts::ReadOnlyPart * )
void KonqView::setLoading( bool loading, bool hasPending /*= false*/)
{
//kDebug(1202) << "loading=" << loading << "hasPending=" << hasPending;
//kDebug() << "loading=" << loading << "hasPending=" << hasPending;
m_bLoading = loading;
m_bPendingRedirection = hasPending;
if ( m_pMainWindow->currentView() == this )
@ -600,7 +600,7 @@ void KonqView::slotCompleted()
void KonqView::slotCompleted( bool hasPending )
{
//kDebug(1202) << "hasPending=" << hasPending;
//kDebug() << "hasPending=" << hasPending;
m_pKonqFrame->statusbar()->slotLoadingProgress( -1 );
if ( ! m_bLockHistory )
@ -631,7 +631,7 @@ void KonqView::slotCompleted( bool hasPending )
void KonqView::slotCanceled( const QString & errorMsg )
{
//kDebug(1202);
//kDebug();
// The errorMsg comes from the ReadOnlyPart's job.
// It should probably be used in a KMessageBox
// Let's use the statusbar for now
@ -659,10 +659,10 @@ void KonqView::setLocationBarURL( const KUrl& locationBarURL )
void KonqView::setLocationBarURL( const QString & locationBarURL )
{
//kDebug(1202) << locationBarURL << "this=" << this;
//kDebug() << locationBarURL << "this=" << this;
m_sLocationBarURL = locationBarURL;
if (m_pMainWindow->currentView() == this) {
//kDebug(1202) << "is current view" << this;
//kDebug() << "is current view" << this;
m_pMainWindow->setLocationBarURL( m_sLocationBarURL );
m_pMainWindow->setPageSecurity( m_pageSecurity );
}
@ -716,7 +716,7 @@ void KonqView::setCaption( const QString & caption )
void KonqView::slotOpenURLNotify()
{
#ifdef DEBUG_HISTORY
kDebug(1202);
kDebug();
#endif
updateHistoryEntry(true);
createHistoryEntry();
@ -731,19 +731,19 @@ void KonqView::createHistoryEntry()
if (current)
{
#ifdef DEBUG_HISTORY
kDebug(1202) << "Truncating history";
kDebug() << "Truncating history";
#endif
while ( current != m_lstHistory.last() )
delete m_lstHistory.takeLast();
}
// Append a new entry
#ifdef DEBUG_HISTORY
kDebug(1202) << "Append a new entry";
kDebug() << "Append a new entry";
#endif
appendHistoryEntry( new HistoryEntry );
setHistoryIndex( m_lstHistory.count()-1 ); // made current
#ifdef DEBUG_HISTORY
kDebug(1202) << "at=" << historyIndex() << "count=" << m_lstHistory.count();
kDebug() << "at=" << historyIndex() << "count=" << m_lstHistory.count();
#endif
}
@ -774,20 +774,20 @@ void KonqView::updateHistoryEntry( bool saveLocationBarURL )
}
#ifdef DEBUG_HISTORY
kDebug(1202) << "Saving part URL:" << m_pPart->url() << "in history position" << historyIndex();
kDebug() << "Saving part URL:" << m_pPart->url() << "in history position" << historyIndex();
#endif
current->url = m_pPart->url();
if (saveLocationBarURL)
{
#ifdef DEBUG_HISTORY
kDebug(1202) << "Saving location bar URL:" << m_sLocationBarURL << "in history position" << historyIndex();
kDebug() << "Saving location bar URL:" << m_sLocationBarURL << "in history position" << historyIndex();
#endif
current->locationBarURL = m_sLocationBarURL;
current->pageSecurity = m_pageSecurity;
}
#ifdef DEBUG_HISTORY
kDebug(1202) << "Saving title:" << m_caption << "in history position" << historyIndex();
kDebug() << "Saving title:" << m_caption << "in history position" << historyIndex();
#endif
current->title = m_caption;
current->strServiceType = m_serviceType;
@ -814,7 +814,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(1202) << "go(0) -> reload";
kDebug() << "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. :-)
@ -824,7 +824,7 @@ void KonqView::go( int steps )
int newPos = historyIndex() + steps;
#ifdef DEBUG_HISTORY
kDebug(1202) << "steps=" << steps
kDebug() << "steps=" << steps
<< "newPos=" << newPos
<< "m_lstHistory.count()=" << m_lstHistory.count();
#endif
@ -836,7 +836,7 @@ void KonqView::go( int steps )
setHistoryIndex( newPos ); // sets current item
#ifdef DEBUG_HISTORY
kDebug(1202) << "New position" << historyIndex();
kDebug() << "New position" << historyIndex();
#endif
restoreHistory();
@ -848,14 +848,14 @@ void KonqView::restoreHistory()
// the pointer points to will change with the following calls
#ifdef DEBUG_HISTORY
kDebug(1202) << "Restoring servicetype/name, and location bar URL from history:" << h.locationBarURL;
kDebug() << "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(1202) << "Couldn't change view mode to" << h.strServiceType << h.strServiceName;
kWarning() << "Couldn't change view mode to" << h.strServiceType << h.strServiceName;
return /*false*/;
}
@ -865,7 +865,7 @@ void KonqView::restoreHistory()
if ( h.reload == false && browserExtension() )
{
//kDebug(1202) << "Restoring view from stream";
//kDebug() << "Restoring view from stream";
QDataStream stream( h.buffer );
browserExtension()->restoreState( stream );
@ -882,7 +882,7 @@ void KonqView::restoreHistory()
m_pMainWindow->updateToolBarActions();
#ifdef DEBUG_HISTORY
kDebug(1202) << "New position (2)" << historyIndex();
kDebug() << "New position (2)" << historyIndex();
#endif
}
@ -937,7 +937,7 @@ void KonqView::setRun( KonqRun * run )
void KonqView::stop()
{
//kDebug(1202);
//kDebug();
m_bAborted = false;
finishedWithCurrentURL();
if ( m_bLoading || m_bPendingRedirection )
@ -946,7 +946,7 @@ void KonqView::stop()
// we decided to keep it :)
KonqHistoryManager::kself()->confirmPending( url(), m_sTypedURL );
//kDebug(1202) << "m_pPart->closeUrl()";
//kDebug() << "m_pPart->closeUrl()";
m_pPart->closeUrl();
m_bAborted = true;
m_pKonqFrame->statusbar()->slotLoadingProgress( -1 );
@ -973,7 +973,7 @@ void KonqView::finishedWithCurrentURL()
{
if ( !m_tempFile.isEmpty() )
{
kDebug(1202) << "######### Deleting tempfile after use:" << m_tempFile;
kDebug() << "######### Deleting tempfile after use:" << m_tempFile;
QFile::remove( m_tempFile );
m_tempFile.clear();
}

146
konqueror/src/konqviewmanager.cpp
View file

@ -70,13 +70,13 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow )
KonqView* KonqViewManager::createFirstView( const QString &mimeType, const QString &serviceName )
{
//kDebug(1202) << serviceName;
//kDebug() << serviceName;
KService::Ptr service;
KService::List partServiceOffers, appServiceOffers;
KonqViewFactory newViewFactory = createView( mimeType, serviceName, service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ );
if ( newViewFactory.isNull() )
{
kDebug(1202) << "No suitable factory found.";
kDebug() << "No suitable factory found.";
return 0;
}
@ -98,7 +98,7 @@ KonqView* KonqViewManager::splitView( KonqView* currentView,
bool newOneFirst, bool forceAutoEmbed )
{
#ifdef DEBUG_VIEWMGR
kDebug(1202);
kDebug();
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@ -130,7 +130,7 @@ KonqView* KonqViewManager::splitView( KonqView* currentView,
KonqFrameContainer* newContainer = parentContainer->splitChildFrame(splitFrame, orientation);
connect(newContainer, SIGNAL(ctrlTabPressed()), m_pMainWindow, SLOT(slotCtrlTabPressed()));
//kDebug(1202) << "Create new child";
//kDebug() << "Create new child";
KonqView *newView = setupView( newContainer, newViewFactory, service, partServiceOffers, appServiceOffers, serviceType, false );
#ifndef DEBUG
@ -161,7 +161,7 @@ KonqView* KonqViewManager::splitView( KonqView* currentView,
#ifdef DEBUG_VIEWMGR
m_pMainWindow->dumpViewList();
printFullHierarchy();
kDebug(1202) << "done";
kDebug() << "done";
#endif
return newView;
@ -173,7 +173,7 @@ KonqView* KonqViewManager::splitMainContainer( KonqView* currentView,
const QString &serviceName,
bool newOneFirst )
{
//kDebug(1202);
//kDebug();
KService::Ptr service;
KService::List partServiceOffers, appServiceOffers;
@ -205,7 +205,7 @@ KonqView* KonqViewManager::splitMainContainer( KonqView* currentView,
#ifdef DEBUG_VIEWMGR
m_pMainWindow->dumpViewList();
printFullHierarchy();
kDebug(1202) << "done";
kDebug() << "done";
#endif
return childView;
@ -214,7 +214,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(1202) << "------------- KonqViewManager::addTab starting -------------";
kDebug() << "------------- KonqViewManager::addTab starting -------------";
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@ -234,7 +234,7 @@ KonqView* KonqViewManager::addTab(const QString &serviceType, const QString &ser
#ifdef DEBUG_VIEWMGR
m_pMainWindow->dumpViewList();
printFullHierarchy();
kDebug(1202) << "------------- KonqViewManager::addTab done -------------";
kDebug() << "------------- KonqViewManager::addTab done -------------";
#endif
return childView;
@ -266,7 +266,7 @@ KonqView* KonqViewManager::addTabFromHistory( KonqView* currentView, int steps,
void KonqViewManager::duplicateTab( KonqFrameBase* currentFrame, bool openAfterCurrentPage )
{
#ifdef DEBUG_VIEWMGR
kDebug(1202) << currentFrame;
kDebug() << currentFrame;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@ -298,7 +298,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* currentFrame, bool openAfterC
void KonqViewManager::breakOffTab( KonqFrameBase* currentFrame, const QSize& windowSize )
{
#ifdef DEBUG_VIEWMGR
kDebug(1202) << currentFrame;
kDebug() << currentFrame;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@ -377,7 +377,7 @@ KonqMainWindow *KonqViewManager::openSavedWindow(const KConfigGroup& configGroup
void KonqViewManager::removeTab( KonqFrameBase* currentFrame, bool emitAboutToRemoveSignal )
{
#ifdef DEBUG_VIEWMGR
kDebug(1202) << currentFrame;
kDebug() << currentFrame;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@ -508,11 +508,11 @@ void KonqViewManager::updatePixmaps()
void KonqViewManager::openClosedTab(const KonqClosedTabItem& closedTab)
{
kDebug(1202);
kDebug();
loadRootItem( closedTab.configGroup(), m_tabContainer, KUrl(), true, KUrl(), false, closedTab.pos() );
int pos = ( closedTab.pos() < m_tabContainer->count() ) ? closedTab.pos() : m_tabContainer->count()-1;
kDebug(1202) << "pos, m_tabContainer->count():" << pos << m_tabContainer->count()-1;
kDebug() << "pos, m_tabContainer->count():" << pos << m_tabContainer->count()-1;
m_tabContainer->setCurrentIndex( pos );
}
@ -520,7 +520,7 @@ void KonqViewManager::openClosedTab(const KonqClosedTabItem& closedTab)
void KonqViewManager::removeView( KonqView *view )
{
#ifdef DEBUG_VIEWMGR
kDebug(1202) << view;
kDebug() << view;
m_pMainWindow->dumpViewList();
printFullHierarchy();
#endif
@ -531,20 +531,20 @@ void KonqViewManager::removeView( KonqView *view )
KonqFrame* frame = view->frame();
KonqFrameContainerBase* parentContainer = frame->parentContainer();
kDebug(1202) << "view=" << view << "frame=" << frame << "parentContainer=" << parentContainer;
kDebug() << "view=" << view << "frame=" << frame << "parentContainer=" << parentContainer;
if (parentContainer->frameType() == KonqFrameBase::Container)
{
setActivePart(0);
kDebug(1202) << "parentContainer is a KonqFrameContainer";
kDebug() << "parentContainer is a KonqFrameContainer";
KonqFrameContainerBase* grandParentContainer = parentContainer->parentContainer();
kDebug(1202) << "grandParentContainer=" << grandParentContainer;
kDebug() << "grandParentContainer=" << grandParentContainer;
KonqFrameBase* otherFrame = static_cast<KonqFrameContainer*>(parentContainer)->otherChild( frame );
if( !otherFrame ) {
kWarning(1202) << "This shouldn't happen!" ;
kWarning() << "This shouldn't happen!" ;
return;
}
@ -561,11 +561,11 @@ void KonqViewManager::removeView( KonqView *view )
grandParentContainer->replaceChildFrame(parentContainer, otherFrame);
//kDebug(1202) << "--- Removing otherFrame from parentContainer";
//kDebug() << "--- Removing otherFrame from parentContainer";
parentContainer->childFrameRemoved( otherFrame );
m_pMainWindow->removeChildView(view);
//kDebug(1202) << "--- Deleting view" << view;
//kDebug() << "--- Deleting view" << view;
delete view; // This deletes the view, which deletes the part, which deletes its widget
delete parentContainer;
@ -578,27 +578,27 @@ void KonqViewManager::removeView( KonqView *view )
grandParentContainer->activateChild();
}
else if (parentContainer->frameType() == KonqFrameBase::Tabs) {
kDebug(1202) << "parentContainer" << parentContainer << "is a KonqFrameTabs";
kDebug() << "parentContainer" << parentContainer << "is a KonqFrameTabs";
removeTab( frame );
}
else if (parentContainer->frameType() == KonqFrameBase::MainWindow)
kDebug(1202) << "parentContainer is a KonqMainWindow. This shouldn't be removeable, not removing.";
kDebug() << "parentContainer is a KonqMainWindow. This shouldn't be removeable, not removing.";
else
kDebug(1202) << "Unrecognized frame type, not removing.";
kDebug() << "Unrecognized frame type, not removing.";
#ifdef DEBUG_VIEWMGR
printFullHierarchy();
m_pMainWindow->dumpViewList();
kDebug(1202) << "done";
kDebug() << "done";
#endif
}
// reimplemented from PartManager
void KonqViewManager::removePart( KParts::Part * part )
{
//kDebug(1202) << part;
//kDebug() << 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)
@ -610,15 +610,15 @@ 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(1202) << "Found a child view";
kDebug() << "Found a child view";
view->partDeleted(); // tell the child view that the part auto-deletes itself
if (m_pMainWindow->mainViewsCount() == 1)
{
kDebug(1202) << "Deleting last view -> closing the window";
kDebug() << "Deleting last view -> closing the window";
clear();
kDebug(1202) << "Closing m_pMainWindow" << m_pMainWindow;
kDebug() << "Closing m_pMainWindow" << m_pMainWindow;
m_pMainWindow->close(); // will delete it
return;
} else { // normal case
@ -626,7 +626,7 @@ void KonqViewManager::removePart( KParts::Part * part )
}
}
//kDebug(1202) << part << "done";
//kDebug() << part << "done";
}
void KonqViewManager::slotPassiveModePartDeleted()
@ -635,9 +635,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(1202) << "part=" << part;
kDebug() << "part=" << part;
KonqView * view = m_pMainWindow->childView( part );
kDebug(1202) << "view=" << view;
kDebug() << "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
@ -663,25 +663,25 @@ void KonqViewManager::viewCountChanged()
void KonqViewManager::clear()
{
//kDebug(1202);
//kDebug();
setActivePart(0);
if (m_pMainWindow->childFrame() == 0) return;
const QList<KonqView*> viewList = KonqViewCollector::collect(m_pMainWindow);
if ( !viewList.isEmpty() ) {
//kDebug(1202) << viewList.count() << "items";
//kDebug() << viewList.count() << "items";
foreach ( KonqView* view, viewList ) {
m_pMainWindow->removeChildView( view );
//kDebug(1202) << "Deleting" << view;
//kDebug() << "Deleting" << view;
delete view;
}
}
KonqFrameBase* frame = m_pMainWindow->childFrame();
Q_ASSERT( frame );
//kDebug(1202) << "deleting mainFrame ";
//kDebug() << "deleting mainFrame ";
m_pMainWindow->childFrameRemoved( frame ); // will set childFrame() to NULL
delete frame;
// tab container was deleted by the above
@ -690,7 +690,7 @@ void KonqViewManager::clear()
KonqView *KonqViewManager::chooseNextView(KonqView *view)
{
//kDebug(1202) << view;
//kDebug() << view;
const KonqMainWindow::MapViews& mapViews = m_pMainWindow->viewMap();
KonqMainWindow::MapViews::const_iterator it = mapViews.begin();
@ -711,9 +711,9 @@ KonqView *KonqViewManager::chooseNextView(KonqView *view)
KonqMainWindow::MapViews::const_iterator startIt = it;
//kDebug(1202) << "count=" << mapViews.count();
//kDebug() << "count=" << mapViews.count();
while (true) {
//kDebug(1202) << "*KonqViewManager::chooseNextView going next";
//kDebug() << "*KonqViewManager::chooseNextView going next";
if (++it == end) // move to next
it = mapViews.begin(); // rewind on end
@ -723,10 +723,10 @@ KonqView *KonqViewManager::chooseNextView(KonqView *view)
KonqView *nextView = it.value();
if (nextView && !nextView->isPassiveMode())
return nextView;
//kDebug(1202) << "nextView=" << nextView << "passive=" << nextView->isPassiveMode();
//kDebug() << "nextView=" << nextView << "passive=" << nextView->isPassiveMode();
}
//kDebug(1202) << "returning 0";
//kDebug() << "returning 0";
return 0; // no next view found
}
@ -775,21 +775,21 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
bool openAfterCurrentPage,
int pos )
{
//kDebug(1202) << "passiveMode=" << passiveMode;
//kDebug() << "passiveMode=" << passiveMode;
QString sType = serviceType;
if ( sType.isEmpty() ) // TODO remove this -- after checking all callers; splitMainContainer seems to need this logic
sType = m_pMainWindow->currentView()->serviceType();
//kDebug(1202) << "creating KonqFrame with parent=" << parentContainer;
//kDebug() << "creating KonqFrame with parent=" << parentContainer;
KonqFrame* newViewFrame = new KonqFrame( parentContainer->asQWidget(), parentContainer );
newViewFrame->setGeometry( 0, 0, m_pMainWindow->width(), m_pMainWindow->height() );
//kDebug(1202) << "Creating KonqView";
//kDebug() << "Creating KonqView";
KonqView *v = new KonqView( viewFactory, newViewFrame,
m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode );
//kDebug(1202) << "KonqView created - v=" << v << "v->part()=" << v->part();
//kDebug() << "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 * ) ) );
@ -816,7 +816,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer,
connect( v->part(), SIGNAL( destroyed() ), this, SLOT( slotPassiveModePartDeleted() ) );
}
//kDebug(1202) << "done";
//kDebug() << "done";
return v;
}
@ -932,7 +932,7 @@ void KonqViewManager::loadViewProfileFromGroup( const KConfigGroup &profileGroup
m_pMainWindow->action("clear_location")->trigger();
}
//kDebug(1202) << "after loadRootItem";
//kDebug() << "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)
@ -973,7 +973,7 @@ void KonqViewManager::loadViewProfileFromGroup( const KConfigGroup &profileGroup
}
}
//kDebug(1202) << "done";
//kDebug() << "done";
}
void KonqViewManager::setActivePart(KParts::Part *part, QWidget *)
@ -983,16 +983,16 @@ void KonqViewManager::setActivePart(KParts::Part *part, QWidget *)
void KonqViewManager::doSetActivePart( KParts::Part *part )
{
//kDebug(1202) << part;
//kDebug() << part;
//if ( part )
// kDebug(1202) << part->metaObject()->className() << part->name();
// kDebug() << part->metaObject()->className() << part->name();
KParts::Part* mainWindowActivePart = m_pMainWindow->currentView()
? m_pMainWindow->currentView()->part() : 0;
if (part == activePart() && mainWindowActivePart == part)
{
//if (part)
// kDebug(1202) << "Part is already active!";
// kDebug() << "Part is already active!";
return;
}
@ -1022,9 +1022,9 @@ void KonqViewManager::doSetActivePart( KParts::Part *part )
void KonqViewManager::slotActivePartChanged ( KParts::Part *newPart )
{
//kDebug(1202) << newPart;
//kDebug() << newPart;
if (newPart == 0L) {
//kDebug(1202) << "newPart = 0L , returning";
//kDebug() << "newPart = 0L , returning";
return;
}
// Send event to mainwindow - this is useful for plugins (like searchbar)
@ -1033,7 +1033,7 @@ void KonqViewManager::slotActivePartChanged ( KParts::Part *newPart )
KonqView * view = m_pMainWindow->childView( static_cast<KParts::ReadOnlyPart *>(newPart) );
if (view == 0L) {
kDebug(1202) << "No view associated with this part";
kDebug() << "No view associated with this part";
return;
}
if (view->frame()->parentContainer() == 0L) return;
@ -1041,7 +1041,7 @@ void KonqViewManager::slotActivePartChanged ( KParts::Part *newPart )
view->frame()->statusbar()->updateActiveStatus();
view->frame()->parentContainer()->setActiveChild( view->frame() );
}
//kDebug(1202) << "done";
//kDebug() << "done";
}
void KonqViewManager::emitActivePartChanged()
@ -1119,7 +1119,7 @@ void KonqViewManager::loadItem( const KConfigGroup &cfg, KonqFrameContainerBase
prefix = name + QLatin1Char( '_' );
}
//kDebug(1202) << "begin name=" << name << "openUrl=" << openUrl;
//kDebug() << "begin name=" << name << "openUrl=" << openUrl;
if (name.startsWith("View") || name == "empty") {
// load view config
@ -1144,7 +1144,7 @@ void KonqViewManager::loadItem( const KConfigGroup &cfg, KonqFrameContainerBase
}
}
}
//kDebug(1202) << "serviceType" << serviceType << serviceName;
//kDebug() << "serviceType" << serviceType << serviceName;
KService::Ptr service;
KService::List partServiceOffers, appServiceOffers;
@ -1152,13 +1152,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(1202) << "Profile Loading Error: View creation failed" ;
kWarning() << "Profile Loading Error: View creation failed" ;
return; //ugh..
}
bool passiveMode = cfg.readEntry( QString::fromLatin1( "PassiveMode" ).prepend( prefix ), false );
//kDebug(1202) << "Creating View Stuff; parent=" << parent;
//kDebug() << "Creating View Stuff; parent=" << parent;
if ( parent == m_pMainWindow )
parent = tabContainer();
KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage, pos );
@ -1194,7 +1194,7 @@ void KonqViewManager::loadItem( const KConfigGroup &cfg, KonqFrameContainerBase
}
if ( !url.isEmpty() ) {
//kDebug(1202) << "calling openUrl" << url;
//kDebug() << "calling openUrl" << url;
//childView->openUrl( url, url.prettyUrl() );
// We need view-follows-view (for the dirtree, for instance)
KonqOpenURLRequest req;
@ -1202,18 +1202,18 @@ void KonqViewManager::loadItem( const KConfigGroup &cfg, KonqFrameContainerBase
req.typedUrl = url.prettyUrl();
m_pMainWindow->openView( serviceType, url, childView, req );
}
//else kDebug(1202) << "url is empty";
//else kDebug() << "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(1202) << "Item is Container";
//kDebug() << "Item is Container";
//load container config
QString ostr = cfg.readEntry( QString::fromLatin1( "Orientation" ).prepend( prefix ), QString() );
//kDebug(1202) << "Orientation:" << ostr;
//kDebug() << "Orientation:" << ostr;
Qt::Orientation o;
if( ostr == "Vertical" )
o = Qt::Vertical;
@ -1249,7 +1249,7 @@ void KonqViewManager::loadItem( const KConfigGroup &cfg, KonqFrameContainerBase
loadItem( cfg, newContainer, childList.at(0), defaultURL, openUrl, forcedUrl );
loadItem( cfg, newContainer, childList.at(1), defaultURL, openUrl, forcedUrl );
//kDebug(1202) << "setSizes" << sizes;
//kDebug() << "setSizes" << sizes;
newContainer->setSizes( sizes );
if (index == 1)
@ -1262,7 +1262,7 @@ void KonqViewManager::loadItem( const KConfigGroup &cfg, KonqFrameContainerBase
}
else if( name.startsWith("Tabs") )
{
//kDebug(1202) << "Item is a Tabs";
//kDebug() << "Item is a Tabs";
int index = cfg.readEntry( QString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 );
if ( !m_tabContainer ) {
@ -1297,7 +1297,7 @@ void KonqViewManager::loadItem( const KConfigGroup &cfg, KonqFrameContainerBase
else
kWarning() << "Profile Loading Error: Unknown item" << name;
//kDebug(1202) << "end" << name;
//kDebug() << "end" << name;
}
void KonqViewManager::setProfiles( KActionMenu *profiles )
@ -1471,7 +1471,7 @@ public:
className = "NoWidget!";
else
className = frame->part()->widget()->metaObject()->className();
kDebug(1202) << m_spaces << frame
kDebug() << m_spaces << frame
<< "parent=" << frame->parentContainer()
<< (frame->isVisible() ? "visible" : "invisible")
<< "containing view" << frame->childView()
@ -1480,7 +1480,7 @@ public:
return true;
}
virtual bool visit(KonqFrameContainer* container) {
kDebug(1202) << m_spaces << container
kDebug() << m_spaces << container
<< (container->isVisible() ? "visible" : "invisible")
<< (container->orientation() == Qt::Horizontal ? "horizontal" : "vertical")
<< "sizes=" << container->sizes()
@ -1488,17 +1488,17 @@ public:
<< "activeChild=" << container->activeChild();
if (!container->activeChild())
kDebug(1202) << "WARNING:" << container << "has a null active child!";
kDebug() << "WARNING:" << container << "has a null active child!";
m_spaces += " ";
return true;
}
virtual bool visit(KonqFrameTabs* tabs) {
kDebug(1202) << m_spaces << "KonqFrameTabs" << tabs
kDebug() << m_spaces << "KonqFrameTabs" << tabs
<< "visible=" << tabs->isVisible()
<< "activeChild=" << tabs->activeChild();
if (!tabs->activeChild())
kDebug(1202) << "WARNING:" << tabs << "has a null active child!";
kDebug() << "WARNING:" << tabs << "has a null active child!";
m_spaces += " ";
return true;
}
@ -1518,7 +1518,7 @@ private:
void KonqViewManager::printFullHierarchy()
{
kDebug(1202) << "currentView=" << m_pMainWindow->currentView();
kDebug() << "currentView=" << m_pMainWindow->currentView();
KonqDebugFrameVisitor visitor;
m_pMainWindow->accept( &visitor );
}
@ -1543,7 +1543,7 @@ bool KonqViewManager::isTabBarVisible() const
void KonqViewManager::createTabContainer(QWidget* parent, KonqFrameContainerBase* parentContainer)
{
//kDebug(1202) << "createTabContainer" << parent << parentContainer;
//kDebug() << "createTabContainer" << parent << parentContainer;
m_tabContainer = new KonqFrameTabs( parent, parentContainer, this );
connect( m_tabContainer, SIGNAL(ctrlTabPressed()), m_pMainWindow, SLOT(slotCtrlTabPressed()) );
// Delay the opening of the URL for #106641