Commit 0cd6edee authored by David Faure's avatar David Faure
Browse files

De-inline methods to fix compilation with gcc3 due to QPointer needing to know...

De-inline methods to fix compilation with gcc3 due to QPointer needing to know that KonqView is a QObject.
Can't add #include (cyclic dependencies)

svn path=/trunk/KDE/kdebase/konqueror/; revision=539680
parent 65cbe753
...@@ -294,7 +294,7 @@ void KonqFrameBase::printFrameInfo(const QString& spaces) ...@@ -294,7 +294,7 @@ void KonqFrameBase::printFrameInfo(const QString& spaces)
//################################################################### //###################################################################
KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer, const char *name ) KonqFrame::KonqFrame( QWidget* parent, KonqFrameContainerBase *parentContainer, const char *name )
:QWidget(parent,name) : QWidget (parent, name )
{ {
//kDebug(1202) << "KonqFrame::KonqFrame()" << endl; //kDebug(1202) << "KonqFrame::KonqFrame()" << endl;
...@@ -353,7 +353,7 @@ void KonqFrame::copyHistory( KonqFrameBase *other ) ...@@ -353,7 +353,7 @@ void KonqFrame::copyHistory( KonqFrameBase *other )
void KonqFrame::printFrameInfo( const QString& spaces ) void KonqFrame::printFrameInfo( const QString& spaces )
{ {
QString className = "NoPart"; QString className = "NoPart";
if (part()) className = part()->widget()->className(); if (part()) className = part()->widget()->metaObject()->className();
kDebug(1202) << spaces << "KonqFrame " << this << " visible=" << QString("%1").arg(isVisible()) << " containing view " kDebug(1202) << spaces << "KonqFrame " << this << " visible=" << QString("%1").arg(isVisible()) << " containing view "
<< childView() << " visible=" << QString("%1").arg(isVisible()) << childView() << " visible=" << QString("%1").arg(isVisible())
<< " and part " << part() << " whose widget is a " << className << endl; << " and part " << part() << " whose widget is a " << className << endl;
...@@ -481,11 +481,21 @@ void KonqFrame::activateChild() ...@@ -481,11 +481,21 @@ void KonqFrame::activateChild()
m_pView->mainWindow()->viewManager()->setActivePart( part() ); m_pView->mainWindow()->viewManager()->setActivePart( part() );
} }
KonqView* KonqFrame::childView() const
{
return m_pView;
}
KonqView* KonqFrame::activeChildView()
{
return m_pView;
}
//################################################################### //###################################################################
void KonqFrameContainerBase::printFrameInfo(const QString& spaces) void KonqFrameContainerBase::printFrameInfo(const QString& spaces)
{ {
kDebug(1202) << spaces << "KonqFrameContainerBase " << this << ", this shouldn't happen!" << endl; kDebug(1202) << spaces << "KonqFrameContainerBase " << this << ", this shouldn't happen!" << endl;
} }
//################################################################### //###################################################################
...@@ -676,6 +686,4 @@ void KonqFrameContainer::childEvent( QChildEvent *c ) ...@@ -676,6 +686,4 @@ void KonqFrameContainer::childEvent( QChildEvent *c )
QSplitter::childEvent(c); QSplitter::childEvent(c);
} }
//emit s;
#include "konq_frame.moc" #include "konq_frame.moc"
...@@ -244,7 +244,7 @@ public: ...@@ -244,7 +244,7 @@ public:
/** /**
* Returns the view that is currently connected to the Frame. * Returns the view that is currently connected to the Frame.
*/ */
KonqView* childView()const { return m_pView; } KonqView* childView() const;
bool isActivePart(); bool isActivePart();
...@@ -272,7 +272,7 @@ public: ...@@ -272,7 +272,7 @@ public:
virtual void activateChild(); virtual void activateChild();
KonqView* activeChildView() { return m_pView; } virtual KonqView* activeChildView();
QString title() const { return m_title; } QString title() const { return m_title; }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment