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/vpn-plugins | |
| 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/vpn-plugins')
5 files changed, 6 insertions, 6 deletions
diff --git a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp index f043aad..0f265fe 100644 --- a/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp +++ b/knetworkmanager-0.8/vpn-plugins/openvpn/src/knetworkmanager-openvpn.cpp @@ -22,7 +22,7 @@ * **************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqmessagebox.h> #include <tqbutton.h> #include <kcombobox.h> diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake b/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake index 60eb42d..8969488 100644 --- a/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake +++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/Makefile.am.automake @@ -6,7 +6,7 @@ INCLUDES = $(PACKAGE_CFLAGS) $(all_includes) # rules for creating .h and .cpp from .ui %.cpp: %.ui %.h - $(UIC) -tr tr2i18n -pch klocale.h -o $@ -impl $*.h $< + $(UIC) -tr tr2i18n -pch tdelocale.h -o $@ -impl $*.h $< %.h: %.ui $(UIC) -o $@ $< diff --git a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp index 0be9f04..a8124da 100644 --- a/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp +++ b/knetworkmanager-0.8/vpn-plugins/pptp/src/knetworkmanager-pptp.cpp @@ -22,7 +22,7 @@ * **************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqmessagebox.h> #include <tqbutton.h> #include <kcombobox.h> diff --git a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp index 17ba6c8..914f324 100644 --- a/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp +++ b/knetworkmanager-0.8/vpn-plugins/strongswan/src/knetworkmanager-strongswan.cpp @@ -22,7 +22,7 @@ * **************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <tqmessagebox.h> #include <tqbutton.h> #include <kcombobox.h> diff --git a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp index adac93c..5f1e47f 100644 --- a/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp +++ b/knetworkmanager-0.8/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp @@ -23,8 +23,8 @@ * **************************************************************************/ -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqmessagebox.h> #include <tqbutton.h> #include <kcombobox.h> |