Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 18 insertions, 18 deletions

diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp
index 424414a3a..401c67fbd 100644
--- a/kicker/extensions/sidebar/sidebarextension.cpp
+++ b/kicker/extensions/sidebar/sidebarextension.cpp
@@ -50,8 +50,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile,
 {
     kdDebug() << "SidebarExtension: Created '" << name << "', '" << configFile << "'" << endl;
     new KonqHistoryManager(0,"SidebarExtensionHistoryManager");
-    m_tqlayout=new TQHBoxLayout(this);
-    m_tqlayout->activate();
+    m_layout=new TQHBoxLayout(this);
+    m_layout->activate();
     m_sbWrapper=new TQVBox(this);
     KParts::ReadOnlyPart *p=KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(
 						"konq_sidebar",
@@ -94,7 +94,7 @@ void SidebarExtension::needLayoutUpdate(bool exp) {
 		m_currentWidth=24;
 		m_resizeHandle->hide();
 	}
-	tqtopLevelWidget()->setFixedWidth(m_currentWidth);
+	topLevelWidget()->setFixedWidth(m_currentWidth);
 	emit updateLayout();
 }
 
@@ -117,7 +117,7 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
 		return true;
 	} else if (e->type()==TQEvent::MouseButtonRelease) {
 		m_resizing=false;
-		m_expandedSize=tqtopLevelWidget()->width();
+		m_expandedSize=topLevelWidget()->width();
 		needLayoutUpdate(true);
 		return true;
 	} else if (e->type()==TQEvent::MouseMove) {
@@ -126,14 +126,14 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
 			if (p==Left) {
 				int diff=((TQMouseEvent*)e)->globalX()-m_x;
 					if (abs(diff)>3) {
-						tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff);
+						topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff);
 						m_x=((TQMouseEvent*)e)->globalX();
 					}
 			} else if (p==Right) {
 				int diff=((TQMouseEvent*)e)->globalX()-m_x;
 					if (abs(diff)>3) {
-						tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff);
-						tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y());
+						topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff);
+						topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y());
 						m_x=((TQMouseEvent*)e)->globalX();
 					}
 			}
@@ -148,24 +148,24 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const {
 	return KPanelExtension::Left;
 }
 
-TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const
+TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const
 {
 	return TQSize(m_currentWidth,maxSize.height());
 }
 
 void SidebarExtension::positionChange( Position  position ) {
 	if (position == Right) {
-		m_tqlayout->remove(m_sbWrapper);
-		m_tqlayout->remove(m_resizeHandle);
+		m_layout->remove(m_sbWrapper);
+		m_layout->remove(m_resizeHandle);
 
-		m_tqlayout->add(m_resizeHandle);
-		m_tqlayout->add(m_sbWrapper);
+		m_layout->add(m_resizeHandle);
+		m_layout->add(m_sbWrapper);
 	} else 	if (position == Left) {
-		m_tqlayout->remove(m_sbWrapper);
-		m_tqlayout->remove(m_resizeHandle);
+		m_layout->remove(m_sbWrapper);
+		m_layout->remove(m_resizeHandle);
 
-		m_tqlayout->add(m_sbWrapper);
-		m_tqlayout->add(m_resizeHandle);
+		m_layout->add(m_sbWrapper);
+		m_layout->add(m_resizeHandle);
 
 	}
 
diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h
index 7dea6b0fb..4d0d1646b 100644
--- a/kicker/extensions/sidebar/sidebarextension.h
+++ b/kicker/extensions/sidebar/sidebarextension.h
@@ -36,7 +36,7 @@ public:
 
     virtual ~SidebarExtension();
 
-    TQSize tqsizeHint( Position, TQSize maxSize ) const;
+    TQSize sizeHint( Position, TQSize maxSize ) const;
     Position preferedPosition() const;
 
     virtual void positionChange( Position position );
@@ -55,7 +55,7 @@ private:
     TQFrame *m_resizeHandle;
     bool m_resizing;
     int m_expandedSize;
-    TQHBoxLayout *m_tqlayout;
+    TQHBoxLayout *m_layout;
     TQVBox *m_sbWrapper;
 };