diff options
41 files changed, 41 insertions, 41 deletions
diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index 5625ca84e..214e596fd 100644 --- a/kappfinder/main_install.cpp +++ b/kappfinder/main_install.cpp @@ -21,7 +21,7 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdestandarddirs.h> diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index aad992e3b..990c163f1 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -44,7 +44,7 @@ #include <tqwhatsthis.h> #include <tqcombobox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <kdialogbase.h> #include <tdeglobalaccel.h> diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 1f7853fd2..cfd158036 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -25,7 +25,7 @@ #include <tdeaboutdata.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestartupinfo.h> #include <dcopclient.h> #include <dcopref.h> diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 76f6d5d6a..bd44d3ffb 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -45,7 +45,7 @@ #include "../interfaces/toolviewmanager.h" #include <dcopclient.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <tdeaction.h> #include <tdecmdlineargs.h> diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp index f6227b90f..f29678e15 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp index 78f84780c..fb816ef84 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include "ikwsopts.h" diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 84f140a54..12c9a37b8 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -24,7 +24,7 @@ #include <kbugreport.h> #include <tdeaboutapplication.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <twin.h> #include <kiconloader.h> diff --git a/kcontrol/tdefontinst/tdeio/KioFonts.cpp b/kcontrol/tdefontinst/tdeio/KioFonts.cpp index afed0d441..753e412cd 100644 --- a/kcontrol/tdefontinst/tdeio/KioFonts.cpp +++ b/kcontrol/tdefontinst/tdeio/KioFonts.cpp @@ -56,7 +56,7 @@ #include <tqdir.h> #include <tqdatastream.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klargefile.h> #include <tdetempfile.h> #include <tdesu/su.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index c2437ef1a..b3f3b1c94 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -45,7 +45,7 @@ #include <tqstringlist.h> #include <tqtimer.h> #include <tdeio/netaccess.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <knuminput.h> #include <kstdaction.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index 90b65eebf..a2ea58602 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp @@ -30,7 +30,7 @@ #include "FontViewPart.h" #include <kdebug.h> #include <tdeaboutdata.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> extern "C" diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 8fb99fdac..760c6a42f 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <tqdir.h> -#include <kinstance.h> +#include <tdeinstance.h> class KonqDirPart; diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp index 5cd554d55..33424ca52 100644 --- a/konqueror/listview/konq_listview.cpp +++ b/konqueror/listview/konq_listview.cpp @@ -46,7 +46,7 @@ #include <sys/stat.h> #include <time.h> #include <unistd.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <konq_sort_constants.h> diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 437c7bda9..7be580b8b 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -79,7 +79,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev) // notable exception of the TDEAboutData data #include <tdeaboutdata.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> TDEInstance* KonqSidebarFactory::s_instance = 0L; TDEAboutData* KonqSidebarFactory::s_about = 0L; diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index 3c979d5fc..7e1145854 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ #include "konqsidebartest.moc" -#include <kinstance.h> +#include <tdeinstance.h> extern "C" { diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp index 146090edf..1051ba7eb 100644 --- a/libkonq/knewmenu.cpp +++ b/libkonq/knewmenu.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tdedesktopfile.h> #include <kdirwatch.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kinputdialog.h> #include <tdelocale.h> #include <tdemessagebox.h> diff --git a/libkonq/konq_propsview.cpp b/libkonq/konq_propsview.cpp index 2d525c23c..a5acfa1bf 100644 --- a/libkonq/konq_propsview.cpp +++ b/libkonq/konq_propsview.cpp @@ -29,7 +29,7 @@ #include <tqfile.h> #include <iostream> #include <ktrader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <assert.h> #include <tdesimpleconfig.h> diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index 3f4c1fc41..fff534978 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -36,7 +36,7 @@ class TDEConfig; * The class KonqPropsView holds the properties for a Konqueror View * * Separating them from the view class allows to store the default - * values (the one read from \<kinstance\>rc) in one instance of this class + * values (the one read from \<tdeinstance\>rc) in one instance of this class * and to have another instance of this class in each view, storing the * current values of the view. * diff --git a/tdeioslave/about/tdeio_about.cpp b/tdeioslave/about/tdeio_about.cpp index 7ed4a5719..6c93a094b 100644 --- a/tdeioslave/about/tdeio_about.cpp +++ b/tdeioslave/about/tdeio_about.cpp @@ -22,7 +22,7 @@ #include <stdlib.h> #include <tqstring.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kurl.h> using namespace TDEIO; diff --git a/tdeioslave/cgi/cgi.cpp b/tdeioslave/cgi/cgi.cpp index 6fae4e5bd..c1e4ced35 100644 --- a/tdeioslave/cgi/cgi.cpp +++ b/tdeioslave/cgi/cgi.cpp @@ -25,7 +25,7 @@ #include <kdebug.h> #include <tdeprocess.h> #include <tdestandarddirs.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/tdeioslave/filter/filter.cpp b/tdeioslave/filter/filter.cpp index 79e9977e2..ff0d4ece7 100644 --- a/tdeioslave/filter/filter.cpp +++ b/tdeioslave/filter/filter.cpp @@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <stdio.h> #include <stdlib.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <kmimemagic.h> #include <kfilterbase.h> diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp index 1605435b9..dd44030cf 100644 --- a/tdeioslave/finger/tdeio_finger.cpp +++ b/tdeioslave/finger/tdeio_finger.cpp @@ -28,7 +28,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdelocale.h> diff --git a/tdeioslave/fish/fish.cpp b/tdeioslave/fish/fish.cpp index edac73fe0..70e42758b 100644 --- a/tdeioslave/fish/fish.cpp +++ b/tdeioslave/fish/fish.cpp @@ -63,7 +63,7 @@ #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdelocale.h> diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp index daa3cd9a0..4f9227b1e 100644 --- a/tdeioslave/floppy/tdeio_floppy.cpp +++ b/tdeioslave/floppy/tdeio_floppy.cpp @@ -42,7 +42,7 @@ #include "tdeio_floppy.h" -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdeio/global.h> #include <tdelocale.h> diff --git a/tdeioslave/info/info.cpp b/tdeioslave/info/info.cpp index 53badf3b4..f436ffeee 100644 --- a/tdeioslave/info/info.cpp +++ b/tdeioslave/info/info.cpp @@ -11,7 +11,7 @@ #include <tdeprocess.h> #include <tdestandarddirs.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include "info.h" diff --git a/tdeioslave/ldap/tdeio_ldap.cpp b/tdeioslave/ldap/tdeio_ldap.cpp index 6bba50dcd..61afd6b62 100644 --- a/tdeioslave/ldap/tdeio_ldap.cpp +++ b/tdeioslave/ldap/tdeio_ldap.cpp @@ -10,7 +10,7 @@ #include <netinet/in.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #ifdef HAVE_SASL_SASL_H //prefer libsasl2 diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp index 8832d267c..fb6bed31e 100644 --- a/tdeioslave/mac/tdeio_mac.cpp +++ b/tdeioslave/mac/tdeio_mac.cpp @@ -18,7 +18,7 @@ #define PARTITION "/dev/hda11" -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdelocale.h> #include <tdeconfig.h> diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp index 5e67d8db5..ea0dda8ec 100644 --- a/tdeioslave/man/kmanpart.cpp +++ b/tdeioslave/man/kmanpart.cpp @@ -20,7 +20,7 @@ #include "kmanpart.h" #include <tqstring.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <kdebug.h> #include <tdelocale.h> diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp index a40ae979d..9a67b8f5c 100644 --- a/tdeioslave/man/tdeio_man.cpp +++ b/tdeioslave/man/tdeio_man.cpp @@ -32,7 +32,7 @@ #include <tqregexp.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> #include <tdestandarddirs.h> #include <tdeprocess.h> diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp index 2f114c29b..b29c66681 100644 --- a/tdeioslave/nfs/tdeio_nfs.cpp +++ b/tdeioslave/nfs/tdeio_nfs.cpp @@ -49,7 +49,7 @@ #include <tqdir.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdeio/global.h> diff --git a/tdeioslave/nntp/nntp.cpp b/tdeioslave/nntp/nntp.cpp index 241b00294..1aba9025b 100644 --- a/tdeioslave/nntp/nntp.cpp +++ b/tdeioslave/nntp/nntp.cpp @@ -15,7 +15,7 @@ #include <tqdir.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> diff --git a/tdeioslave/pop3/pop3.cpp b/tdeioslave/pop3/pop3.cpp index 494c4a6a3..0132dc92c 100644 --- a/tdeioslave/pop3/pop3.cpp +++ b/tdeioslave/pop3/pop3.cpp @@ -52,7 +52,7 @@ extern "C" { #include <tqregexp.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <kmdcodec.h> #include <tdeprotocolmanager.h> diff --git a/tdeioslave/settings/tdeio_settings.cpp b/tdeioslave/settings/tdeio_settings.cpp index 6371c2f4f..3bdbd00eb 100644 --- a/tdeioslave/settings/tdeio_settings.cpp +++ b/tdeioslave/settings/tdeio_settings.cpp @@ -18,7 +18,7 @@ */ #include <tdeio/slavebase.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tqtextstream.h> #include <tdelocale.h> diff --git a/tdeioslave/smb/tdeio_smb.h b/tdeioslave/smb/tdeio_smb.h index 56c296c31..f56b11cbd 100644 --- a/tdeioslave/smb/tdeio_smb.h +++ b/tdeioslave/smb/tdeio_smb.h @@ -49,7 +49,7 @@ // KDE includes //-------------- #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/global.h> #include <tdeio/slavebase.h> #include <kurl.h> diff --git a/tdeioslave/smtp/smtp.cpp b/tdeioslave/smtp/smtp.cpp index 76e79f8a5..1197de853 100644 --- a/tdeioslave/smtp/smtp.cpp +++ b/tdeioslave/smtp/smtp.cpp @@ -61,7 +61,7 @@ using KioSMTP::TransactionState; #include <tdeemailsettings.h> #include <ksock.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/connection.h> #include <tdeio/slaveinterface.h> #include <tdelocale.h> diff --git a/tdeioslave/tar/ktartest.cpp b/tdeioslave/tar/ktartest.cpp index efb1e42fe..2fe00d32c 100644 --- a/tdeioslave/tar/ktartest.cpp +++ b/tdeioslave/tar/ktartest.cpp @@ -1,7 +1,7 @@ #include "ktar.h" #include <stdio.h> #include <tqfile.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> void recursive_print( const KTarDirectory * dir, const TQString & path ) diff --git a/tdeioslave/tar/tar.cpp b/tdeioslave/tar/tar.cpp index 428a65971..a006d537f 100644 --- a/tdeioslave/tar/tar.cpp +++ b/tdeioslave/tar/tar.cpp @@ -12,7 +12,7 @@ #include <tdeglobal.h> #include <kurl.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <ktar.h> #include <kzip.h> #include <kar.h> diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp index 2915c9999..4efcbe569 100644 --- a/tdeprint/slave/tdeio_print.cpp +++ b/tdeprint/slave/tdeio_print.cpp @@ -28,7 +28,7 @@ #include <tqtextstream.h> #include <tdelocale.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/global.h> #include <tdestandarddirs.h> #include <kiconloader.h> diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 3c9b0e9f1..9377e53fb 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/tdeprint/tdeprint_part/printpart.cpp @@ -23,7 +23,7 @@ #include <tdeprint/kiconselectaction.h> #include <tdeaction.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kiconloader.h> #include <tdeaboutdata.h> #include <kdebug.h> diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index e79049c74..8bef2cfac 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/tdesu/tdesud/tdesud.cpp @@ -64,7 +64,7 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <kdebug.h> #include <tdelocale.h> #include <tdecmdlineargs.h> diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp index f771229fc..c37abc81d 100644 --- a/twin/data/update_default_rules.cpp +++ b/twin/data/update_default_rules.cpp @@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <dcopclient.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdestandarddirs.h> int main( int argc, char* argv[] ) diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp index 422bb30c5..d4b525691 100644 --- a/twin/data/update_window_settings.cpp +++ b/twin/data/update_window_settings.cpp @@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <netwm_def.h> #include <tdeconfig.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <dcopclient.h> struct SessionInfo |