1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-26 00:55:14 +00:00

Fix build with gcc 3.4

Submitted by:	Andy Fawcett <andy@athame.co.uk>
Approved by:	portmgr (will)
		Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer)
This commit is contained in:
Markus Brueffer 2004-09-04 12:25:05 +00:00
parent 80441fd488
commit 1b7e47de71
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=118109
39 changed files with 447 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- ./acquireimages/plugin_acquireimages.cpp.orig Sat Sep 4 11:32:24 2004
+++ ./acquireimages/plugin_acquireimages.cpp Sat Sep 4 11:32:45 2004
@@ -40,7 +40,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_acquireimages,
- KGenericFactory<Plugin_AcquireImages>("digikam"));
+ KGenericFactory<Plugin_AcquireImages>("digikam"))
// -----------------------------------------------------------
Plugin_AcquireImages::Plugin_AcquireImages(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./acquireimages/screenshotdialog.cpp.orig Sat Sep 4 11:33:39 2004
+++ ./acquireimages/screenshotdialog.cpp Sat Sep 4 11:33:48 2004
@@ -116,7 +116,7 @@
m_delay->setValue(m_config->readNumEntry("Delay", 1));
delete m_config;
-};
+}
//////////////////////////////////// DESTRUCTOR /////////////////////////////////////////////

View File

@ -0,0 +1,11 @@
--- ./cdarchiving/plugin_cdarchiving.cpp.orig Sat Sep 4 11:34:46 2004
+++ ./cdarchiving/plugin_cdarchiving.cpp Sat Sep 4 11:34:56 2004
@@ -32,7 +32,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_cdarchiving,
- KGenericFactory<Plugin_CDArchiving>("digikam"));
+ KGenericFactory<Plugin_CDArchiving>("digikam"))
// -----------------------------------------------------------
Plugin_CDArchiving::Plugin_CDArchiving(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./commentseditor/plugin_commentseditor.cpp.orig Sat Sep 4 11:36:04 2004
+++ ./commentseditor/plugin_commentseditor.cpp Sat Sep 4 11:36:12 2004
@@ -34,7 +34,7 @@
#include "commentseditor.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_commentseditor,
- KGenericFactory<Plugin_CommentsEditor>("digikam"));
+ KGenericFactory<Plugin_CommentsEditor>("digikam"))
Plugin_CommentsEditor::Plugin_CommentsEditor(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./imagesgallery/plugin_imagesgallery.cpp.orig Sat Sep 4 11:37:02 2004
+++ ./imagesgallery/plugin_imagesgallery.cpp Sat Sep 4 11:37:08 2004
@@ -32,7 +32,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_imagesgallery,
- KGenericFactory<Plugin_Imagesgallery>("digikam"));
+ KGenericFactory<Plugin_Imagesgallery>("digikam"))
// -----------------------------------------------------------
Plugin_Imagesgallery::Plugin_Imagesgallery(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./jpeglossless/plugin_jpeglossless.cpp.orig Sat Sep 4 11:38:19 2004
+++ ./jpeglossless/plugin_jpeglossless.cpp Sat Sep 4 11:38:26 2004
@@ -42,7 +42,7 @@
#include "plugin_jpeglossless.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_jpeglossless,
- KGenericFactory<Plugin_JPEGLossless>("digikam"));
+ KGenericFactory<Plugin_JPEGLossless>("digikam"))
/////////////////////////////////////////////////////////////////////////////////////////////////////

View File

@ -0,0 +1,11 @@
--- ./miscsoperations/plugin_miscsoperations.cpp.orig Sat Sep 4 11:39:39 2004
+++ ./miscsoperations/plugin_miscsoperations.cpp Sat Sep 4 11:39:46 2004
@@ -39,7 +39,7 @@
// plugin library and the second is the genericfactory templated from
// the class for your plugin
K_EXPORT_COMPONENT_FACTORY( digikamplugin_miscsoperations,
- KGenericFactory<Plugin_MiscsOperations>("digikam"));
+ KGenericFactory<Plugin_MiscsOperations>("digikam"))
Plugin_MiscsOperations::Plugin_MiscsOperations(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./mpegencoder/plugin_mpegencoder.cpp.orig Sat Sep 4 11:40:24 2004
+++ ./mpegencoder/plugin_mpegencoder.cpp Sat Sep 4 11:40:30 2004
@@ -37,7 +37,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_mpegencoder,
- KGenericFactory<Plugin_Mpegencoder>("digikam"));
+ KGenericFactory<Plugin_Mpegencoder>("digikam"))
// -----------------------------------------------------------

