diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /knetattach | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'knetattach')
| -rw-r--r-- | knetattach/knetattach.ui | 6 | ||||
| -rw-r--r-- | knetattach/main.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index dd7f5d645..781643ff1 100644 --- a/knetattach/knetattach.ui +++ b/knetattach/knetattach.ui @@ -407,10 +407,10 @@ </tabstops> <includes> <include location="global" impldecl="in implementation">tdeio/netaccess.h</include> - <include location="global" impldecl="in implementation">kmessagebox.h</include> + <include location="global" impldecl="in implementation">tdemessagebox.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> - <include location="global" impldecl="in implementation">klocale.h</include> - <include location="global" impldecl="in implementation">kglobalsettings.h</include> + <include location="global" impldecl="in implementation">tdelocale.h</include> + <include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="global" impldecl="in implementation">ksimpleconfig.h</include> <include location="global" impldecl="in implementation">tdeapplication.h</include> <include location="global" impldecl="in implementation">kstandarddirs.h</include> diff --git a/knetattach/main.cpp b/knetattach/main.cpp index 5c40741f7..b2cb63d08 100644 --- a/knetattach/main.cpp +++ b/knetattach/main.cpp @@ -20,8 +20,8 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "knetattach.h" |