diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | networkstatus/networkstatus.tdevelop | 108 | ||||
| -rw-r--r-- | tdehtml/html/Platform.h | 5 | ||||
| -rw-r--r-- | tdestyles/light/lightstyle-v2.h | 6 | ||||
| -rw-r--r-- | tdestyles/light/lightstyle-v3.h | 6 |
5 files changed, 6 insertions, 119 deletions
diff --git a/admin b/admin -Subproject 85116532467b2bb4c73caf54c106c91a22dbe37 +Subproject 43b0c7bdb9af44dc13b0fd17b95ae172a4a382d diff --git a/networkstatus/networkstatus.tdevelop b/networkstatus/networkstatus.tdevelop deleted file mode 100644 index 543efe323..000000000 --- a/networkstatus/networkstatus.tdevelop +++ /dev/null @@ -1,108 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Will Stephenson</author> - <email>wstephenson@suse.de</email> - <version>$VERSION$</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - </general> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - </general> - </kdevdebugger> - <kdevfilecreate> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevautoproject> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - </make> - <run> - <directoryradio>executable</directoryradio> - </run> - <general> - <activetarget>kded_networkstatus.la</activetarget> - </general> - </kdevautoproject> - <kdevcppsupport> - <references/> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </kdevcppsupport> -</tdevelop> diff --git a/tdehtml/html/Platform.h b/tdehtml/html/Platform.h index 260931d78..69c354915 100644 --- a/tdehtml/html/Platform.h +++ b/tdehtml/html/Platform.h @@ -149,11 +149,6 @@ /* Compiler */ -/* COMPILER(CWP) */ -#if defined(__MWERKS__) -#define WTF_COMPILER_CWP 1 -#endif - /* COMPILER(MSVC) */ #if defined(_MSC_VER) #define WTF_COMPILER_MSVC 1 diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h index 17240ac88..68ab02c25 100644 --- a/tdestyles/light/lightstyle-v2.h +++ b/tdestyles/light/lightstyle-v2.h @@ -28,13 +28,13 @@ #ifdef QT_PLUGIN -# define Q_EXPORT_STYLE_LIGHT_V2 +# define TQ_EXPORT_STYLE_LIGHT_V2 #else -# define Q_EXPORT_STYLE_LIGHT_V2 TQ_EXPORT +# define TQ_EXPORT_STYLE_LIGHT_V2 TQ_EXPORT #endif // QT_PLUGIN -class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle +class TQ_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle { TQ_OBJECT diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h index 8f03cca74..ff6c537f9 100644 --- a/tdestyles/light/lightstyle-v3.h +++ b/tdestyles/light/lightstyle-v3.h @@ -31,13 +31,13 @@ #include "tdestyle.h" #ifdef QT_PLUGIN -# define Q_EXPORT_STYLE_LIGHT_V3 +# define TQ_EXPORT_STYLE_LIGHT_V3 #else -# define Q_EXPORT_STYLE_LIGHT_V3 TQ_EXPORT +# define TQ_EXPORT_STYLE_LIGHT_V3 TQ_EXPORT #endif // QT_PLUGIN -class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle +class TQ_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle { TQ_OBJECT TQStyle *basestyle; |