View File

@ -0,0 +1,11 @@
--- ./printwizard/plugin_printwizard.cpp.orig Sat Sep 4 11:42:03 2004
+++ ./printwizard/plugin_printwizard.cpp Sat Sep 4 11:42:15 2004
@@ -39,7 +39,7 @@
#include "frmprintwizard.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_printwizard,
- KGenericFactory<Plugin_PrintWizard>("digikam"));
+ KGenericFactory<Plugin_PrintWizard>("digikam"))
Plugin_PrintWizard::Plugin_PrintWizard(QObject *parent,
const char*,

View File

@ -0,0 +1,17 @@
--- ./printwizard/tphoto.cpp.orig Sat Sep 4 11:43:00 2004
+++ ./printwizard/tphoto.cpp Sat Sep 4 11:43:12 2004
@@ -86,12 +86,12 @@
int TPhoto::width()
{
return size().width();
-};
+}
int TPhoto::height()
{
return size().height();
-};
+}
bool paintOnePage(QPainter &p, QPtrList<TPhoto> photos, QPtrList<QRect> layouts,

View File

@ -0,0 +1,11 @@
--- ./rawconverter/plugin_rawconverter.cpp.orig Sat Sep 4 11:44:10 2004
+++ ./rawconverter/plugin_rawconverter.cpp Sat Sep 4 11:44:18 2004
@@ -45,7 +45,7 @@
#include "batchdialog.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_rawconverter,
- KGenericFactory<Plugin_RawConverter>("digikam"));
+ KGenericFactory<Plugin_RawConverter>("digikam"))
Plugin_RawConverter::Plugin_RawConverter(QObject *parent,

View File

@ -0,0 +1,11 @@
--- ./sendimages/plugin_sendimages.cpp.orig Sat Sep 4 11:45:40 2004
+++ ./sendimages/plugin_sendimages.cpp Sat Sep 4 11:45:47 2004
@@ -41,7 +41,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_sendimages,
- KGenericFactory<Plugin_SendImages>("digikam"));
+ KGenericFactory<Plugin_SendImages>("digikam"))
// -----------------------------------------------------------
Plugin_SendImages::Plugin_SendImages(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./slideshow/plugin_slideshow.cpp.orig Sat Sep 4 11:46:53 2004
+++ ./slideshow/plugin_slideshow.cpp Sat Sep 4 11:47:01 2004
@@ -36,7 +36,7 @@
#include "slideshowconfig.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_slideshow,
- KGenericFactory<Plugin_SlideShow>("digikam"));
+ KGenericFactory<Plugin_SlideShow>("digikam"))
Plugin_SlideShow::Plugin_SlideShow(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./acquireimages/plugin_acquireimages.cpp.orig Sat Sep 4 11:32:24 2004
+++ ./acquireimages/plugin_acquireimages.cpp Sat Sep 4 11:32:45 2004
@@ -40,7 +40,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_acquireimages,
- KGenericFactory<Plugin_AcquireImages>("digikam"));
+ KGenericFactory<Plugin_AcquireImages>("digikam"))
// -----------------------------------------------------------
Plugin_AcquireImages::Plugin_AcquireImages(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./acquireimages/screenshotdialog.cpp.orig Sat Sep 4 11:33:39 2004
+++ ./acquireimages/screenshotdialog.cpp Sat Sep 4 11:33:48 2004
@@ -116,7 +116,7 @@
m_delay->setValue(m_config->readNumEntry("Delay", 1));
delete m_config;
-};
+}
//////////////////////////////////// DESTRUCTOR /////////////////////////////////////////////

View File

