diff options
27 files changed, 32 insertions, 31 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 45c0be953..e038287c3 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -144,7 +144,7 @@ endif( NOT HAVE_CRYPT ) if( WITH_TDEHWLIB ) tde_save_and_set( CMAKE_REQUIRED_INCLUDES "${TDE_INCLUDE_DIR}" ) check_cxx_source_compiles( " - #include <kdemacros.h> + #include <tdemacros.h> #ifndef __TDE_HAVE_TDEHWLIB #error tdecore is not build with tdehwlib #endif diff --git a/admin b/admin -Subproject 34c35e11fbc7237f94ec8ede61ef0c8c9b6c58b +Subproject b770a18e00a82febd12c1787247533771ecbb57 diff --git a/kate/interfaces/pluginconfiginterface.h b/kate/interfaces/pluginconfiginterface.h index b3180bc96..749a1c33a 100644 --- a/kate/interfaces/pluginconfiginterface.h +++ b/kate/interfaces/pluginconfiginterface.h @@ -19,7 +19,7 @@ #ifndef __kate_pluginconfiginterface_h__ #define __kate_pluginconfiginterface_h__ -#include <kdemacros.h> +#include <tdemacros.h> namespace Kate { diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h index 7f89cd62b..01fbf9e28 100644 --- a/khotkeys/shared/khlistview.h +++ b/khotkeys/shared/khlistview.h @@ -14,7 +14,7 @@ #include <tqtimer.h> #include <tdelistview.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KHotKeys { diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 28dfeb0b6..f62eb2855 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -22,7 +22,7 @@ #include <tqmemarray.h> #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /** @author Olivier Goffart diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h index 54324f27f..5f0ffe9fe 100644 --- a/khotkeys/shared/soundrecorder.h +++ b/khotkeys/shared/soundrecorder.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include "sound.h" -#include <kdemacros.h> +#include <tdemacros.h> class KLibrary; diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h index ddc757e30..681f784b7 100644 --- a/khotkeys/shared/triggers.h +++ b/khotkeys/shared/triggers.h @@ -14,7 +14,7 @@ #include <tqptrlist.h> #include <tqtimer.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "khotkeysglobal.h" #include "voicesignature.h" diff --git a/khotkeys/shared/voicesignature.h b/khotkeys/shared/voicesignature.h index 7b29802a2..e0f31bb31 100644 --- a/khotkeys/shared/voicesignature.h +++ b/khotkeys/shared/voicesignature.h @@ -23,7 +23,7 @@ #include <tqmemarray.h> #include <tqmap.h> -#include <kdemacros.h> +#include <tdemacros.h> class Sound; class TDEConfigBase; diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 0a6dff12e..9731d1633 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -64,7 +64,7 @@ class KasPopup; #include <tqvaluevector.h> #include <tqapplication.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kasbar.h" diff --git a/kicker/extensions/kasbar/kasloaditem.h b/kicker/extensions/kasbar/kasloaditem.h index 0c0d179e7..c727d9709 100644 --- a/kicker/extensions/kasbar/kasloaditem.h +++ b/kicker/extensions/kasbar/kasloaditem.h @@ -3,7 +3,7 @@ #include "kasitem.h" -#include <kdemacros.h> +#include <tdemacros.h> /** * An item that displays the system load. diff --git a/kicker/extensions/kasbar/kastasker.h b/kicker/extensions/kasbar/kastasker.h index c37ea39ef..4cb96999f 100644 --- a/kicker/extensions/kasbar/kastasker.h +++ b/kicker/extensions/kasbar/kastasker.h @@ -57,7 +57,7 @@ #include "kasbar.h" -#include <kdemacros.h> +#include <tdemacros.h> #include <taskmanager.h> class TDEConfig; diff --git a/kicker/kicker/core/pluginmanager.h b/kicker/kicker/core/pluginmanager.h index f2d2adccf..ea7730387 100644 --- a/kicker/kicker/core/pluginmanager.h +++ b/kicker/kicker/core/pluginmanager.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqmap.h> #include <tqobject.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <kstaticdeleter.h> #include "appletinfo.h" diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h index 39af6a1f6..441d71200 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.h +++ b/kicker/kicker/interfaces/kickoff-search-plugin.h @@ -26,7 +26,7 @@ #include <tqobject.h> #include <kurl.h> #include <kservice.h> -#include <kdemacros.h> +#include <tdemacros.h> typedef enum { ACTIONS = 0, diff --git a/kicker/kicker/interfaces/kickoffsearchinterface.h b/kicker/kicker/interfaces/kickoffsearchinterface.h index 9c2a647af..89768d8ce 100644 --- a/kicker/kicker/interfaces/kickoffsearchinterface.h +++ b/kicker/kicker/interfaces/kickoffsearchinterface.h @@ -22,7 +22,7 @@ #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class HitMenuItem; diff --git a/kicker/libkicker/appletinfo.h b/kicker/libkicker/appletinfo.h index b6b41fbed..343c8eae5 100644 --- a/kicker/libkicker/appletinfo.h +++ b/kicker/libkicker/appletinfo.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> #include <tqvaluevector.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDE_EXPORT AppletInfo { diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 9757ebede..ae423d0bc 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -28,7 +28,7 @@ #include <tqimage.h> #include <tqcolor.h> -#include <kdemacros.h> +#include <tdemacros.h> class KShadowSettings; diff --git a/kicker/libkicker/kshadowsettings.h b/kicker/libkicker/kshadowsettings.h index 774340c01..a328fd8bd 100644 --- a/kicker/libkicker/kshadowsettings.h +++ b/kicker/libkicker/kshadowsettings.h @@ -22,7 +22,7 @@ #ifndef __FX_DATA #define __FX_DATA -#include <kdemacros.h> +#include <tdemacros.h> #define SHADOW_CONFIG_ENTRY TQString("ShadowParameters") #define SHADOW_TEXT_COLOR TQString("ShadowTextColor") diff --git a/kicker/libkicker/menuinfo.h b/kicker/libkicker/menuinfo.h index 8d9b2d5e1..8b5917992 100644 --- a/kicker/libkicker/menuinfo.h +++ b/kicker/libkicker/menuinfo.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> class KPanelMenu; class TQWidget; diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index 435e06b6d..21bb879d3 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqdragobject.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "appletinfo.h" diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index d923eef55..ea91e6f91 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -24,7 +24,7 @@ #include <tqbutton.h> #include <tqpixmap.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDE_EXPORT SimpleButton : public TQButton { diff --git a/ksplashml/themeengine/themeengine.h b/ksplashml/themeengine/themeengine.h index 202adc1ce..c1639ac74 100644 --- a/ksplashml/themeengine/themeengine.h +++ b/ksplashml/themeengine/themeengine.h @@ -16,7 +16,7 @@ #include <tqvbox.h> #include <tqwidget.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; class ObjKsTheme; diff --git a/ksysguard/gui/ksgrd/StyleEngine.h b/ksysguard/gui/ksgrd/StyleEngine.h index 345a91546..927150f65 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.h +++ b/ksysguard/gui/ksgrd/StyleEngine.h @@ -28,7 +28,7 @@ #include <tqobject.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; diff --git a/libkonq/libkonq_export.h b/libkonq/libkonq_export.h index 23b8f2f38..f1fe245a7 100644 --- a/libkonq/libkonq_export.h +++ b/libkonq/libkonq_export.h @@ -22,7 +22,7 @@ #define LIBKONQ_EXPORT_H /* needed for TDE_EXPORT macros */ -#include <kdemacros.h> +#include <tdemacros.h> /* needed, because e.g. Q_OS_UNIX is so frequently used */ #include <tqglobal.h> diff --git a/tdeioslave/thumbnail/cursorcreator.cpp b/tdeioslave/thumbnail/cursorcreator.cpp index c9d127ceb..42a573d1d 100644 --- a/tdeioslave/thumbnail/cursorcreator.cpp +++ b/tdeioslave/thumbnail/cursorcreator.cpp @@ -20,7 +20,7 @@ #include <tqimage.h> #include <tqfile.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "cursorcreator.h" diff --git a/tdeioslave/thumbnail/djvucreator.cpp b/tdeioslave/thumbnail/djvucreator.cpp index 296d904a3..31b4fcfe1 100644 --- a/tdeioslave/thumbnail/djvucreator.cpp +++ b/tdeioslave/thumbnail/djvucreator.cpp @@ -39,7 +39,7 @@ #include <tqfile.h> #include <tqimage.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "djvucreator.h" diff --git a/tdm/backend/dm.c b/tdm/backend/dm.c index 9168b88b5..05dfb7a5b 100644 --- a/tdm/backend/dm.c +++ b/tdm/backend/dm.c @@ -36,6 +36,13 @@ from the copyright holder. #include <tqglobal.h> +#include <config.h> +#ifdef HAVE_PTHREAD_SETNAME_NP +#define _GNU_SOURCE +#define __BSD_VISIBLE 1 +#include <pthread.h> +#endif /* pthread_setname_np() */ + #include "dm.h" #include "dm_auth.h" #include "dm_error.h" @@ -53,12 +60,6 @@ from the copyright holder. # include <sys/vt.h> #endif -#ifdef HAVE_PTHREAD_SETNAME_NP -#define _GNU_SOURCE -#define __BSD_VISIBLE 1 -#include <pthread.h> -#endif /* pthread_setname_np() */ - // Limited by the number of VTs configured into the kernel or 256, whichever is less #define MAX_VT_NUMBER 48 diff --git a/tdmlib/kgreeterplugin.h b/tdmlib/kgreeterplugin.h index 70b52cc60..946f48ed7 100644 --- a/tdmlib/kgreeterplugin.h +++ b/tdmlib/kgreeterplugin.h @@ -26,7 +26,7 @@ #include <tqvariant.h> #include <tqmessagebox.h> -#include <kdemacros.h> +#include <tdemacros.h> class KdmThemer; |