[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi (silent)
From:       Adam Pigg <adam () piggz ! co ! uk>
Date:       2010-02-12 19:56:08
Message-ID: 1266004568.608498.8005.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1089259 by piggz:

krazy fixes
SVN_SILENT

 M  +1 -0      core/kexipart.cpp  
 M  +1 -0      core/kexipartguiclient.h  
 M  +1 -1      kexidb/drivers/oracle/oraclecursor.cpp  
 M  +1 -0      plugins/forms/widgets/kexidbutils.h  
 M  +11 -11    plugins/queries/kexiquerydesignerguieditor.cpp  


--- trunk/koffice/kexi/core/kexipart.cpp #1089258:1089259
@@ -555,3 +555,4 @@
 }
 
 #include "kexipart.moc"
+#include "kexipartguiclient.moc"
--- trunk/koffice/kexi/core/kexipartguiclient.h #1089258:1089259
@@ -33,6 +33,7 @@
 */
 class GUIClient : public QObject, public KXMLGUIClient
 {
+    Q_OBJECT
 public:
     virtual ~GUIClient() {}
 
--- trunk/koffice/kexi/kexidb/drivers/oracle/oraclecursor.cpp #1089258:1089259
@@ -226,7 +226,7 @@
 	data.resize(m_fieldCount);
 	const uint fieldsExpandedCount = m_fieldsExpanded ?
 																	 m_fieldsExpanded->count() : UINT_MAX;
-	const uint realCount = QMIN(fieldsExpandedCount, m_fieldCount);
+	const uint realCount = qMin(fieldsExpandedCount, m_fieldCount);
 	
 	for( uint i=0; i<realCount; i++) 
 	{
--- trunk/koffice/kexi/plugins/forms/widgets/kexidbutils.h #1089258:1089259
@@ -42,6 +42,7 @@
  actions when "read only" flag is true. */
 class KexiDBWidgetContextMenuExtender : public QObject
 {
+    Q_OBJECT
 public:
     KexiDBWidgetContextMenuExtender(QObject* parent, KexiDataItemInterface* iface);
     ~KexiDBWidgetContextMenuExtender();
--- trunk/koffice/kexi/plugins/queries/kexiquerydesignerguieditor.cpp #1089258:1089259
@@ -1290,22 +1290,22 @@
     //1. get token
     token = 0;
     //2-char-long tokens
-    if (str.startsWith(">="))
+    if (str.startsWith(QLatin1String(">=")))
         token = GREATER_OR_EQUAL;
-    else if (str.startsWith("<="))
+    else if (str.startsWith(QLatin1String("<=")))
         token = LESS_OR_EQUAL;
-    else if (str.startsWith("<>"))
+    else if (str.startsWith(QLatin1String("<>")))
         token = NOT_EQUAL;
-    else if (str.startsWith("!="))
+    else if (str.startsWith(QLatin1String("!=")))
         token = NOT_EQUAL2;
-    else if (str.startsWith("=="))
+    else if (str.startsWith(QLatin1String("==")))
         token = '=';
 
     if (token != 0)
         len = 2;
-    else if (str.startsWith("=") //1-char-long tokens
-             || str.startsWith("<")
-             || str.startsWith(">")) {
+    else if (str.startsWith(QLatin1String("=")) //1-char-long tokens
+             || str.startsWith(QLatin1String("<"))
+             || str.startsWith(QLatin1String(">"))) {
         token = str[0].toLatin1();
         len = 1;
     } else {
@@ -1326,11 +1326,11 @@
     QRegExp re;
     if (str.length() >= 2 &&
             (
-                (str.startsWith("\"") && str.endsWith("\""))
-                || (str.startsWith("'") && str.endsWith("'")))
+                (str.startsWith(QLatin1String("\"")) && str.endsWith(QLatin1String("\"")))
+                || (str.startsWith(QLatin1String("'")) && str.endsWith(QLatin1String("'"))))
        ) {
         valueExpr = new KexiDB::ConstExpr(CHARACTER_STRING_LITERAL, str.mid(1, str.length() - 2));
-    } else if (str.startsWith("[") && str.endsWith("]")) {
+    } else if (str.startsWith(QLatin1String("[")) && str.endsWith(QLatin1String("]"))) {
         valueExpr = new KexiDB::QueryParameterExpr(str.mid(1, str.length() - 2));
     } else if ((re = QRegExp("(\\d{1,4})-(\\d{1,2})-(\\d{1,2})")).exactMatch(str)) {
         valueExpr = new KexiDB::ConstExpr(DATE_CONST, QDate::fromString(
[prev in list] [next in list] [prev in thread] [next in thread]