sorry, habe die Anhänge nicht mitgeschickt.
Gruß
Martin
diff -urB
aqbanking-3.99.7rc1.orig/src/frontends/qbanking/lib/gui/qguiprogresswidget.h
aqbanking-3.99.7rc1/src/frontends/qbanking/lib/gui/qguiprogresswidget.h
---
aqbanking-3.99.7rc1.orig/src/frontends/qbanking/lib/gui/qguiprogresswidget.h
2008-10-03 18:41:22.000000000 +0200
+++ aqbanking-3.99.7rc1/src/frontends/qbanking/lib/gui/qguiprogresswidget.h
2009-01-25 09:36:19.734126987 +0100
@@ -19,6 +19,7 @@
#include <gwenhywfar/gui.h>
#include <time.h>
+#include <list>
#define QGUI_PROGRESS_SHOWTIMEOUT 5
diff -urB
aqbanking-3.99.7rc1.orig/src/plugins/backends/aqhbci/ui/qt3/qt3_debug/qt3_debug.cpp
aqbanking-3.99.7rc1/src/plugins/backends/aqhbci/ui/qt3/qt3_debug/qt3_debug.cpp
---
aqbanking-3.99.7rc1.orig/src/plugins/backends/aqhbci/ui/qt3/qt3_debug/qt3_debug.cpp
2008-10-03 18:41:22.000000000 +0200
+++
aqbanking-3.99.7rc1/src/plugins/backends/aqhbci/ui/qt3/qt3_debug/qt3_debug.cpp
2009-01-25 11:16:28.603747996 +0100
@@ -22,6 +22,7 @@
#include <gwenhywfar/logger.h>
#include <gwenhywfar/debug.h>
+#include <gwenhywfar/gwenhywfar.h>
#include <stdio.h>
@@ -36,6 +37,39 @@
int result;
string hdir;
QTranslator translator(0);
+
+ // stuff needed for Sun Studio Express Compiler
+ #if defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+ int err;
+ err=GWEN_Init();
+ if (err) {
+ fprintf(stderr, "ERROR: could not initialize GWEN errorcode=%d!!\n" ,
err);
+ return 1;
+ }
+ else
+ fprintf(stderr, "GWEN_Init()called\n");
+ // create logdomain 0=default if not existant
+ if (!GWEN_Logger_IsOpen(0)) {
+ err=GWEN_Logger_Open(0, "qt3dbg", 0, GWEN_LoggerType_Console,
GWEN_LoggerFacility_User);
+ if (err) {
+ fprintf(stderr, "ERROR: could not create logdomain 0\n");
+ return 2;
+ }
+ else
+ fprintf(stderr, "logdomain 0 is not open --> logdomain 0 opened\n");
+ }
+ // create logdomain aqbanking if not existant
+ if (!GWEN_Logger_IsOpen("aqbanking")) {
+ err=GWEN_Logger_Open("aqbanking", "aqbanking", 0,
GWEN_LoggerType_Console, GWEN_LoggerFacility_User);
+ if (err) {
+ fprintf(stderr, "ERROR: could not create logdomain aqbanking\n");
+ return 2;
+ }
+ else
+ fprintf(stderr, "logdomain aqbanking is not open --> logdomain
aqbanking opened\n");
+ } //if
+ GWEN_Logger_SetLevel("aqbanking", GWEN_LoggerLevel_Notice);
+ #endif
GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Notice);
//GWEN_Logger_SetLevel(GWEN_LOGDOMAIN, GWEN_LoggerLevelNotice);
diff -urB aqbanking-3.99.7rc1.orig/system.h aqbanking-3.99.7rc1/system.h
--- aqbanking-3.99.7rc1.orig/system.h 2009-01-22 00:10:26.000000000 +0100
+++ aqbanking-3.99.7rc1/system.h 2009-01-25 11:14:32.113795989 +0100
@@ -15,7 +15,7 @@
#define AQBANKING_SYSTEM_H
#define AQBANKING_SYS_IS_WINDOWS 0
-#define AQBANKING_SYSTEM "linux"
+#define AQBANKING_SYSTEM "unknown"
#endif
diff -urB gwenhywfar-3.7.0.orig/src/base/debug.c
gwenhywfar-3.7.0/src/base/debug.c
--- gwenhywfar-3.7.0.orig/src/base/debug.c 2008-07-31 19:56:06.000000000
+0200
+++ gwenhywfar-3.7.0/src/base/debug.c 2009-01-24 18:14:00.445627893 +0100
@@ -314,7 +314,7 @@
va_start(args, format);
vsnprintf(dbg_buffer, sizeof(dbg_buffer)-1, format, args);
dbg_buffer[sizeof(dbg_buffer)-1] = 0;
- GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevelError, dbg_buffer);
+ GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Error, dbg_buffer);
va_end(args);
}
@@ -324,43 +324,43 @@
va_start(args, format);
vsnprintf(dbg_buffer, sizeof(dbg_buffer)-1, format, args);
dbg_buffer[sizeof(dbg_buffer)-1] = 0;
- GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevelWarning, dbg_buffer);
+ GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Warning, dbg_buffer);
va_end(args);
}
void DBG_NOTICE(const char *dbg_logger, const char *format, ...) {
- if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevelNotice) {
+ if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Notice) {
va_list args;
char dbg_buffer[256];
va_start(args, format);
vsnprintf(dbg_buffer, sizeof(dbg_buffer)-1, format, args);
dbg_buffer[sizeof(dbg_buffer)-1] = 0;
- GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevelNotice, dbg_buffer);
+ GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Notice, dbg_buffer);
va_end(args);
}
}
void DBG_INFO(const char *dbg_logger, const char *format, ...) {
- if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevelInfo) {
+ if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Info) {
va_list args;
char dbg_buffer[256];
va_start(args, format);
vsnprintf(dbg_buffer, sizeof(dbg_buffer)-1, format, args);
dbg_buffer[sizeof(dbg_buffer)-1] = 0;
- GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevelInfo, dbg_buffer);
+ GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Info, dbg_buffer);
va_end(args);
}
}
void DBG_DEBUG(const char *dbg_logger, const char *format, ...) {
# ifndef DISABLE_DEBUGLOG
- if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevelDebug) {
+ if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Debug) {
va_list args;
char dbg_buffer[256];
va_start(args, format);
vsnprintf(dbg_buffer, sizeof(dbg_buffer)-1, format, args);
dbg_buffer[sizeof(dbg_buffer)-1] = 0;
- GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevelDebug, dbg_buffer);
+ GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Debug, dbg_buffer);
va_end(args);
}
# endif /* DISABLE_DEBUGLOG */
@@ -368,13 +368,13 @@
void DBG_VERBOUS(const char *dbg_logger, const char *format, ...) {
# ifndef DISABLE_DEBUGLOG
- if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevelVerbous) {
+ if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Verbous) {
va_list args;
char dbg_buffer[256];
va_start(args, format);
vsnprintf(dbg_buffer, sizeof(dbg_buffer)-1, format, args);
dbg_buffer[sizeof(dbg_buffer)-1] = 0;
- GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevelVerbous, dbg_buffer);
+ GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Verbous, dbg_buffer);
va_end(args);
}
# endif /* DISABLE_DEBUGLOG */
diff -urB gwenhywfar-3.7.0.orig/src/base/debug.h
gwenhywfar-3.7.0/src/base/debug.h
--- gwenhywfar-3.7.0.orig/src/base/debug.h 2008-07-31 19:56:06.000000000
+0200
+++ gwenhywfar-3.7.0/src/base/debug.h 2009-01-25 18:11:30.708390312 +0100
@@ -94,11 +94,11 @@
const char *fmt, ...);
#ifndef NO_VARIADIC_MACROS
-# define DBG_ERROR(dbg_logger, format, args...) if (1){\
- char dbg_buffer[256]; \
- snprintf(dbg_buffer, sizeof(dbg_buffer)-1,\
- __FILE__":%5d: " format , __LINE__ , ## args); \
- dbg_buffer[sizeof(dbg_buffer)-1]=0; \
+# define DBG_ERROR(dbg_logger, args...) if (1){\
+ char dbg_buffer[256], dbg_err[256]; \
+ snprintf(dbg_err,sizeof(dbg_err)-1,##args); dbg_err[sizeof(dbg_err)-1]=0; \
+ snprintf(dbg_buffer,sizeof(dbg_buffer)-1,"%s:%5d
%s",__FILE__,__LINE__,dbg_err); \
+ dbg_buffer[sizeof(dbg_buffer)-1]=0; \
GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Error, dbg_buffer);};
#else /* #ifndef NO_VARIADIC_MACROS */
GWENHYWFAR_API
@@ -115,11 +115,12 @@
GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Error, dbg_buffer);};
#ifndef NO_VARIADIC_MACROS
-# define DBG_WARN(dbg_logger, format, args...) {\
- char dbg_buffer[256]; \
- snprintf(dbg_buffer, sizeof(dbg_buffer)-1,\
- __FILE__":%5d: " format , __LINE__ , ## args); \
- dbg_buffer[sizeof(dbg_buffer)-1]=0; \
+# define DBG_WARN(dbg_logger, args...) \
+ if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Warning) {\
+ char dbg_buffer[256], dbg_err[256]; \
+ snprintf(dbg_err,sizeof(dbg_err)-1,##args); dbg_err[sizeof(dbg_err)-1]=0; \
+ snprintf(dbg_buffer,sizeof(dbg_buffer)-1,"%s:%5d
%s",__FILE__,__LINE__,dbg_err); \
+ dbg_buffer[sizeof(dbg_buffer)-1]=0; \
GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Warning, dbg_buffer);};
#else /* #ifndef NO_VARIADIC_MACROS */
GWENHYWFAR_API
@@ -137,12 +138,12 @@
#ifndef NO_VARIADIC_MACROS
-# define DBG_NOTICE(dbg_logger, format, args...) \
+# define DBG_NOTICE(dbg_logger, args...) \
if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Notice) {\
- char dbg_buffer[256]; \
- snprintf(dbg_buffer, sizeof(dbg_buffer)-1,\
- __FILE__":%5d: " format , __LINE__ , ## args); \
- dbg_buffer[sizeof(dbg_buffer)-1]=0; \
+ char dbg_buffer[256], dbg_err[256]; \
+ snprintf(dbg_err,sizeof(dbg_err)-1,##args); dbg_err[sizeof(dbg_err)-1]=0; \
+ snprintf(dbg_buffer,sizeof(dbg_buffer)-1,"%s:%5d
%s",__FILE__,__LINE__,dbg_err); \
+ dbg_buffer[sizeof(dbg_buffer)-1]=0; \
GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Notice, dbg_buffer);};
#else /* #ifndef NO_VARIADIC_MACROS */
GWENHYWFAR_API
@@ -161,12 +162,12 @@
#ifndef NO_VARIADIC_MACROS
-# define DBG_INFO(dbg_logger, format, args...) \
+# define DBG_INFO(dbg_logger, args...) \
if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Info) {\
- char dbg_buffer[256]; \
- snprintf(dbg_buffer, sizeof(dbg_buffer)-1,\
- __FILE__":%5d: " format , __LINE__ , ## args); \
- dbg_buffer[sizeof(dbg_buffer)-1]=0; \
+ char dbg_buffer[256], dbg_err[256]; \
+ snprintf(dbg_err,sizeof(dbg_err)-1,##args); dbg_err[sizeof(dbg_err)-1]=0; \
+ snprintf(dbg_buffer,sizeof(dbg_buffer)-1,"%s:%5d
%s",__FILE__,__LINE__,dbg_err); \
+ dbg_buffer[sizeof(dbg_buffer)-1]=0; \
GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Info, dbg_buffer);};
#else /* #ifndef NO_VARIADIC_MACROS */
GWENHYWFAR_API
@@ -189,20 +190,20 @@
#ifndef DISABLE_DEBUGLOG
# ifndef NO_VARIADIC_MACROS
-# define DBG_DEBUG(dbg_logger, format, args...) \
+# define DBG_DEBUG(dbg_logger, args...) \
if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Debug) {\
- char dbg_buffer[256]; \
- snprintf(dbg_buffer, sizeof(dbg_buffer)-1,\
- __FILE__":%5d: " format , __LINE__ , ## args); \
- dbg_buffer[sizeof(dbg_buffer)-1]=0; \
+ char dbg_buffer[256], dbg_err[256]; \
+ snprintf(dbg_err,sizeof(dbg_err)-1,##args); dbg_err[sizeof(dbg_err)-1]=0; \
+ snprintf(dbg_buffer,sizeof(dbg_buffer)-1,"%s:%5d
%s",__FILE__,__LINE__,dbg_err); \
+ dbg_buffer[sizeof(dbg_buffer)-1]=0; \
GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Debug, dbg_buffer);};
-# define DBG_VERBOUS(dbg_logger, format, args...) \
+# define DBG_VERBOUS(dbg_logger, args...) \
if (GWEN_Logger_GetLevel(dbg_logger)>=GWEN_LoggerLevel_Verbous) {\
- char dbg_buffer[256]; \
- snprintf(dbg_buffer, sizeof(dbg_buffer)-1,\
- __FILE__":%5d: " format , __LINE__ , ## args); \
- dbg_buffer[sizeof(dbg_buffer)-1]=0; \
+ char dbg_buffer[256], dbg_err[256]; \
+ snprintf(dbg_err,sizeof(dbg_err)-1,##args); dbg_err[sizeof(dbg_err)-1]=0; \
+ snprintf(dbg_buffer,sizeof(dbg_buffer)-1,"%s:%5d
%s",__FILE__,__LINE__,dbg_err); \
+ dbg_buffer[sizeof(dbg_buffer)-1]=0; \
GWEN_Logger_Log(dbg_logger, GWEN_LoggerLevel_Verbous, dbg_buffer);};
# endif /* #ifndef NO_VARIADIC_MACROS */
@@ -231,8 +232,8 @@
#else
# ifndef NO_VARIADIC_MACROS
-# define DBG_DEBUG(dbg_logger, format, args...)
-# define DBG_VERBOUS(dbg_logger, format, args...)
+# define DBG_DEBUG(dbg_logger, args...)
+# define DBG_VERBOUS(dbg_logger, args...)
# endif /* ifndef NO_VARIADIC_MACROS */
# define DBG_DEBUG_ERR(dbg_logger, dbg_err)
diff -urB gwenhywfar-3.7.0.orig/src/gui/gui.c gwenhywfar-3.7.0/src/gui/gui.c
--- gwenhywfar-3.7.0.orig/src/gui/gui.c 2008-07-31 19:56:06.000000000 +0200
+++ gwenhywfar-3.7.0/src/gui/gui.c 2009-01-24 18:36:49.195549711 +0100
@@ -339,7 +339,8 @@
void GWEN_Gui_HideBox(uint32_t id) {
if (gwenhywfar_gui && gwenhywfar_gui->hideBoxFn)
- return gwenhywfar_gui->hideBoxFn(gwenhywfar_gui, id);
+ // return gwenhywfar_gui->hideBoxFn(gwenhywfar_gui, id);
+ gwenhywfar_gui->hideBoxFn(gwenhywfar_gui, id);
}
diff -urB qbankmanager-0.9.51beta.orig/src/kbanking/libs/kbanking.cpp
qbankmanager-0.9.51beta/src/kbanking/libs/kbanking.cpp
--- qbankmanager-0.9.51beta.orig/src/kbanking/libs/kbanking.cpp 2008-10-04
01:31:10.000000000 +0200
+++ qbankmanager-0.9.51beta/src/kbanking/libs/kbanking.cpp 2009-01-01
21:33:04.038769495 +0100
@@ -1362,7 +1362,7 @@
Account *acc;
b=EditTransaction::createDatedTransfer(this, t,
- tr("New Dated Transfer"),
+ QWidget::tr("New Dated Transfer"),
parent, true);
if (!b) {
DBG_INFO(0, "User aborted");
@@ -1393,11 +1393,11 @@
if (!ba) {
DBG_ERROR(0, "Account not available");
QMessageBox::critical(parent,
- tr("Account Not Available"),
- tr("The account you requested is not "
+ QWidget::tr("Account Not Available"),
+ QWidget::tr("The account you requested is not "
"available\n"
"with any backend."),
- tr("Dismiss"), QString::null);
+ QWidget::tr("Dismiss"), QString::null);
return -1;
}
@@ -1407,11 +1407,11 @@
if (rv) {
DBG_NOTICE(0, "Job is not available (%d)", rv);
QMessageBox::critical(parent,
- tr("Job Not Available"),
- tr("The job you requested is not "
+ QWidget::tr("Job Not Available"),
+ QWidget::tr("The job you requested is not "
"available with\n"
"the backend which handles parent account.\n"),
- tr("Dismiss"), QString::null);
+ QWidget::tr("Dismiss"), QString::null);
AB_Job_free(job);
return -1;
}
@@ -1425,8 +1425,8 @@
case AB_BankInfoCheckResult_NotOk:
DBG_INFO(0, "Account check result: %d", res);
i=QMessageBox::warning(parent,
- tr("Warning"),
- tr("<qt>"
+ QWidget::tr("Warning"),
+ QWidget::tr("<qt>"
"<p>"
"The given bank code and account number "
"combination is invalid."
@@ -1446,8 +1446,8 @@
case AB_BankInfoCheckResult_UnknownBank:
DBG_INFO(0, "Account check result: %d", res);
i=QMessageBox::warning(parent,
- tr("Warning"),
- tr("<qt>"
+ QWidget::tr("Warning"),
+ QWidget::tr("<qt>"
"<p>"
"The given bank code is invalid."
"</p>"
@@ -1483,8 +1483,8 @@
if (rv) {
DBG_NOTICE(0, "Could not set transfer (%d)", rv);
int res = QMessageBox::critical(parent,
- tr("Bad Transfer Data"),
- tr("<qt>"
+ QWidget::tr("Bad Transfer Data"),
+ QWidget::tr("<qt>"
"<p>"
"There seems to be some errors "
"in the dated transfer data."
diff -urB qbankmanager-0.9.51beta.orig/src/kbanking/libs/mainwindow.cpp
qbankmanager-0.9.51beta/src/kbanking/libs/mainwindow.cpp
--- qbankmanager-0.9.51beta.orig/src/kbanking/libs/mainwindow.cpp
2008-11-07 22:09:06.000000000 +0100
+++ qbankmanager-0.9.51beta/src/kbanking/libs/mainwindow.cpp 2009-01-02
01:53:15.421190199 +0100
@@ -38,6 +38,9 @@
#include <qbanking/qbimporter.h>
#include <qbanking/qbprocesswatcher.h>
#include <qbanking/qbcfgtabsettings.h>
+// added to prove that QWidget is a parent of QBCfgTabSettings
+// #include <qbanking/qbcfgtab.h>
+// #include <qbanking/qbcfgtab.ui.h>
#include <qtabwidget.h>
#include <qpopupmenu.h>
@@ -618,7 +621,7 @@
QBCfgTabSettings dlg(_app, this, "QBankingSettings");
CfgTabPageSettingsQbm *qbmSettings;
- qbmSettings=new CfgTabPageSettingsQbm(_app, &dlg);
+ qbmSettings=new CfgTabPageSettingsQbm(_app, (QWidget*) &dlg);
dlg.addPage(qbmSettings);
dlg.addUsersPage();
dlg.addAccountsPage();
diff -urB qbankmanager-0.9.51beta.orig/src/kbanking/libs/prg/app.cpp
qbankmanager-0.9.51beta/src/kbanking/libs/prg/app.cpp
--- qbankmanager-0.9.51beta.orig/src/kbanking/libs/prg/app.cpp 2008-11-07
22:07:06.000000000 +0100
+++ qbankmanager-0.9.51beta/src/kbanking/libs/prg/app.cpp 2009-01-01
22:57:45.729091639 +0100
@@ -28,6 +28,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+// required by close(fd)
+#include <unistd.h>
+
#include <string.h>
#include <errno.h>
#include <ctype.h>
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Aqbanking-devel mailing list
Aqbanking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/aqbanking-devel
