diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:57:18 -0600 |
| commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
| tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /ksnapshot | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksnapshot')
| -rw-r--r-- | ksnapshot/ksnapshot.cpp | 10 | ||||
| -rw-r--r-- | ksnapshot/ksnapshot.h | 2 | ||||
| -rw-r--r-- | ksnapshot/ksnapshotwidget.ui | 2 | ||||
| -rw-r--r-- | ksnapshot/main.cpp | 2 | ||||
| -rw-r--r-- | ksnapshot/regiongrabber.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index 15a3407c..ad5df57c 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -11,17 +11,17 @@ */ -#include <klocale.h> +#include <tdelocale.h> #include <kimageio.h> #include <tdefiledialog.h> #include <kimagefilepreview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeapplication.h> #include <kprinter.h> #include <tdeio/netaccess.h> #include <ksavefile.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqbitmap.h> #include <tqdragobject.h> @@ -34,7 +34,7 @@ #include <khelpmenu.h> #include <tdepopupmenu.h> #include <kpushbutton.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tqcursor.h> #include <tqregexp.h> @@ -54,7 +54,7 @@ #include <config.h> -#include <kglobal.h> +#include <tdeglobal.h> #define kApp TDEApplication::kApplication() diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index 4ccaaeb6..5db7c0e6 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -13,7 +13,7 @@ #include <tqtimer.h> #include <dcopclient.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialogbase.h> #include <kurl.h> diff --git a/ksnapshot/ksnapshotwidget.ui b/ksnapshot/ksnapshotwidget.ui index 95590cb4..10082ab6 100644 --- a/ksnapshot/ksnapshotwidget.ui +++ b/ksnapshot/ksnapshotwidget.ui @@ -320,7 +320,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> - <include location="global" impldecl="in implementation">kglobalsettings.h</include> + <include location="global" impldecl="in implementation">tdeglobalsettings.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> </includes> <Q_SIGNALS> diff --git a/ksnapshot/main.cpp b/ksnapshot/main.cpp index f3dde8e0..098ae004 100644 --- a/ksnapshot/main.cpp +++ b/ksnapshot/main.cpp @@ -23,7 +23,7 @@ #include <tdeapplication.h> #include <kimageio.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> #include <kiconloader.h> diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index 9db7ed2f..2c4d4a2b 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -26,7 +26,7 @@ #include <tqtimer.h> #include <tqtooltip.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> SizeTip::SizeTip( TQWidget *parent, const char *name ) : TQLabel( parent, name, WStyle_Customize | WX11BypassWM | |