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

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

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent e4b116d69b
commit c8fc55e7f6
39 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File

2
KMFSysTray/app.cpp
Unescape View File

@ -18,7 +18,7 @@
// #include <kglobal.h>
// #include <klocale.h>
// #include <kaboutdata.h>
// #include <kconfig.h>
// #include <tdeconfig.h>
// #include <kapplication.h>
// #include <kmessagebox.h>
// #include <kapplication.h>

2
KMFSysTray/kmfsystray.cpp
Unescape View File

@ -27,7 +27,7 @@
#include <kglobal.h>
#include <klocale.h>
#include <kaboutdata.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
#include <kapplication.h>
#include <kmessagebox.h>

2
KMFSysTray/kmfsystray.h
Unescape View File

@ -33,7 +33,7 @@
// KDE Includes
#include <kpanelapplet.h>
#include <ksystemtray.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <dcopobject.h>
class TDEAboutData;

2
KMFSysTray/main.cpp
Unescape View File

@ -17,7 +17,7 @@
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>

8
acinclude.m4
Unescape View File

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

2
doc/Makefile
Unescape View File

@ -114,7 +114,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH =

2
doc/kmyfirewall/Makefile
Unescape View File

@ -98,7 +98,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH =

4
kmyfirewall/compilers/iptables/kmfiptablescompiler.cpp
Unescape View File

@ -20,9 +20,9 @@
#include <kdebug.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <ktempfile.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <kapplication.h>

4
kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.cpp
Unescape View File

@ -22,9 +22,9 @@
#include <kdebug.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <ktempfile.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <kapplication.h>

4
kmyfirewall/compilers/pf/kmfpfscriptgenerator.cpp
Unescape View File

@ -22,9 +22,9 @@
#include <kdebug.h>
#include <klocale.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <ktempfile.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <kapplication.h>

2
kmyfirewall/core/kmfapp.cpp
Unescape View File

@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kglobalsettings.h>
#include <kurl.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
// Project includes
#include "kmfapp.h"
#include "../version.h"

8
kmyfirewall/core/kmfdoc.cpp
Unescape View File

@ -35,15 +35,15 @@
// KDE includes
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kurl.h>
#include <tqfiledialog.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kprocess.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
#include <ktempfile.h>

4
kmyfirewall/core/kmfgenericdoc.cpp
Unescape View File

@ -34,8 +34,8 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <ktrader.h>
#include <klibloader.h>

8
kmyfirewall/core/kmfiptdoc.cpp
Unescape View File

@ -44,15 +44,15 @@
// KDE includes
#include <kdebug.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kurl.h>
#include <tqfiledialog.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <klocale.h>
#include <kprocess.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kmessagebox.h>
#include <ktempfile.h>
#include <ktrader.h>

4
kmyfirewall/core/kmfnetwork.cpp
Unescape View File

@ -33,8 +33,8 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <ktrader.h>
#include <klibloader.h>

6
kmyfirewall/core/kmfprotocol.cpp
Unescape View File

@ -33,12 +33,12 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <ktrader.h>
#include <klibloader.h>
#include <ktempfile.h>
#include <kfileitem.h>
#include <tdefileitem.h>
// project includes
#include "../version.h"

6
kmyfirewall/core/kmfprotocollibrary.cpp
Unescape View File

@ -24,12 +24,12 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <ktrader.h>
#include <klibloader.h>
#include <ktempfile.h>
#include <kfileitem.h>
#include <tdefileitem.h>
// project includes
#include "../version.h"

6
kmyfirewall/core/kmfprotocolusage.cpp
Unescape View File

@ -23,12 +23,12 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <ktrader.h>
#include <klibloader.h>
#include <ktempfile.h>
#include <kfileitem.h>
#include <tdefileitem.h>
// project includes
#include "../version.h"

2
kmyfirewall/core/kmftarget.cpp
Unescape View File

@ -22,7 +22,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2008
#include <kdebug.h>
#include <ktrader.h>
#include <kstandarddirs.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
// Project Inclueds

2
kmyfirewall/core/kprocesswrapper.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <kdebug.h>
#include <kurl.h>
#include <ktempfile.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
// Project includes
#include "kmftarget.h"

4
kmyfirewall/installer/kmfinstallerplugin.cpp
Unescape View File

@ -25,14 +25,14 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include <kinstance.h>
#include <kaction.h>
#include <kstdaction.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <ktrader.h>
#include <kstandarddirs.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
// Project includes
#include "../core/kmfconfig.h"

4
kmyfirewall/installer/linux/kmfiptinstaller.cpp
Unescape View File

@ -29,11 +29,11 @@ email : chubinger@irrsinnig.org
#include <kdebug.h>
#include <klocale.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ktempfile.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <ktar.h>
#include <kmdcodec.h>

2
kmyfirewall/installer/openbsd/Makefile
Unescape View File

