[SCM] KCheckGMail's Development repository branch, kde4-port, updated. acff3181862d04cc85b55a6e188470d299e74ae9

[Luís Pereira]

The following commit has been merged in the kde4-port branch:
commit 7bc15a4c39a515da5838875fa1edd4689b57b7c5
Author: Luís Pereira <luis.artur.pereira at gmail.com>
Date:   Thu Jul 16 08:42:13 2009 -0700

    Replaces QString::null by QString()
    
    Signed-off-by: Luís Pereira <luis.artur.pereira at gmail.com>
---
 src/gmail.cpp           |   14 +++++++-------
 src/gmail.h             |    2 +-
 src/kcheckgmailcore.cpp |   12 ++++++------
 src/kcheckgmailcore.h   |    2 +-
 src/kcheckgmailtray.cpp |    2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/gmail.cpp b/src/gmail.cpp
index 5a6eb47..f2838ce 100644
--- a/src/gmail.cpp
+++ b/src/gmail.cpp
@@ -147,7 +147,7 @@ void GMail::checkLoginParams()
 	
 	mUsername = username;
 	mPasswordHash = password;
-	sessionCookie = QString::null;
+	sessionCookie = QString();
 	
 	useUsername = mUsername;
 	useDomain = "";
@@ -299,7 +299,7 @@ void GMail::slotLoginResult(KJob *job)
 		redirection = getRedirectURL(mLoginBuffer);
 		dump2File("gmail_login.html", mLoginBuffer);
 		
-		if( redirection == QString::null ) {
+		if( redirection == QString() ) {
 			
 			if(!isLoggedIn(false)) {
 				if(mLoginBuffer.contains("onload") && (
@@ -466,7 +466,7 @@ void GMail::slotPostLoginResult(KJob *job)
 
 			QString url = getRedirectURL(mPostLoginBuffer);
 			
-			if(url == QString::null) {
+			if(url == QString()) {
 				dump2File("gmail_postlogin.html", mPostLoginBuffer);
 				mPostLoginBuffer = "";
 				
@@ -713,7 +713,7 @@ void GMail::logOut(bool force)
 		return;
 
 	alreadyRunning = true;
-	sessionCookie = QString::null;
+	sessionCookie = QString();
 	mTimer->stop();
 	
 	QString logoutUrl = (!isGAP4D)? gGMailLogOut : QString(gGAP4DLogOut).arg(useDomain);
@@ -792,7 +792,7 @@ QString GMail::getDomainAdvice(QString url)
 		QDBusError error = reply.error();
 		kWarning() << k_funcinfo << "D-BUS error while calling getDomainAdvice" << endl;
 		kDebug() << "Error description:" << error.message() << endl;
-		return QString::null;
+		return QString();
 	}
 
 	return reply.value();
@@ -821,7 +821,7 @@ QString GMail::findCookies(QString url)
 		QDBusError error = reply.error();
 		kWarning() << k_funcinfo << "D-BUS error while calling findCookies" << endl;
 		kWarning() << "Error description:" << error.message() << endl;
-		return QString::null;
+		return QString();
 	}
 	return reply.value();
 }
@@ -916,7 +916,7 @@ QString GMail::getRedirectURL(QString buffer)
 	found = metaRX.indexIn(buffer);
 			
 	if( found == -1 ) {
-		return QString::null;
+		return QString();
 	}
 	
 	url = KCharsets::resolveEntities(metaRX.cap(2));
diff --git a/src/gmail.h b/src/gmail.h
index 6be0a7d..56e2158 100644
--- a/src/gmail.h
+++ b/src/gmail.h
@@ -135,7 +135,7 @@ private slots:
 
 signals:
 	void loginStart();
-	void loginDone(bool success, bool spawnedFromTimer, const QString &why = QString::null);
+	void loginDone(bool success, bool spawnedFromTimer, const QString &why = QString());
 
 	void checkStart();
 	void checkDone(const QString &data);
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index 7a9c2cd..e8180b0 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -425,7 +425,7 @@ void KCheckGmailCore::slotLaunchBrowser(const QString &url)
 {
 	QString loadURL;
 
-	if(url == QString::null) {
+	if(url == QString()) {
 		loadURL = getUrlBase();
 		
 		if (Prefs::gMailSimpleInterface())
@@ -596,7 +596,7 @@ void KCheckGmailCore::slotSettingsChanged()
 							"<p>A search without an <i>in:</i> and <i>label:</i> will return all unread emails.</p>"
 							"<p>If what you want is to show the new emails in your inbox use <i>in:inbox</i> or leave empty.</p>"
 							"<p>Are you sure you want to proceed without specifying location?</p>"),
-       					QString::null,
+       					QString(),
        					KStandardGuiItem::yes(),
 					KStandardGuiItem::no(),
 					"no_location_check");
@@ -611,7 +611,7 @@ void KCheckGmailCore::slotSettingsChanged()
 							".</p>"
 							"<p>It should be set to ensure more unread messages are retrieved.</p>"
 							"<p>Are you sure you want to proceed?</p>"),
-					QString::null,
+					QString(),
 					KStandardGuiItem::yes(),
 					KStandardGuiItem::no(),
 					"is_unread_check");
@@ -767,7 +767,7 @@ QString KCheckGmailCore::getThreadSubject(QString msgId)
 	GMailParser::Thread t = d->mJSP->parser()->getThread(msgId);
 	
 	if (t.subject.isEmpty()) {
-		return QString::null;
+		return QString();
 	}
 	
 	return t.subject;
@@ -779,7 +779,7 @@ QString KCheckGmailCore::getThreadSender(QString msgId)
 	GMailParser::Thread t = d->mJSP->parser()->getThread(msgId);
 	
 	if (t.senders.isEmpty()) {
-		return QString::null;
+		return QString();
 	}
 	
 	return t.senders;
@@ -791,7 +791,7 @@ QString KCheckGmailCore::getThreadSnippet(QString msgId)
 	GMailParser::Thread t = d->mJSP->parser()->getThread(msgId);
 	
 	if (t.snippet.isEmpty()) {
-		return QString::null;
+		return QString();
 	}
 	
 	return t.snippet;
diff --git a/src/kcheckgmailcore.h b/src/kcheckgmailcore.h
index a54331c..faa6159 100644
--- a/src/kcheckgmailcore.h
+++ b/src/kcheckgmailcore.h
@@ -65,7 +65,7 @@ private slots:
 	void slotShowKNotifyDialog();
 	void slotShowPrefsDialog();
 
-	void slotLaunchBrowser(const QString &url = QString::null);
+	void slotLaunchBrowser(const QString &url = QString());
 	void slotComposeMail();
 
 	void slotLeftButtonClicked();
diff --git a/src/kcheckgmailtray.cpp b/src/kcheckgmailtray.cpp
index 7ee5421..d5a4fb7 100644
--- a/src/kcheckgmailtray.cpp
+++ b/src/kcheckgmailtray.cpp
@@ -269,7 +269,7 @@ void KCheckGmailTray::slotgNameUpdate(QString name)
 	kDebug() << k_funcinfo << "Updating tooltip" << endl;
 	
 	//Trick to restore the tooltip
-	if(name == QString::null)
+	if(name == QString())
 		name = sname;
 	else
 		sname = name;

-- 
KCheckGMail's Development repository