From 885fa53d1817d4ff2d079e1d4bef9be2d87ef514 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:55:58 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- Makefile.am | 2 +- Makefile.am.in | 2 +- README | 2 +- acinclude.m4 | 8 ++++---- kuickshow/ChangeLog | 26 +++++++++++++------------- kuickshow/src/filefinder.cpp | 2 +- kuickshow/src/filewidget.cpp | 2 +- kuickshow/src/imagewindow.cpp | 6 +++--- kuickshow/src/imdata.cpp | 2 +- kuickshow/src/imlibwidget.cpp | 2 +- kuickshow/src/kuickconfigdlg.cpp | 2 +- kuickshow/src/kuickdata.cpp | 2 +- kuickshow/src/kuickfile.cpp | 4 ++-- kuickshow/src/kuickshow.cpp | 8 ++++---- kuickshow/src/kuickshow.h | 2 +- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index 890e8cf..14329cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1 # COMPILE_BEFORE_kooka = libkscan # COMPILE_BEFORE_kfaxview = kfax -# COMPILE_BEFORE_kfile-plugins = kghostview +# COMPILE_BEFORE_tdefile-plugins = kghostview # COMPILE_AFTER_kviewshell = kdvi kfaxview DISTCLEANFILES = inst-apps diff --git a/Makefile.am.in b/Makefile.am.in index c7cc36e..2ace23a 100644 --- a/Makefile.am.in +++ b/Makefile.am.in @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1 COMPILE_BEFORE_kooka = libkscan COMPILE_BEFORE_kfaxview = kfax -COMPILE_BEFORE_kfile-plugins = kghostview +COMPILE_BEFORE_tdefile-plugins = kghostview COMPILE_AFTER_kviewshell = kdvi kfaxview DISTCLEANFILES = inst-apps diff --git a/README b/README index e11aa41..e8cce22 100644 --- a/README +++ b/README @@ -32,7 +32,7 @@ tdegraphics is a collection of graphic oriented applications: * kfaxview An embeddable KPart to display tiffed fax images. -* kfile-plugins +* tdefile-plugins Provide meta information for graphic files. * kghostview diff --git a/acinclude.m4 b/acinclude.m4 index e1baa47..a2ce3eb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/kuickshow/ChangeLog b/kuickshow/ChangeLog index 4f455d1..eda22bb 100644 --- a/kuickshow/ChangeLog +++ b/kuickshow/ChangeLog @@ -148,7 +148,7 @@ Tue May 29 15:20:34 2001 Carsten Pfeiffer changed accels: shift-accel is now for removing brightness/contrast/gamma - removed delete action, now provided by kfile + removed delete action, now provided by tdefile Thu Apr 19 23:16:12 2001 Carsten Pfeiffer @@ -413,9 +413,9 @@ Fri Nov 3 01:49:57 2000 Carsten Pfeiffer Thu Aug 31 01:48:55 2000 Carsten Pfeiffer * src/*: started reworking/rewriting the whole stuff to make it KDE2 - ready. Now I have to pay for rewriting so much of tdelibs/kfile... + ready. Now I have to pay for rewriting so much of tdelibs/tdefile... The good thing is: it's mostly about removing stuff from KuickShow - because the functionality is already in libkfile, now :) + because the functionality is already in libtdefile, now :) Tue Sep 28 10:35:39 1999 Carsten Pfeiffer @@ -473,7 +473,7 @@ Thu Jul 22 21:26:11 1999 Carsten Pfeiffer Fri Jul 16 13:09:07 1999 Carsten Pfeiffer - * src/kfileview.cpp (refresh): + * src/tdefileview.cpp (refresh): Oh well, thanks to Robert Hamberger , I fixed another (hopefully last, for the next time) segfault. SIGSEGV happened, when opening the about-dialog, NOT giving the focus back @@ -533,7 +533,7 @@ Fri Jul 2 14:27:08 1999 Carsten Pfeiffer in the filebrowser??? In certain cases, I got an almost completely black Messagebox... - * src/kfileview.cpp (removeItem): + * src/tdefileview.cpp (removeItem): oups... segfault fixed: removing the very first item in the filebrowser caused crash @@ -586,15 +586,15 @@ Fri May 28 11:48:46 1999 Carsten Pfeiffer Tue May 18 21:19:32 1999 Carsten Pfeiffer - * src/kfileview.cpp (refresh): + * src/tdefileview.cpp (refresh): sorting does somehow work. Some code seems to be duplicated in KFileInfoContents and KDir - both offer sorting. However, both don't work 100% :-/ Anyway, if you have KDE 1.1.1, sorting should work, it is disabled for earlier releases, as there was a segfault - problem in kfile (nobody ever seemed to use KFileInfoContent's sorting, + problem in tdefile (nobody ever seemed to use KFileInfoContent's sorting, so that was never realized). - * src/kfileview.cpp, src/fileview.cpp: + * src/tdefileview.cpp, src/fileview.cpp: some minor fixlets: always try to highlight the last active file, whenever the directory contents are updated @@ -630,7 +630,7 @@ Sat Apr 17 18:43:03 1999 Carsten Pfeiffer * src/kuickdata.cpp: updated file filters (Photoshop psd and bmp) - * src/kfileview.cpp: + * src/tdefileview.cpp: changed the kdir behavior, so that the browser displays files altogether at once, not incrementally. This also let me (finally, yippeee :-P) highlight the last direcory, where you came from. @@ -670,7 +670,7 @@ Wed Feb 3 22:43:32 1999 Carsten Pfeiffer Tue Dec 29 16:55:11 1998 Carsten Pfeiffer - * src/kuickshow.cpp, imlibwidget.cpp, kfileview.*: + * src/kuickshow.cpp, imlibwidget.cpp, tdefileview.*: fixed updating of directory in statusbar and filename in caption of imlibwidget @@ -773,8 +773,8 @@ Mon Sep 21 16:29:56 1998 Carsten Pfeiffer Sun Sep 20 19:04:23 1998 Carsten Pfeiffer - * src/kfileview.cpp (prev): - whoops, fixed a segfault, when trying to get a kfileinfo of index -1. + * src/tdefileview.cpp (prev): + whoops, fixed a segfault, when trying to get a tdefileinfo of index -1. I shouldn't check, whether an unsigned int is smaller than 0, which it actually was. Now uses int. @@ -853,7 +853,7 @@ Tue Sep 15 14:06:27 1998 Carsten Pfeiffer Mon Sep 14 16:20:30 1998 Carsten Pfeiffer * src/fileview.cpp/.h - * src/kfileview.cpp/.h + * src/tdefileview.cpp/.h * src/kuickshow.cpp added "change directory" possibility. A dialog asks for a directory and the fileview is being updated. Either accessible via the diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp index 5087625..24324a5 100644 --- a/kuickshow/src/filefinder.cpp +++ b/kuickshow/src/filefinder.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 9f158c1..bc93179 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -93,7 +93,7 @@ void FileWidget::initActions() if ( coll->action("kuick_delete") ) menu->insert( coll->action("kuick_delete"), 9 ); - // properties dialog is now in kfile, but not at the right position, + // properties dialog is now in tdefile, but not at the right position, // so we move it to the real bottom menu->remove( coll->action( "properties" ) ); diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index c3a6e8f..e510382 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -37,14 +37,14 @@ #include #include -#include +#include #include #include #include #ifdef KDE_USE_FINAL #undef Unsorted #endif -#include +#include #include #include #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include "filecache.h" #include "imagewindow.h" diff --git a/kuickshow/src/imdata.cpp b/kuickshow/src/imdata.cpp index e084e89..c580f7e 100644 --- a/kuickshow/src/imdata.cpp +++ b/kuickshow/src/imdata.cpp @@ -18,7 +18,7 @@ #include -#include +#include #include "imdata.h" diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 3642091..530875e 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include "filecache.h" diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp index 263e98e..e72062a 100644 --- a/kuickshow/src/kuickconfigdlg.cpp +++ b/kuickshow/src/kuickconfigdlg.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/kuickshow/src/kuickdata.cpp b/kuickshow/src/kuickdata.cpp index c7b5f20..84c4ff3 100644 --- a/kuickshow/src/kuickdata.cpp +++ b/kuickshow/src/kuickdata.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "kuickdata.h" diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index d0cff15..764210f 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -5,8 +5,8 @@ #include #include #include -#include -#include +#include +#include #include #include "filecache.h" diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 4c25a99..74704cd 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -33,15 +33,15 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h index 3187415..baba06a 100644 --- a/kuickshow/src/kuickshow.h +++ b/kuickshow/src/kuickshow.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include