@ -152,7 +152,7 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG)
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
KCFG_DEPENDENCIES = $(KCONFIG_COMPILER)
KCONFIG_COMPILER = /usr/bin/kconfig_compiler
KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler
KDECONFIG = /usr/bin/tde-config
KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir)
KDE_EXTRA_RPATH =

4
kmyfirewall/installer/openbsd/kmfpfinstaller.cpp
Unescape View File

@ -32,11 +32,11 @@ email : chubinger@irrsinnig.org
#include <kdebug.h>
#include <klocale.h>
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ktempfile.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <ktar.h>
#include <kmdcodec.h>

2
kmyfirewall/ipteditor/kmfipteditorpart.cpp
Unescape View File

@ -24,7 +24,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include <kaction.h>
#include <kstdaction.h>
#include <kaccel.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kdebug.h>
#include <kmessagebox.h>

2
kmyfirewall/ipteditor/kmfruleedit.h
Unescape View File

@ -26,7 +26,7 @@
#include <tqguardedptr.h>
// kde includes
#include <kconfig.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <kstandarddirs.h>

2
kmyfirewall/kmfconfigdialog.h
Unescape View File

@ -15,7 +15,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <tqwidget.h>
#include <kdialogbase.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kprocess.h>
#include <tqstring.h>

2
kmyfirewall/kmfdisclaimer.cpp
Unescape View File

@ -16,7 +16,7 @@
#include "kmfdisclaimer.h"
#include "kmyfirewall.h"
// kde
#include <kconfig.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kurl.h>
#include <kdebug.h>

2
kmyfirewall/kmfnet.desktop
Unescape View File

@ -10,7 +10,7 @@ Comment[bg]=Мрежова настройка на KMyFirewall
Comment[es]=Configuración de red de KMyFirewall
Comment[et]=KMyFirewalli võrguseadistused
Comment[it]=Configurazione di rete di KMyFirewall
Comment[nl]=KMyFirewall netwerkconfiguratie
Comment[nl]=KMyFirewall netwertdeconfiguratie
Comment[pt]=Configuração da Rede do KMyFirewall
Comment[pt_BR]=Configuração da Rede do KMyFirewall
Comment[sr]=KMyFirewall - подешавање мреже

4
kmyfirewall/kmfwidgets/kmfgenericinterfaceeditprotocol.cpp
Unescape View File

@ -45,8 +45,8 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <ktrader.h>
#include <klibloader.h>
#include <klistview.h>

2
kmyfirewall/kmfwidgets/kmfhostwidget.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kio/netaccess.h>
#include <tdeio/netaccess.h>
#include <kapplication.h>
#include <ktrader.h>
#include <tdeparts/part.h>

2
kmyfirewall/kmfwidgets/kmfhostwidget.h
Unescape View File

@ -17,7 +17,7 @@
#include <tqwidget.h>
#include <kdialogbase.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kprocess.h>
#include <tqstring.h>

2
kmyfirewall/kmfwidgets/kmflistview.cpp
Unescape View File

@ -24,7 +24,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kconfig.h>
#include <tdeconfig.h>
// Project includes
#include "../core/netfilterobject.h"

2
kmyfirewall/kmfwidgets/kmfmynetworkwidget.h
Unescape View File

@ -17,7 +17,7 @@
#include <tqwidget.h>
#include <kdialogbase.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kprocess.h>
#include <tqstring.h>

4
kmyfirewall/kmfwidgets/kmfselectactivetarget.cpp
Unescape View File

@ -36,8 +36,8 @@
#include <kdebug.h>
#include <kstandarddirs.h>
#include <klocale.h>
#include <kio/netaccess.h>
#include <kio/job.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <ktrader.h>
#include <klibloader.h>
#include <klistview.h>

6
kmyfirewall/kmyfirewall.cpp
Unescape View File

@ -28,7 +28,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kaccel.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <kmenubar.h>
#include <kprocess.h>
@ -40,8 +40,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kmessagebox.h>
#include <kstdguiitem.h>
#include <kcmdlineargs.h>
#include <kio/netaccess.h>
#include <kfileitem.h>
#include <tdeio/netaccess.h>
#include <tdefileitem.h>
#include <klibloader.h>
#include <ktextedit.h>
#include <tdeparts/partmanager.h>

2
kmyfirewall/kmyfirewall.h
Unescape View File

@ -27,7 +27,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004
#include <kapplication.h>
#include <kmainwindow.h>
#include <kprocess.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kurl.h>
#include <tdeparts/mainwindow.h>
#include <tdeparts/dockmainwindow.h>

2
kmyfirewall/main.cpp
Unescape View File

@ -24,7 +24,7 @@
#include <kcmdlineargs.h>
#include <kaboutdata.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// project inclues

2
kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
Unescape View File

@ -26,7 +26,7 @@
#include <kcombobox.h>
#include <kurl.h>
#include <kstandarddirs.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kapplication.h>
#include <kdebug.h>
#include <klocale.h>

Write Preview
Loading…
Cancel
Save