@ -0,0 +1,11 @@
--- ./cdarchiving/plugin_cdarchiving.cpp.orig Sat Sep 4 11:34:46 2004
+++ ./cdarchiving/plugin_cdarchiving.cpp Sat Sep 4 11:34:56 2004
@@ -32,7 +32,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_cdarchiving,
- KGenericFactory<Plugin_CDArchiving>("digikam"));
+ KGenericFactory<Plugin_CDArchiving>("digikam"))
// -----------------------------------------------------------
Plugin_CDArchiving::Plugin_CDArchiving(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./commentseditor/plugin_commentseditor.cpp.orig Sat Sep 4 11:36:04 2004
+++ ./commentseditor/plugin_commentseditor.cpp Sat Sep 4 11:36:12 2004
@@ -34,7 +34,7 @@
#include "commentseditor.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_commentseditor,
- KGenericFactory<Plugin_CommentsEditor>("digikam"));
+ KGenericFactory<Plugin_CommentsEditor>("digikam"))
Plugin_CommentsEditor::Plugin_CommentsEditor(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./imagesgallery/plugin_imagesgallery.cpp.orig Sat Sep 4 11:37:02 2004
+++ ./imagesgallery/plugin_imagesgallery.cpp Sat Sep 4 11:37:08 2004
@@ -32,7 +32,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_imagesgallery,
- KGenericFactory<Plugin_Imagesgallery>("digikam"));
+ KGenericFactory<Plugin_Imagesgallery>("digikam"))
// -----------------------------------------------------------
Plugin_Imagesgallery::Plugin_Imagesgallery(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./jpeglossless/plugin_jpeglossless.cpp.orig Sat Sep 4 11:38:19 2004
+++ ./jpeglossless/plugin_jpeglossless.cpp Sat Sep 4 11:38:26 2004
@@ -42,7 +42,7 @@
#include "plugin_jpeglossless.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_jpeglossless,
- KGenericFactory<Plugin_JPEGLossless>("digikam"));
+ KGenericFactory<Plugin_JPEGLossless>("digikam"))
/////////////////////////////////////////////////////////////////////////////////////////////////////

View File

@ -0,0 +1,11 @@
--- ./miscsoperations/plugin_miscsoperations.cpp.orig Sat Sep 4 11:39:39 2004
+++ ./miscsoperations/plugin_miscsoperations.cpp Sat Sep 4 11:39:46 2004
@@ -39,7 +39,7 @@
// plugin library and the second is the genericfactory templated from
// the class for your plugin
K_EXPORT_COMPONENT_FACTORY( digikamplugin_miscsoperations,
- KGenericFactory<Plugin_MiscsOperations>("digikam"));
+ KGenericFactory<Plugin_MiscsOperations>("digikam"))
Plugin_MiscsOperations::Plugin_MiscsOperations(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./mpegencoder/plugin_mpegencoder.cpp.orig Sat Sep 4 11:40:24 2004
+++ ./mpegencoder/plugin_mpegencoder.cpp Sat Sep 4 11:40:30 2004
@@ -37,7 +37,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_mpegencoder,
- KGenericFactory<Plugin_Mpegencoder>("digikam"));
+ KGenericFactory<Plugin_Mpegencoder>("digikam"))
// -----------------------------------------------------------

View File

