From 0bfcc16156eefad3c5a9b258433f2c538d3c448d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 19:56:32 +0200 Subject: [PATCH] Additional k => tde renaming and fixes --- NEWS | 2 +- admin | 2 +- src/app/Makefile.am | 4 ++-- src/app/mainwindow.cpp | 2 +- src/gvcore/Makefile.am | 2 +- src/gvcore/document.cpp | 2 +- src/gvcore/fileopobject.h | 2 +- src/gvcore/thumbnailloadjob.cpp | 4 ++-- src/gvdirpart/Makefile.am | 4 ++-- src/gvimagepart/Makefile.am | 4 ++-- src/spec/gwenview-mdk.spec | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NEWS b/NEWS index 6f14078..70466bb 100644 --- a/NEWS +++ b/NEWS @@ -783,7 +783,7 @@ 2001.07.11 - v0.7.0 - Added zoom in and out feature. - Thumbnail generation is now non-blocking. -- Uses KIO for file operations. +- Uses TDEIO for file operations. - Added "move" to file operations. - Selecting a folder which does not contain images will now empty the image widget. diff --git a/admin b/admin index b4d585c..6b7f722 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit b4d585c643d92787bfa17b935ce00b09960ee360 +Subproject commit 6b7f7225eff4c49b2dd71804d5fdacb03efcf461 diff --git a/src/app/Makefile.am b/src/app/Makefile.am index 68db340..8babb28 100644 --- a/src/app/Makefile.am +++ b/src/app/Makefile.am @@ -32,7 +32,7 @@ gwenview_la_SOURCES = \ history.cpp \ main.cpp -gwenview_la_LIBADD = libgwenshared.la ../gvcore/libgwenviewcore.la $(GV_LIB_KIPI) $(LIB_KUTILS) $(LIB_QT) +gwenview_la_LIBADD = libgwenshared.la ../gvcore/libgwenviewcore.la $(GV_LIB_KIPI) $(LIB_TDEUTILS) $(LIB_QT) # the library search path. gwenview_la_LDFLAGS = $(all_libraries) $(LIB_QT) -module $(KDE_PLUGIN) @@ -51,6 +51,6 @@ check_PROGRAMS = testvtabwidget testvtabwidget_SOURCES = testvtabwidget.cpp testvtabwidget_LDADD = \ libgwenshared.la \ - $(LIB_KUTILS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ + $(LIB_TDEUTILS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ $(LIBJPEG) testvtabwidget_LDFLAGS = $(all_libraries) $(LIB_QT) diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index f61d799..d21a265 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -141,7 +141,7 @@ enum { StackIDBrowse, StackIDView }; static bool urlIsDirectory(TQWidget* parent, const KURL& url) { if( url.filename( false ).isEmpty()) return true; // file:/somewhere/ - // Do direct stat instead of using KIO if the file is local (faster) + // Do direct stat instead of using TDEIO if the file is local (faster) if( url.isLocalFile() && !TDEIO::probably_slow_mounted( url.path())) { KDE_struct_stat buff; diff --git a/src/gvcore/Makefile.am b/src/gvcore/Makefile.am index 9e981e9..e336c3a 100644 --- a/src/gvcore/Makefile.am +++ b/src/gvcore/Makefile.am @@ -6,7 +6,7 @@ libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined libgwenviewcore_la_LIBADD = \ $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \ - $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_KPARTS) -ltdefx \ + $(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2) $(LIB_TDEPARTS) -ltdefx \ -ltdemediaplayer ../imageutils/libgvimageutils.la \ ../tsthread/libtsthread.la diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp index 9908a95..f244a85 100644 --- a/src/gvcore/document.cpp +++ b/src/gvcore/document.cpp @@ -182,7 +182,7 @@ void Document::setURL(const KURL& paramURL) { } // Set high busy level, so that operations like smoothing are suspended. - // Otherwise the stat() below done using KIO can take quite long. + // Otherwise the stat() below done using TDEIO can take quite long. BusyLevelManager::instance()->setBusyLevel( this, BUSY_CHECKING_NEW_IMAGE ); diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h index 584c5ff..29cf54f 100644 --- a/src/gvcore/fileopobject.h +++ b/src/gvcore/fileopobject.h @@ -34,7 +34,7 @@ class TQWidget; namespace Gwenview { /** - * This class is a base class for wrappers to KIO slaves asynchronous + * This class is a base class for wrappers to TDEIO slaves asynchronous * file operations. These classes handle all steps of a file operation : * - asking the user what to do with a file * - performing the operation diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp index 6d1f609..345c6e1 100644 --- a/src/gvcore/thumbnailloadjob.cpp +++ b/src/gvcore/thumbnailloadjob.cpp @@ -543,7 +543,7 @@ void ThumbnailLoadJob::determineNextIcon() { mCurrentURL = mCurrentItem->url(); mCurrentURL.cleanPath(); - // Do direct stat instead of using KIO if the file is local (faster) + // Do direct stat instead of using TDEIO if the file is local (faster) if( mCurrentURL.isLocalFile() && !TDEIO::probably_slow_mounted( mCurrentURL.path())) { KDE_struct_stat buff; @@ -552,7 +552,7 @@ void ThumbnailLoadJob::determineNextIcon() { TQTimer::singleShot( 0, this, TQT_SLOT( checkThumbnail())); } } - if( mOriginalTime == 0 ) { // KIO must be used + if( mOriginalTime == 0 ) { // TDEIO must be used TDEIO::Job* job = TDEIO::stat(mCurrentURL,false); job->setWindow(TDEApplication::kApplication()->mainWidget()); LOG( "TDEIO::stat orig " << mCurrentURL.url() ); diff --git a/src/gvdirpart/Makefile.am b/src/gvdirpart/Makefile.am index 767ddc4..f87b87a 100644 --- a/src/gvdirpart/Makefile.am +++ b/src/gvdirpart/Makefile.am @@ -5,8 +5,8 @@ INCLUDES = -I$(srcdir)/.. $(all_includes) kde_module_LTLIBRARIES = libgvdirpart.la libgvdirpart_la_SOURCES = gvdirpart.cpp gvdirpartconfig.kcfgc -libgvdirpart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la -libgvdirpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) +libgvdirpart_la_LIBADD = $(LIB_TDEPARTS) ../gvcore/libgwenviewcore.la +libgvdirpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) # Automatically generate moc files METASOURCES = AUTO diff --git a/src/gvimagepart/Makefile.am b/src/gvimagepart/Makefile.am index 9596eac..805449a 100644 --- a/src/gvimagepart/Makefile.am +++ b/src/gvimagepart/Makefile.am @@ -5,8 +5,8 @@ INCLUDES = -I$(srcdir)/.. $(all_includes) kde_module_LTLIBRARIES = libgvimagepart.la libgvimagepart_la_SOURCES = gvimagepart.cpp -libgvimagepart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la -libgvimagepart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT) +libgvimagepart_la_LIBADD = $(LIB_TDEPARTS) ../gvcore/libgwenviewcore.la +libgvimagepart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) # Automatically generate moc files METASOURCES = AUTO diff --git a/src/spec/gwenview-mdk.spec b/src/spec/gwenview-mdk.spec index 24a73e4..3f2a91f 100644 --- a/src/spec/gwenview-mdk.spec +++ b/src/spec/gwenview-mdk.spec @@ -47,7 +47,7 @@ All common image formats are supported, such as PNG(including transparency), JPEG(including EXIF tags and lossless transformations), GIF, XCF (Gimp image format), BMP, XPM and others. Standard features include slideshow, fullscreen view, image thumbnails, drag'n'drop, image zoom, full network -transparency using the KIO framework, including basic file operations and +transparency using the TDEIO framework, including basic file operations and browsing in compressed archives, non-blocking GUI with adjustable views. Gwenview also provides image and directory KParts components for use e.g. in Konqueror. Additional features, such as image renaming, comparing,