[rkward-cvs] SF.net SVN: rkward: [1005] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 1005
          http://svn.sourceforge.net/rkward/?rev=1005&view=rev
Author:   tfry
Date:     2006-12-13 08:29:38 -0800 (Wed, 13 Dec 2006)

Log Message:
-----------
Fixes for compilation with older versions of GCC, KDE

Modified Paths:
--------------
    trunk/rkward/rkward/misc/rkcommonfunctions.cpp
    trunk/rkward/rkward/windows/qxembedcopy.h

Modified: trunk/rkward/rkward/misc/rkcommonfunctions.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkcommonfunctions.cpp	2006-12-12 16:34:27 UTC (rev 1004)
+++ trunk/rkward/rkward/misc/rkcommonfunctions.cpp	2006-12-13 16:29:38 UTC (rev 1005)
@@ -98,14 +98,14 @@
 	}
 
 	QString getCurrentSymbol (const QString &context_line, int cursor_pos, bool strict) {
-		if (context_line.isEmpty ()) return (QString ());
+		if (context_line.isEmpty ()) return (QString::null);
 
 		int current_word_start;
 		int current_word_end;
 		getCurrentSymbolOffset (context_line, cursor_pos, strict, &current_word_start, &current_word_end);
 	
 		// if both return the same position, we're on a non-word.
-		if (current_word_start == current_word_end) return (QString ());
+		if (current_word_start == current_word_end) return (QString::null);
 
 		return (context_line.mid (current_word_start, current_word_end - current_word_start));
 	}

Modified: trunk/rkward/rkward/windows/qxembedcopy.h
===================================================================
--- trunk/rkward/rkward/windows/qxembedcopy.h	2006-12-12 16:34:27 UTC (rev 1004)
+++ trunk/rkward/rkward/windows/qxembedcopy.h	2006-12-13 16:29:38 UTC (rev 1005)
@@ -23,7 +23,7 @@
 #define QXEMBED_H
 
 #include <qwidget.h>
-#include <kdelibs_export.h>
+//#include <kdelibs_export.h>		// this line changed against original QXEmbed
 
 #ifdef Q_WS_X11
 
@@ -55,7 +55,7 @@
  *
  * @short The QXEmbedCopy widget is a graphical socket that can embed an external X-Window.
 */
-class KDEUI_EXPORT QXEmbedCopy : public QWidget
+class QXEmbedCopy : public QWidget		// this line changed against original QXEmbed
 {
     Q_OBJECT
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.