TDE
/
gwenview
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/gwenview
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KApplication to TDEApplication to avoid conflicts with KDE4

Browse Source
r14.0.x
Timothy Pearson 12 years ago
parent 4ff6dfc573
commit 4d3c178751
12 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File

26
acinclude.m4
Unescape View File

@ -1970,20 +1970,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");

2
src/app/main.cpp
Unescape View File

@ -129,7 +129,7 @@ KDE_EXPORT int kdemain (int argc, char *argv[]) {
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );
KApplication kapplication; TDEApplication kapplication;
if (kapplication.isRestored()) { if (kapplication.isRestored()) {
RESTORE(MainWindow) RESTORE(MainWindow)

2
src/app/mainwindow.cpp
Unescape View File

@ -453,7 +453,7 @@ void MainWindow::printFile() {
KPrinter printer; KPrinter printer;
printer.setDocName(mDocument->filename()); printer.setDocName(mDocument->filename());
const KAboutData* pAbout = KApplication::kApplication()->aboutData(); const KAboutData* pAbout = TDEApplication::kApplication()->aboutData();
TQString nm = pAbout->appName(); TQString nm = pAbout->appName();
nm += "-"; nm += "-";
nm += pAbout->version(); nm += pAbout->version();

2
src/app/testvtabwidget.cpp
Unescape View File

@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
KAboutData aboutData("testvtabwidget", "testvtabwidget", "0"); KAboutData aboutData("testvtabwidget", "testvtabwidget", "0");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication app; TDEApplication app;
Gwenview::VTabWidget tabWidget(0); Gwenview::VTabWidget tabWidget(0);
TQLabel* lbl=new TQLabel("label 1", &tabWidget); TQLabel* lbl=new TQLabel("label 1", &tabWidget);

4
src/gvcore/document.cpp
Unescape View File

@ -76,7 +76,7 @@ const char* CONFIG_SAVE_AUTOMATICALLY="save automatically";
* Returns a widget suitable to use as a dialog parent * Returns a widget suitable to use as a dialog parent
*/ */
static TQWidget* dialogParentWidget() { 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->mURL = localURL; // this may be fixed after stat() is complete, but set at least something
d->mStatJob = KIO::stat( localURL, !localURL.isLocalFile() ); 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 *) ), connect( d->mStatJob, TQT_SIGNAL( result (KIO::Job *) ),
this, TQT_SLOT( slotStatResult (KIO::Job *) ) ); this, TQT_SLOT( slotStatResult (KIO::Job *) ) );
} }

2
src/gvcore/documentloadedimpl.cpp
Unescape View File

@ -175,7 +175,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
return i18n("Could not write to %1.").arg(url.path()); return i18n("Could not write to %1.").arg(url.path());
} }
} else { } 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()); return i18n("Could not upload the file to %1.").arg(url.prettyURL());
} }
} }

4
src/gvcore/imageloader.cpp
Unescape View File

@ -327,7 +327,7 @@ void ImageLoader::checkPendingStat() {
if( d->mSuspended || d->mGetState != GET_PENDING_STAT ) return; if( d->mSuspended || d->mGetState != GET_PENDING_STAT ) return;
KIO::Job* job=KIO::stat( d->mURL, false ); 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*)), connect(job, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(slotStatResult(KIO::Job*)) ); this, TQT_SLOT(slotStatResult(KIO::Job*)) );
d->mGetState = GET_STATING; d->mGetState = GET_STATING;
@ -393,7 +393,7 @@ void ImageLoader::checkPendingGet() {
// Start loading the image // Start loading the image
KIO::Job* getJob=KIO::get( d->mURL, false, false); 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&)), connect(getJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
this, TQT_SLOT(slotDataReceived(KIO::Job*, const TQByteArray&)) ); this, TQT_SLOT(slotDataReceived(KIO::Job*, const TQByteArray&)) );

4
src/gvcore/imageviewcontroller.cpp
Unescape View File

