Rename a number of classes to enhance compatibility with KDE4

1 files changed, 33 insertions, 33 deletions

diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index e61ef8c..47438fd 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -160,24 +160,24 @@ struct ImageView::Private {
 
 	// Our actions
 	TQComboBox* mZoomCombo;
-	// We do not use KSelectAction because it's not possible to set the combo text
+	// We do not use TDESelectAction because it's not possible to set the combo text
 	KWidgetAction* mZoomComboAction;
-	KToggleAction* mZoomToFit;
-	KToggleAction* mZoomToWidth;
-	KToggleAction* mZoomToHeight;
-	TQValueVector<KToggleAction*> mZoomComboActions;
-	KAction* mZoomIn;
-	KAction* mZoomOut;
-	KAction* mResetZoom;
-	KToggleAction* mLockZoom;
-	KAction* mAdjustBCG;
-	KAction* mIncreaseGamma;
-	KAction* mDecreaseGamma;
-	KAction* mIncreaseBrightness;
-	KAction* mDecreaseBrightness;
-	KAction* mIncreaseContrast;
-	KAction* mDecreaseContrast;
-	KActionCollection* mActionCollection;
+	TDEToggleAction* mZoomToFit;
+	TDEToggleAction* mZoomToWidth;
+	TDEToggleAction* mZoomToHeight;
+	TQValueVector<TDEToggleAction*> mZoomComboActions;
+	TDEAction* mZoomIn;
+	TDEAction* mZoomOut;
+	TDEAction* mResetZoom;
+	TDEToggleAction* mLockZoom;
+	TDEAction* mAdjustBCG;
+	TDEAction* mIncreaseGamma;
+	TDEAction* mDecreaseGamma;
+	TDEAction* mIncreaseBrightness;
+	TDEAction* mDecreaseBrightness;
+	TDEAction* mIncreaseContrast;
+	TDEAction* mDecreaseContrast;
+	TDEActionCollection* mActionCollection;
 	BCGDialog* mBCGDialog;
 
 	// Fullscreen stuff
@@ -246,7 +246,7 @@ struct ImageView::Private {
 
 	void initZoomCombo() {
 		mZoomCombo->clear();
-		for (TQValueVector<KToggleAction*>::iterator it=mZoomComboActions.begin();
+		for (TQValueVector<TDEToggleAction*>::iterator it=mZoomComboActions.begin();
 			it!=mZoomComboActions.end();
 			++it)
 		{
@@ -291,7 +291,7 @@ public:
 
 
 
-ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* actionCollection)
+ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* actionCollection)
 : TQScrollView(parent,0L,WResizeNoErase|WRepaintNoErase|WPaintClever)
 {
 	d=new Private;
@@ -325,13 +325,13 @@ ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* act
 	d->mTools[d->mToolID]->updateCursor();
 
 	// Create actions
-	d->mZoomToFit=new KToggleAction(i18n("Fit to &Window"),"viewmagfit",0,d->mActionCollection,"view_zoom_to_fit");
+	d->mZoomToFit=new TDEToggleAction(i18n("Fit to &Window"),"viewmagfit",0,d->mActionCollection,"view_zoom_to_fit");
 	connect(d->mZoomToFit,TQT_SIGNAL(toggled(bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(setZoomToFit(bool)) );
-	d->mZoomToWidth=new KToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width");
+	d->mZoomToWidth=new TDEToggleAction(i18n("Fit to &Width"),0,0,d->mActionCollection,"view_zoom_to_width");
 	connect(d->mZoomToWidth,TQT_SIGNAL(toggled(bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(setZoomToWidth(bool)) );
-	d->mZoomToHeight=new KToggleAction(i18n("Fit to &Height"),0,0,d->mActionCollection,"view_zoom_to_height");
+	d->mZoomToHeight=new TDEToggleAction(i18n("Fit to &Height"),0,0,d->mActionCollection,"view_zoom_to_height");
 	connect(d->mZoomToHeight,TQT_SIGNAL(toggled(bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(setZoomToHeight(bool)) );
 
@@ -342,7 +342,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* act
 	d->mResetZoom=KStdAction::actualSize(TQT_TQOBJECT(this),TQT_SLOT(slotResetZoom()),d->mActionCollection);
 	d->mResetZoom->setIcon("viewmag1");
 
-	d->mLockZoom=new KToggleAction(i18n("&Lock Zoom"),"lock",0,d->mActionCollection,"view_zoom_lock");
+	d->mLockZoom=new TDEToggleAction(i18n("&Lock Zoom"),"lock",0,d->mActionCollection,"view_zoom_lock");
 	d->mLockZoom->setChecked(ImageViewConfig::lockZoom());
 	connect(d->mLockZoom,TQT_SIGNAL(toggled(bool)),
 		TQT_TQOBJECT(this), TQT_SLOT(setLockZoom(bool)) );
@@ -363,19 +363,19 @@ ImageView::ImageView(TQWidget* parent,Document* document, KActionCollection* act
 	}
 	d->initZoomCombo();
 
-	d->mAdjustBCG=new KAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0,
+	d->mAdjustBCG=new TDEAction(i18n("Adjust Brightness/Contrast/Gamma"), "colorize", 0,
 		TQT_TQOBJECT(this), TQT_SLOT(showBCGDialog()), d->mActionCollection, "adjust_bcg");
-	d->mIncreaseGamma=new KAction(i18n("Increase Gamma"),0,CTRL+Key_G,
+	d->mIncreaseGamma=new TDEAction(i18n("Increase Gamma"),0,CTRL+Key_G,
 		TQT_TQOBJECT(this), TQT_SLOT(increaseGamma()),d->mActionCollection,"increase_gamma");
-	d->mDecreaseGamma=new KAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G,
+	d->mDecreaseGamma=new TDEAction(i18n("Decrease Gamma"),0,SHIFT+CTRL+Key_G,
 		TQT_TQOBJECT(this), TQT_SLOT(decreaseGamma()),d->mActionCollection,"decrease_gamma");
-	d->mIncreaseBrightness=new KAction(i18n("Increase Brightness" ),0,CTRL+Key_B,
+	d->mIncreaseBrightness=new TDEAction(i18n("Increase Brightness" ),0,CTRL+Key_B,
 		TQT_TQOBJECT(this), TQT_SLOT(increaseBrightness()),d->mActionCollection,"increase_brightness");
-	d->mDecreaseBrightness=new KAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B,
+	d->mDecreaseBrightness=new TDEAction(i18n("Decrease Brightness" ),0,SHIFT+CTRL+Key_B,
 		TQT_TQOBJECT(this), TQT_SLOT(decreaseBrightness()),d->mActionCollection,"decrease_brightness");
-	d->mIncreaseContrast=new KAction(i18n("Increase Contrast" ),0,CTRL+Key_C,
+	d->mIncreaseContrast=new TDEAction(i18n("Increase Contrast" ),0,CTRL+Key_C,
 		TQT_TQOBJECT(this), TQT_SLOT(increaseContrast()),d->mActionCollection,"increase_contrast");
-	d->mDecreaseContrast=new KAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C,
+	d->mDecreaseContrast=new TDEAction(i18n("Decrease Contrast" ),0,SHIFT+CTRL+Key_C,
 		TQT_TQOBJECT(this), TQT_SLOT(decreaseContrast()),d->mActionCollection,"decrease_contrast");
 
 	// Connect to some interesting signals
@@ -477,12 +477,12 @@ TQPoint ImageView::offset() const {
 	
 
 bool ImageView::canZoom(bool in) const {
-	KAction* zoomAction=in ? d->mZoomIn : d->mZoomOut;
+	TDEAction* zoomAction=in ? d->mZoomIn : d->mZoomOut;
 	return zoomAction->isEnabled();
 }
 
 
-KToggleAction* ImageView::zoomToFit() const {
+TDEToggleAction* ImageView::zoomToFit() const {
 	return d->mZoomToFit;
 }
 
@@ -522,7 +522,7 @@ void ImageView::updateZoom(ZoomMode zoomMode, double value, int centerX, int cen
 	ZoomMode oldZoomMode = d->mZoomMode;
 	double oldZoom=d->mZoom;
 	d->mZoomMode=zoomMode;
-	KAction* checkedZoomAction=0;
+	TDEAction* checkedZoomAction=0;
 	
 	viewport()->setUpdatesEnabled(false);