diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:09:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:09:23 -0600 |
| commit | e803d90d546f1be991b4d90d298a9938a80af913 (patch) | |
| tree | 3320a6adaaccc25cfc5a9cbfe4aa5acb3c88505a | |
| parent | c624bc4eb985bceef5b0d2a73aed3867bff6b4c9 (diff) | |
| download | kmyfirewall-e803d90d.tar.gz kmyfirewall-e803d90d.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
43 files changed, 128 insertions, 128 deletions
diff --git a/KMFSysTray/Makefile.am b/KMFSysTray/Makefile.am index 446b4b0..d6ca737 100644 --- a/KMFSysTray/Makefile.am +++ b/KMFSysTray/Makefile.am @@ -7,7 +7,7 @@ bin_PROGRAMS = kmfsystray -kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmfsystray_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kmfsystray_LDADD = ../kmyfirewall/core/libkmfcore.la ../kmyfirewall/kmfwidgets/libkmfwidgets.la $(LIB_TDEUI) $(LIB_KPARTS) kmfsystray_DATA = kmfsystray.desktop @@ -31,7 +31,7 @@ ToDo ---- -*) Single root password input (e.g. kwallet support) +*) Single root password input (e.g. tdewallet support) *) Implement logfile parsing and display diff --git a/acinclude.m4 b/acinclude.m4 index 0707b24..f27e5a2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") - AC_SUBST(LIB_KIMPROXY, "-lkimproxy") + AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") - AC_SUBST(LIB_KDNSSD, "-lkdnssd") - AC_SUBST(LIB_KUNITTEST, "-lkunittest") + AC_SUBST(LIB_KDNSSD, "-ltdednssd") + AC_SUBST(LIB_KUNITTEST, "-ltdeunittest") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") @@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then @@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" AC_SUBST(KDE_PLUGIN) -# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. +# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs. KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" AC_SUBST(KDE_CHECK_PLUGIN) diff --git a/doc/Makefile b/doc/Makefile index 602c7a9..46c6099 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -159,19 +159,19 @@ LIB_KDED = LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui -LIB_KDNSSD = -lkdnssd +LIB_KDNSSD = -ltdednssd LIB_KFILE = -lkio LIB_KFM = -LIB_KHTML = -lkhtml -LIB_KIMPROXY = -lkimproxy +LIB_KHTML = -ltdehtml +LIB_KIMPROXY = -ltdeimproxy LIB_KIO = -lkio LIB_KJS = -lkjs LIB_KNEWSTUFF = -lknewstuff -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell +LIB_KPARTS = -ltdeparts +LIB_KSPELL = -ltdespell LIB_KSYCOCA = -lkio -LIB_KUNITTEST = -lkunittest -LIB_KUTILS = -lkutils +LIB_KUNITTEST = -ltdeunittest +LIB_KUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/doc/kmyfirewall/Makefile b/doc/kmyfirewall/Makefile index a59ddd9..7ce4c54 100644 --- a/doc/kmyfirewall/Makefile +++ b/doc/kmyfirewall/Makefile @@ -143,19 +143,19 @@ LIB_KDED = LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui -LIB_KDNSSD = -lkdnssd +LIB_KDNSSD = -ltdednssd LIB_KFILE = -lkio LIB_KFM = -LIB_KHTML = -lkhtml -LIB_KIMPROXY = -lkimproxy +LIB_KHTML = -ltdehtml +LIB_KIMPROXY = -ltdeimproxy LIB_KIO = -lkio LIB_KJS = -lkjs LIB_KNEWSTUFF = -lknewstuff -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell +LIB_KPARTS = -ltdeparts +LIB_KSPELL = -ltdespell LIB_KSYCOCA = -lkio -LIB_KUNITTEST = -lkunittest -LIB_KUTILS = -lkutils +LIB_KUNITTEST = -ltdeunittest +LIB_KUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/doc/kmyfirewall/index.docbook b/doc/kmyfirewall/index.docbook index bd50735..33c025f 100644 --- a/doc/kmyfirewall/index.docbook +++ b/doc/kmyfirewall/index.docbook @@ -987,9 +987,9 @@ uninstall-local: #include "../../interfaces/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> #include <qstring.h> diff --git a/kmyfirewall/Makefile.am b/kmyfirewall/Makefile.am index b65bbfa..a2c1ae3 100644 --- a/kmyfirewall/Makefile.am +++ b/kmyfirewall/Makefile.am @@ -11,7 +11,7 @@ METASOURCES = AUTO ######################################################################### bin_PROGRAMS = kmyfirewall kmyfirewall_SOURCES = kmfconfigdialog.cpp kmyfirewall.cpp main.cpp -kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kmyfirewall_LDFLAGS = -no-undefined $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kmyfirewall_LDADD = kmfwidgets/libkmfwidgets.la \ core/libkmfcore.la $(LIB_KPARTS) diff --git a/kmyfirewall/compilers/iptables/kmfiptablescompiler.h b/kmyfirewall/compilers/iptables/kmfiptablescompiler.h index 5e2f99c..aca6eac 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablescompiler.h +++ b/kmyfirewall/compilers/iptables/kmfiptablescompiler.h @@ -23,9 +23,9 @@ #include <tqobject.h> // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> // Project includes diff --git a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h index 9c11c4c..772aedf 100644 --- a/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h +++ b/kmyfirewall/compilers/iptables/kmfiptablesscriptgenerator.h @@ -21,9 +21,9 @@ #include <tqtextstream.h> // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> namespace KMF { diff --git a/kmyfirewall/compilers/pf/kmfpfcompiler.h b/kmyfirewall/compilers/pf/kmfpfcompiler.h index 5131236..d57b42f 100644 --- a/kmyfirewall/compilers/pf/kmfpfcompiler.h +++ b/kmyfirewall/compilers/pf/kmfpfcompiler.h @@ -24,9 +24,9 @@ #include <tqvaluelist.h> // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> // Project includes diff --git a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h index eeae699..fc48b8d 100644 --- a/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h +++ b/kmyfirewall/compilers/pf/kmfpfscriptgenerator.h @@ -21,9 +21,9 @@ #include <tqtextstream.h> // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> namespace KMF { diff --git a/kmyfirewall/core/kmfcompilerinterface.h b/kmyfirewall/core/kmfcompilerinterface.h index 88d2a0b..734ec2c 100644 --- a/kmyfirewall/core/kmfcompilerinterface.h +++ b/kmyfirewall/core/kmfcompilerinterface.h @@ -21,7 +21,7 @@ #include <tqobject.h> // KDE Includes -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> namespace KMF { diff --git a/kmyfirewall/core/kmfconfig.kcfg b/kmyfirewall/core/kmfconfig.kcfg index 37d7e69..a67fb77 100644 --- a/kmyfirewall/core/kmfconfig.kcfg +++ b/kmyfirewall/core/kmfconfig.kcfg @@ -23,7 +23,7 @@ <default>true</default> </entry> <entry name="UseSSHForLocalhost" type="Bool"> - <label>Use SSH for localhost Execution, enables password keeping, kwallet support</label> + <label>Use SSH for localhost Execution, enables password keeping, tdewallet support</label> <default>false</default> </entry> <entry name="OS" type="String"> diff --git a/kmyfirewall/core/kmfiptdoc.h b/kmyfirewall/core/kmfiptdoc.h index 39b4564..dfdf5a1 100644 --- a/kmyfirewall/core/kmfiptdoc.h +++ b/kmyfirewall/core/kmfiptdoc.h @@ -34,9 +34,9 @@ // kde includes #include <kurl.h> -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> //project includes #include "iptchain.h" diff --git a/kmyfirewall/core/kmfplugin.h b/kmyfirewall/core/kmfplugin.h index c689246..e22f6e9 100644 --- a/kmyfirewall/core/kmfplugin.h +++ b/kmyfirewall/core/kmfplugin.h @@ -18,7 +18,7 @@ class TQWidget; #include <tqobject.h> // KDE includes -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> // Project includes diff --git a/kmyfirewall/core/kmfpluginfactory.cpp b/kmyfirewall/core/kmfpluginfactory.cpp index b48a56a..81491aa 100644 --- a/kmyfirewall/core/kmfpluginfactory.cpp +++ b/kmyfirewall/core/kmfpluginfactory.cpp @@ -17,9 +17,9 @@ // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kmessagebox.h> #include <kdebug.h> #include <ktrader.h> diff --git a/kmyfirewall/core/kmfpluginfactory.h b/kmyfirewall/core/kmfpluginfactory.h index 5ae7288..189ff00 100644 --- a/kmyfirewall/core/kmfpluginfactory.h +++ b/kmyfirewall/core/kmfpluginfactory.h @@ -20,9 +20,9 @@ #include <tqptrlist.h> #include <tqvaluelist.h> // KDE includes -// #include <kparts> -#include <kparts/part.h> -#include <kparts/mainwindow.h> +// #include <tdeparts> +#include <tdeparts/part.h> +#include <tdeparts/mainwindow.h> class TQObject; namespace KMF { diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp index 9fad3c1..e29c8ea 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp +++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.cpp @@ -25,7 +25,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001 #include <kaboutdata.h> #include <kmessagebox.h> #include <kiconloader.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> // Project includes #include "kmfgenericinterface.h" diff --git a/kmyfirewall/genericinterface/kmfgenericinterface_part.h b/kmyfirewall/genericinterface/kmfgenericinterface_part.h index 4c3ac8a..63f4d23 100644 --- a/kmyfirewall/genericinterface/kmfgenericinterface_part.h +++ b/kmyfirewall/genericinterface/kmfgenericinterface_part.h @@ -15,8 +15,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001 #define __kmfgenericinterface_part_h__ #include <klibloader.h> -#include <kparts/part.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> class TDEInstance; class TDEAboutData; diff --git a/kmyfirewall/installer/kmfinstallerplugin.h b/kmyfirewall/installer/kmfinstallerplugin.h index e1c8ad9..642ad98 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.h +++ b/kmyfirewall/installer/kmfinstallerplugin.h @@ -16,9 +16,9 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001 #include <tqstring.h> -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> // Project Includes diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.h b/kmyfirewall/installer/linux/kmfiptinstaller.h index 051431e..c403a01 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.h +++ b/kmyfirewall/installer/linux/kmfiptinstaller.h @@ -18,9 +18,9 @@ #include <tqpixmap.h> #include <tqstringlist.h> -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> diff --git a/kmyfirewall/installer/openbsd/Makefile b/kmyfirewall/installer/openbsd/Makefile index 67eb7d1..10cde33 100644 --- a/kmyfirewall/installer/openbsd/Makefile +++ b/kmyfirewall/installer/openbsd/Makefile @@ -197,19 +197,19 @@ LIB_KDED = LIB_TDEPIM = -ltdepim LIB_TDEPRINT = -ltdeprint LIB_TDEUI = -ltdeui -LIB_KDNSSD = -lkdnssd +LIB_KDNSSD = -ltdednssd LIB_KFILE = -lkio LIB_KFM = -LIB_KHTML = -lkhtml -LIB_KIMPROXY = -lkimproxy +LIB_KHTML = -ltdehtml +LIB_KIMPROXY = -ltdeimproxy LIB_KIO = -lkio LIB_KJS = -lkjs LIB_KNEWSTUFF = -lknewstuff -LIB_KPARTS = -lkparts -LIB_KSPELL = -lkspell +LIB_KPARTS = -ltdeparts +LIB_KSPELL = -ltdespell LIB_KSYCOCA = -lkio -LIB_KUNITTEST = -lkunittest -LIB_KUTILS = -lkutils +LIB_KUNITTEST = -ltdeunittest +LIB_KUTILS = -ltdeutils LIB_POLL = LIB_QPE = LIB_QT = -lqt-mt $(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM) -lpthread diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.h b/kmyfirewall/installer/openbsd/kmfpfinstaller.h index e36485a..c1731a6 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.h +++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.h @@ -18,9 +18,9 @@ #include <tqpixmap.h> #include <tqstringlist.h> -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> diff --git a/kmyfirewall/ipteditor/kmfipteditorpart.h b/kmyfirewall/ipteditor/kmfipteditorpart.h index 5084cfc..9ddbbd1 100644 --- a/kmyfirewall/ipteditor/kmfipteditorpart.h +++ b/kmyfirewall/ipteditor/kmfipteditorpart.h @@ -13,8 +13,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001 #ifndef _KMFIPTEDITORPART_H_ #define _KMFIPTEDITORPART_H_ -#include <kparts/part.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> class TQWidget; class TQPainter; diff --git a/kmyfirewall/ipteditor/kmfruleedit.cpp b/kmyfirewall/ipteditor/kmfruleedit.cpp index 0746f2c..16bdc0c 100644 --- a/kmyfirewall/ipteditor/kmfruleedit.cpp +++ b/kmyfirewall/ipteditor/kmfruleedit.cpp @@ -26,9 +26,9 @@ email : chubinger@irrsinnig.org #include <kpushbutton.h> #include <kcombobox.h> #include <ktrader.h> -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> //QT includes #include <tqtooltip.h> diff --git a/kmyfirewall/kmfconfigdialog.cpp b/kmyfirewall/kmfconfigdialog.cpp index 4017ac3..3cf7346 100644 --- a/kmyfirewall/kmfconfigdialog.cpp +++ b/kmyfirewall/kmfconfigdialog.cpp @@ -39,9 +39,9 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004 #include <kmessagebox.h> #include <klistview.h> #include <ktrader.h> -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> // Project includes diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp index a39ce88..c66fb92 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp @@ -29,9 +29,9 @@ #include <kio/netaccess.h> #include <kapplication.h> #include <ktrader.h> -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> // Project includes diff --git a/kmyfirewall/kmfwidgets/kmfmainwindow.h b/kmyfirewall/kmfwidgets/kmfmainwindow.h index a789f8f..6b822df 100644 --- a/kmyfirewall/kmfwidgets/kmfmainwindow.h +++ b/kmyfirewall/kmfwidgets/kmfmainwindow.h @@ -22,7 +22,7 @@ #ifndef KMFMAINWINDOW_H #define KMFMAINWINDOW_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include "../core/kmyfirewallinterface.h" #include "../core/netfilterobject.h" diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp index 3fa3b72..cb046a7 100644 --- a/kmyfirewall/kmyfirewall.cpp +++ b/kmyfirewall/kmyfirewall.cpp @@ -44,7 +44,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004 #include <kfileitem.h> #include <klibloader.h> #include <ktextedit.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include <kpushbutton.h> #include <kedittoolbar.h> diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h index 77d78d7..d68baeb 100644 --- a/kmyfirewall/kmyfirewall.h +++ b/kmyfirewall/kmyfirewall.h @@ -29,8 +29,8 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001-2004 #include <kprocess.h> #include <kconfig.h> #include <kurl.h> -#include <kparts/mainwindow.h> -#include <kparts/dockmainwindow.h> +#include <tdeparts/mainwindow.h> +#include <tdeparts/dockmainwindow.h> #include <ktempfile.h> // Project includes diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp index e4d8d75..633ecb6 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.cpp @@ -31,7 +31,7 @@ // KDE includes #include <kdebug.h> #include <klocale.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> // Project includes #include "../../core/iptrule.h" diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h index 26f0ef4..18d5cea 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmfruleoptioneditcustom.h @@ -32,9 +32,9 @@ #include <tqstring.h> // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h index 61584ce..8df6a9e 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmfruleoptioneditinterface.h @@ -15,9 +15,9 @@ #include "../../core/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h index c81e8de..8fd0064 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmfruleoptioneditip.h @@ -27,9 +27,9 @@ #include "../../core/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; namespace KMF { diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h index 62e0cdf..7e716e9 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmfruleoptioneditlimit.h @@ -27,9 +27,9 @@ #include "../../core/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; namespace KMF { diff --git a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h index f916905..c7c84b7 100644 --- a/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h +++ b/kmyfirewall/ruleoptionplugins/log_target_option/kmfruletargetoptioneditlog.h @@ -15,9 +15,9 @@ #include "../../core/kmfruletargetoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; namespace KMF { diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h index 3f0683c..53169c0 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmfruleoptioneditmac.h @@ -27,9 +27,9 @@ #include "../../core/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> #include <tqstring.h> diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h index 9180cf8..51df05b 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmfruletargetoptioneditmark.h @@ -15,9 +15,9 @@ #include "../../core/kmfruletargetoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; diff --git a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h index 17518c4..d621789 100644 --- a/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h +++ b/kmyfirewall/ruleoptionplugins/nat_target_option/kmfruletargetoptioneditnat.h @@ -27,9 +27,9 @@ #include "../../core/kmfruletargetoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; namespace KMF { diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h index 36834f8..5b7dfbb 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmfruleoptioneditprotocol.h @@ -27,9 +27,9 @@ #include "../../core/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h index 3a34da9..0829d11 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h +++ b/kmyfirewall/ruleoptionplugins/state_option/kmfruleoptioneditstate.h @@ -27,9 +27,9 @@ #include "../../core/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; namespace KMF { diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h index d852719..e1fbb87 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmfruleoptionedittos.h @@ -27,9 +27,9 @@ #include "../../core/kmfruleoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; namespace KMF { diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h index 1fb76fc..149fc41 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmfruletargetoptionedittos.h @@ -15,9 +15,9 @@ #include "../../core/kmfruletargetoptioneditinterface.h" // KDE includes -#include <kparts/part.h> -#include <kparts/plugin.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/plugin.h> +#include <tdeparts/factory.h> #include <kxmlgui.h> class TDEInstance; namespace KMF { |