diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:04 -0600 |
commit | 783715b853042d24841e3e888051f3a184e78a40 (patch) | |
tree | 33ce107e439bb622368ba17b8a2a6485ef28e3b5 /ksim/monitors/net | |
parent | 980088ed866120f458c10c1ec64295e84ad8ba82 (diff) | |
download | tdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksim/monitors/net')
-rw-r--r-- | ksim/monitors/net/ksimnet.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/net/netconfig.cpp | 4 | ||||
-rw-r--r-- | ksim/monitors/net/netdialog.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index c1d56a8..065797d 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -44,11 +44,11 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 }; #include <tqpopupmenu.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutapplication.h> #include <tdeaboutdata.h> #include <ksimpleconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <krun.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index 73a995b..eb2c1a3 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -23,12 +23,12 @@ #include <tdelistview.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdeapplication.h> #include <tdepopupmenu.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "netconfig.h" #include "netconfig.moc" diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 6f713aa..21d6236 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -30,7 +30,7 @@ #include <tqfile.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <kdebug.h> #include <klineedit.h> |