diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:01 -0600 |
| commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
| tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /filesharing/simple | |
| parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
| download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'filesharing/simple')
| -rw-r--r-- | filesharing/simple/fileshare.cpp | 2 | ||||
| -rw-r--r-- | filesharing/simple/groupconfigdlg.cpp | 4 | ||||
| -rw-r--r-- | filesharing/simple/krichtextlabel.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 327e6f6a..2ce40e3a 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -38,7 +38,7 @@ #include <tdefileshare.h> #include <kstandarddirs.h> #include <ksimpleconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kuser.h> #include <kurl.h> diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index f771fa6c..67d66274 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -26,10 +26,10 @@ #include <tqvbox.h> #include <tqhbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuser.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kinputdialog.h> #include <tdelistbox.h> #include <kprocess.h> diff --git a/filesharing/simple/krichtextlabel.cpp b/filesharing/simple/krichtextlabel.cpp index 0df5a95f..9130c4a2 100644 --- a/filesharing/simple/krichtextlabel.cpp +++ b/filesharing/simple/krichtextlabel.cpp @@ -22,7 +22,7 @@ #include <tqstylesheet.h> #include <tqsimplerichtext.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> static TQString qrichtextify( const TQString& text ) { |