@ -0,0 +1,11 @@
--- ./printwizard/plugin_printwizard.cpp.orig Sat Sep 4 11:42:03 2004
+++ ./printwizard/plugin_printwizard.cpp Sat Sep 4 11:42:15 2004
@@ -39,7 +39,7 @@
#include "frmprintwizard.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_printwizard,
- KGenericFactory<Plugin_PrintWizard>("digikam"));
+ KGenericFactory<Plugin_PrintWizard>("digikam"))
Plugin_PrintWizard::Plugin_PrintWizard(QObject *parent,
const char*,

View File

@ -0,0 +1,17 @@
--- ./printwizard/tphoto.cpp.orig Sat Sep 4 11:43:00 2004
+++ ./printwizard/tphoto.cpp Sat Sep 4 11:43:12 2004
@@ -86,12 +86,12 @@
int TPhoto::width()
{
return size().width();
-};
+}
int TPhoto::height()
{
return size().height();
-};
+}
bool paintOnePage(QPainter &p, QPtrList<TPhoto> photos, QPtrList<QRect> layouts,

View File

@ -0,0 +1,11 @@
--- ./rawconverter/plugin_rawconverter.cpp.orig Sat Sep 4 11:44:10 2004
+++ ./rawconverter/plugin_rawconverter.cpp Sat Sep 4 11:44:18 2004
@@ -45,7 +45,7 @@
#include "batchdialog.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_rawconverter,
- KGenericFactory<Plugin_RawConverter>("digikam"));
+ KGenericFactory<Plugin_RawConverter>("digikam"))
Plugin_RawConverter::Plugin_RawConverter(QObject *parent,

View File

@ -0,0 +1,11 @@
--- ./sendimages/plugin_sendimages.cpp.orig Sat Sep 4 11:45:40 2004
+++ ./sendimages/plugin_sendimages.cpp Sat Sep 4 11:45:47 2004
@@ -41,7 +41,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_sendimages,
- KGenericFactory<Plugin_SendImages>("digikam"));
+ KGenericFactory<Plugin_SendImages>("digikam"))
// -----------------------------------------------------------
Plugin_SendImages::Plugin_SendImages(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./slideshow/plugin_slideshow.cpp.orig Sat Sep 4 11:46:53 2004
+++ ./slideshow/plugin_slideshow.cpp Sat Sep 4 11:47:01 2004
@@ -36,7 +36,7 @@
#include "slideshowconfig.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_slideshow,
- KGenericFactory<Plugin_SlideShow>("digikam"));
+ KGenericFactory<Plugin_SlideShow>("digikam"))
Plugin_SlideShow::Plugin_SlideShow(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./acquireimages/plugin_acquireimages.cpp.orig Sat Sep 4 11:32:24 2004
+++ ./acquireimages/plugin_acquireimages.cpp Sat Sep 4 11:32:45 2004
@@ -40,7 +40,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_acquireimages,
- KGenericFactory<Plugin_AcquireImages>("digikam"));
+ KGenericFactory<Plugin_AcquireImages>("digikam"))
// -----------------------------------------------------------
Plugin_AcquireImages::Plugin_AcquireImages(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./acquireimages/screenshotdialog.cpp.orig Sat Sep 4 11:33:39 2004
+++ ./acquireimages/screenshotdialog.cpp Sat Sep 4 11:33:48 2004
@@ -116,7 +116,7 @@
m_delay->setValue(m_config->readNumEntry("Delay", 1));
delete m_config;
-};
+}
//////////////////////////////////// DESTRUCTOR /////////////////////////////////////////////

View File

@ -0,0 +1,11 @@
--- ./cdarchiving/plugin_cdarchiving.cpp.orig Sat Sep 4 11:34:46 2004
+++ ./cdarchiving/plugin_cdarchiving.cpp Sat Sep 4 11:34:56 2004
@@ -32,7 +32,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_cdarchiving,
- KGenericFactory<Plugin_CDArchiving>("digikam"));
+ KGenericFactory<Plugin_CDArchiving>("digikam"))
// -----------------------------------------------------------
Plugin_CDArchiving::Plugin_CDArchiving(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./commentseditor/plugin_commentseditor.cpp.orig Sat Sep 4 11:36:04 2004
+++ ./commentseditor/plugin_commentseditor.cpp Sat Sep 4 11:36:12 2004
@@ -34,7 +34,7 @@
#include "commentseditor.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_commentseditor,
- KGenericFactory<Plugin_CommentsEditor>("digikam"));
+ KGenericFactory<Plugin_CommentsEditor>("digikam"))
Plugin_CommentsEditor::Plugin_CommentsEditor(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./imagesgallery/plugin_imagesgallery.cpp.orig Sat Sep 4 11:37:02 2004
+++ ./imagesgallery/plugin_imagesgallery.cpp Sat Sep 4 11:37:08 2004
@@ -32,7 +32,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_imagesgallery,
- KGenericFactory<Plugin_Imagesgallery>("digikam"));
+ KGenericFactory<Plugin_Imagesgallery>("digikam"))
// -----------------------------------------------------------
Plugin_Imagesgallery::Plugin_Imagesgallery(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./jpeglossless/plugin_jpeglossless.cpp.orig Sat Sep 4 11:38:19 2004
+++ ./jpeglossless/plugin_jpeglossless.cpp Sat Sep 4 11:38:26 2004
@@ -42,7 +42,7 @@
#include "plugin_jpeglossless.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_jpeglossless,
- KGenericFactory<Plugin_JPEGLossless>("digikam"));
+ KGenericFactory<Plugin_JPEGLossless>("digikam"))
/////////////////////////////////////////////////////////////////////////////////////////////////////

