diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:47:09 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:47:09 -0600 |
commit | 37fdbaf53a238a96aff48f31f47b6064ceae4b98 (patch) | |
tree | dd27649a30c2a2f8d4ddc0ba86937215eb2f8e78 /knetworkmanager-0.8/src/knetworkmanager.cpp | |
parent | c0374166f6d99440d36d0a7428f63851a68b2419 (diff) | |
download | knetworkmanager8-37fdbaf53a238a96aff48f31f47b6064ceae4b98.tar.gz knetworkmanager8-37fdbaf53a238a96aff48f31f47b6064ceae4b98.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'knetworkmanager-0.8/src/knetworkmanager.cpp')
-rw-r--r-- | knetworkmanager-0.8/src/knetworkmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/knetworkmanager-0.8/src/knetworkmanager.cpp b/knetworkmanager-0.8/src/knetworkmanager.cpp index 81532e0..72a7ebc 100644 --- a/knetworkmanager-0.8/src/knetworkmanager.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager.cpp @@ -24,7 +24,7 @@ // KDE includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> // NM includes #include <NetworkManager.h> @@ -67,7 +67,7 @@ #include <tqobject.h> // KDE includes -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> char active_vpn_prev = 0; |