I am including below three patch files.
This patch is for Windows-specific issues in two files. It corresponds to
changes 1-4 and 16 in my original post in this thread.
_____________________
diff U3 3rdparty/kdgantt/kdganttglobal.h 3rdparty/kdgantt/kdganttglobal.h
--- 3rdparty/kdgantt/kdganttglobal.h Sat Sep 20 12:42:01 2014
+++ 3rdparty/kdgantt/kdganttglobal.h Tue Oct 21 18:36:18 2014
@@ -181,7 +181,7 @@
void swap( X& other ) { doSwap( other ); }
#if defined(Q_OS_WIN) && defined(QT_DLL)
-#if _MSC_VER >= 1300
+#if defined(_MSC_VER) && _MSC_VER >= 1300
// workaround
http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
#include <QPointF>
#include <QVector>
diff U3 winquirks/unistd.h winquirks/unistd.h
--- winquirks/unistd.h Sat Sep 20 12:42:14 2014
+++ winquirks/unistd.h Tue Oct 21 18:36:14 2014
@@ -113,21 +113,26 @@
#define STDERR_FILENO 2
#endif
-#if _MSC_VER < 1600
+#if defined(_MSC_VER) && _MSC_VER < 1600
#define ENOTSUP ENOSYS
#endif
#ifndef _MODE_T_
#define _MODE_T_
-typedef int mode_t;
+typedef unsigned short mode_t;
#endif
typedef unsigned int gid_t;
typedef unsigned int uid_t;
#ifndef pid_t
-typedef int pid_t;
+#ifndef _WIN64
+typedef int pid_t;
+#else
+typedef __int64 pid_t;
#endif
+#endif
+
#define getgroups(x,y) 0
@@ -164,15 +169,15 @@
#ifdef __cplusplus
extern "C" {
-#endif
#if 0
int setenv(const char *name, const char *value, int overwrite);
int unsetenv (const char *name);
#endif
-#ifdef __cplusplus
+
}
-#endif
+#endif /* __cplusplus */
+
static int sleep(unsigned int sec) {
_____________________
This patch is for two files in the libs\db\ folder. It corresponds to
changes 5 and 6 in my original post in this thread.
_____________________
diff U3 libs/db/parser/sqlscanner.cpp libs/db/parser/sqlscanner.cpp
--- libs/db/parser/sqlscanner.cpp Sat Sep 20 12:42:09 2014
+++ libs/db/parser/sqlscanner.cpp Tue Oct 21 18:36:22 2014
@@ -341,7 +341,7 @@
/* Begin user sect3 */
-#define yywrap(n) 1
+#define yywrap() 1
#define YY_SKIP_YYWRAP
typedef unsigned char YY_CHAR;
diff U3 libs/db/msghandler.cpp libs/db/msghandler.cpp
--- libs/db/msghandler.cpp Sat Sep 20 12:42:09 2014
+++ libs/db/msghandler.cpp Tue Oct 21 18:36:27 2014
@@ -78,7 +78,7 @@
buttonNo,
dontShowAskAgainName, options);
}
else {
- return askQuestion(message, dlgType, defaultResult, buttonYes,
+ return askQuestionInternal(message, dlgType, defaultResult,
buttonYes,
buttonNo, dontShowAskAgainName, options);
}
}
_____________________
This patch is for four files in the plan\workpackage folder. It corresponds
to changes 7-15 in my original post in this thread.
_____________________
diff U3 plan/workpackage/part.cpp plan/workpackage/part.cpp
--- plan/workpackage/part.cpp Wed Oct 22 04:41:15 2014
+++ plan/workpackage/part.cpp Wed Oct 22 04:33:37 2014
@@ -821,7 +821,7 @@
return true;
}
-bool Part::completeSaving( KoStore */*store*/ )
+bool Part::completeSaving( KoStore *store )
{
return true;
}
diff U3 plan/workpackage/taskworkpackagemodel.cpp
plan/workpackage/taskworkpackagemodel.cpp
--- plan/workpackage/taskworkpackagemodel.cpp Sat Sep 20 12:42:14 2014
+++ plan/workpackage/taskworkpackagemodel.cpp Tue Oct 21 18:36:35 2014
@@ -95,7 +95,7 @@
beginInsertRows( indexForNode( parent ), row, row );
}
-void TaskWorkPackageModel::slotNodeInserted( Node */*node*/ )
+void TaskWorkPackageModel::slotNodeInserted( Node *node )
{
//kDebug(planworkDbg())<<node->parentNode()->name()<<"-->"<<node->name();
endInsertRows();
@@ -108,7 +108,7 @@
beginRemoveRows( indexForNode( node->parentNode() ), row, row );
}
-void TaskWorkPackageModel::slotNodeRemoved( Node */*node*/ )
+void TaskWorkPackageModel::slotNodeRemoved( Node *node )
{
//kDebug(planworkDbg())<<node->name();
endRemoveRows();
@@ -124,7 +124,7 @@
emit dataChanged( createIndex( row, 0, node->parentNode() ),
createIndex( row, columnCount()-1, node->parentNode() ) );
}
-void TaskWorkPackageModel::slotDocumentAdded( Node *node, Document
*/*doc*/, int row )
+void TaskWorkPackageModel::slotDocumentAdded( Node *node, Document *doc,
int row )
{
QModelIndex parent = indexForNode( node );
if ( parent.isValid() ) {
@@ -133,7 +133,7 @@
}
}
-void TaskWorkPackageModel::slotDocumentRemoved( Node *node, Document
*/*doc*/, int row )
+void TaskWorkPackageModel::slotDocumentRemoved( Node *node, Document *doc,
int row )
{
QModelIndex parent = indexForNode( node );
if ( parent.isValid() ) {
@@ -142,7 +142,7 @@
}
}
-void TaskWorkPackageModel::slotDocumentChanged( Node *node, Document
*/*doc*/, int row )
+void TaskWorkPackageModel::slotDocumentChanged( Node *node, Document *doc,
int row )
{
QModelIndex parent = indexForNode( node );
if ( parent.isValid() ) {
diff U3 plan/workpackage/taskworkpackageview.cpp
plan/workpackage/taskworkpackageview.cpp
--- plan/workpackage/taskworkpackageview.cpp Wed Oct 22 04:40:51 2014
+++ plan/workpackage/taskworkpackageview.cpp Wed Oct 22 04:33:50 2014
@@ -178,7 +178,7 @@
kDebug(planworkDbg())<<index.column();
}
-void TaskWorkPackageTreeView::dragMoveEvent(QDragMoveEvent */*event*/)
+void TaskWorkPackageTreeView::dragMoveEvent(QDragMoveEvent *event)
{
/* if (dragDropMode() == InternalMove
&& (event->source() != this || !(event->possibleActions() &
Qt::MoveAction)))
diff U3 plan/workpackage/workpackage.cpp plan/workpackage/workpackage.cpp
--- plan/workpackage/workpackage.cpp Wed Oct 22 04:41:03 2014
+++ plan/workpackage/workpackage.cpp Wed Oct 22 04:33:42 2014
@@ -104,7 +104,7 @@
setModified( true );
}
-bool WorkPackage::addChild( Part */*part*/, const Document *doc )
+bool WorkPackage::addChild( Part *part, const Document *doc )
{
DocumentChild *ch = findChild( doc );
if ( ch ) {
@@ -295,7 +295,7 @@
return nwritten == (int)s.size();
}
-bool WorkPackage::saveNativeFormat( Part */*part*/, const QString &path )
+bool WorkPackage::saveNativeFormat( Part *part, const QString &path )
{
if ( path.isEmpty() ) {
KMessageBox::error( 0, i18n("Cannot save to empty filename") );
_____________________
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
