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

List:       kde-commits
Subject:    branches/koffice/1.4/koffice
From:       Stephan Binner <binner () kde ! org>
Date:       2005-10-18 15:34:46
Message-ID: 1129649686.412601.23441.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 471722 by binner:

compile with gcc 4.1


 M  +3 -3      kexi/migration/mysql/mysqlmigrate.h  
 M  +1 -1      kspread/kspread_cell.h  


--- branches/koffice/1.4/koffice/kexi/migration/mysql/mysqlmigrate.h #471721:471722
@@ -60,7 +60,7 @@
 			~MySQLMigrate();
 			//Constructor
 			MySQLMigrate();
-			MySQLMigrate::MySQLMigrate(QObject *parent, const char *name, const QStringList& \
args = QStringList()); +			MySQLMigrate(QObject *parent, const char *name, const \
QStringList& args = QStringList());  
 			KexiDB::Field::Type type(const QString& table, const MYSQL_FIELD* t);
 			
@@ -69,8 +69,8 @@
 			
 			QStringList examineEnumField(const QString& table,
 			                             const MYSQL_FIELD* fld);
-			void MySQLMigrate::getConstraints(int mysqlConstraints, KexiDB::Field* fld);
-			void MySQLMigrate::getOptions(int flags, KexiDB::Field* fld);
+			void getConstraints(int mysqlConstraints, KexiDB::Field* fld);
+			void getOptions(int flags, KexiDB::Field* fld);
 
 		/*! driver's static version information, it is automatically implemented
 		 in implementation using KEXIDB_DRIVER macro (see driver_p.h) */
--- branches/koffice/1.4/koffice/kspread/kspread_cell.h #471721:471722
@@ -596,7 +596,7 @@
      *
      * @return the cell that decides the format for the cell in question.
      */
-    KSpreadCell *KSpreadCell::ultimateObscuringCell() const;
+    KSpreadCell *ultimateObscuringCell() const;
 
     /**
      * @return the obscuring cell list (might be empty)


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