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

List:       kde-commits
Subject:    branches/koffice/1.4/koffice
From:       Dirk Mueller <mueller () kde ! org>
Date:       2005-11-22 0:18:55
Message-ID: 1132618735.004323.1096.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 482153 by mueller:

the usual "daily unbreak compilation"


 M  +7 -3      karbon/core/vtext.cc  
 M  +1 -1      kexi/formeditor/test/kfd_part.cpp  
 M  +1 -1      kexi/kexidb/drivers/mySQL/mysqldriver.cpp  
 M  +1 -1      kexi/migration/mysql/mysqlmigrate.cpp  


--- branches/koffice/1.4/koffice/karbon/core/vtext.cc #482152:482153
@@ -51,6 +51,7 @@
 
 // Trace routines for ttf / ps font -> VSubpath
 
+static
 int traceMoveto( FT_Vector *to, VPath *composite )
 {
 	double tox = ( to->x / 64.0 );
@@ -63,6 +64,7 @@
 	return 0;
 }
 
+static
 int traceLineto( FT_Vector *to, VPath *composite )
 {
 	double tox = ( to->x / 64.0 );
@@ -74,8 +76,9 @@
 	composite->lineTo( KoPoint( tox, toy ) );
 
 	return 0;
-};
+}
 
+static
 int traceQuadraticBezier( FT_Vector *control, FT_Vector *to, VPath *composite )
 {
 	double x1 = ( control->x / 64.0 );
@@ -89,8 +92,9 @@
 	//composite->curve2To( KoPoint( x1, y1 ), KoPoint( x2, y2 ) );
 
 	return 0;
-};
+}
 
+static
 int traceCubicBezier( FT_Vector *p, FT_Vector *q, FT_Vector *to, VPath *composite )
 {
 	double x1 = ( p->x / 64.0 );
@@ -106,7 +110,7 @@
 	composite->curveTo( KoPoint( x1, y1 ), KoPoint( x2, y2 ), KoPoint( x3, y3 ) );
 
 	return 0;
-};
+}
 
 FT_Outline_Funcs OutlineMethods =
 {
--- branches/koffice/1.4/koffice/kexi/formeditor/test/kfd_part.cpp #482152:482153
@@ -691,7 +691,7 @@
 	}
 }
 
-K_EXPORT_COMPONENT_FACTORY(libkformdesigner_part, KFDFactory);
+K_EXPORT_COMPONENT_FACTORY(libkformdesigner_part, KFDFactory)
 
 #include "kfd_part.moc"
 
--- branches/koffice/1.4/koffice/kexi/kexidb/drivers/mySQL/mysqldriver.cpp #482152:482153
@@ -40,7 +40,7 @@
 
 using namespace KexiDB;
 
-KEXIDB_DRIVER_INFO( MySqlDriver, mysql );
+KEXIDB_DRIVER_INFO( MySqlDriver, mysql )
 
 /* TODO: Implement buffered/unbuffered, rather than buffer everything.
    Each MYSQL connection can only handle at most one unbuffered cursor,
--- branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.cpp #482152:482153
@@ -35,7 +35,7 @@
 
 /* This is the implementation for the MySQL specific import routines. */
 
-KEXIMIGRATE_DRIVER_INFO( MySQLMigrate, mysql );
+KEXIMIGRATE_DRIVER_INFO( MySQLMigrate, mysql )
 
 /* ************************************************************************** */
 //! Constructor
[prev in list] [next in list] [prev in thread] [next in thread]