Attachment #30892 for bug #40986

Lines 49-55 Link Here

(-)digikamplugins.orig/acquireimages/plugin_acquireimages.cpp (-1 / +1 lines)
49		49
50		50
51	K_EXPORT_COMPONENT_FACTORY( digikamplugin_acquireimages,	51	K_EXPORT_COMPONENT_FACTORY( digikamplugin_acquireimages,
52	KGenericFactory<Plugin_AcquireImages>("digikam"));	52	KGenericFactory<Plugin_AcquireImages>("digikam"))
53		53
54	// -----------------------------------------------------------	54	// -----------------------------------------------------------
55	Plugin_AcquireImages::Plugin_AcquireImages(QObject parent, const char, const QStringList&)	55	Plugin_AcquireImages::Plugin_AcquireImages(QObject parent, const char, const QStringList&)

Lines 133-139 Link Here

(-)digikamplugins.orig/acquireimages/screenshotdialog.cpp (-1 / +1 lines)
133	m_delay->setValue(m_config->readNumEntry("Delay", 1));	133	m_delay->setValue(m_config->readNumEntry("Delay", 1));
134		134
135	delete m_config;	135	delete m_config;
136	};	136	}
137		137
138		138
139	//////////////////////////////////// DESTRUCTOR /////////////////////////////////////////////	139	//////////////////////////////////// DESTRUCTOR /////////////////////////////////////////////

Lines 62-68 Link Here

(-)digikamplugins.orig/batchprocessimages/plugin_batchprocessimages.cpp (-1 / +1 lines)
62	#include "resizeimagesdialog.h"	62	#include "resizeimagesdialog.h"
63		63
64	K_EXPORT_COMPONENT_FACTORY( digikamplugin_batchprocessimages,	64	K_EXPORT_COMPONENT_FACTORY( digikamplugin_batchprocessimages,
65	KGenericFactory<Plugin_BatchProcessImages>("digikam"));	65	KGenericFactory<Plugin_BatchProcessImages>("digikam"))
66		66
67	// -----------------------------------------------------------	67	// -----------------------------------------------------------
68	Plugin_BatchProcessImages::Plugin_BatchProcessImages(QObject parent, const char, const QStringList&)	68	Plugin_BatchProcessImages::Plugin_BatchProcessImages(QObject parent, const char, const QStringList&)

Lines 38-44 Link Here

