From 8b692b24ac1b817bbefa0dc64d4da117fa079992 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 6 Jan 2009 19:12:26 +0000 Subject: 1st round of compilation fixes for mingw git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2977 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/kvirc/module/kvi_module.h | 16 +++++++++++++++- src/modules/iograph/libkviiograph.cpp | 6 +++--- src/modules/mediaplayer/mp_winampinterface.cpp | 6 +++++- src/modules/notifier/notifierwindow.cpp | 2 +- src/modules/notifier/notifierwindowprogressbar.cpp | 4 ++-- src/modules/objects/class_lcd.cpp | 2 +- src/modules/perl/libkviperl.cpp | 2 +- src/modules/perlcore/libkviperlcore.cpp | 2 +- src/modules/reguser/dialog.cpp | 2 +- 9 files changed, 30 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/kvi_module.h index b8ebad8ea..44638d7e4 100644 --- a/src/kvirc/module/kvi_module.h +++ b/src/kvirc/module/kvi_module.h @@ -43,7 +43,7 @@ #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #define KVIMODULEEXPORT extern "C" __declspec(dllexport) - #define KVIMODULEEXPORTDATA KVIMODULEEXPORT + #define KVIMODULEEXPORTDATA #define KVIMODULEEXPORTFUNC KVIMODULEEXPORT #else #define KVIMODULEEXPORT extern "C" @@ -125,6 +125,20 @@ typedef struct _KviModuleInfo _cleanup_routine \ }; +#define KVIRC_MODULE_EXTERN(_szModuleName,_szVersion,_szCopyright,_szDescription,_init_routine,_can_unload,_ctrl_routine,_cleanup_routine) \ + \ + KVIMODULEEXPORT KviModuleInfo KVIrc_module_info= \ + { \ + KVI_VERSION, \ + _szModuleName, \ + _szVersion, \ + _szCopyright, \ + _szDescription, \ + _init_routine, \ + _can_unload, \ + _ctrl_routine, \ + _cleanup_routine \ + }; class KVIRC_API KviModule : public KviKvsModuleInterface { diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 64f698bcf..c273435f6 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -187,16 +187,16 @@ void KviIOGraphWidget::paintEvent(QPaintEvent *) for(int i=0;i<=KVI_IOGRAPH_HORIZ_SEGMENTS;i++) { - p.drawLine(0, c, width(), c); + p.drawLine(0, (int)c, width(), (int)c); if(i>0) - p.drawText(2,c,KviQString::makeSizeReadable(m_maxRate * (KVI_IOGRAPH_HORIZ_SEGMENTS - i) / KVI_IOGRAPH_HORIZ_SEGMENTS)); + p.drawText(2,(int)c,KviQString::makeSizeReadable(m_maxRate * (KVI_IOGRAPH_HORIZ_SEGMENTS - i) / KVI_IOGRAPH_HORIZ_SEGMENTS)); c+=sh; } c=1; for(int i=0;i<=KVI_IOGRAPH_VERT_SEGMENTS;i++) { - p.drawLine(c, 0, c, height()); + p.drawLine((int)c, 0, (int)c, height()); c+=sw; } diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp index 686b176e8..90018ae36 100644 --- a/src/modules/mediaplayer/mp_winampinterface.cpp +++ b/src/modules/mediaplayer/mp_winampinterface.cpp @@ -403,7 +403,11 @@ int KviWinampInterface::getVol() { int ret = -1; HWND hWinamp = find_winamp(this); - if(hWinamp)ret = SendMessage(hWinamp,WM_USER,-666,IPC_SETVOLUME); +#if defined(COMPILE_ON_MINGW) + if(hWinamp)ret = SendMessage(hWinamp,WM_USER,666,IPC_SETVOLUME); +#else + if(hWinamp)ret = SendMessage(hWinamp,WM_USER,-666,IPC_SETVOLUME); +#endif return ret; } diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index f53058d61..fae1197f2 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -703,7 +703,7 @@ void KviNotifierWindow::redrawText() KviNotifierMessage * m = cur; while(m && (y > m_pWndBody->textRect().y())) { - int iHeight = m->text()->size().height(); + int iHeight = (int) m->text()->size().height(); if(iHeight < 18)iHeight = 18; y -= iHeight; if(m->historic()) diff --git a/src/modules/notifier/notifierwindowprogressbar.cpp b/src/modules/notifier/notifierwindowprogressbar.cpp index 8b916a530..76d624011 100644 --- a/src/modules/notifier/notifierwindowprogressbar.cpp +++ b/src/modules/notifier/notifierwindowprogressbar.cpp @@ -41,9 +41,9 @@ void KviNotifierWindowProgressBar::draw(QPainter *p) p->fillRect( QRect( m_rect.x()+1, - m_rect.y()+1 + m_rect.height() * (1 - m_dProgress), + (int) (m_rect.y()+1 + m_rect.height() * (1 - m_dProgress)), m_rect.width() - 2, - (m_rect.height() - 2) * m_dProgress + (int) ((m_rect.height() - 2) * m_dProgress) ), QColor(175, 28, 95) ); diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp index 29dc29e7e..cc2a5756b 100644 --- a/src/modules/objects/class_lcd.cpp +++ b/src/modules/objects/class_lcd.cpp @@ -164,7 +164,7 @@ KVSO_CLASS_FUNCTION(lcd,setNumDigits) KVSO_PARAMETERS_BEGIN(c) KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit) KVSO_PARAMETERS_END(c) - ((QLCDNumber *)widget())->setNumDigits(digit); + ((QLCDNumber *)widget())->setNumDigits((int)digit); return true; } diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp index 96be07ae2..9e0486e1d 100644 --- a/src/modules/perl/libkviperl.cpp +++ b/src/modules/perl/libkviperl.cpp @@ -586,7 +586,7 @@ static bool perl_module_cleanup(KviModule *m) return true; } -KVIRC_MODULE( +KVIRC_MODULE_EXTERN( "Perl", // module name "4.0.0", // module version "Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp index 0804531c6..a2aac1321 100644 --- a/src/modules/perlcore/libkviperlcore.cpp +++ b/src/modules/perlcore/libkviperlcore.cpp @@ -411,7 +411,7 @@ static bool perlcore_module_can_unload(KviModule * m) return true; } -KVIRC_MODULE( +KVIRC_MODULE_EXTERN( "PerlCore", // module name "4.0.0", // module version "Copyright (C) 2008 Szymon Stefanek (pragma at kvirc dot net)", // author & (C) diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index fef65fb99..941524d32 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -200,7 +200,7 @@ QSize KviRegisteredUsersDialogItemDelegate::sizeHint( const QStyleOptionViewItem //users // KviRegisteredUsersDialogItem *it=(KviRegisteredUsersDialogItem*)item; - return QSize(300, LVI_ICON_SIZE+2.0*LVI_BORDER); + return QSize(300, (int) LVI_ICON_SIZE+2.0*LVI_BORDER); } } -- cgit v1.3.1-10-gc9f91