Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 9 years ago
parent
commit
59d3d7e9bd
  1. 2
      ChangeLog
  2. 2
      TODO
  3. 8
      acinclude.m4
  4. 4
      krename/batchrenamer.cpp
  5. 2
      krename/commandplugin.cpp
  6. 4
      krename/dateplugin.cpp
  7. 2
      krename/dsdirselectdialog.h
  8. 4
      krename/fileoperation.cpp
  9. 2
      krename/fileoperation.h
  10. 2
      krename/fileplugin.cpp
  11. 2
      krename/kmyhistorycombo.cpp
  12. 4
      krename/kmylistbox.cpp
  13. 2
      krename/kmylistbox.h
  14. 2
      krename/krecursivelister.h
  15. 6
      krename/krenameimpl.cpp
  16. 2
      krename/main.cpp
  17. 2
      krename/mydirplugin.cpp
  18. 2
      krename/numberdialog.cpp
  19. 8
      krename/pluginloader.cpp
  20. 2
      krename/profiledlg.cpp
  21. 2
      krename/replacedialog.cpp
  22. 2
      krename/semantic.cache
  23. 2
      krename/threadedlister.h
  24. 2
      krename/undodialog.cpp

2
ChangeLog

@ -387,7 +387,7 @@ Version 2.5
2.6-rc1 (Release Date: 06.04.2003):
Added icon to service menu entry
Fixed gcc 3.x compiler warnings
Fixed kfile plugins returning spaces at the end
Fixed tdefile plugins returning spaces at the end
Greatly improved startup time
2.6-rc2 (Release Date: 11.04.2003):
History size can be configured now

2
TODO

@ -161,7 +161,7 @@ Of course a drop-down combo "memory" would help.
I hope my "annoyance" is helpful, Phoenix
===================================================================
[23:32:12] <Keimix> BTW is there a possibility to load just one of the kfile-plugins at krename startup, because loading all slows krename down alot?
[23:32:12] <Keimix> BTW is there a possibility to load just one of the tdefile-plugins at krename startup, because loading all slows krename down alot?
[23:35:49] <domseichter> No, not yet. But it's a good idea. Strange that I did not have it and nobody asked me for this feature!
===================================================================
"Squashing weird characters" sollte auf die ToDO liste

8
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
])

4
krename/batchrenamer.cpp

@ -38,8 +38,8 @@
// KDE includes
#include <kapplication.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
// Own includes

2
krename/commandplugin.cpp

@ -24,7 +24,7 @@
// KDE includes
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <klineedit.h>

4
krename/dateplugin.cpp

@ -20,8 +20,8 @@
#include <tqdatetime.h>
// KDE includes
#include <kfileitem.h>
#include <kio/netaccess.h>
#include <tdefileitem.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
DatePlugin::DatePlugin()

2
krename/dsdirselectdialog.h

@ -18,7 +18,7 @@
#ifndef DSDIRSELECTDIALOG_H
#define DSDIRSELECTDIALOG_H
#include <kfiledialog.h>
#include <tdefiledialog.h>
class TQCheckBox;
class TQLabel;

4
krename/fileoperation.cpp

@ -18,8 +18,8 @@
// KDE includes
#include <kapplication.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
// QT includes
#include <tqeventloop.h>

2
krename/fileoperation.h

@ -19,7 +19,7 @@
#define FILEOPERATION_H
#include <tqobject.h>
#include <kio/jobclasses.h>
#include <tdeio/jobclasses.h>
#include <kurl.h>
class TQString;

2
krename/fileplugin.cpp

@ -25,7 +25,7 @@
// KDE includes
#include <kapplication.h>
#include <kfilemetainfo.h>
#include <tdefilemetainfo.h>
#include <klineedit.h>
#include <klistbox.h>
#include <klocale.h>

2
krename/kmyhistorycombo.cpp

@ -22,7 +22,7 @@
#include "kmyhistorycombo.h"
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <tqpopupmenu.h>

4
krename/kmylistbox.cpp

@ -28,8 +28,8 @@
#include <kdirlister.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kio/previewjob.h>
#include <kio/netaccess.h>
#include <tdeio/previewjob.h>
#include <tdeio/netaccess.h>
#include <tqptrlist.h>
#include <kurldrag.h>
#include <kurllabel.h>

2
krename/kmylistbox.h

@ -21,7 +21,7 @@
// KDE includes
#include <klistbox.h>
#include <kurl.h>
#include <kfileitem.h>
#include <tdefileitem.h>
// TQt includes
#include <tqmutex.h>

2
krename/krecursivelister.h

@ -21,7 +21,7 @@
#include <tqwidget.h>
#include <tqobject.h>
#include <kdirlister.h>
#include <kfileitem.h>
#include <tdefileitem.h>
#include <tqguardedptr.h>
/**A convienience class that recursively lists a directory

6
krename/krenameimpl.cpp

@ -43,8 +43,8 @@
#include <kaction.h>
#include <kcmdlineargs.h>
#include <kdirselectdialog.h>
#include <kfiledialog.h>
#include <kfileitem.h>
#include <tdefiledialog.h>
#include <tdefileitem.h>
#include <khelpmenu.h>
#include <kiconloader.h>
#include <kmessagebox.h>
@ -53,7 +53,7 @@
#include <kurlrequester.h>
#include <ktempfile.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
// QT includes
#include <tqbuttongroup.h>

2
krename/main.cpp

@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kaboutapplication.h>
#include <kcmdlineargs.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kimageio.h>
#include <klocale.h>
#include <kmessagebox.h>

2
krename/mydirplugin.cpp

@ -21,7 +21,7 @@
// KDE includes
#include <kapplication.h>
#include <kiconloader.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
// QT includes

2
krename/numberdialog.cpp

@ -25,7 +25,7 @@
// KDE includes
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kpushbutton.h>
#include <tqcheckbox.h>

8
krename/pluginloader.cpp

@ -166,12 +166,12 @@ void PluginLoader::loadFilePlugins()
for( unsigned int i = 0; i < list.count(); i++ ) {
KService* s = (KService*)list[i];
if( !s->terminal() && s->type() == "Service" && s->hasServiceType( "KFilePlugin" ) ) {
FilePlugin* kfileplugin = new FilePlugin( s );
if( kfileplugin->isValid() ) {
addPlugin( kfileplugin );
FilePlugin* tdefileplugin = new FilePlugin( s );
if( tdefileplugin->isValid() ) {
addPlugin( tdefileplugin );
kapp->processEvents();
} else
delete kfileplugin;
delete tdefileplugin;
}
}

2
krename/profiledlg.cpp

@ -23,7 +23,7 @@
#include <kapplication.h>
#include <kcombobox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kinputdialog.h>
#include <klistbox.h>

2
krename/replacedialog.cpp

@ -27,7 +27,7 @@
// KDE includes
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <klistview.h>
#include <kmessagebox.h>

2
krename/semantic.cache
File diff suppressed because it is too large
View File

2
krename/threadedlister.h

@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tqthread.h>
#include <kfileitem.h>
#include <tdefileitem.h>
class KDirLister;
class KRecursiveLister;

2
krename/undodialog.cpp

@ -22,7 +22,7 @@
#include <tqlayout.h>
// KDE includes
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocess.h>

Loading…
Cancel
Save