[kmobiletools] KDE/kdepim/kmobiletools/kmobiletools
Marco Gulino
marco at kmobiletools.org
Wed Jun 20 22:43:41 CEST 2007
SVN commit 678171 by gulino:
QDateTime-->KDateTime
M +3 -3 engines/at_engine/at_jobs.cpp
M +1 -1 engines/at_engine/calendar_jobs.cpp
M +2 -2 engines/at_engine/sms_jobs.cpp
M +2 -2 engines/at_engine/sms_jobs.h
M +2 -2 engines/gammu_engine/device.cpp
M +4 -4 libkmobiletools/sms.cpp
M +4 -4 libkmobiletools/sms.h
M +1 -1 mainpart/kmobiletools_mainpart.cpp
M +1 -1 mainpart/smslistviewitem.cpp
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/at_engine/at_jobs.cpp #678170:678171
@@ -324,15 +324,15 @@
int year = CCLK.cap(1).toInt();
if ( year<100 ) year = year + 2000;
- QDateTime datetime( QDate( year, CCLK.cap(2).toInt(), CCLK.cap(3).toInt() ), QTime( CCLK.cap(4).toInt(), CCLK.cap(5).toInt(), CCLK.cap(6).toInt() ) );
+ KDateTime datetime( QDate( year, CCLK.cap(2).toInt(), CCLK.cap(3).toInt() ), QTime( CCLK.cap(4).toInt(), CCLK.cap(5).toInt(), CCLK.cap(6).toInt() ) );
-// int timediff = abs( datetime.secsTo( QDateTime::currentDateTime() ) );
+// int timediff = abs( datetime.secsTo( KDateTime::currentDateTime() ) );
if ( true /** @TODO Since we already have a config entry for syncing time, it's not a bad idea to sync ANYWAY if this config entry is enabled.
* However i'll need to have a better look on it.
* timediff>2 */ )
{
p_device->lockMutex();
- QDateTime now = QDateTime::currentDateTime();
+ KDateTime now = KDateTime::currentLocalDateTime();
p_device->sendATCommand(this, "AT+CCLK=\""+now.toString("yy/MM/dd,hh:mm:ss")+CCLK.cap(7)+"\"\r" );
slotPercentDone( 99 );
p_device->unlockMutex();
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/at_engine/calendar_jobs.cpp #678170:678171
@@ -68,7 +68,7 @@
}
QStringList::Iterator it;
int index; QString text; bool timed; bool enabled;
- QDateTime startDT, alDT; int duration, repeat;
+ KDateTime startDT, alDT; int duration, repeat;
QDate tempDate; int tempyear, tempmonth, tempday;
for(it=entries.begin(); it!=entries.end(); ++it)
{
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/at_engine/sms_jobs.cpp #678170:678171
@@ -44,7 +44,7 @@
multiPart=NULL;
}
-ATSMS::ATSMS(const QStringList & numbers, const QString & text, const QDateTime & datetime ) : SMS ( numbers, text, datetime ) {
+ATSMS::ATSMS(const QStringList & numbers, const QString & text, const KDateTime & datetime ) : SMS ( numbers, text, datetime ) {
concatenated=false;
multiPart=NULL;
}
@@ -538,7 +538,7 @@
.arg( ttime.section( ':', 1, 1 ) ,2 )
.arg( ttime.section( ':', 2, 2 ),2 )
.replace(' ', '0');
- sms->setDateTime( QDateTime(
+ sms->setDateTime( KDateTime(
QDate::fromString( date, Qt::ISODate ),
QTime::fromString( time )
) );
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/at_engine/sms_jobs.h #678170:678171
@@ -33,7 +33,7 @@
{
public:
ATSMS(const QStringList & numbers, const QString & text );
- ATSMS(const QStringList & numbers, const QString & text, const QDateTime & datetime );
+ ATSMS(const QStringList & numbers, const QString & text, const KDateTime & datetime );
virtual ~ATSMS();
//! Return true if the this object is part of a multipart message.
bool isMultiPart() { return concatenated; };
@@ -89,7 +89,7 @@
protected:
inline bool hasMR() { return HAS_MR(SMTL); };
inline bool hasTimeStamp() { return HAS_TIMESTAMP(SMTL); };
- QDateTime datetime;
+ KDateTime datetime;
QString message;
int timezone;
uint referenceNumber, sequenceNumber, maxMessages;
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/engines/gammu_engine/device.cpp #678170:678171
@@ -1080,7 +1080,7 @@
sms.SMS[0].DateTime.Minute,
sms.SMS[0].DateTime.Second );
- kmobileSMS->setDateTime( QDateTime( date, time ) );
+ kmobileSMS->setDateTime( KDateTime( date, time ) );
// join multi-part sms and set text
QString text;
@@ -1102,7 +1102,7 @@
kdDebug() << "=========================" << endl;
kdDebug() << "Number: " << number[0] << endl;
- kdDebug() << "Date: " << QDateTime( date, time ) << endl;
+ kdDebug() << "Date: " << KDateTime( date, time ) << endl;
kdDebug() << "Slot: " << kmobileSMS->slot() << endl;
kdDebug() << "Folder: " << kmobileSMS->folder() << endl;
kdDebug() << "Location: " << kmobileSMS->location() << endl;
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/sms.cpp #678170:678171
@@ -39,7 +39,7 @@
{ parent=p_parent; }
QStringList sl_numbers;
// QString s_text;
- QDateTime dt_datetime;
+ KDateTime dt_datetime;
int i_folder;
int i_slot;
SMS::SMSType i_type;
@@ -64,7 +64,7 @@
{
}
-SMS::SMS(const QStringList & numbers, const QString & text, const QDateTime & datetime)
+SMS::SMS(const QStringList & numbers, const QString & text, const KDateTime & datetime)
: KMime::Content(), d(new SMSPrivate(this) )
{
setNumbers(numbers);
@@ -84,7 +84,7 @@
setText(text);
}
-void SMS::setDateTime(const QDateTime & datetime)
+void SMS::setDateTime(const KDateTime & datetime)
{
d->dt_datetime=datetime;
}
@@ -299,7 +299,7 @@
void SMS::setText(const QString & text) { setBody(text.toUtf8()); }
QString SMS::getText() const { return QString(body() ); }
QString SMS::getDate() const { return d->dt_datetime.toString(); }
-QDateTime SMS::getDateTime() const { return d->dt_datetime; }
+KDateTime SMS::getDateTime() const { return d->dt_datetime; }
void SMS::setRawSlot(const QString &rawSlot){ d->s_rawSlot=rawSlot;}
QString SMS::rawSlot() const { return d->s_rawSlot;}
void SMS::setNumbers(const QStringList & numbers) { d->sl_numbers=numbers; }
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/libkmobiletools/sms.h #678170:678171
@@ -25,7 +25,7 @@
#include <QtCore/QObject>
#include <QtCore/QStringList>
-#include <QtCore/QDateTime>
+#include <kdatetime.h>
#include <QtCore/QSharedDataPointer>
/**
@author Marco Gulino
@@ -37,7 +37,7 @@
public:
SMS();
SMS(const QStringList & numbers, const QString & text);
- SMS(const QStringList & numbers, const QString & text, const QDateTime & datetime);
+ SMS(const QStringList & numbers, const QString & text, const KDateTime & datetime);
virtual ~SMS();
@@ -59,11 +59,11 @@
virtual QString getFrom() const;
virtual QStringList getTo() const;
virtual QString getDate() const;
- virtual QDateTime getDateTime() const;
+ virtual KDateTime getDateTime() const;
virtual void setRawSlot(const QString &rawSlot);
virtual QString rawSlot() const;
void setNumbers(const QStringList & numbers);
- void setDateTime(const QDateTime & datetime);
+ void setDateTime(const KDateTime & datetime);
void setFolder( int newFolder );
int folder() const;
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/kmobiletools_mainpart.cpp #678170:678171
@@ -162,7 +162,7 @@
if(qApp->isSessionRestored() )
QTimer::singleShot( 100, this, SLOT(slotHide()) );
- QFile testfile(QString("/var/lock/testLock.%1").arg(QDateTime::currentDateTime().toTime_t() ) );
+ QFile testfile(QString("/var/lock/testLock.%1").arg(KDateTime::currentLocalDateTime().toTime_t() ) );
if(testfile.open( QIODevice::WriteOnly ) )
{
testfile.close();
--- trunk/KDE/kdepim/kmobiletools/kmobiletools/mainpart/smslistviewitem.cpp #678170:678171
@@ -36,7 +36,7 @@
p_phoneBook=phoneBook;
if(! sms->getFrom().isNull()) setText(0, KMobileTools::KMobiletoolsHelper::translateNumber(sms->getFrom() ) );
if(!sms->getTo().isEmpty()) setText(1, KMobileTools::KMobiletoolsHelper::translateNumber(sms->getTo ().join(",") ) );
- setText(2, sms->getDateTime().toString(Qt::LocalDate) );
+ setText(2, sms->getDateTime().toString(KDateTime::LocalDate) );
setText(3, sms->getText().replace( '\n', ' ').replace( '\r', ' ').trimmed() );
}
More information about the kmobiletools
mailing list