Rename a number of classes to enhance compatibility with KDE4

1 files changed, 18 insertions, 18 deletions

diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index 17f592d..63b48a4 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -88,15 +88,15 @@ struct ImageViewController::Private {
 	ImageViewController* mImageViewController;
 	
 	Document* mDocument;
-	KActionCollection* mActionCollection;
+	TDEActionCollection* mActionCollection;
 	TQWidget* mContainer;
-	KToolBar* mToolBar;
+	TDEToolBar* mToolBar;
 	KXMLGUIFactory* mFactory;
 	XMLGUIBuilder* mBuilder;
 	TQWidgetStack* mStack;
 	
 	ImageView* mImageView;
-	KActionPtrList mImageViewActions;
+	TDEActionPtrList mImageViewActions;
 	
 	// Hide cursor stuff
 	TQTimer* mAutoHideTimer;
@@ -107,7 +107,7 @@ struct ImageViewController::Private {
 	// Fullscreen stuff
 	bool mFullScreen;
 	FullScreenBar* mFullScreenBar;
-	KActionPtrList mFullScreenCommonActions;
+	TDEActionPtrList mFullScreenCommonActions;
 
 
 	void setXMLGUIClient(KXMLGUIClient* client) {
@@ -121,11 +121,11 @@ struct ImageViewController::Private {
 		}
 
 		// Unplug image view actions, if plugged
-		KActionPtrList::Iterator
+		TDEActionPtrList::Iterator
 			it=mImageViewActions.begin(),
 			end=mImageViewActions.end();
 		for (; it!=end; ++it) {
-			KAction* action=*it;
+			TDEAction* action=*it;
 			if (action->isPlugged(mToolBar)) {
 				action->unplug(mToolBar);
 			}
@@ -183,7 +183,7 @@ struct ImageViewController::Private {
 	void showImageView(void) {
 		LOG("");
 		if (mStack->visibleWidget()==mImageView) {
-			KAction* action=mImageViewActions.first();
+			TDEAction* action=mImageViewActions.first();
 			if (action && !action->isPlugged(mToolBar)) {
 				// In the ctor, we set the imageview as the visible widget but
 				// we did not fill the toolbar because mImageViewActions was
@@ -203,11 +203,11 @@ struct ImageViewController::Private {
 	}
 
 	void plugImageViewActions() {
-		KActionPtrList::Iterator
+		TDEActionPtrList::Iterator
 			it=mImageViewActions.begin(),
 			end=mImageViewActions.end();
 		for (; it!=end; ++it) {
-			KAction* action=*it;
+			TDEAction* action=*it;
 			action->plug(mToolBar);
 		}
 	}
@@ -246,7 +246,7 @@ struct ImageViewController::Private {
 		Q_ASSERT(!mFullScreenBar);
 		mFullScreenBar=new FullScreenBar(mContainer);
 		
-		KActionPtrList::ConstIterator
+		TDEActionPtrList::ConstIterator
 			it=mFullScreenCommonActions.begin(),
 			end=mFullScreenCommonActions.end();
 
@@ -264,7 +264,7 @@ struct ImageViewController::Private {
 //------------------------------------------------------------------------
 
 
-ImageViewController::ImageViewController(TQWidget* parent, Document* document, KActionCollection* actionCollection)
+ImageViewController::ImageViewController(TQWidget* parent, Document* document, TDEActionCollection* actionCollection)
 : TQObject(parent) {
 	d=new Private;
 	d->mImageViewController=this;
@@ -276,7 +276,7 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K
 	d->mContainer=new TQWidget(parent);
 	d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size
 	TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer);
-	d->mToolBar=new KToolBar(d->mContainer, "", true);
+	d->mToolBar=new TDEToolBar(d->mContainer, "", true);
 
 	layout->add(d->mToolBar);
 	d->mStack=new TQWidgetStack(d->mContainer);
@@ -362,8 +362,8 @@ void ImageViewController::setFullScreen(bool fullScreen) {
 }
 
 
-void ImageViewController::setNormalCommonActions(const KActionPtrList& actions) {
-	KActionPtrList::ConstIterator
+void ImageViewController::setNormalCommonActions(const TDEActionPtrList& actions) {
+	TDEActionPtrList::ConstIterator
 		it=actions.begin(),
 		end=actions.end();
 
@@ -374,12 +374,12 @@ void ImageViewController::setNormalCommonActions(const KActionPtrList& actions)
 }
 
 
-void ImageViewController::setFullScreenCommonActions(const KActionPtrList& actions) {
+void ImageViewController::setFullScreenCommonActions(const TDEActionPtrList& actions) {
 	d->mFullScreenCommonActions=actions;
 }
 
 
-void ImageViewController::setImageViewActions(const KActionPtrList& actions) {
+void ImageViewController::setImageViewActions(const TDEActionPtrList& actions) {
 	d->mImageViewActions=actions;
 }
 
@@ -453,8 +453,8 @@ bool ImageViewController::eventFilter(TQObject* object, TQEvent* event) {
 /**
  * Little helper to plug an action if it exists
  */
-inline void plugAction(TQPopupMenu* menu, KActionCollection* actionCollection, const char* actionName) {
-	KAction* action=actionCollection->action(actionName);
+inline void plugAction(TQPopupMenu* menu, TDEActionCollection* actionCollection, const char* actionName) {
+	TDEAction* action=actionCollection->action(actionName);
 	if (action) action->plug(menu);
 }