From 4d3c1787513cb6c17f4e087bcf5e25b801731d94 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 19 Jan 2013 23:53:44 -0600 Subject: [PATCH] Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- acinclude.m4 | 26 +++++++++++++------------- src/app/main.cpp | 2 +- src/app/mainwindow.cpp | 2 +- src/app/testvtabwidget.cpp | 2 +- src/gvcore/document.cpp | 4 ++-- src/gvcore/documentloadedimpl.cpp | 2 +- src/gvcore/imageloader.cpp | 4 ++-- src/gvcore/imageviewcontroller.cpp | 4 ++-- src/gvcore/mimetypeutils.cpp | 2 +- src/gvcore/thumbnailloadjob.cpp | 6 +++--- src/gvimagepart/gvimagepart.cpp | 2 +- src/imageutils/testjpegcontent.cpp | 2 +- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 65e0a0f..f7629e5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1970,20 +1970,20 @@ cat > conftest.$ac_ext < int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); diff --git a/src/app/main.cpp b/src/app/main.cpp index 0200a0d..3767036 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -129,7 +129,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) { TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication kapplication; + TDEApplication kapplication; if (kapplication.isRestored()) { RESTORE(MainWindow) diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index be3782d..36e4a5e 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -453,7 +453,7 @@ void MainWindow::printFile() { KPrinter printer; printer.setDocName(mDocument->filename()); - const KAboutData* pAbout = KApplication::kApplication()->aboutData(); + const KAboutData* pAbout = TDEApplication::kApplication()->aboutData(); TQString nm = pAbout->appName(); nm += "-"; nm += pAbout->version(); diff --git a/src/app/testvtabwidget.cpp b/src/app/testvtabwidget.cpp index a607b55..1047527 100644 --- a/src/app/testvtabwidget.cpp +++ b/src/app/testvtabwidget.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. int main(int argc, char* argv[]) { KAboutData aboutData("testvtabwidget", "testvtabwidget", "0"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; Gwenview::VTabWidget tabWidget(0); TQLabel* lbl=new TQLabel("label 1", &tabWidget); diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp index b994669..f4310cb 100644 --- a/src/gvcore/document.cpp +++ b/src/gvcore/document.cpp @@ -76,7 +76,7 @@ const char* CONFIG_SAVE_AUTOMATICALLY="save automatically"; * Returns a widget suitable to use as a dialog parent */ static TQWidget* dialogParentWidget() { - return KApplication::kApplication()->mainWidget(); + return TDEApplication::kApplication()->mainWidget(); } //------------------------------------------------------------------- @@ -196,7 +196,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 = KIO::stat( localURL, !localURL.isLocalFile() ); - d->mStatJob->setWindow(KApplication::kApplication()->mainWidget()); + d->mStatJob->setWindow(TDEApplication::kApplication()->mainWidget()); connect( d->mStatJob, TQT_SIGNAL( result (KIO::Job *) ), this, TQT_SLOT( slotStatResult (KIO::Job *) ) ); } diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp index 59eee19..08eb24f 100644 --- a/src/gvcore/documentloadedimpl.cpp +++ b/src/gvcore/documentloadedimpl.cpp @@ -175,7 +175,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con return i18n("Could not write to %1.").arg(url.path()); } } else { - if (!KIO::NetAccess::upload(tmp.name(), url, KApplication::kApplication()->mainWidget() )) { + if (!KIO::NetAccess::upload(tmp.name(), url, TDEApplication::kApplication()->mainWidget() )) { return i18n("Could not upload the file to %1.").arg(url.prettyURL()); } } diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp index 78ab568..ee43c5b 100644 --- a/src/gvcore/imageloader.cpp +++ b/src/gvcore/imageloader.cpp @@ -327,7 +327,7 @@ void ImageLoader::checkPendingStat() { if( d->mSuspended || d->mGetState != GET_PENDING_STAT ) return; KIO::Job* job=KIO::stat( d->mURL, false ); - job->setWindow(KApplication::kApplication()->mainWidget()); + job->setWindow(TDEApplication::kApplication()->mainWidget()); connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotStatResult(KIO::Job*)) ); d->mGetState = GET_STATING; @@ -393,7 +393,7 @@ void ImageLoader::checkPendingGet() { // Start loading the image KIO::Job* getJob=KIO::get( d->mURL, false, false); - getJob->setWindow(KApplication::kApplication()->mainWidget()); + getJob->setWindow(TDEApplication::kApplication()->mainWidget()); connect(getJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)), this, TQT_SLOT(slotDataReceived(KIO::Job*, const TQByteArray&)) ); diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp index 3634146..8416224 100644 --- a/src/gvcore/imageviewcontroller.cpp +++ b/src/gvcore/imageviewcontroller.cpp @@ -285,7 +285,7 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K d->mImageView=new ImageView(d->mStack, document, actionCollection); d->mStack->addWidget(d->mImageView); - KApplication::kApplication()->installEventFilter(this); + TDEApplication::kApplication()->installEventFilter(this); d->mPlayerPart=0; d->mBuilder=new XMLGUIBuilder(d->mToolBar); @@ -395,7 +395,7 @@ void ImageViewController::slotAutoHide() { } // Only hide cursor if we are not over a dialog - TQWidget* widget = TQT_TQWIDGET(KApplication::kApplication()->activeWindow()); + TQWidget* widget = TQT_TQWIDGET(TDEApplication::kApplication()->activeWindow()); if (!widget || !widget->inherits(TQDIALOG_OBJECT_NAME_STRING)) { TQApplication::setOverrideCursor(blankCursor); d->mCursorHidden=true; diff --git a/src/gvcore/mimetypeutils.cpp b/src/gvcore/mimetypeutils.cpp index 828f025..1925b7d 100644 --- a/src/gvcore/mimetypeutils.cpp +++ b/src/gvcore/mimetypeutils.cpp @@ -77,7 +77,7 @@ Kind urlKind(const KURL& url) { if (url.isLocalFile()) { mimeType=KMimeType::findByURL(url)->name(); } else { - mimeType=KIO::NetAccess::mimetype(url, KApplication::kApplication()->mainWidget()); + mimeType=KIO::NetAccess::mimetype(url, TDEApplication::kApplication()->mainWidget()); } return mimeTypeKind(mimeType); } diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index c61e0d0..63b38e4 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/src/gvcore/thumbnailloadjob.cpp @@ -554,7 +554,7 @@ void ThumbnailLoadJob::determineNextIcon() { } if( mOriginalTime == 0 ) { // KIO must be used KIO::Job* job = KIO::stat(mCurrentURL,false); - job->setWindow(KApplication::kApplication()->mainWidget()); + job->setWindow(TDEApplication::kApplication()->mainWidget()); LOG( "KIO::stat orig " << mCurrentURL.url() ); addSubjob(job); } @@ -701,7 +701,7 @@ void ThumbnailLoadJob::checkThumbnail() { KURL url; url.setPath(mTempPath); KIO::Job* job=KIO::file_copy(mCurrentURL, url,-1,true,false,false); - job->setWindow(KApplication::kApplication()->mainWidget()); + job->setWindow(TDEApplication::kApplication()->mainWidget()); LOG("Download remote file " << mCurrentURL.prettyURL()); addSubjob(job); } @@ -711,7 +711,7 @@ void ThumbnailLoadJob::checkThumbnail() { KFileItemList list; list.append(mCurrentItem); KIO::Job* job=KIO::filePreview(list, mThumbnailSize); - job->setWindow(KApplication::kApplication()->mainWidget()); + job->setWindow(TDEApplication::kApplication()->mainWidget()); connect(job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) ); connect(job, TQT_SIGNAL(failed(const KFileItem*)), diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp index 95c67e3..69c1d64 100644 --- a/src/gvimagepart/gvimagepart.cpp +++ b/src/gvimagepart/gvimagepart.cpp @@ -98,7 +98,7 @@ GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQO mDirLister = new KDirLister; mDirLister->setAutoErrorHandlingEnabled( false, 0 ); - mDirLister->setMainWindow(KApplication::kApplication()->mainWidget()); + mDirLister->setMainWindow(TDEApplication::kApplication()->mainWidget()); connect( mDirLister, TQT_SIGNAL( clear()), TQT_SLOT( dirListerClear())); connect( mDirLister, TQT_SIGNAL( newItems( const KFileItemList& )), TQT_SLOT( dirListerNewItems( const KFileItemList& ))); diff --git a/src/imageutils/testjpegcontent.cpp b/src/imageutils/testjpegcontent.cpp index 50e35f6..1518127 100644 --- a/src/imageutils/testjpegcontent.cpp +++ b/src/imageutils/testjpegcontent.cpp @@ -203,7 +203,7 @@ int main(int argc, char* argv[]) { bool result; KAboutData aboutData("testjpegcontent", "testjpegcontent", "0"); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication kapplication; + TDEApplication kapplication; // Reading info ImageUtils::JPEGContent content;