[Kst] extragear/graphics

[Dirk Mueller]

SVN commit 478968 by mueller:

the usual "daily unbreak compilation"



 M  +2 -2      kst/kst/kstplotlabel.h  
 M  +4 -4      showimg/showimgdb/categories.cpp  


--- trunk/extragear/graphics/kst/kst/kstplotlabel.h #478967:478968
@@ -44,8 +44,8 @@
     const QString& fontName() const;
 
     void setFontSize(int size);
-    void KstPlotLabel::updateAbsFontSize(int x_pix, int y_pix);
-    
+    void updateAbsFontSize(int x_pix, int y_pix);
+
     int fontSize() const;
 
     inline int lineSpacing() const { return _lineSpacing; }
--- trunk/extragear/graphics/showimg/showimgdb/categories.cpp #478967:478968
@@ -1091,13 +1091,13 @@
 	QString query = QString("SELECT DISTINCT image_id FROM images WHERE ");
 	for( unsigned int i=0; i<patterns.count()-1; i++)
 	{
-		query += QString(" (image_name LIKE '\%%1\%') ").arg(*patterns.at(i));
+		query += QString(" (image_name LIKE '%%1%') ").arg(*patterns.at(i));
 		if(mode == mode_OR)
 			query += " OR ";
 		else
 			query += " AND ";
 	}
-	query += QString("image_name LIKE '\%%1\%' ").arg(*patterns.at(patterns.count()-1));
+	query += QString("image_name LIKE '%%1%' ").arg(*patterns.at(patterns.count()-1));
 
 	///
 	if(!iiList.isEmpty())
@@ -1688,7 +1688,7 @@
 
 	if(conn_data->driverName.lower() == QString::fromLatin1("mysql"))
 	{
-		query = QString("UPDATE directories SET directory_path = CONCAT('%1', '/', SUBSTR(directory_path, LENGTH('%2')+2, LENGTH(directory_path)-LENGTH('%3')+1)) WHERE directory_path LIKE '%4/\%' ; ")
+		query = QString("UPDATE directories SET directory_path = CONCAT('%1', '/', SUBSTR(directory_path, LENGTH('%2')+2, LENGTH(directory_path)-LENGTH('%3')+1)) WHERE directory_path LIKE '%4/%' ; ")
 				.arg(new_path)
 				.arg(old_path)
 				.arg(old_path)
@@ -1696,7 +1696,7 @@
 	}
 	else
 	{
-		query = QString("UPDATE directories SET directory_path='%1' || '/' || SUBSTR(directory_path, LENGTH('%2')+2, LENGTH(directory_path)-LENGTH('%3')+1) WHERE directory_path LIKE '%4/\%' ; ")
+		query = QString("UPDATE directories SET directory_path='%1' || '/' || SUBSTR(directory_path, LENGTH('%2')+2, LENGTH(directory_path)-LENGTH('%3')+1) WHERE directory_path LIKE '%4/%' ; ")
 				.arg(new_path)
 				.arg(old_path)
 				.arg(old_path)