@ -285,7 +285,7 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K
d->mImageView=new ImageView(d->mStack, document, actionCollection); d->mImageView=new ImageView(d->mStack, document, actionCollection);
d->mStack->addWidget(d->mImageView); d->mStack->addWidget(d->mImageView);
KApplication::kApplication()->installEventFilter(this); TDEApplication::kApplication()->installEventFilter(this);
d->mPlayerPart=0; d->mPlayerPart=0;
d->mBuilder=new XMLGUIBuilder(d->mToolBar); d->mBuilder=new XMLGUIBuilder(d->mToolBar);
@ -395,7 +395,7 @@ void ImageViewController::slotAutoHide() {
} }
// Only hide cursor if we are not over a dialog // 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)) { if (!widget || !widget->inherits(TQDIALOG_OBJECT_NAME_STRING)) {
TQApplication::setOverrideCursor(blankCursor); TQApplication::setOverrideCursor(blankCursor);
d->mCursorHidden=true; d->mCursorHidden=true;

2
src/gvcore/mimetypeutils.cpp
Unescape View File

@ -77,7 +77,7 @@ Kind urlKind(const KURL& url) {
if (url.isLocalFile()) { if (url.isLocalFile()) {
mimeType=KMimeType::findByURL(url)->name(); mimeType=KMimeType::findByURL(url)->name();
} else { } else {
mimeType=KIO::NetAccess::mimetype(url, KApplication::kApplication()->mainWidget()); mimeType=KIO::NetAccess::mimetype(url, TDEApplication::kApplication()->mainWidget());
} }
return mimeTypeKind(mimeType); return mimeTypeKind(mimeType);
} }

6
src/gvcore/thumbnailloadjob.cpp
Unescape View File

@ -554,7 +554,7 @@ void ThumbnailLoadJob::determineNextIcon() {
} }
if( mOriginalTime == 0 ) { // KIO must be used if( mOriginalTime == 0 ) { // KIO must be used
KIO::Job* job = KIO::stat(mCurrentURL,false); KIO::Job* job = KIO::stat(mCurrentURL,false);
job->setWindow(KApplication::kApplication()->mainWidget()); job->setWindow(TDEApplication::kApplication()->mainWidget());
LOG( "KIO::stat orig " << mCurrentURL.url() ); LOG( "KIO::stat orig " << mCurrentURL.url() );
addSubjob(job); addSubjob(job);
} }
@ -701,7 +701,7 @@ void ThumbnailLoadJob::checkThumbnail() {
KURL url; KURL url;
url.setPath(mTempPath); url.setPath(mTempPath);
KIO::Job* job=KIO::file_copy(mCurrentURL, url,-1,true,false,false); 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()); LOG("Download remote file " << mCurrentURL.prettyURL());
addSubjob(job); addSubjob(job);
} }
@ -711,7 +711,7 @@ void ThumbnailLoadJob::checkThumbnail() {
KFileItemList list; KFileItemList list;
list.append(mCurrentItem); list.append(mCurrentItem);
KIO::Job* job=KIO::filePreview(list, mThumbnailSize); 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&)), connect(job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
this, TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) ); this, TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) );
connect(job, TQT_SIGNAL(failed(const KFileItem*)), connect(job, TQT_SIGNAL(failed(const KFileItem*)),

2
src/gvimagepart/gvimagepart.cpp
Unescape View File

@ -98,7 +98,7 @@ GVImagePart::GVImagePart(TQWidget* parentWidget, const char* /*widgetName*/, TQO
mDirLister = new KDirLister; mDirLister = new KDirLister;
mDirLister->setAutoErrorHandlingEnabled( false, 0 ); 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( clear()), TQT_SLOT( dirListerClear()));
connect( mDirLister, TQT_SIGNAL( newItems( const KFileItemList& )), connect( mDirLister, TQT_SIGNAL( newItems( const KFileItemList& )),
TQT_SLOT( dirListerNewItems( const KFileItemList& ))); TQT_SLOT( dirListerNewItems( const KFileItemList& )));

2
src/imageutils/testjpegcontent.cpp
Unescape View File

@ -203,7 +203,7 @@ int main(int argc, char* argv[]) {
bool result; bool result;
KAboutData aboutData("testjpegcontent", "testjpegcontent", "0"); KAboutData aboutData("testjpegcontent", "testjpegcontent", "0");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication kapplication; TDEApplication kapplication;
// Reading info // Reading info
ImageUtils::JPEGContent content; ImageUtils::JPEGContent content;

Write Preview
Loading…
Cancel
Save