[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdeprint
From:       Alex Merry <huntedhacker () tiscali ! co ! uk>
Date:       2007-09-03 23:54:23
Message-ID: 1188863663.347468.22338.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 708158 by alexmerry:

KLibLoader => KPluginLoader



 M  +4 -4      kmfactory.cpp  
 M  +9 -3      posterpreview.cpp  


--- trunk/KDE/kdelibs/kdeprint/kmfactory.cpp #708157:708158
@@ -177,7 +177,7 @@
 void KMFactory::createManager()
 {
 	loadFactory();
-	if (m_factory) m_manager = (KMManager*)m_factory->create(this,"KMManager");
+	if (m_factory) m_manager = m_factory->create<KMManager>(this);
 	if (!m_manager) {
 		m_manager = new KMManager(this );
 	}
@@ -187,7 +187,7 @@
 void KMFactory::createJobManager()
 {
 	loadFactory();
-	if (m_factory) m_jobmanager = \
(KMJobManager*)m_factory->create(this,"KMJobManager"); +	if (m_factory) m_jobmanager \
= m_factory->create<KMJobManager>(this);  if (!m_jobmanager) {
 		m_jobmanager = new KMJobManager( this );
 	}
@@ -198,7 +198,7 @@
 void KMFactory::createUiManager()
 {
 	loadFactory();
-	if (m_factory) m_uimanager = (KMUiManager*)m_factory->create(this,"KMUiManager");
+	if (m_factory) m_uimanager = m_factory->create<KMUiManager>(this);
 	if (!m_uimanager) {
 		m_uimanager = new KMUiManager(this );
 	}
@@ -208,7 +208,7 @@
 void KMFactory::createPrinterImpl()
 {
 	loadFactory();
-	if (m_factory) m_implementation = \
(KPrinterImpl*)m_factory->create(this,"KPrinterImpl"); +	if (m_factory) \
m_implementation = m_factory->create<KPrinterImpl>(this);  if (!m_implementation) {
 		m_implementation = new KPrinterImpl( this );
 	}
--- trunk/KDE/kdelibs/kdeprint/posterpreview.cpp #708157:708158
@@ -23,7 +23,7 @@
 #include <kprocess.h>
 #include <kprinter.h>
 #include <klocale.h>
-#include <kglobalsettings.h>
+#include <kcolorscheme.h>
 
 #include <QtGui/QTextObjectInterface>
 #include <QtGui/QCursor>
@@ -155,11 +155,17 @@
 				for ( int j=0; j<m_cols; j++, x+=m_pw )
 				{
 					bool selected = ( m_selectedpages.contains( i*m_cols+j+1 ) );
-					painter.fillRect( x+1, y+1, m_pw-2, m_ph-2, ( selected ? \
KGlobalSettings::highlightColor() : Qt::white ) ); +                                  \
QBrush backBrush(Qt::white); +                                        QBrush \
fillBrush(Qt::lightGray); +                                        if ( selected ) {
+                                            backBrush = \
KColorScheme(QPalette::Active, KColorScheme::Selection).background(); +               \
fillBrush = QBrush(backBrush.color().darker(160)); +                                  \
} +					painter.fillRect( x+1, y+1, m_pw-2, m_ph-2, backBrush );
 					painter.drawRect( x, y, m_pw, m_ph );
 					if ( pw > 0 && ph > 0 )
 						painter.fillRect( x+m_mw+px, y+m_mh+py, qMin( pw, m_pw-2*m_mw-px ), qMin( ph, \
                m_ph-2*m_mh-py ),
-								( selected ? KGlobalSettings::highlightColor().dark( 160 ) : Qt::lightGray ) \
); +								fillBrush );
 					painter.setPen( Qt::DotLine );
 					painter.drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh );
 					painter.setPen( Qt::SolidLine );


[prev in list] [next in list] [prev in thread] [next in thread]