From 3b1405169d66e029912f53d10c2880c46f5ed159 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 13:51:39 -0600 Subject: Additional renaming of kde to tde --- win/common.pro | 8 ++++---- win/config.h | 2 +- win/dirent.h | 2 +- win/fcntl.h | 2 +- win/kde_file_win.h | 2 +- win/pro_files/README.pro_files | 10 +++++----- win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro | 6 +++--- win/pro_files/tdecore/tdecore.pro | 2 +- win/pwd.h | 2 +- win/signal.h | 2 +- win/stdlib.h | 2 +- win/string.h | 2 +- win/sys/mman.h | 2 +- win/sys/resource.h | 2 +- win/sys/stat.h | 2 +- win/sys/time.h | 2 +- win/sys/times.h | 2 +- win/sys/utsname.h | 2 +- win/syslog.h | 2 +- win/tools/.build_kdelibs_comon | 2 +- win/tools/.check_kde_env | 8 ++++---- win/tools/README.tools | 2 +- win/tools/build_kdelibs_dbg | 6 +++--- win/tools/build_kdelibs_rel | 6 +++--- win/tools/collect_kdelibs_pro_files | 2 +- win/tools/kde_env | 2 +- win/tools/update_kdelibs_pro_files | 4 ++-- win/unistd.h | 2 +- win/win.pro | 4 ++-- win/win32_utils.h | 4 ++-- 30 files changed, 49 insertions(+), 49 deletions(-) (limited to 'win') diff --git a/win/common.pro b/win/common.pro index a27fe889e..12816231c 100644 --- a/win/common.pro +++ b/win/common.pro @@ -142,12 +142,12 @@ contains( TEMPLATE, lib ) { # global definitions win32-borland { - QMAKE_CXXFLAGS += /I $(KDELIBS)/win/kdelibs_global_win.h - QMAKE_CFLAGS += /I $(KDELIBS)/win/kdelibs_global_win.h + QMAKE_CXXFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h + QMAKE_CFLAGS += /I $(KDELIBS)/win/tdelibs_global_win.h } win32-msvc* { - QMAKE_CXXFLAGS += /FI$(KDELIBS)/win/kdelibs_global_win.h - QMAKE_CFLAGS += /FI$(KDELIBS)/win/kdelibs_global_win.h + QMAKE_CXXFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h + QMAKE_CFLAGS += /FI$(KDELIBS)/win/tdelibs_global_win.h # Language Extensions QMAKE_CXXFLAGS += /Ze diff --git a/win/config.h b/win/config.h index 465498141..40bba653b 100644 --- a/win/config.h +++ b/win/config.h @@ -22,7 +22,7 @@ #ifndef _KDE_WIN_CONFIG_H_ #define _KDE_WIN_CONFIG_H_ -#include +#include #ifndef HAVE_LIMITS_H #define HAVE_LIMITS_H 1 diff --git a/win/dirent.h b/win/dirent.h index 19af3be3c..e6e67c73f 100644 --- a/win/dirent.h +++ b/win/dirent.h @@ -22,7 +22,7 @@ #ifndef _SYS_DIRENT_H #define _SYS_DIRENT_H -#include +#include #include #include diff --git a/win/fcntl.h b/win/fcntl.h index 4c495863a..1dc65a17e 100644 --- a/win/fcntl.h +++ b/win/fcntl.h @@ -20,7 +20,7 @@ #ifndef _FCNTL_H #define _FCNTL_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/kde_file_win.h b/win/kde_file_win.h index 1c9e22304..0f32d2663 100644 --- a/win/kde_file_win.h +++ b/win/kde_file_win.h @@ -27,7 +27,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/pro_files/README.pro_files b/win/pro_files/README.pro_files index 2192750f3..4ea2cdd34 100644 --- a/win/pro_files/README.pro_files +++ b/win/pro_files/README.pro_files @@ -1,14 +1,14 @@ -kdelibs/win32 .pro files +tdelibs/win32 .pro files (c) 2003-2005, Jaroslaw Staniek Add this directory to your PATH. Cygwin or (other bash replacement) required. -Please copy .pro files to destination kdelibs/ -subdirectores using update_kdelibs_pro_files scipt. +Please copy .pro files to destination tdelibs/ +subdirectores using update_tdelibs_pro_files scipt. -.pro files were copied here from kdelibs/ directory -using collect_kdelibs_pro_files scipt. +.pro files were copied here from tdelibs/ directory +using collect_tdelibs_pro_files scipt. Scripts are available in win/tools/. diff --git a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro index 448cec678..4e09b8bb9 100644 --- a/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro +++ b/win/pro_files/kio/kfile/tests/kfiletreeviewtest.pro @@ -4,9 +4,9 @@ include( $(KDELIBS)/win/common.pro ) #allow to select target independently from debug information -kdebase_release:CONFIG -= console -kdebase_release:CONFIG += windows -kdebase_release:QMAKE_MAKEFILE = Makefile.release +tdebase_release:CONFIG -= console +tdebase_release:CONFIG += windows +tdebase_release:QMAKE_MAKEFILE = Makefile.release TARGET = kfiletreeviewtest diff --git a/win/pro_files/tdecore/tdecore.pro b/win/pro_files/tdecore/tdecore.pro index 04bfcd3fd..230673237 100644 --- a/win/pro_files/tdecore/tdecore.pro +++ b/win/pro_files/tdecore/tdecore.pro @@ -69,7 +69,7 @@ kshortcut.cpp \ kshortcutmenu.cpp \ kshortcutlist.cpp \ kinstance.cpp \ -kdeversion.cpp \ +tdeversion.cpp \ klocale.cpp \ kicontheme.cpp \ kiconloader.cpp \ diff --git a/win/pwd.h b/win/pwd.h index f827918f4..6c5449679 100644 --- a/win/pwd.h +++ b/win/pwd.h @@ -35,7 +35,7 @@ #ifndef _PWD_H_ -#include +#include #include diff --git a/win/signal.h b/win/signal.h index fc59997f5..571280f4b 100644 --- a/win/signal.h +++ b/win/signal.h @@ -20,7 +20,7 @@ #ifndef SIGNAL_H #define SIGNAL_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/stdlib.h b/win/stdlib.h index 967b76533..96f458b0d 100644 --- a/win/stdlib.h +++ b/win/stdlib.h @@ -21,7 +21,7 @@ * Definitions for common types, variables, and functions. */ -#include +#include #ifdef _MSC_VER # include diff --git a/win/string.h b/win/string.h index 4c4ae2b99..2ed942612 100644 --- a/win/string.h +++ b/win/string.h @@ -20,7 +20,7 @@ #ifndef KDEWIN_STRING_H #define KDEWIN_STRING_H -#include +#include #define strncasecmp strnicmp #define strcasecmp stricmp diff --git a/win/sys/mman.h b/win/sys/mman.h index 6ec8abcbe..af12ce18f 100644 --- a/win/sys/mman.h +++ b/win/sys/mman.h @@ -23,7 +23,7 @@ #ifndef _MMAP_H #define _MMAP_H -#include +#include #include diff --git a/win/sys/resource.h b/win/sys/resource.h index d49a21f4b..91aee90dd 100644 --- a/win/sys/resource.h +++ b/win/sys/resource.h @@ -20,7 +20,7 @@ #ifndef _SYS_RESOURCE_H_ #define _SYS_RESOURCE_H_ -#include +#include #include #ifdef __cplusplus diff --git a/win/sys/stat.h b/win/sys/stat.h index f65a56e0c..288782032 100644 --- a/win/sys/stat.h +++ b/win/sys/stat.h @@ -20,7 +20,7 @@ #ifndef _SYS_STAT_H #define _SYS_STAT_H -#include +#include /* regular sys/stat.h */ #ifdef _MSC_VER diff --git a/win/sys/time.h b/win/sys/time.h index ebb5144be..ea40014b6 100644 --- a/win/sys/time.h +++ b/win/sys/time.h @@ -20,7 +20,7 @@ #ifndef _SYS_TIME_H_ #define _SYS_TIME_H_ -#include +#include //??#if !defined(_INC_TIME) diff --git a/win/sys/times.h b/win/sys/times.h index 6ee6d652a..59d5992ab 100644 --- a/win/sys/times.h +++ b/win/sys/times.h @@ -20,7 +20,7 @@ #ifndef _SYS_TIMES_H #define _SYS_TIMES_H -#include +#include //#include <_ansi.h> #include diff --git a/win/sys/utsname.h b/win/sys/utsname.h index 55f0b3237..ce21168fa 100644 --- a/win/sys/utsname.h +++ b/win/sys/utsname.h @@ -20,7 +20,7 @@ #ifndef _SYS_UTSNAME_H #define _SYS_UTSNAME_H -#include +#include #ifdef __cplusplus extern "C" { diff --git a/win/syslog.h b/win/syslog.h index 38398fcbf..d3d6dba50 100644 --- a/win/syslog.h +++ b/win/syslog.h @@ -24,7 +24,7 @@ #ifndef _SYS_LOG_H #define _SYS_LOG_H -#include +#include #define LOG_EMERG 0 #define LOG_ALERT 1 diff --git a/win/tools/.build_kdelibs_comon b/win/tools/.build_kdelibs_comon index 5ed09f724..6ef96f94c 100755 --- a/win/tools/.build_kdelibs_comon +++ b/win/tools/.build_kdelibs_comon @@ -1,5 +1,5 @@ #!/bin/bash -# compile entire kdelibs/win32 : common part for dbg and release target +# compile entire tdelibs/win32 : common part for dbg and release target # (c) 2005, Jaroslaw Staniek, js@iidea.pl pwd=`pwd` diff --git a/win/tools/.check_kde_env b/win/tools/.check_kde_env index d22cf13e6..e4605ed1d 100755 --- a/win/tools/.check_kde_env +++ b/win/tools/.check_kde_env @@ -3,18 +3,18 @@ # checks current environment if [ -z "$KDEWIN" ] ; then - echo `basename $0`": \$KDEWIN environment variable is not set. Set it to absolute path of kdelibs/win32 source code, e.g. C:\\kdelibs" + echo `basename $0`": \$KDEWIN environment variable is not set. Set it to absolute path of tdelibs/win32 source code, e.g. C:\\tdelibs" exit 1 fi if [ -z "$KDEDIR" ] ; then - echo `basename $0`": \$KDEDIR environment variable is not set. Set it to absolute path of kdelibs/win32 binaries, e.g. C:\\kde" + echo `basename $0`": \$KDEDIR environment variable is not set. Set it to absolute path of tdelibs/win32 binaries, e.g. C:\\kde" exit 1 fi -if [ -z "$KDELIBS" -o "$KDEWIN\\kdelibs" != "$KDELIBS" ] ; then +if [ -z "$KDELIBS" -o "$KDEWIN\\tdelibs" != "$KDELIBS" ] ; then echo `basename $0`": \$KDELIBS = \"$KDELIBS\" but \$KDEWIN = \"$KDEWIN\"" - echo "\$KDELIBS environment variable is not properly set. Set it to absolute path of kdelibs/win32 source code. It needs to be equal to \"\$KDEWIN\\kdelibs\", e.g. C:\\kdewin32\\kdelibs". + echo "\$KDELIBS environment variable is not properly set. Set it to absolute path of tdelibs/win32 source code. It needs to be equal to \"\$KDEWIN\\tdelibs\", e.g. C:\\kdewin32\\tdelibs". echo "You may need to run:" echo " source kde_env" exit 1 diff --git a/win/tools/README.tools b/win/tools/README.tools index 35b3a5264..f21079caa 100644 --- a/win/tools/README.tools +++ b/win/tools/README.tools @@ -1,4 +1,4 @@ -kdelibs/win32 build tools +tdelibs/win32 build tools (c) 2003-2005, Jaroslaw Staniek diff --git a/win/tools/build_kdelibs_dbg b/win/tools/build_kdelibs_dbg index 9af5cc9b2..cabec259f 100644 --- a/win/tools/build_kdelibs_dbg +++ b/win/tools/build_kdelibs_dbg @@ -1,14 +1,14 @@ #!/bin/bash -# compile entire kdelibs/win32 in debug mode +# compile entire tdelibs/win32 in debug mode # (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl if [ "$1" == "noclean" ] ; then noclean=1 fi -update_kdelibs_pro_files || exit 1 +update_tdelibs_pro_files || exit 1 .copy_missing_headers || exit 1 -source .build_kdelibs_comon || exit 1 +source .build_tdelibs_comon || exit 1 cd "$KDELIBS" diff --git a/win/tools/build_kdelibs_rel b/win/tools/build_kdelibs_rel index f8c9ba410..7490c4866 100644 --- a/win/tools/build_kdelibs_rel +++ b/win/tools/build_kdelibs_rel @@ -1,14 +1,14 @@ #!/bin/bash -# compile entire kdelibs/win32 in release mode +# compile entire tdelibs/win32 in release mode # (c) 2003-2005, Jaroslaw Staniek, js@iidea.pl if [ "$1" == "noclean" ] ; then noclean=1 fi -update_kdelibs_pro_files || exit 1 +update_tdelibs_pro_files || exit 1 .copy_missing_headers || exit 1 -source .build_kdelibs_comon || exit 1 +source .build_tdelibs_comon || exit 1 cd "$KDELIBS" diff --git a/win/tools/collect_kdelibs_pro_files b/win/tools/collect_kdelibs_pro_files index ea2466ef2..3925f675e 100755 --- a/win/tools/collect_kdelibs_pro_files +++ b/win/tools/collect_kdelibs_pro_files @@ -1,6 +1,6 @@ #!/bin/bash -# Copies all used .pro (and a few shell) files kdelibs/ to kdelibs/win/pro_files/ +# Copies all used .pro (and a few shell) files tdelibs/ to tdelibs/win/pro_files/ # what makes it easier to commit that to KDE CVS # (c) 2005, Jaroslaw Staniek diff --git a/win/tools/kde_env b/win/tools/kde_env index 287fef1bb..a8c721a5d 100755 --- a/win/tools/kde_env +++ b/win/tools/kde_env @@ -13,7 +13,7 @@ if [ -n "$MSVC" ] ; then fi # Generic settings -export KDELIBS=$KDEWIN\\kdelibs # KDElibs/win32 source directory +export KDELIBS=$KDEWIN\\tdelibs # KDElibs/win32 source directory export INCLUDE="$KDELIBS\\win;$KDELIBS;$KDELIBS\\tdecore;$KDELIBS\\tdefx;$KDELIBS\\tdeprint;$KDELIBS\\tdeui;$KDELIBS\\kmdi;$KDELIBS\\dcop;$KDELIBS\\kio;$KDELIBS\\kio\\kio;$KDELIBS\\kio\\kfile;$INCLUDE" # Version information for binaries diff --git a/win/tools/update_kdelibs_pro_files b/win/tools/update_kdelibs_pro_files index 15f745cf8..92125fec1 100755 --- a/win/tools/update_kdelibs_pro_files +++ b/win/tools/update_kdelibs_pro_files @@ -1,7 +1,7 @@ #!/bin/bash -# Copies all used .pro (and a few shell) files from kdelibs/win/pro_files/ to kdelibs/ -# so they can be used to build kdelibs. +# Copies all used .pro (and a few shell) files from tdelibs/win/pro_files/ to tdelibs/ +# so they can be used to build tdelibs. # Note: only newer files are copied over older. # (c) 2005, Jaroslaw Staniek, js@iidea.pl diff --git a/win/unistd.h b/win/unistd.h index 297d69933..4b9c501b6 100644 --- a/win/unistd.h +++ b/win/unistd.h @@ -20,7 +20,7 @@ #ifndef _KDEWIN_UNISTD_H #define _KDEWIN_UNISTD_H -#include +#include #include /* access(), etc.*/ #include /* getpid(), etc.*/ diff --git a/win/win.pro b/win/win.pro index 94ca2d541..90c30f3fa 100644 --- a/win/win.pro +++ b/win/win.pro @@ -5,8 +5,8 @@ include( $(KDELIBS)/win/common.pro ) TARGET = kdewin32$$KDEBUG -QMAKE_CXXFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h -QMAKE_CFLAGS += /FI$(KDELIBS)/tdecore/kdelibs_export.h +QMAKE_CXXFLAGS += /FI$(KDELIBS)/tdecore/tdelibs_export.h +QMAKE_CFLAGS += /FI$(KDELIBS)/tdecore/tdelibs_export.h system( moc qeventloopex.h -o moc/qeventloopex.moc ) diff --git a/win/win32_utils.h b/win/win32_utils.h index e42864ccb..a0702c84c 100644 --- a/win/win32_utils.h +++ b/win/win32_utils.h @@ -22,7 +22,7 @@ #include -#include +#include #ifdef __cplusplus #include @@ -88,7 +88,7 @@ TQCString getWin32LocaleName(); /*! Temporary solutiuon \return a KFileDialog-compatible filter string converted to TQFileDialog compatible one. - This is temporary solution for kdelibs/win32... */ + This is temporary solution for tdelibs/win32... */ KDEWIN32_EXPORT TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter); #endif //__cplusplus -- cgit v1.2.1