[rkward-cvs] SF.net SVN: rkward: [2272] branches/KDE4_port
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Nov 26 12:14:50 UTC 2007
Revision: 2272
http://rkward.svn.sourceforge.net/rkward/?rev=2272&view=rev
Author: tfry
Date: 2007-11-26 04:14:50 -0800 (Mon, 26 Nov 2007)
Log Message:
-----------
cleanups
Modified Paths:
--------------
branches/KDE4_port/CMakeLists.txt
branches/KDE4_port/TODO_KDE4
branches/KDE4_port/po/Messages.sh
branches/KDE4_port/rkward/debug.h
branches/KDE4_port/rkward/windows/CMakeLists.txt
Modified: branches/KDE4_port/CMakeLists.txt
===================================================================
--- branches/KDE4_port/CMakeLists.txt 2007-11-25 21:30:01 UTC (rev 2271)
+++ branches/KDE4_port/CMakeLists.txt 2007-11-26 12:14:50 UTC (rev 2272)
@@ -6,13 +6,13 @@
SET(CMAKE_VERBOSE_MAKEFILE OFF)
ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DQT_NO_CAST_TO_ASCII)
+#uncomment the line below to save ~250-350kB in object size
+#ADD_DEFINITIONS(-DRKWARD_NO_TRACE)
LINK_DIRECTORIES(${KDE4_LIB_DIR})
-ADD_SUBDIRECTORY( rkward )
-ADD_SUBDIRECTORY( po )
-ADD_SUBDIRECTORY( doc )
+ADD_SUBDIRECTORY(rkward)
+ADD_SUBDIRECTORY(po)
+ADD_SUBDIRECTORY(doc)
-INCLUDE_DIRECTORIES( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
# TODO: figure out how to make source distributions (with REAMDE files, etc.)
Modified: branches/KDE4_port/TODO_KDE4
===================================================================
--- branches/KDE4_port/TODO_KDE4 2007-11-25 21:30:01 UTC (rev 2271)
+++ branches/KDE4_port/TODO_KDE4 2007-11-26 12:14:50 UTC (rev 2272)
@@ -7,8 +7,6 @@
- clean up
- documentation
- NOTES
- - INSTALL
- - create a dummy ./configure
- wiki / web
- adjust debian dir
@@ -19,8 +17,6 @@
- grep sources for "KDE4"
- remove all the passing around of KGlobal::config() as a parameter
- the whole idea of having a single mutex for everything is flawed. We should use several specialized ones
- -* when rkward freezes, terminating (window close -> Terminate) rkward does not kill rkward.bin
- - do some profiling, whether the more expensive lookup in RContainerObject::findObjectByName() is a performance issue
rkcommandeditorwindow
- code completion
@@ -41,8 +37,6 @@
rksettings:
- are the defaults ok?
- + When going to a specific page programmitcally, e.g. "Plugins" and "R-Pacakges" text on the left panel remain selected
- - likely bug in KDE libs
rklocalesupport:
- does locale switching / detection work? Does Qt have something, yet?
Modified: branches/KDE4_port/po/Messages.sh
===================================================================
--- branches/KDE4_port/po/Messages.sh 2007-11-25 21:30:01 UTC (rev 2271)
+++ branches/KDE4_port/po/Messages.sh 2007-11-26 12:14:50 UTC (rev 2272)
@@ -23,7 +23,7 @@
find . -name '*.cpp' -o -name '*.h' -o -name '*.c' | sort > ${WDIR}/infiles.list
echo "extractedrc.cpp" >> ${WDIR}/infiles.list
cd ${WDIR}
-xgettext --from-code=UTF-8 -C --kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \
+xgettext --from-code=UTF-8 -C -kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \
-kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 \
--msgid-bugs-address="${BUGADDR}" \
--files-from=infiles.list -D ${BASEDIR} -D ${WDIR} -o ${PROJECT}.pot || { echo "error while calling xgettext. aborting."; exit 1; }
Modified: branches/KDE4_port/rkward/debug.h
===================================================================
--- branches/KDE4_port/rkward/debug.h 2007-11-25 21:30:01 UTC (rev 2271)
+++ branches/KDE4_port/rkward/debug.h 2007-11-26 12:14:50 UTC (rev 2272)
@@ -45,16 +45,16 @@
#define ALL (APP | PLUGIN | PHP | OBJECTS | EDITOR | RBACKEND | COMMANDEDITOR | MISC | DIALOGS | OUTPUT | XML)
#ifdef RKWARD_DEBUG
-
// Debug functions
-#define RK_DO(expr,flags,level) if ((flags & RK_Debug_Flags) && (level >= RK_Debug_Level)) { expr; }
-#define RK_ASSERT(x) if (!(x)) qDebug ("Assert failed at %s - function %s line %d", __FILE__, __FUNCTION__, __LINE__);
-#define RK_TRACE(flags) RK_DO (qDebug ("Trace: %s - function %s line %d", __FILE__, __FUNCTION__, __LINE__), flags, DL_TRACE);
-
+# define RK_DO(expr,flags,level) if ((flags & RK_Debug_Flags) && (level >= RK_Debug_Level)) { expr; }
+# define RK_ASSERT(x) if (!(x)) qDebug ("Assert failed at %s - function %s line %d", __FILE__, __FUNCTION__, __LINE__);
+# ifndef RKWARD_NO_TRACE
+# define RK_TRACE(flags) RK_DO (qDebug ("Trace: %s - function %s line %d", __FILE__, __FUNCTION__, __LINE__), flags, DL_TRACE);
+# else
+# define RK_TRACE(flags)
+# endif
#else
-
-#define RK_DO(expr,flags,level) ;
-#define RK_ASSERT(x) ;
-#define RK_TRACE(flags) ;
-
+# define RK_DO(expr,flags,level)
+# define RK_ASSERT(x)
+# define RK_TRACE(flags)
#endif
Modified: branches/KDE4_port/rkward/windows/CMakeLists.txt
===================================================================
--- branches/KDE4_port/rkward/windows/CMakeLists.txt 2007-11-25 21:30:01 UTC (rev 2271)
+++ branches/KDE4_port/rkward/windows/CMakeLists.txt 2007-11-26 12:14:50 UTC (rev 2272)
@@ -1,6 +1,5 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
-
########### next target ###############
SET(windows_STAT_SRCS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list