(-)digikamplugins.orig/calendar/plugin_calendar.cpp (-1 / +1 lines)
38	#include "calwizard.h"	38	#include "calwizard.h"
39		39
40	K_EXPORT_COMPONENT_FACTORY( digikamplugin_calendar,	40	K_EXPORT_COMPONENT_FACTORY( digikamplugin_calendar,
41	KGenericFactory<Plugin_Calendar>("digikam"));	41	KGenericFactory<Plugin_Calendar>("digikam"))
42		42
43	Plugin_Calendar::Plugin_Calendar(QObject *parent,	43	Plugin_Calendar::Plugin_Calendar(QObject *parent,
44	const char*,	44	const char*,

Lines 32-38 Link Here

(-)digikamplugins.orig/cdarchiving/plugin_cdarchiving.cpp (-1 / +1 lines)
32		32
33		33
34	K_EXPORT_COMPONENT_FACTORY( digikamplugin_cdarchiving,	34	K_EXPORT_COMPONENT_FACTORY( digikamplugin_cdarchiving,
35	KGenericFactory<Plugin_CDArchiving>("digikam"));	35	KGenericFactory<Plugin_CDArchiving>("digikam"))
36		36
37	// -----------------------------------------------------------	37	// -----------------------------------------------------------
38	Plugin_CDArchiving::Plugin_CDArchiving(QObject parent, const char, const QStringList&)	38	Plugin_CDArchiving::Plugin_CDArchiving(QObject parent, const char, const QStringList&)

Lines 34-40 Link Here

(-)digikamplugins.orig/commentseditor/plugin_commentseditor.cpp (-1 / +1 lines)
34	#include "commentseditor.h"	34	#include "commentseditor.h"
35		35
36	K_EXPORT_COMPONENT_FACTORY( digikamplugin_commentseditor,	36	K_EXPORT_COMPONENT_FACTORY( digikamplugin_commentseditor,
37	KGenericFactory<Plugin_CommentsEditor>("digikam"));	37	KGenericFactory<Plugin_CommentsEditor>("digikam"))
38		38
39	Plugin_CommentsEditor::Plugin_CommentsEditor(QObject *parent,	39	Plugin_CommentsEditor::Plugin_CommentsEditor(QObject *parent,
40	const char*,	40	const char*,

Lines 45-51 Link Here

(-)digikamplugins.orig/findimages/plugin_findimages.cpp (-1 / +1 lines)
45	/////////////////////////////////////////////////////////////////////////////////////////////	45	/////////////////////////////////////////////////////////////////////////////////////////////
46		46
47	K_EXPORT_COMPONENT_FACTORY( digikamplugin_findimages,	47	K_EXPORT_COMPONENT_FACTORY( digikamplugin_findimages,
48	KGenericFactory<Plugin_FindImages>("digikam"));	48	KGenericFactory<Plugin_FindImages>("digikam"))
49		49
50	Plugin_FindImages::Plugin_FindImages(QObject parent, const char, const QStringList&)	50	Plugin_FindImages::Plugin_FindImages(QObject parent, const char, const QStringList&)
51	: Digikam::Plugin(parent, "FindImages")	51	: Digikam::Plugin(parent, "FindImages")

Lines 38-44 Link Here

(-)digikamplugins.orig/imagesgallery/plugin_imagesgallery.cpp (-1 / +1 lines)
38		38
39		39
40	K_EXPORT_COMPONENT_FACTORY( digikamplugin_imagesgallery,	40	K_EXPORT_COMPONENT_FACTORY( digikamplugin_imagesgallery,
41	KGenericFactory<Plugin_Imagesgallery>("digikam"));	41	KGenericFactory<Plugin_Imagesgallery>("digikam"))
42		42
43	// -----------------------------------------------------------	43	// -----------------------------------------------------------
44	Plugin_Imagesgallery::Plugin_Imagesgallery(QObject parent, const char, const QStringList&)	44	Plugin_Imagesgallery::Plugin_Imagesgallery(QObject parent, const char, const QStringList&)

Lines 42-48 Link Here

(-)digikamplugins.orig/jpeglossless/plugin_jpeglossless.cpp (-1 / +1 lines)
42	#include "plugin_jpeglossless.h"	42	#include "plugin_jpeglossless.h"
43		43
44	K_EXPORT_COMPONENT_FACTORY( digikamplugin_jpeglossless,	44	K_EXPORT_COMPONENT_FACTORY( digikamplugin_jpeglossless,
45	KGenericFactory<Plugin_JPEGLossless>("digikam"));	45	KGenericFactory<Plugin_JPEGLossless>("digikam"))
46		46
47		47
48	/////////////////////////////////////////////////////////////////////////////////////////////////////	48	/////////////////////////////////////////////////////////////////////////////////////////////////////

Lines 50-56 Link Here

(-)digikamplugins.orig/miscsoperations/plugin_miscsoperations.cpp (-1 / +1 lines)
50	#include "plugin_miscsoperations.h"	50	#include "plugin_miscsoperations.h"
51		51
52	K_EXPORT_COMPONENT_FACTORY( digikamplugin_miscsoperations,	52	K_EXPORT_COMPONENT_FACTORY( digikamplugin_miscsoperations,
53	KGenericFactory<Plugin_MiscsOperations>("digikam"));	53	KGenericFactory<Plugin_MiscsOperations>("digikam"))
54		54
55	/////////////////////////////////////////////////////////////////////////////////////////////////////	55	/////////////////////////////////////////////////////////////////////////////////////////////////////
56		56

Lines 49-55 Link Here

(-)digikamplugins.orig/mpegencoder/plugin_mpegencoder.cpp (-1 / +1 lines)
49		49
50		50
51	K_EXPORT_COMPONENT_FACTORY( digikamplugin_mpegencoder,	51	K_EXPORT_COMPONENT_FACTORY( digikamplugin_mpegencoder,
52	KGenericFactory<Plugin_Mpegencoder>("digikam"));	52	KGenericFactory<Plugin_Mpegencoder>("digikam"))
53		53
54	// -----------------------------------------------------------	54	// -----------------------------------------------------------
55		55

Lines 52-58 Link Here

(-)digikamplugins.orig/printwizard/plugin_printwizard.cpp (-1 / +1 lines)
52	#include "frmprintwizard.h"	52	#include "frmprintwizard.h"
53		53
54	K_EXPORT_COMPONENT_FACTORY( digikamplugin_printwizard,	54	K_EXPORT_COMPONENT_FACTORY( digikamplugin_printwizard,
55	KGenericFactory<Plugin_PrintWizard>("digikam"));	55	KGenericFactory<Plugin_PrintWizard>("digikam"))
56		56
57	Plugin_PrintWizard::Plugin_PrintWizard(QObject parent, const char, const QStringList&)	57	Plugin_PrintWizard::Plugin_PrintWizard(QObject parent, const char, const QStringList&)
58	: Digikam::Plugin(parent, "PrintWizard")	58	: Digikam::Plugin(parent, "PrintWizard")




int TPhoto::width()
{
  return size().width();
}

int TPhoto::height()
{
  return size().height();
}


bool paintOnePage(QPainter &p, QPtrList<TPhoto> photos, QPtrList<QRect> layouts,

Lines 45-51 Link Here

(-)digikamplugins.orig/rawconverter/plugin_rawconverter.cpp (-1 / +1 lines)
45	#include "batchdialog.h"	45	#include "batchdialog.h"
46		46
47	K_EXPORT_COMPONENT_FACTORY( digikamplugin_rawconverter,	47	K_EXPORT_COMPONENT_FACTORY( digikamplugin_rawconverter,
48	KGenericFactory<Plugin_RawConverter>("digikam"));	48	KGenericFactory<Plugin_RawConverter>("digikam"))
49		49
50		50
51	Plugin_RawConverter::Plugin_RawConverter(QObject *parent,	51	Plugin_RawConverter::Plugin_RawConverter(QObject *parent,

Lines 58-64 Link Here

(-)digikamplugins.orig/sendimages/plugin_sendimages.cpp (-1 / +1 lines)
58		58
59		59
60	K_EXPORT_COMPONENT_FACTORY( digikamplugin_sendimages,	60	K_EXPORT_COMPONENT_FACTORY( digikamplugin_sendimages,
61	KGenericFactory<Plugin_SendImages>("digikam"));	61	KGenericFactory<Plugin_SendImages>("digikam"))
62		62
63	// -----------------------------------------------------------	63	// -----------------------------------------------------------
64	Plugin_SendImages::Plugin_SendImages(QObject parent, const char, const QStringList&)	64	Plugin_SendImages::Plugin_SendImages(QObject parent, const char, const QStringList&)

Lines 36-42 Link Here

(-)digikamplugins.orig/slideshow/plugin_slideshow.cpp (-1 / +1 lines)
36	#include "slideshowconfig.h"	36	#include "slideshowconfig.h"
37		37
38	K_EXPORT_COMPONENT_FACTORY( digikamplugin_slideshow,	38	K_EXPORT_COMPONENT_FACTORY( digikamplugin_slideshow,
39	KGenericFactory<Plugin_SlideShow>("digikam"));	39	KGenericFactory<Plugin_SlideShow>("digikam"))
40		40
41	Plugin_SlideShow::Plugin_SlideShow(QObject *parent,	41	Plugin_SlideShow::Plugin_SlideShow(QObject *parent,
42	const char*,	42	const char*,

Return to bug 40986

Lines 86-97 Link Here

(-)digikamplugins.orig/printwizard/tphoto.cpp (-2 / +2 lines)
86	int TPhoto::width()	86	int TPhoto::width()
87	{	87	{
88	return size().width();	88	return size().width();
89	};	89	}
90		90
91	int TPhoto::height()	91	int TPhoto::height()
92	{	92	{
93	return size().height();	93	return size().height();
94	};	94	}
95		95
96		96
97	bool paintOnePage(QPainter &p, QPtrList<TPhoto> photos, QPtrList<QRect> layouts,	97	bool paintOnePage(QPainter &p, QPtrList<TPhoto> photos, QPtrList<QRect> layouts,