Use tdeApp

Signed-off-by: Michele Calgaro <[email protected]>

8 files changed, 14 insertions, 14 deletions

diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index 9174a0f..d40e74a 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -75,7 +75,7 @@ const char* CONFIG_SAVE_AUTOMATICALLY="save automatically";
  * Returns a widget suitable to use as a dialog parent
  */
 static TQWidget* dialogParentWidget() {
-	return TDEApplication::kApplication()->mainWidget();
+	return tdeApp->mainWidget();
 }
 
 //-------------------------------------------------------------------
@@ -195,7 +195,7 @@ void Document::setURL(const KURL& paramURL) {
 
 	d->mURL = localURL; // this may be fixed after stat() is complete, but set at least something
 	d->mStatJob = TDEIO::stat( localURL, !localURL.isLocalFile() );
-	d->mStatJob->setWindow(TDEApplication::kApplication()->mainWidget());
+	d->mStatJob->setWindow(tdeApp->mainWidget());
 	connect( d->mStatJob, TQ_SIGNAL( result (TDEIO::Job *) ),
 	   this, TQ_SLOT( slotStatResult (TDEIO::Job *) ) );
 }
diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
index 22f55b3..7914207 100644
--- a/src/gvcore/documentloadedimpl.cpp
+++ b/src/gvcore/documentloadedimpl.cpp
@@ -174,7 +174,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
 			return i18n("Could not write to %1.").arg(url.path());
 		}
 	} else {
-		if (!TDEIO::NetAccess::upload(tmp.name(), url, TDEApplication::kApplication()->mainWidget() )) {
+		if (!TDEIO::NetAccess::upload(tmp.name(), url, tdeApp->mainWidget() )) {
 			return i18n("Could not upload the file to %1.").arg(url.prettyURL());
 		}
 	}
diff --git a/src/gvcore/externaltoolcontext.cpp b/src/gvcore/externaltoolcontext.cpp
index 1ccc2aa..fef6136 100644
--- a/src/gvcore/externaltoolcontext.cpp
+++ b/src/gvcore/externaltoolcontext.cpp
@@ -45,7 +45,7 @@ ExternalToolContext::ExternalToolContext(
 
 
 void ExternalToolContext::showExternalToolDialog() {
-	ExternalToolDialog* dialog=new ExternalToolDialog(kapp->mainWidget());
+	ExternalToolDialog* dialog=new ExternalToolDialog(tdeApp->mainWidget());
 	dialog->show();
 }
 
diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp
index 17aedf2..795d161 100644
--- a/src/gvcore/imageloader.cpp
+++ b/src/gvcore/imageloader.cpp
@@ -326,7 +326,7 @@ void ImageLoader::checkPendingStat() {
 	if( d->mSuspended || d->mGetState != GET_PENDING_STAT ) return;
 
 	TDEIO::Job* job=TDEIO::stat( d->mURL, false );
-	job->setWindow(TDEApplication::kApplication()->mainWidget());
+	job->setWindow(tdeApp->mainWidget());
 	connect(job, TQ_SIGNAL(result(TDEIO::Job*)),
 		this, TQ_SLOT(slotStatResult(TDEIO::Job*)) );
 	d->mGetState = GET_STATING;
@@ -392,7 +392,7 @@ void ImageLoader::checkPendingGet() {
 
 	// Start loading the image
 	TDEIO::Job* getJob=TDEIO::get( d->mURL, false, false);
-	getJob->setWindow(TDEApplication::kApplication()->mainWidget());
+	getJob->setWindow(tdeApp->mainWidget());
 
 	connect(getJob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
 		this, TQ_SLOT(slotDataReceived(TDEIO::Job*, const TQByteArray&)) );
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index 371eff4..2d336c0 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -404,7 +404,7 @@ ImageView::ImageView(TQWidget* parent,Document* document, TDEActionCollection* a
 	// installs an event filter on its viewport, and doesn't filter out the paint
 	// events -> it'd get it twice, first from app filter, second from viewport filter.
 	EventFilter* filter=new EventFilter(this);
-	kapp->installEventFilter(filter);
+	tdeApp->installEventFilter(filter);
 }
 
 
@@ -1029,7 +1029,7 @@ bool ImageView::eventFilter(TQObject* obj, TQEvent* event) {
 		return true;
 
 	case TQEvent::Enter:
-		selectTool( kapp->keyboardMouseState(), true );
+		selectTool( tdeApp->keyboardMouseState(), true );
 		emitRequestHintDisplay();
 		break;
 
diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index 4a00ccb..5b93645 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -284,7 +284,7 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, T
 	d->mImageView=new ImageView(d->mStack, document, actionCollection);
 	d->mStack->addWidget(d->mImageView);
 
-	TDEApplication::kApplication()->installEventFilter(this);
+	tdeApp->installEventFilter(this);
 
 	d->mPlayerPart=0;
 	d->mBuilder=new XMLGUIBuilder(d->mToolBar);
@@ -394,7 +394,7 @@ void ImageViewController::slotAutoHide() {
 	}
 
 	// Only hide cursor if we are not over a dialog
-	TQWidget* widget = TDEApplication::kApplication()->activeWindow();
+	TQWidget* widget = tdeApp->activeWindow();
 	if (!widget || !widget->inherits("TQDialog")) {
 		TQApplication::setOverrideCursor(blankCursor);
 		d->mCursorHidden=true;
diff --git a/src/gvcore/mimetypeutils.cpp b/src/gvcore/mimetypeutils.cpp
index e69834f..00c33cb 100644
--- a/src/gvcore/mimetypeutils.cpp
+++ b/src/gvcore/mimetypeutils.cpp
@@ -76,7 +76,7 @@ Kind urlKind(const KURL& url) {
 	if (url.isLocalFile()) {
 		mimeType=KMimeType::findByURL(url)->name();
 	} else {
-		mimeType=TDEIO::NetAccess::mimetype(url, TDEApplication::kApplication()->mainWidget());
+		mimeType=TDEIO::NetAccess::mimetype(url, tdeApp->mainWidget());
 	}
 	return mimeTypeKind(mimeType);
 }
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index 7d3a11f..545a818 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -550,7 +550,7 @@ void ThumbnailLoadJob::determineNextIcon() {
 	}
 	if( mOriginalTime == 0 ) { // TDEIO must be used
 		TDEIO::Job* job = TDEIO::stat(mCurrentURL,false);
-		job->setWindow(TDEApplication::kApplication()->mainWidget());
+		job->setWindow(tdeApp->mainWidget());
 		LOG( "TDEIO::stat orig " << mCurrentURL.url() );
 		addSubjob(job);
 	}
@@ -697,7 +697,7 @@ void ThumbnailLoadJob::checkThumbnail() {
 			KURL url;
 			url.setPath(mTempPath);
 			TDEIO::Job* job=TDEIO::file_copy(mCurrentURL, url,-1,true,false,false);
-			job->setWindow(TDEApplication::kApplication()->mainWidget());
+			job->setWindow(tdeApp->mainWidget());
 			LOG("Download remote file " << mCurrentURL.prettyURL());
 			addSubjob(job);
 		}
@@ -707,7 +707,7 @@ void ThumbnailLoadJob::checkThumbnail() {
 		KFileItemList list;
 		list.append(mCurrentItem);
 		TDEIO::Job* job=TDEIO::filePreview(list, mThumbnailSize);
-		job->setWindow(TDEApplication::kApplication()->mainWidget());
+		job->setWindow(tdeApp->mainWidget());
 		connect(job, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
 			this, TQ_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) );
 		connect(job, TQ_SIGNAL(failed(const KFileItem*)),