View File

@ -0,0 +1,11 @@
--- ./miscsoperations/plugin_miscsoperations.cpp.orig Sat Sep 4 11:39:39 2004
+++ ./miscsoperations/plugin_miscsoperations.cpp Sat Sep 4 11:39:46 2004
@@ -39,7 +39,7 @@
// plugin library and the second is the genericfactory templated from
// the class for your plugin
K_EXPORT_COMPONENT_FACTORY( digikamplugin_miscsoperations,
- KGenericFactory<Plugin_MiscsOperations>("digikam"));
+ KGenericFactory<Plugin_MiscsOperations>("digikam"))
Plugin_MiscsOperations::Plugin_MiscsOperations(QObject *parent,
const char*,

View File

@ -0,0 +1,11 @@
--- ./mpegencoder/plugin_mpegencoder.cpp.orig Sat Sep 4 11:40:24 2004
+++ ./mpegencoder/plugin_mpegencoder.cpp Sat Sep 4 11:40:30 2004
@@ -37,7 +37,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_mpegencoder,
- KGenericFactory<Plugin_Mpegencoder>("digikam"));
+ KGenericFactory<Plugin_Mpegencoder>("digikam"))
// -----------------------------------------------------------

View File

@ -0,0 +1,11 @@
--- ./printwizard/plugin_printwizard.cpp.orig Sat Sep 4 11:42:03 2004
+++ ./printwizard/plugin_printwizard.cpp Sat Sep 4 11:42:15 2004
@@ -39,7 +39,7 @@
#include "frmprintwizard.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_printwizard,
- KGenericFactory<Plugin_PrintWizard>("digikam"));
+ KGenericFactory<Plugin_PrintWizard>("digikam"))
Plugin_PrintWizard::Plugin_PrintWizard(QObject *parent,
const char*,

View File

@ -0,0 +1,17 @@
--- ./printwizard/tphoto.cpp.orig Sat Sep 4 11:43:00 2004
+++ ./printwizard/tphoto.cpp Sat Sep 4 11:43:12 2004
@@ -86,12 +86,12 @@
int TPhoto::width()
{
return size().width();
-};
+}
int TPhoto::height()
{
return size().height();
-};
+}
bool paintOnePage(QPainter &p, QPtrList<TPhoto> photos, QPtrList<QRect> layouts,

View File

@ -0,0 +1,11 @@
--- ./rawconverter/plugin_rawconverter.cpp.orig Sat Sep 4 11:44:10 2004
+++ ./rawconverter/plugin_rawconverter.cpp Sat Sep 4 11:44:18 2004
@@ -45,7 +45,7 @@
#include "batchdialog.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_rawconverter,
- KGenericFactory<Plugin_RawConverter>("digikam"));
+ KGenericFactory<Plugin_RawConverter>("digikam"))
Plugin_RawConverter::Plugin_RawConverter(QObject *parent,

View File

@ -0,0 +1,11 @@
--- ./sendimages/plugin_sendimages.cpp.orig Sat Sep 4 11:45:40 2004
+++ ./sendimages/plugin_sendimages.cpp Sat Sep 4 11:45:47 2004
@@ -41,7 +41,7 @@
K_EXPORT_COMPONENT_FACTORY( digikamplugin_sendimages,
- KGenericFactory<Plugin_SendImages>("digikam"));
+ KGenericFactory<Plugin_SendImages>("digikam"))
// -----------------------------------------------------------
Plugin_SendImages::Plugin_SendImages(QObject *parent, const char*, const QStringList&)

View File

@ -0,0 +1,11 @@
--- ./slideshow/plugin_slideshow.cpp.orig Sat Sep 4 11:46:53 2004
+++ ./slideshow/plugin_slideshow.cpp Sat Sep 4 11:47:01 2004
@@ -36,7 +36,7 @@
#include "slideshowconfig.h"
K_EXPORT_COMPONENT_FACTORY( digikamplugin_slideshow,
- KGenericFactory<Plugin_SlideShow>("digikam"));
+ KGenericFactory<Plugin_SlideShow>("digikam"))
Plugin_SlideShow::Plugin_SlideShow(QObject *parent,
const char*,