Menu
▾
▴
[KCheckGMail-Development] kcheckgmail: Changes to 'kde4-port'
|
From: Luís P. <lpe...@al...> - 2009-06-12 20:06:56
|
src/CMakeLists.txt | 3 -
src/gmail.cpp | 52 ++++++++++++++++++++-----
src/gmail.h | 2
src/gmailparser.cpp | 10 ++--
src/gmailparser.h | 2
src/jsprotocol.cpp | 6 +-
src/jsprotocol.h | 2
src/kcheckgmailcore.cpp | 99 +++++++++++++++++++++++++++---------------------
src/kcheckgmailcore.h | 4 -
src/kcheckgmailcore_p.h | 8 ++-
src/kcheckgmailtray.cpp | 4 -
src/kcheckgmailtray.h | 2
12 files changed, 122 insertions(+), 72 deletions(-)
New commits:
commit a56bb8cbf5b8c1847392112f78a53209e6c3268f
Author: Luís Pereira <lui...@gm...>
Date: Fri Jun 12 12:51:31 2009 -0700
Fixes a typo in a function name
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index 9379c69..7a9c2cd 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -67,7 +67,7 @@ KCheckGmailCore::KCheckGmailCore(QObject* parent)
initTray();
initActions();
- buidTrayPopupMenu();
+ buildTrayPopupMenu();
initConfigDialog();
makeConnections(d->mJSP, d->mTray);
@@ -146,7 +146,7 @@ void KCheckGmailCore::initActions()
}
-void KCheckGmailCore::buidTrayPopupMenu()
+void KCheckGmailCore::buildTrayPopupMenu()
{
d->menu = qobject_cast<KMenu *>(d->mTray->contextMenu());
d->menu->clear();
diff --git a/src/kcheckgmailcore.h b/src/kcheckgmailcore.h
index 0d542db..a54331c 100644
--- a/src/kcheckgmailcore.h
+++ b/src/kcheckgmailcore.h
@@ -93,7 +93,7 @@ private:
void initTray();
void initActions();
- void buidTrayPopupMenu();
+ void buildTrayPopupMenu();
void initConfigDialog();
void makeConnections(JSProtocol* mJSP, KCheckGmailTray* mTray);
void start();
commit d454063a5f4f43e399ac8a52b932685022fb4954
Author: Luís Pereira <lui...@gm...>
Date: Fri Jun 12 08:30:42 2009 -0700
Gets rid of the QObject second parameter (const char* name = 0)
A 'lot' of warnings simply go away.
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/gmail.cpp b/src/gmail.cpp
index 9475ba2..afd1946 100644
--- a/src/gmail.cpp
+++ b/src/gmail.cpp
@@ -69,7 +69,7 @@ public:
};
-GMail::GMail(QObject* parent, const char* name)
+GMail::GMail(QObject* parent)
: QObject(parent),
d(new Private())
{
diff --git a/src/gmail.h b/src/gmail.h
index ba9c3ae..6be0a7d 100644
--- a/src/gmail.h
+++ b/src/gmail.h
@@ -40,7 +40,7 @@ class GMail : public QObject
{
Q_OBJECT
public:
- GMail(QObject* parent = 0, const char* name = 0);
+ GMail(QObject* parent = 0);
virtual ~GMail();
void checkLoginParams();
diff --git a/src/gmailparser.cpp b/src/gmailparser.cpp
index eef29a2..2644244 100644
--- a/src/gmailparser.cpp
+++ b/src/gmailparser.cpp
@@ -38,7 +38,7 @@
* This class parses the resulting data of a call to
* Gmail's JavaScript interface.
*/
-GMailParser::GMailParser(QObject* parent, const char* name) :
+GMailParser::GMailParser(QObject* parent) :
QObject(parent),
mInvites(0)
{
diff --git a/src/gmailparser.h b/src/gmailparser.h
index 8f9791d..abfd794 100644
--- a/src/gmailparser.h
+++ b/src/gmailparser.h
@@ -104,7 +104,7 @@ public:
ParsedOnlyCount
};
- GMailParser(QObject* parent = 0, const char* name = 0);
+ GMailParser(QObject* parent = 0);
virtual ~GMailParser();
void parse(const QString &data);
diff --git a/src/jsprotocol.cpp b/src/jsprotocol.cpp
index 0a50503..ecee018 100644
--- a/src/jsprotocol.cpp
+++ b/src/jsprotocol.cpp
@@ -23,10 +23,10 @@
namespace KCheckGmail {
-JSProtocol::JSProtocol(QObject* parent, const char* name)
+JSProtocol::JSProtocol(QObject* parent)
: QObject(parent),
- mParser(new GMailParser(this, "JS_GMailParser")),
- mGmail(new GMail(this, "JS_GMailNetwork")),
+ mParser(new GMailParser(this)),
+ mGmail(new GMail(this)),
firstTime(true)
{
connect(mParser, SIGNAL(countUpdate(unsigned int)),
diff --git a/src/jsprotocol.h b/src/jsprotocol.h
index 69515b7..47d20bc 100644
--- a/src/jsprotocol.h
+++ b/src/jsprotocol.h
@@ -45,7 +45,7 @@ class JSProtocol : public QObject {
Q_OBJECT
public:
- JSProtocol(QObject* parent, const char* name = 0);
+ JSProtocol(QObject* parent);
~JSProtocol();
GMailParser* parser();
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index eeebb94..9379c69 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -58,11 +58,11 @@
#include <ktoolinvocation.h>
-KCheckGmailCore::KCheckGmailCore(QObject* parent, const char* name)
+KCheckGmailCore::KCheckGmailCore(QObject* parent)
: QObject(parent),
d(new Private)
{
- d->mJSP = new JSProtocol(this, "JSProtocol");
+ d->mJSP = new JSProtocol(this);
d->actions = new KActionCollection(this);
initTray();
@@ -95,14 +95,14 @@ KCheckGmailCore::~KCheckGmailCore()
KCheckGmailCore& KCheckGmailCore::instance()
{
- static KCheckGmailCore object(0, "KCheckGmailCore");
+ static KCheckGmailCore object(0);
return object;
}
void KCheckGmailCore::initTray()
{
- d->mTray = new KCheckGmailTray(0, "KCheckGmailTray");
+ d->mTray = new KCheckGmailTray(0);
connect(d->mTray, SIGNAL(quitSelected()), kapp, SLOT(quit()));
connect(d->mTray, SIGNAL(leftButtonClicked()),
diff --git a/src/kcheckgmailcore.h b/src/kcheckgmailcore.h
index 3e9f992..0d542db 100644
--- a/src/kcheckgmailcore.h
+++ b/src/kcheckgmailcore.h
@@ -86,7 +86,7 @@ private slots:
void slotOpenButtonClicked();
private:
- KCheckGmailCore(QObject* parent = 0, const char* name = 0);
+ KCheckGmailCore(QObject* parent = 0);
virtual ~KCheckGmailCore();
KCheckGmailCore(KCheckGmailCore&);
KCheckGmailCore& operator=(const KCheckGmailCore&);
diff --git a/src/kcheckgmailtray.cpp b/src/kcheckgmailtray.cpp
index ba19173..7ee5421 100644
--- a/src/kcheckgmailtray.cpp
+++ b/src/kcheckgmailtray.cpp
@@ -47,7 +47,7 @@
-KCheckGmailTray::KCheckGmailTray(QWidget *parent, const char *name)
+KCheckGmailTray::KCheckGmailTray(QWidget *parent)
: KSystemTrayIcon(parent),
mMailCount(0)
{
diff --git a/src/kcheckgmailtray.h b/src/kcheckgmailtray.h
index cb0976a..4ff0158 100644
--- a/src/kcheckgmailtray.h
+++ b/src/kcheckgmailtray.h
@@ -47,7 +47,7 @@ class KCheckGmailTray : public KSystemTrayIcon
{
Q_OBJECT
public:
- KCheckGmailTray(QWidget *parent = 0, const char *name = 0);
+ KCheckGmailTray(QWidget *parent = 0);
virtual ~KCheckGmailTray();
void takeScreenshotOfTrayIcon();
commit ae309c480adf4d09dbec9178d5fd295057e26916
Author: Luís Pereira <lui...@gm...>
Date: Fri Jun 12 12:20:09 2009 -0700
Removes QT3Support & KDE3Support
They are not needed anymore. We are now a 'native' KDE4 application.
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35a0631..f1abc1d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
@@ -29,7 +28,7 @@ kde4_add_kcfg_files(kcheckgmail_SRCS prefs.kcfgc)
kde4_add_executable(kcheckgmail ${kcheckgmail_SRCS})
-target_link_libraries(kcheckgmail ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
+target_link_libraries(kcheckgmail ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} )
install(TARGETS kcheckgmail ${INSTALL_TARGETS_DEFAULT_ARGS})
commit b34ee1f5b5be21afcdce4bc4b9e5962580027537
Author: Luís Pereira <lui...@gm...>
Date: Fri Jun 12 12:03:53 2009 -0700
Replaces deprecated QMutex::locked()
Just do it by the book:
http://doc.qtsoftware.com/4.5/qmutex-qt3.html#locked
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/gmail.cpp b/src/gmail.cpp
index d0a94e4..9475ba2 100644
--- a/src/gmail.cpp
+++ b/src/gmail.cpp
@@ -104,12 +104,24 @@ GMail::GMail(QObject* parent, const char* name)
GMail::~GMail()
{
- if (mCheckLock->locked())
+ bool isLocked;
+
+ isLocked = true;
+ if (mCheckLock->tryLock()) {
+ mCheckLock->unlock();
+ isLocked = false;
+ }
+ if (isLocked)
mCheckLock->unlock();
delete mCheckLock;
mCheckLock = 0;
- if (mLoginLock->locked())
+ isLocked = true;
+ if (mLoginLock->tryLock()) {
+ mLoginLock->unlock();
+ isLocked = false;
+ }
+ if (isLocked)
mLoginLock->unlock();
delete mLoginLock;
mLoginLock = 0;
@@ -153,8 +165,13 @@ void GMail::checkLoginParams()
}
kDebug() << k_funcinfo << "Using " << useUsername << " as username and " << useDomain << " as domain" << endl;
-
- if(!mLoginLock->locked()) {
+
+ bool isLocked = true;
+ if (mLoginLock->tryLock()) {
+ mLoginLock->unlock();
+ isLocked = false;
+ }
+ if(!isLocked) {
//Try to log out if a session already exists (because it might be from another address)
if(isLoggedIn(false)) {
@@ -351,8 +368,13 @@ void GMail::slotLoginResult(KJob *job)
///////////////////////////////////////////////////////////////////////////
void GMail::postLogin(QString url)
{
+ bool isLocked = true;
+ if (mLoginLock->tryLock()) {
+ mLoginLock->unlock();
+ isLocked = false;
+ }
// this is expected to be locked.
- if(mLoginLock->locked()) {
+ if(isLocked) {
static QRegExp rx("^(http[s]?://)(.*)$");
int found;
@@ -640,7 +662,12 @@ bool GMail::isLoggedIn(bool lockCheck)
{
bool ret = false;
- if( !lockCheck || ( lockCheck && !mLoginLock->locked() ) ) {
+ bool isLocked = true;
+ if (mLoginLock->tryLock()) {
+ mLoginLock->unlock();
+ isLocked = false;
+ }
+ if( !lockCheck || ( lockCheck && !isLocked ) ) {
if(cookieExists(ACTION_TOKEN_COOKIE))
ret = true;
else kDebug() << k_funcinfo << ACTION_TOKEN_COOKIE << " wasn't found!" << endl;
@@ -847,7 +874,12 @@ void GMail::slotSessionChanged()
{
logOut();
- if(mCheckLock->locked())
+ bool isLocked = true;
+ if (mCheckLock->tryLock()) {
+ mCheckLock->unlock();
+ isLocked = false;
+ }
+ if (isLocked)
mCheckLock->unlock();
//Clearing values will force login
commit 86166b54daa75c1493834f89192ae5ca5a5e9743
Author: Luís Pereira <lui...@gm...>
Date: Fri Jun 12 07:43:38 2009 -0700
Drops all deprecated QMenu related stuff
The threads menu now uses an signal mapper to map the selected action
(thread) to the thread id.
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index f947094..eeebb94 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -51,6 +51,7 @@
#include <qfile.h>
#include <qtooltip.h>
#include <QHash>
+#include <QSignalMapper>
//Added by qt3to4:
#include <QList>
#include <QPixmap>
@@ -138,6 +139,10 @@ void KCheckGmailCore::initActions()
d->actions->addAction("compose-mail", d->actionComposeMail);
connect(d->actionComposeMail, SIGNAL(triggered(bool)),
this, SLOT(slotComposeMail()));
+
+ d->threadsMapper = new QSignalMapper(this);
+ connect(d->threadsMapper, SIGNAL(mapped(int)),
+ this, SLOT(slotThreadActivated(int)));
}
@@ -148,8 +153,6 @@ void KCheckGmailCore::buidTrayPopupMenu()
d->mThreadsMenu = new KMenu(d->menu);
- connect(d->mThreadsMenu, SIGNAL(activated(int)),
- SLOT(slotThreadActivated(int)));
#if 0
connect(d->mThreadsMenu, SIGNAL(highlighted(int)),
SLOT(slotThreadsItemHighlighted(int)));
@@ -167,14 +170,17 @@ void KCheckGmailCore::buidTrayPopupMenu()
d->menu->addAction(d->actionLaunchBrowser);
d->menu->addAction(d->actionComposeMail);
- d->mThreadsMenuId = d->menu->insertItem(SmallIcon("kcheckgmail"),
- i18n("Th&reads"), d->mThreadsMenu);
- d->mTray->contextMenu()->setItemEnabled(d->mThreadsMenuId, false);
+ d->mThreadsMenuAction = d->menu->addMenu(d->mThreadsMenu);
+ d->mThreadsMenuAction->setIcon(SmallIcon("kcheckgmail"));
+ d->mThreadsMenuAction->setText(i18n("Th&reads"));
+ d->mThreadsMenuAction->setEnabled(false);
d->menu->addSeparator();
d->mHelpMenu = new KHelpMenu(d->menu, KGlobal::mainComponent().aboutData(), false, d->actions);
- d->menu->insertItem(SmallIcon("help-contents"), KStandardGuiItem::help().text(), d->mHelpMenu->menu());
+ d->mHelpMenu->menu()->setIcon(SmallIcon("help-contents"));
+ d->mHelpMenu->menu()->setTitle(KStandardGuiItem::help().text());
+ d->menu->addMenu(d->mHelpMenu->menu());
}
@@ -316,8 +322,12 @@ void KCheckGmailCore::updateThreadMenu()
QMap<QString, int> entries;
QMap<QString,bool> *threads = d->mJSP->parser()->getThreadList();
int numItems = 0;
- int id = 0;
+ /*
+ * There is no need to unmap the mThreadsMenu actions. They are
+ * automatically unmapped when they are destroyed.
+ * QMenu::clear() destroys them.
+ */
d->mThreadsMenu->clear();
if(threads) {
QList<QString> klist = threads->keys();
@@ -332,12 +342,17 @@ void KCheckGmailCore::updateThreadMenu()
str += t.subject;
str.replace("&","&&");
+ QAction* action = new QAction(str, d->mThreadsMenu);
+
// TODO: Add an hasAttach method
- if (t.attachments.isEmpty())
- id = d->mThreadsMenu->insertItem(str, t.id);
- else
- id = d->mThreadsMenu->insertItem(SmallIcon("mail-attachment"), str, t.id);
+ if (!t.attachments.isEmpty())
+ action->setIcon(SmallIcon("mail-attachment"));
+
+ connect(action, SIGNAL(triggered(bool)),
+ d->threadsMapper, SLOT(map()));
+ d->threadsMapper->setMapping(action, t.id);
+ d->mThreadsMenu->addAction(action);
numItems++;
}
iter++;
@@ -345,7 +360,7 @@ void KCheckGmailCore::updateThreadMenu()
delete threads;
threads = 0;
}
- d->mTray->contextMenu()->setItemEnabled(d->mThreadsMenuId, (numItems > 0));
+ d->mThreadsMenuAction->setEnabled(numItems > 0);
}
diff --git a/src/kcheckgmailcore_p.h b/src/kcheckgmailcore_p.h
index ec09bd8..bcb07d2 100644
--- a/src/kcheckgmailcore_p.h
+++ b/src/kcheckgmailcore_p.h
@@ -34,7 +34,9 @@ using KCheckGmail::JSProtocol;
using KCheckGmail::ConfigDialog;
class KActioncollection;
+class QAction;
class KAction;
+class QSignalMapper;
class KPopupmenu;
class KConfig;
class KIconeffect;
@@ -62,7 +64,8 @@ public:
KMenu* menu;
KMenu* mThreadsMenu;
- int mThreadsMenuId;
+ QAction* mThreadsMenuAction;
+ QSignalMapper* threadsMapper;
KHelpMenu* mHelpMenu;
ConfigDialog* mConfigDialog;
@@ -87,7 +90,8 @@ KCheckGmailCore::Private::Private()
menu(0),
mThreadsMenu(0),
- mThreadsMenuId(0),
+ mThreadsMenuAction(0),
+ threadsMapper(0),
mHelpMenu(0),
mConfigDialog(0),
commit 4ced953f3d8ffbecd88f5d29f1e1617d37c9a7e3
Author: Luís Pereira <lui...@gm...>
Date: Thu Jun 11 12:27:12 2009 -0700
Fixes indentation in KCheckGmailCore::updateThreadMenu()
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index c00cb68..f947094 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -313,39 +313,38 @@ QString KCheckGmailCore::getUrlBase()
void KCheckGmailCore::updateThreadMenu()
{
- QMap<QString, int> entries;
- QMap<QString,bool> *threads = d->mJSP->parser()->getThreadList();
- int numItems = 0;
+ QMap<QString, int> entries;
+ QMap<QString,bool> *threads = d->mJSP->parser()->getThreadList();
+ int numItems = 0;
int id = 0;
d->mThreadsMenu->clear();
- if(threads) {
- QList<QString> klist = threads->keys();
- QList<QString>::iterator iter = klist.begin();
-
- kDebug() << k_funcinfo << "number of threads=" << klist.size() << endl;
+ if(threads) {
+ QList<QString> klist = threads->keys();
+ QList<QString>::iterator iter = klist.begin();
- while(iter != klist.end()) {
- const GMailParser::Thread &t = d->mJSP->parser()->getThread(*iter);
- if(!t.isNull) {
- QString str = t.senders;
- str += " - ";
- str += t.subject;
- str.replace("&","&&");
+ kDebug() << k_funcinfo << "number of threads=" << klist.size() << endl;
+ while(iter != klist.end()) {
+ const GMailParser::Thread &t = d->mJSP->parser()->getThread(*iter);
+ if(!t.isNull) {
+ QString str = t.senders;
+ str += " - ";
+ str += t.subject;
+ str.replace("&","&&");
// TODO: Add an hasAttach method
if (t.attachments.isEmpty())
id = d->mThreadsMenu->insertItem(str, t.id);
else
id = d->mThreadsMenu->insertItem(SmallIcon("mail-attachment"), str, t.id);
- numItems ++;
- }
- iter ++;
- }
- delete threads;
- threads = 0;
- }
+ numItems++;
+ }
+ iter++;
+ }
+ delete threads;
+ threads = 0;
+ }
d->mTray->contextMenu()->setItemEnabled(d->mThreadsMenuId, (numItems > 0));
}
commit cbb815e41d4426ad72454e3afcf44142896e9df6
Author: Luís Pereira <lui...@gm...>
Date: Wed Jun 10 11:34:00 2009 -0700
Replaces deprecated QMenu::insertSeparator()
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index 56dba17..c00cb68 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -159,7 +159,7 @@ void KCheckGmailCore::buidTrayPopupMenu()
d->menu->addAction(d->actionShowKNotifyDialog);
d->menu->addAction(d->actionShowPrefsDialog);
- d->menu->insertSeparator();
+ d->menu->addSeparator();
d->menu->addAction(d->mLoginCheckMailAction);
d->mLoginCheckMailAction->setEnabled(false);
@@ -171,7 +171,7 @@ void KCheckGmailCore::buidTrayPopupMenu()
i18n("Th&reads"), d->mThreadsMenu);
d->mTray->contextMenu()->setItemEnabled(d->mThreadsMenuId, false);
- d->menu->insertSeparator();
+ d->menu->addSeparator();
d->mHelpMenu = new KHelpMenu(d->menu, KGlobal::mainComponent().aboutData(), false, d->actions);
d->menu->insertItem(SmallIcon("help-contents"), KStandardGuiItem::help().text(), d->mHelpMenu->menu());
commit 64c11d17e259ae2c5fe24527b41b99404bb1c2aa
Author: Luís Pereira <lui...@gm...>
Date: Wed Jun 10 11:08:59 2009 -0700
Replaces deprecated QStringList::split() by QString::split()
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/gmailparser.cpp b/src/gmailparser.cpp
index a731a5c..eef29a2 100644
--- a/src/gmailparser.cpp
+++ b/src/gmailparser.cpp
@@ -291,7 +291,7 @@ uint GMailParser::parseThread(const QString &_data, const QMap<QString,bool>* ol
t->subject = cleanUpData(rx.cap(7));
t->snippet = cleanUpData(rx.cap(8));
t->labels = rx.cap(9);
- t->attachments = QStringList::split(",", rx.cap(10));
+ t->attachments = rx.cap(10).split(",", QString::SkipEmptyParts);
t->msgId = rx.cap(11);
t->unknown2 = rx.cap(12).toUInt();
t->date_long = rx.cap(13);
@@ -328,7 +328,7 @@ uint GMailParser::parseThread(const QString &_data, const QMap<QString,bool>* ol
t->subject = cleanUpData(rx2.cap(7));
t->snippet = cleanUpData(rx2.cap(8));
t->labels = rx2.cap(9);
- t->attachments = QStringList::split(",", rx.cap(10));
+ t->attachments = rx.cap(10).split(",", QString::SkipEmptyParts);
t->msgId = rx2.cap(11);
t->unknown2 = rx2.cap(12).toUInt();
t->date_long = rx2.cap(13);
@@ -372,7 +372,7 @@ void GMailParser::parseVersion(const QString &_data)
kDebug() << k_funcinfo << "Version string: " << data << endl;
- QStringList list = QStringList::split(",",data);
+ QStringList list = data.split(",", QString::SkipEmptyParts);
if(list.size() != 5)
kWarning() << k_funcinfo << "Wrong number of elements: "
<< list.size() << ", should be: 5." << endl;
@@ -436,7 +436,7 @@ void GMailParser::parseVersion(const QString &_data)
*/
void GMailParser::parseQuota(const QString &data)
{
- QStringList list = QStringList::split(",",data);
+ QStringList list = data.split(",", QString::SkipEmptyParts);
if(list.size() == 4 || list.size() == 9) {
QStringList::Iterator iter = list.begin();
unsigned int i = 0;
commit 2df511507180f9a2b9e67acb3728d546c8b31d8b
Author: Luís Pereira <lui...@gm...>
Date: Wed Jun 10 10:45:59 2009 -0700
Replaces deprecated QTimer constructor
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/kcheckgmailtray.cpp b/src/kcheckgmailtray.cpp
index 52610cb..ba19173 100644
--- a/src/kcheckgmailtray.cpp
+++ b/src/kcheckgmailtray.cpp
@@ -59,7 +59,7 @@ KCheckGmailTray::KCheckGmailTray(QWidget *parent, const char *name)
false).toImage();
setIcon(mPixGmail);
- mLoginAnim = new QTimer(this, "KCheckGmail::login");
+ mLoginAnim = new QTimer(this);
connect(mLoginAnim, SIGNAL(timeout()),
this, SLOT(slotToggleLoginAnim()));
commit ead5921312b07a7f49a2d47590149f282a380b1c
Author: Luís Pereira <lui...@gm...>
Date: Wed Jun 10 10:43:52 2009 -0700
Replaces deprecated QTimer::changeInterval() by QTimer::setInterval()
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/gmail.cpp b/src/gmail.cpp
index 5dbbac3..d0a94e4 100644
--- a/src/gmail.cpp
+++ b/src/gmail.cpp
@@ -623,7 +623,7 @@ void GMail::setInterval(unsigned int i, bool forceStart)
else
running = mTimer->isActive();
- mTimer->changeInterval(MILLISECS(mInterval));
+ mTimer->setInterval(MILLISECS(mInterval));
//Prevent starting the timer when it wasn't needed to
if(!running)
commit 8e942b5256ac06a64513e5822136e311b05e132a
Author: Luís Pereira <lui...@gm...>
Date: Wed Jun 10 10:12:59 2009 -0700
Replaces deprecated QTimer::start (int msec, bool sshot)
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index 2cfc883..56dba17 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -450,7 +450,8 @@ void KCheckGmailCore::slotLeftButtonClicked()
if(Prefs::catchAccidentalClick()) {
static QTimer *t = new QTimer(this);
if(!t->isActive()) {
- t->start(ACCIDENTAL_CLICK_TIMEOUT, true);
+ t->setSingleShot(true);
+ t->start(ACCIDENTAL_CLICK_TIMEOUT);
slotLaunchBrowser();
}
} else
commit 534ece3ccbf0910bc68d5fcb62af42e44c660f0e
Author: Luís Pereira <lui...@gm...>
Date: Wed Jun 10 10:04:53 2009 -0700
Replaces deprecated QString::lower() by QString::toLower()
Signed-off-by: Luís Pereira <lui...@gm...>
diff --git a/src/gmail.cpp b/src/gmail.cpp
index 0c6c2e1..5dbbac3 100644
--- a/src/gmail.cpp
+++ b/src/gmail.cpp
@@ -744,7 +744,7 @@ bool GMail::setDomainAdvice(QString url, QString advice)
return false;
}
- if (QString::compare(advice.lower(),getDomainAdvice(url).lower()) == 0) {
+ if (QString::compare(advice.toLower(),getDomainAdvice(url).toLower()) == 0) {
return true;
} else {
return false;
|