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

List:       kde-commits
Subject:    KDE/kdepim/libkdepim
From:       Laurent Montel <montel () kde ! org>
Date:       2010-09-16 20:22:36
Message-ID: 20100916202236.204EAAC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1176153 by mlaurent:

Some compile fix with "-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII"


 M  +1 -1      addcontactjob.cpp  
 M  +2 -2      addemailaddressjob.cpp  
 M  +9 -9      kprefsdialog.cpp  
 M  +1 -1      ktimeedit.cpp  
 M  +4 -4      maillistdrag.cpp  


--- trunk/KDE/kdepim/libkdepim/addcontactjob.cpp #1176152:1176153
@@ -115,7 +115,7 @@
       const QString text = i18n( "The VCard was added to your address book; "
                                  "you can add more information to this "
                                  "entry by opening the address book." );
-      KMessageBox::information( mParentWidget, text, QString(), "addedtokabc" );
+      KMessageBox::information( mParentWidget, text, QString(), \
QLatin1String("addedtokabc") );  
       q->emitResult();
     }
--- trunk/KDE/kdepim/libkdepim/addemailaddressjob.cpp #1176152:1176153
@@ -60,7 +60,7 @@
         const QString text = i18n( "<qt>The email address <b>%1</b> is already in \
your address book.</qt>",  mCompleteAddress );
 
-        KMessageBox::information( mParentWidget, text, QString(), \
"alreadyInAddressBook" ); +        KMessageBox::information( mParentWidget, text, \
QString(), QLatin1String("alreadyInAddressBook") );  q->setError( UserDefinedError );
         q->emitResult();
         return;
@@ -156,7 +156,7 @@
       const QString text = i18n( "<qt>The email address <b>%1</b> was added to your \
                "
                                  "address book; you can add more information to this \
                "
                                  "entry by opening the address book.</qt>", \
                mCompleteAddress );
-      KMessageBox::information( mParentWidget, text, QString(), "addedtokabc" );
+      KMessageBox::information( mParentWidget, text, QString(), \
QLatin1String("addedtokabc") );  
       q->emitResult();
     }
--- trunk/KDE/kdepim/libkdepim/kprefsdialog.cpp #1176152:1176153
@@ -143,7 +143,7 @@
 KPrefsWidInt::KPrefsWidInt( KConfigSkeleton::ItemInt *item, QWidget *parent )
   : mItem( item )
 {
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
   mSpin = new QSpinBox( parent );
   if ( !mItem->minValue().isNull() ) {
     mSpin->setMinimum( mItem->minValue().toInt() );
@@ -198,7 +198,7 @@
 {
   mButton = new KColorButton( parent );
   connect( mButton, SIGNAL(changed(const QColor&)), SIGNAL(changed()) );
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
   mLabel->setBuddy( mButton );
   QString toolTip = mItem->toolTip();
   if ( !toolTip.isEmpty() ) {
@@ -238,7 +238,7 @@
                               QWidget *parent, const QString &sampleText )
   : mItem( item )
 {
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
 
   mPreview = new QLabel( sampleText, parent );
   mPreview->setFrameStyle( QFrame::Panel | QFrame::Sunken );
@@ -301,7 +301,7 @@
 KPrefsWidTime::KPrefsWidTime( KConfigSkeleton::ItemDateTime *item, QWidget *parent )
   : mItem( item )
 {
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
   mTimeEdit = new KTimeEdit( parent );
   mLabel->setBuddy( mTimeEdit );
   connect( mTimeEdit, SIGNAL(timeChanged(const QTime&)), SIGNAL(changed()) );
@@ -343,11 +343,11 @@
                                       const QString &format, QWidget *parent )
   : mItem( item )
 {
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
   mTimeEdit = new QTimeEdit( parent );
   mLabel->setBuddy( mTimeEdit );
   if ( format.isEmpty() ) {
-    mTimeEdit->setDisplayFormat( "hh:mm:ss" );
+    mTimeEdit->setDisplayFormat( QLatin1String( "hh:mm:ss" ) );
   } else {
     mTimeEdit->setDisplayFormat( format );
   }
@@ -389,7 +389,7 @@
 KPrefsWidDate::KPrefsWidDate( KConfigSkeleton::ItemDateTime *item, QWidget *parent )
   : mItem( item )
 {
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
   mDateEdit = new KDateEdit( parent );
   mLabel->setBuddy( mDateEdit );
   connect( mDateEdit, SIGNAL(dateChanged(const QDate&)), SIGNAL(changed()) );
@@ -522,7 +522,7 @@
                                   KLineEdit::EchoMode echomode )
   : mItem( item )
 {
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
   mEdit = new KLineEdit( parent );
   mLabel->setBuddy( mEdit );
   connect( mEdit, SIGNAL(textChanged(const QString&)), SIGNAL(changed()) );
@@ -573,7 +573,7 @@
                               const QString &filter, KFile::Modes mode )
   : mItem( item )
 {
-  mLabel = new QLabel( mItem->label() + ':', parent );
+  mLabel = new QLabel( mItem->label() + QLatin1Char( ':' ), parent );
   mURLRequester = new KUrlRequester( parent );
   mLabel->setBuddy( mURLRequester );
   mURLRequester->setMode( mode );
--- trunk/KDE/kdepim/libkdepim/ktimeedit.cpp #1176152:1176153
@@ -75,7 +75,7 @@
 
       // readTime doesn't help knowing when the string is "Intermediate".
       // HACK. Not fully locale aware etc. (esp. the separator is '.' in sv_SE...)
-      QChar sep = ':';
+      QChar sep = QLatin1Char(':');
       // I want to allow "HH:", ":MM" and ":" to make editing easier
       if ( str[0] == sep ) {
         if ( length == 1 ) { // just ":"
--- trunk/KDE/kdepim/libkdepim/maillistdrag.cpp #1176152:1176153
@@ -145,7 +145,7 @@
 
 QString MailList::mimeDataType()
 {
-  return "x-kmail-drag/message-list";
+  return QLatin1String( "x-kmail-drag/message-list" );
 }
 
 bool MailList::canDecode( const QMimeData *md )
@@ -223,7 +223,7 @@
 
 bool MailListMimeData::hasFormat ( const QString & mimeType ) const
 {
-  if ( mimeType == "message/rfc822" && mMailTextSource )
+  if ( mimeType == QLatin1String( "message/rfc822" ) && mMailTextSource )
     return true;
   else
     return QMimeData::hasFormat( mimeType );
@@ -233,14 +233,14 @@
 {
   QStringList theFormats = QMimeData::formats();
   if ( mMailTextSource )
-    theFormats.prepend( QByteArray( "message/rfc822" ) );
+    theFormats.prepend( QLatin1String( "message/rfc822" ) );
   return theFormats;
 }
 
 QVariant MailListMimeData::retrieveData( const QString & mimeType,
                                          QVariant::Type type ) const
 {
-  if ( ( mimeType == "message/rfc822" ) && mMailTextSource ) {
+  if ( ( mimeType == QLatin1String( "message/rfc822" ) ) && mMailTextSource ) {
 
     if ( mMails.isEmpty() ) {
       MailList list = MailList::fromMimeData( this );


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