[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kaddressbook
From: Tobias Koenig <tokoe () kde ! org>
Date: 2008-09-30 20:37:00
Message-ID: 1222807020.296300.5283.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 866431 by tokoe:
krazy--
M +1 -1 common/filter.cpp
M +1 -1 distributionlistpicker.cpp
M +2 -2 kabcore.cpp
M +1 -1 kabcore.h
M +2 -0 kaddressbookservice.h
M +3 -3 kaddressbookview.cpp
M +4 -4 printing/mikesstyle.cpp
M +2 -2 printing/ringbinderstyle.cpp
M +1 -1 thumbnailcreator/ldifvcardcreator.cpp
M +3 -3 views/cardview.cpp
M +1 -1 xxport/csvimportdialog.cpp
M +2 -2 xxport/eudora_xxport.cpp
M +1 -1 xxport/gmx_xxport.cpp
M +6 -6 xxport/gnokii_xxport.cpp
M +5 -5 xxport/pab_mapihd.cpp
--- trunk/KDE/kdepim/kaddressbook/common/filter.cpp #866430:866431
@@ -178,7 +178,7 @@
count = s.readEntry( "Count", 0 );
}
- for ( int i = 0; i < count; i++ ) {
+ for ( int i = 0; i < count; ++i ) {
{
KConfigGroup s = config->group( QString( "%1_%2" ).arg( baseGroup ).arg( i ) \
); f.restore( s );
--- trunk/KDE/kdepim/kaddressbook/distributionlistpicker.cpp #866430:866431
@@ -127,7 +127,7 @@
void KPIM::DistributionListPickerDialog::slotCancel()
{
- m_selectedDistributionList = QString();
+ m_selectedDistributionList.clear();
reject();
}
--- trunk/KDE/kdepim/kaddressbook/kabcore.cpp #866430:866431
@@ -343,7 +343,7 @@
if ( writable ) {
//check if every single (sub)resource is writable
- //### We have a performance problem here - everytime *one* item is added or
+ //### We have a performance problem here - every time *one* item is added or
// removed we re-check *all* items. If this turns out to be a bottleneck
// we need to keep some state and check new items only.
KABC::Addressee::List::ConstIterator addrIt = list.constBegin();
@@ -465,7 +465,7 @@
return;
if ( KMessageBox::warningContinueCancelList( mWidget, i18np( "Do you really want \
to delete this distribution list?",
"Do you really want to delete these \
%1 distribution lists?", names.count() ),
- names, QString::null, \
KStandardGuiItem::del() ) == KMessageBox::Cancel ) + \
names, QString(), KStandardGuiItem::del() ) == KMessageBox::Cancel ) return;
QStringList uids;
--- trunk/KDE/kdepim/kaddressbook/kabcore.h #866430:866431
@@ -219,7 +219,7 @@
/**
- Copys the selected contacts into clipboard for later pasting.
+ Copies the selected contacts into clipboard for later pasting.
*/
void copyContacts();
--- trunk/KDE/kdepim/kaddressbook/kaddressbookservice.h #866430:866431
@@ -33,6 +33,8 @@
class KAddressBookService : public QObject
{
+ Q_OBJECT
+
public:
KAddressBookService( KAB::Core *core );
--- trunk/KDE/kdepim/kaddressbook/kaddressbookview.cpp #866430:866431
@@ -82,12 +82,12 @@
addr = mCore->addressBook()->findByUid( *it );
if ( !addr.isEmpty() ) {
- QString m = QString();
+ QString mail;
if ( addr.emails().count() > 1 )
- m = KABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), \
this ); + mail = KABC::EmailSelector::getEmail( addr.emails(), \
addr.preferredEmail(), this );
- email = addr.fullEmail( m );
+ email = addr.fullEmail( mail );
if ( !first )
emailAddrs += ", ";
--- trunk/KDE/kdepim/kaddressbook/printing/mikesstyle.cpp #866430:866431
@@ -165,7 +165,7 @@
QString label;
QString value;
- for ( int i = 0; i < numFields / 2; i++ ) {
+ for ( int i = 0; i < numFields / 2; ++i ) {
label = fields[ i ]->label();
value = trimString( fields[ i ]->value( addr ), (width - 10) / 4, fm );
@@ -181,7 +181,7 @@
yPos = bfm.height() + 2 * mFieldSpacingHint;
xPos = margin + width / 2;
- for ( int i = numFields / 2; i < numFields; i++ ) {
+ for ( int i = numFields / 2; i < numFields; ++i ) {
label = fields[ i ]->label();
value = value = trimString( fields[ i ]->value( addr ), (width - 10) / 4, fm );
@@ -221,14 +221,14 @@
int halfHeight = 0;
// Determine which half of the fields is higher
- for ( int i = 0; i < numFields / 2; i++ )
+ for ( int i = 0; i < numFields / 2; ++i )
halfHeight += fm.height() * (fieldList[ i ]->value( addr ).count( '\n' ) + 1);
height = halfHeight;
// now the second half
halfHeight = 0;
- for ( int i = numFields / 2; i < numFields; i++ )
+ for ( int i = numFields / 2; i < numFields; ++i )
halfHeight += fm.height() * (fieldList[ i ]->value( addr ).count( '\n' ) + 1);
height = qMax( height, halfHeight );
--- trunk/KDE/kdepim/kaddressbook/printing/ringbinderstyle.cpp #866430:866431
@@ -143,7 +143,7 @@
config.writeEntry( FillWithEmptyFields, mPageAppearance->cbFillEmpty->isChecked() \
); config.writeEntry( MinNumberOfEmptyFields, mPageAppearance->sbMinNumFill->value() \
); QStringList tmpstrl;
- for ( int i = 0; i < mPageAppearance->letterListBox->count(); i++ ) {
+ for ( int i = 0; i < mPageAppearance->letterListBox->count(); ++i ) {
if ( !mPageAppearance->letterListBox->item( i )->text().isEmpty() ) {
tmpstrl.append( mPageAppearance->letterListBox->item( i )->text() );
}
@@ -463,7 +463,7 @@
painter->setPen( thickpen );
painter->drawRect( 0, top, window.width(), ( 3 * fmnorm.lineSpacing() ) );
painter->setPen( thinpen );
- for ( int i = 1; i < 3; i++ ) {
+ for ( int i = 1; i < 3; ++i ) {
painter->drawLine( 0, top + i * fmnorm.lineSpacing(), window.width(),
top + i * fmnorm.lineSpacing() );
}
--- trunk/KDE/kdepim/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp \
#866430:866431 @@ -191,7 +191,7 @@
Q_ASSERT( posNewLine > 0 );
//const QPixmap *fontPixmap = &(mSplitter->pixmap());
- for ( int i = 0; i < text.length(); i++ ) {
+ for ( int i = 0; i < text.length(); ++i ) {
if ( x > posNewLine || newLine ) { // start a new line?
x = xborder;
y += yOffset;
--- trunk/KDE/kdepim/kaddressbook/views/cardview.cpp #866430:866431
@@ -309,7 +309,7 @@
p->drawText( labelXPos, yPos, label + ':' );
}
- for ( cln = 0; cln <= maxLines; cln++ ) {
+ for ( cln = 0; cln <= maxLines; ++cln ) {
tmp = value.section( '\n', cln, cln );
if ( !tmp.isEmpty() )
p->drawText( valueXPos, yPos + cln * fh, trimString( tmp, valueWidth, fm ) \
); @@ -1080,7 +1080,7 @@
to = a > b ? a : b;
CardViewItem *aItem;
- for ( ; from <= to; from++ ) {
+ for ( ; from <= to; ++from ) {
aItem = d->mItemList.at( from );
aItem->setSelected( s );
repaintItem( aItem );
@@ -1364,7 +1364,7 @@
}
CardViewItem *item;
- for ( ; from <= to; from++ ) {
+ for ( ; from <= to; ++from ) {
item = d->mItemList.at( from );
item->setSelected( s );
repaintItem( item );
--- trunk/KDE/kdepim/kaddressbook/xxport/csvimportdialog.cpp #866430:866431
@@ -688,7 +688,7 @@
mCodecCombo->addItem( i18n( "Unicode" ), Uni );
mCodecCombo->addItem( i18n( "Microsoft Unicode" ), MSBug );
- for ( int i = 0; i < mCodecs.count(); i++ )
+ for ( int i = 0; i < mCodecs.count(); ++i )
mCodecCombo->addItem( mCodecs.at( i )->name(), Codec + i );
}
--- trunk/KDE/kdepim/kaddressbook/xxport/eudora_xxport.cpp #866430:866431
@@ -177,7 +177,7 @@
}
result = line.mid( b + 1 );
- for ( i = 0; i < result.length(); i++ ) {
+ for ( i = 0; i < result.length(); ++i ) {
if ( result[ i ] == CTRL_C )
result[ i ] = '\n';
}
@@ -202,7 +202,7 @@
e--;
QString result = line.mid( b, e - b + 1 );
- for ( int i = 0; i < result.length(); i++ ) {
+ for ( int i = 0; i < result.length(); ++i ) {
if ( result[ i ] == CTRL_C )
result[ i ] = '\n';
}
--- trunk/KDE/kdepim/kaddressbook/xxport/gmx_xxport.cpp #866430:866431
@@ -291,7 +291,7 @@
no = 1;
while ( (addr = addrMap[no]) != NULL ) {
- for (int record_id=0; record_id<3; record_id++) {
+ for (int record_id=0; record_id<3; ++record_id) {
KABC::Address address;
KABC::PhoneNumber phone, fax, cell;
--- trunk/KDE/kdepim/kaddressbook/xxport/gnokii_xxport.cpp #866430:866431
@@ -290,7 +290,7 @@
int num_read = 0;
- for (int i = 1; !m_progressDlg->wasCancelled() && i <= memstat.used + \
memstat.free; i++) { + for (int i = 1; !m_progressDlg->wasCancelled() && i <= \
memstat.used + memstat.free; ++i) { error = read_phone_entry( i, memtype, &entry );
progress->setValue(num_read);
@@ -351,7 +351,7 @@
/* scan sub-entries */
if (entry.subentries_count)
- for (int n=0; n<entry.subentries_count; n++) {
+ for (int n=0; n<entry.subentries_count; ++n) {
QString s = GN_FROM(entry.subentries[n].data.number).simplified();
GNOKII_DEBUG(QString(" Subentry#%1, entry_type=%2, number_type=%3, number=%4\n")
.arg(n).arg(entry.subentries[n].entry_type)
@@ -529,7 +529,7 @@
// allowed chars: 0-9, *, #, p, w, +
QString num = number.simplified();
QString allowed("0123456789*+#pw");
- for (unsigned int i=num.length(); i>=1; i--)
+ for (unsigned int i=num.length(); i>=1; --i)
if (allowed.indexOf(num[i-1])==-1)
num.remove(i-1,1);
if (num.isEmpty())
@@ -619,7 +619,7 @@
}
// add E-Mails
QStringList emails = addr->emails();
- for (int n=0; n<emails.count(); n++) {
+ for (int n=0; n<emails.count(); ++n) {
if (entry.subentries_count >= GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER)
break; // Phonebook full
s = emails[n].simplified();
@@ -635,7 +635,7 @@
entry.subentries_count++;
subentry++;
}
- // add Adresses
+ // add Addresses
const KABC::Address::List addresses = addr->addresses();
KABC::Address::List::ConstIterator it2;
for ( it2 = addresses.begin(); it2 != addresses.end(); ++it2 ) {
@@ -669,7 +669,7 @@
}
// debug output
- for (int st=0; st<entry.subentries_count; st++) {
+ for (int st=0; st<entry.subentries_count; ++st) {
gn_phonebook_subentry *subentry = &entry.subentries[st];
GNOKII_DEBUG(QString(" SubTel #%1: entry_type=%2, number_type=%3, number=%4\n")
.arg(st).arg(subentry->entry_type)
--- trunk/KDE/kdepim/kaddressbook/xxport/pab_mapihd.cpp #866430:866431
@@ -142,8 +142,8 @@
int i,j;
pabrec_entry e=pr_unknown;
- for(i=0;mapi_map[i]!=NULL && e==pr_unknown;i++) {
- for(j=1;mapi_map[i][j]!=0 && _tag!=mapi_map[i][j];j++) {};
+ for(i=0;mapi_map[i]!=NULL && e==pr_unknown;++i) {
+ for(j=1;mapi_map[i][j]!=0 && _tag!=mapi_map[i][j];++j) {};
if (mapi_map[i][j]!=0) {
e=(pabrec_entry) mapi_map[i][0];
}
@@ -177,7 +177,7 @@
// get the right entries now
- for(i=2,k=0;i<R.N() && k<tags.size();i++,k++) {
+ for(i=2,k=0;i<R.N() && k<tags.size();++i,++k) {
if (!isUsed(k)) { i-=1; }
else {pabrec_entry e;
QString E;
@@ -357,7 +357,7 @@
m_W=new word_t[m_N+1];
P.read(dummy);
- for(i=0;i<=m_N;i++) {
+ for(i=0;i<=m_N;++i) {
P.read(m_W[i]);
}
}
@@ -384,7 +384,7 @@
int mb,me;
int k;
mb=m_W[i];me=m_W[i+1];
- for(k=0;mb!=me;mb++) {
+ for(k=0;mb!=me;++mb) {
if (_mem[mb]>=' ' || _mem[mb]=='\n' || _mem[mb]==13 || _mem[mb]=='\t') {
if (_mem[mb]==13) { entry[k]='\n'; }
else { entry[k]=_mem[mb]; }
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic