Browse Source

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

pull/1/head
Timothy Pearson 9 years ago
parent
commit
19e49186e5
  1. 8
      acinclude.m4
  2. 4
      po/lt/filelight.po
  3. 2
      src/app/historyAction.cpp
  4. 2
      src/app/mainWindow.cpp
  5. 8
      src/part/Config.cpp
  6. 2
      src/part/Config.h
  7. 2
      src/part/progressBox.cpp
  8. 2
      src/part/radialMap/widgetEvents.cpp

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
po/lt/filelight.po

@ -58,7 +58,7 @@ msgid "&Add..."
msgstr ""
"#-#-#-#-# kcmbackground.po (kcmbackground) #-#-#-#-#\n"
"&Įdėti...\n"
"#-#-#-#-# knetworkconf.po (knetworkconf) #-#-#-#-#\n"
"#-#-#-#-# knetwortdeconf.po (knetwortdeconf) #-#-#-#-#\n"
"&Įdėti...\n"
"#-#-#-#-# tdelibs.po (tdelibs) #-#-#-#-#\n"
"&Pridėti...\n"
@ -397,7 +397,7 @@ msgstr ""
"At&verti\n"
"#-#-#-#-# quanta.po (quanta) #-#-#-#-#\n"
"&Atverti\n"
"#-#-#-#-# kfilereplace.po (kfilereplace) #-#-#-#-#\n"
"#-#-#-#-# tdefilereplace.po (tdefilereplace) #-#-#-#-#\n"
"&Atverti\n"
"#-#-#-#-# ksysv.po (ksysv) #-#-#-#-#\n"
"&Atverti\n"

2
src/app/historyAction.cpp

@ -4,7 +4,7 @@
#include "historyAction.h"
#include <kaccel.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>

2
src/app/mainWindow.cpp

@ -10,7 +10,7 @@
#include <kaction.h>
#include <kapplication.h> //setupActions()
#include <kcombobox.h> //locationbar
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdirselectdialog.h> //slotScanDirectory
#include <kedittoolbar.h> //for editToolbar dialog
#include <kkeydialog.h>

8
src/part/Config.cpp

@ -1,6 +1,6 @@
#include "Config.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
@ -18,7 +18,7 @@ TQStringList Config::skipList;
inline TDEConfig&
Filelight::Config::kconfig()
Filelight::Config::tdeconfig()
{
TDEConfig *config = TDEGlobal::config();
config->setGroup( "filelight_part" );
@ -28,7 +28,7 @@ Filelight::Config::kconfig()
void
Filelight::Config::read()
{
const TDEConfig &config = kconfig();
const TDEConfig &config = tdeconfig();
scanAcrossMounts = config.readBoolEntry( "scanAcrossMounts", false );
scanRemoteMounts = config.readBoolEntry( "scanRemoteMounts", false );
@ -47,7 +47,7 @@ Filelight::Config::read()
void
Filelight::Config::write()
{
TDEConfig &config = kconfig();
TDEConfig &config = tdeconfig();
config.writeEntry( "scanAcrossMounts", scanAcrossMounts );
config.writeEntry( "scanRemoteMounts", scanRemoteMounts );

2
src/part/Config.h

@ -13,7 +13,7 @@ namespace Filelight
class Config
{
static TDEConfig& kconfig();
static TDEConfig& tdeconfig();
public:
static void read();

2
src/part/progressBox.cpp

@ -3,7 +3,7 @@
#include <kglobal.h>
#include <kglobalsettings.h>
#include <kio/job.h>
#include <tdeio/job.h>
#include <klocale.h>
#include "scan.h"

2
src/part/radialMap/widgetEvents.cpp

@ -9,7 +9,7 @@
#include <kcursor.h> //::mouseMoveEvent()
#include <kiconeffect.h> //::mousePressEvent()
#include <kiconloader.h> //::mousePressEvent()
#include <kio/job.h> //::mousePressEvent()
#include <tdeio/job.h> //::mousePressEvent()
#include <klocale.h>
#include <kmessagebox.h> //::mousePressEvent()
#include <kpopupmenu.h> //::mousePressEvent()

Loading…
Cancel
Save