[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice
Subject: [PATCH] kword optimization
From: Raul Fernandes <rgfernandes () correioweb ! com ! br>
Date: 2004-10-18 23:15:03
Message-ID: 200410182315.03280.rgfernandes () correioweb ! com ! br
[Download RAW message or body]
I was trying to optimize the kword code a little today.
I found some functions that don't pass QString as a reference, I changed some
QString to const QString&.
I've attached a patch with my experiments. Here it seems to work nicely.
Anyone with more experience can answer me if this patch is correct??
Raul Fernandes
rgfernandes@correioweb.com.br
["koffice.patch" (text/x-diff)]
Index: koffice/kword/KWordMailMergeDatabaseIface.h
===================================================================
RCS file: /home/kde/koffice/kword/KWordMailMergeDatabaseIface.h,v
retrieving revision 1.3
diff -u -3 -p -u -r1.3 KWordMailMergeDatabaseIface.h
--- koffice/kword/KWordMailMergeDatabaseIface.h 22 Feb 2002 23:05:37 -0000 1.3
+++ koffice/kword/KWordMailMergeDatabaseIface.h 18 Oct 2004 21:39:44 -0000
@@ -45,7 +45,7 @@ k_dcop:
This call will return false, when the plugin couldn't be loaded,
the user rejected to change the datasource or the configuration dialog is open
*/
- virtual bool loadPlugin(QString name,QString command)=0;
+ virtual bool loadPlugin(const QString &name,const QString &command)=0;
};
#endif
Index: koffice/kword/KWordPictureFrameSetIface.cc
===================================================================
RCS file: /home/kde/koffice/kword/KWordPictureFrameSetIface.cc,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 KWordPictureFrameSetIface.cc
--- koffice/kword/KWordPictureFrameSetIface.cc 29 Jun 2002 19:53:00 -0000 1.4
+++ koffice/kword/KWordPictureFrameSetIface.cc 18 Oct 2004 21:39:45 -0000
@@ -40,7 +40,7 @@ void KWordPictureFrameSetIface::setKeepA
m_frame->setKeepAspectRatio(b);
}
-void KWordPictureFrameSetIface::loadImage( QString image )
+void KWordPictureFrameSetIface::loadImage( const QString &image )
{
m_frame->loadPicture( image );
m_frame->kWordDocument()->slotRepaintChanged( m_frame );
Index: koffice/kword/KWordPictureFrameSetIface.h
===================================================================
RCS file: /home/kde/koffice/kword/KWordPictureFrameSetIface.h,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 KWordPictureFrameSetIface.h
--- koffice/kword/KWordPictureFrameSetIface.h 10 Jun 2002 20:13:06 -0000 1.2
+++ koffice/kword/KWordPictureFrameSetIface.h 18 Oct 2004 21:39:45 -0000
@@ -38,7 +38,7 @@ public:
k_dcop:
bool keepAspectRatio() const;
void setKeepAspectRatio( bool b );
- void loadImage( QString );
+ void loadImage( const QString &image );
private:
KWPictureFrameSet *m_frame;
Index: koffice/kword/docstruct.cc
===================================================================
RCS file: /home/kde/koffice/kword/docstruct.cc,v
retrieving revision 1.76
diff -u -3 -p -u -r1.76 docstruct.cc
--- koffice/kword/docstruct.cc 28 Jun 2004 13:04:02 -0000 1.76
+++ koffice/kword/docstruct.cc 18 Oct 2004 21:39:45 -0000
@@ -33,12 +33,12 @@
#include <kdebug.h>
-KWDocListViewItem::KWDocListViewItem(QListViewItem *_parent, QString _text)
+KWDocListViewItem::KWDocListViewItem(QListViewItem *_parent, const QString &_text)
:QListViewItem( _parent, _text )
{
}
-KWDocListViewItem::KWDocListViewItem( QListViewItem *_parent, QListViewItem *_after, \
QString _text ) +KWDocListViewItem::KWDocListViewItem( QListViewItem *_parent, \
QListViewItem *_after, const QString &_text ) :QListViewItem( _parent, _after, _text \
) {
}
@@ -47,14 +47,14 @@ KWDocListViewItem::KWDocListViewItem( QL
/* Class: KWDocStructParagItem */
/******************************************************************/
-KWDocStructParagItem::KWDocStructParagItem( QListViewItem *_parent, QString _text, \
KWTextParag *_parag, KWGUI*__parent ) +KWDocStructParagItem::KWDocStructParagItem( \
QListViewItem *_parent, const QString &_text, KWTextParag *_parag, KWGUI*__parent ) \
: KWDocListViewItem(_parent,_text) {
parag = _parag;
gui = __parent;
}
-KWDocStructParagItem::KWDocStructParagItem( QListViewItem *_parent, QListViewItem \
*_after, QString _text, KWTextParag *_parag, KWGUI*__parent ) \
+KWDocStructParagItem::KWDocStructParagItem( QListViewItem *_parent, QListViewItem \
*_after, const QString &_text, KWTextParag *_parag, KWGUI*__parent ) : \
KWDocListViewItem( _parent, _after, _text ) {
parag = _parag;
@@ -101,7 +101,7 @@ void KWDocStructParagItem::deleteFrameSe
/* Class: KWDocStructFrameItem */
/******************************************************************/
-KWDocStructFrameItem::KWDocStructFrameItem( QListViewItem *_parent, QString _text, \
KWFrameSet *_frameset, KWFrame *_frame, KWGUI*__parent ) \
+KWDocStructFrameItem::KWDocStructFrameItem( QListViewItem *_parent, const QString \
&_text, KWFrameSet *_frameset, KWFrame *_frame, KWGUI*__parent ) : \
KWDocListViewItem( _parent, _text ) {
frame = _frame;
@@ -145,7 +145,7 @@ void KWDocStructFrameItem::editPropertie
/* Class: KWDocStructTableItem */
/******************************************************************/
-KWDocStructTableItem::KWDocStructTableItem( QListViewItem *_parent, QString _text, \
KWTableFrameSet *_table, KWGUI*__parent ) \
+KWDocStructTableItem::KWDocStructTableItem( QListViewItem *_parent, const QString \
&_text, KWTableFrameSet *_table, KWGUI*__parent ) :KWDocListViewItem( _parent, _text \
) {
table = _table;
@@ -191,7 +191,7 @@ void KWDocStructTableItem::editPropertie
/* Class: KWDocStructPictureItem */
/******************************************************************/
-KWDocStructPictureItem::KWDocStructPictureItem( QListViewItem *_parent, QString \
_text, KWPictureFrameSet *_pic, KWGUI*__parent ) \
+KWDocStructPictureItem::KWDocStructPictureItem( QListViewItem *_parent, const \
QString &_text, KWPictureFrameSet *_pic, KWGUI*__parent ) : KWDocListViewItem( \
_parent, _text ) {
pic = _pic;
@@ -232,7 +232,7 @@ void KWDocStructPictureItem::editPropert
/* Class: KWDocStructFormulaItem */
/******************************************************************/
-KWDocStructFormulaItem::KWDocStructFormulaItem( QListViewItem *_parent, QString \
_text, KWFormulaFrameSet *_form, KWGUI*__parent ) \
+KWDocStructFormulaItem::KWDocStructFormulaItem( QListViewItem *_parent, const \
QString &_text, KWFormulaFrameSet *_form, KWGUI*__parent ) : KWDocListViewItem( \
_parent, _text ) {
form = _form;
@@ -277,7 +277,7 @@ void KWDocStructFormulaItem::editPropert
/* Class: KWDocStructPartItem */
/******************************************************************/
-KWDocStructPartItem::KWDocStructPartItem( QListViewItem *_parent, QString _text, \
KWPartFrameSet *_part, KWGUI*__parent ) +KWDocStructPartItem::KWDocStructPartItem( \
QListViewItem *_parent, const QString &_text, KWPartFrameSet *_part, KWGUI*__parent ) \
: KWDocListViewItem( _parent, _text ) {
part = _part;
Index: koffice/kword/docstruct.h
===================================================================
RCS file: /home/kde/koffice/kword/docstruct.h,v
retrieving revision 1.23
diff -u -3 -p -u -r1.23 docstruct.h
--- koffice/kword/docstruct.h 15 Dec 2002 15:26:45 -0000 1.23
+++ koffice/kword/docstruct.h 18 Oct 2004 21:39:45 -0000
@@ -36,8 +36,8 @@ class KWTextParag;
class KWDocListViewItem : public QObject,public QListViewItem
{
public:
- KWDocListViewItem(QListViewItem *_parent, QString _text);
- KWDocListViewItem( QListViewItem *_parent, QListViewItem *_after, QString _text \
); + KWDocListViewItem(QListViewItem *_parent, const QString &_text);
+ KWDocListViewItem( QListViewItem *_parent, QListViewItem *_after, const QString \
&_text ); virtual void selectFrameSet() {};
virtual void editFrameSet() {};
virtual void deleteFrameSet() {};
@@ -52,8 +52,8 @@ class KWDocStructParagItem : public KWDo
{
Q_OBJECT
public:
- KWDocStructParagItem( QListViewItem *_parent, QString _text, KWTextParag \
*_parag, KWGUI *__parent );
- KWDocStructParagItem( QListViewItem *_parent, QListViewItem *_after, QString \
_text, KWTextParag *_parag, KWGUI*__parent ); + KWDocStructParagItem( \
QListViewItem *_parent, const QString &_text, KWTextParag *_parag, KWGUI *__parent ); \
+ KWDocStructParagItem( QListViewItem *_parent, QListViewItem *_after, const \
QString &_text, KWTextParag *_parag, KWGUI*__parent ); virtual void \
selectFrameSet(); virtual void editFrameSet();
virtual void deleteFrameSet();
@@ -77,7 +77,7 @@ class KWDocStructFrameItem : public KWDo
Q_OBJECT
public:
- KWDocStructFrameItem( QListViewItem *_parent, QString _text, KWFrameSet \
*_frameset, KWFrame *_frame, KWGUI *__parent ); + KWDocStructFrameItem( \
QListViewItem *_parent, const QString &_text, KWFrameSet *_frameset, KWFrame *_frame, \
KWGUI *__parent ); virtual void selectFrameSet();
virtual void editFrameSet();
virtual void deleteFrameSet();
@@ -101,7 +101,7 @@ class KWDocStructTableItem : public KWDo
Q_OBJECT
public:
- KWDocStructTableItem( QListViewItem *_parent, QString _text, KWTableFrameSet \
*_table, KWGUI*__parent ); + KWDocStructTableItem( QListViewItem *_parent, const \
QString &_text, KWTableFrameSet *_table, KWGUI*__parent ); virtual void \
selectFrameSet(); virtual void editFrameSet();
virtual void deleteFrameSet();
@@ -125,7 +125,7 @@ class KWDocStructFormulaItem : public KW
Q_OBJECT
public:
- KWDocStructFormulaItem( QListViewItem *_parent, QString _text, KWFormulaFrameSet \
*_form, KWGUI*__parent ); + KWDocStructFormulaItem( QListViewItem *_parent, const \
QString &_text, KWFormulaFrameSet *_form, KWGUI*__parent ); virtual void \
selectFrameSet(); virtual void editFrameSet();
virtual void deleteFrameSet();
@@ -150,7 +150,7 @@ class KWDocStructPictureItem : public KW
Q_OBJECT
public:
- KWDocStructPictureItem( QListViewItem *_parent, QString _text, KWPictureFrameSet \
*_pic, KWGUI*__parent ); + KWDocStructPictureItem( QListViewItem *_parent, const \
QString &_text, KWPictureFrameSet *_pic, KWGUI*__parent ); virtual void \
selectFrameSet(); virtual void deleteFrameSet();
virtual void editProperties();
@@ -173,7 +173,7 @@ class KWDocStructPartItem : public KWDoc
Q_OBJECT
public:
- KWDocStructPartItem( QListViewItem *_parent, QString _text, KWPartFrameSet \
*_part, KWGUI*__parent ); + KWDocStructPartItem( QListViewItem *_parent, const \
QString &_text, KWPartFrameSet *_part, KWGUI*__parent ); virtual void \
selectFrameSet(); virtual void editFrameSet();
virtual void deleteFrameSet();
Index: koffice/kword/mailmerge.cc
===================================================================
RCS file: /home/kde/koffice/kword/mailmerge.cc,v
retrieving revision 1.56
diff -u -3 -p -u -r1.56 mailmerge.cc
--- koffice/kword/mailmerge.cc 16 Aug 2004 22:15:53 -0000 1.56
+++ koffice/kword/mailmerge.cc 18 Oct 2004 21:39:46 -0000
@@ -73,7 +73,7 @@ bool KWMailMergeDataBase::isConfigDialog
return rejectdcopcall;
}
-bool KWMailMergeDataBase::loadPlugin(QString name,QString command)
+bool KWMailMergeDataBase::loadPlugin(const QString &name,const QString &command)
{
if (rejectdcopcall)return false;
QString constrain=QString("[X-KDE-InternalName] =='"+name+"'");
Index: koffice/kword/mailmerge.h
===================================================================
RCS file: /home/kde/koffice/kword/mailmerge.h,v
retrieving revision 1.27
diff -u -3 -p -u -r1.27 mailmerge.h
--- koffice/kword/mailmerge.h 16 Jul 2003 21:15:35 -0000 1.27
+++ koffice/kword/mailmerge.h 18 Oct 2004 21:39:46 -0000
@@ -75,7 +75,7 @@ public:
virtual void refresh(bool force);
virtual QStringList availablePlugins();
- virtual bool loadPlugin(QString name,QString command);
+ virtual bool loadPlugin(const QString &name,const QString &command);
virtual bool isConfigDialogShown();
int version();
____________________________________
koffice mailing list
koffice@mail.kde.org
To unsubscribe please visit:
https://mail.kde.org/mailman/listinfo/koffice
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic