From: Luís P. <lpe...@al...> - 2009-06-04 19:50:58
|
src/appearancesettingsbase.ui | 8 +------- src/appletsettingsbase.ui | 20 ++++---------------- src/gmail.cpp | 37 ++++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 40 deletions(-) New commits: commit f09486a51c530ba7ca67833c27597eb3d9dc8084 Author: Luís Pereira <lui...@gm...> Date: Wed Jun 3 05:23:59 2009 -0700 Replaces deprecated Q3ButtonGroup Replaced by QGroupBox. Signed-off-by: Luís Pereira <lui...@gm...> diff --git a/src/appletsettingsbase.ui b/src/appletsettingsbase.ui index 9cdf1bf..cd69b41 100644 --- a/src/appletsettingsbase.ui +++ b/src/appletsettingsbase.ui @@ -91,7 +91,7 @@ </spacer> </item> <item row="1" column="0" > - <widget class="Q3ButtonGroup" name="buttonGroup1" > + <widget class="QGroupBox" name="groupBox4" > <property name="title" > <string>Browser</string> </property> @@ -185,12 +185,6 @@ <extends>QFrame</extends> <header>kurlrequester.h</header> </customwidget> - <customwidget> - <class>Q3ButtonGroup</class> - <extends>Q3GroupBox</extends> - <header>Qt3Support/Q3ButtonGroup</header> - <container>1</container> - </customwidget> </customwidgets> <includes> <include location="local" >kurlrequester.h</include> commit 705190a8f10c83763ff98dd0f8ae408f1954323c Author: Luís Pereira <lui...@gm...> Date: Wed Jun 3 05:00:13 2009 -0700 Replaces deprecated Q3GroupBox Replaced by QGroupBox. Signed-off-by: Luís Pereira <lui...@gm...> diff --git a/src/appearancesettingsbase.ui b/src/appearancesettingsbase.ui index 5982674..194c4ad 100644 --- a/src/appearancesettingsbase.ui +++ b/src/appearancesettingsbase.ui @@ -19,7 +19,7 @@ <number>0</number> </property> <item row="0" column="0"> - <widget class="Q3GroupBox" name="groupBox1"> + <widget class="QGroupBox" name="groupBox1"> <property name="title"> <string>Tray Icon</string> </property> @@ -81,12 +81,6 @@ of unread messages:</string> <extends>QPushButton</extends> <header>kcolorbutton.h</header> </customwidget> - <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> </customwidgets> <includes> <include location="local">kcolorbutton.h</include> diff --git a/src/appletsettingsbase.ui b/src/appletsettingsbase.ui index d071bd7..9cdf1bf 100644 --- a/src/appletsettingsbase.ui +++ b/src/appletsettingsbase.ui @@ -17,7 +17,7 @@ <number>0</number> </property> <item row="2" column="0" > - <widget class="Q3GroupBox" name="groupBox2" > + <widget class="QGroupBox" name="groupBox2" > <property name="title" > <string>Debug</string> </property> @@ -36,7 +36,7 @@ </widget> </item> <item row="3" column="0" > - <widget class="Q3GroupBox" name="groupBox3" > + <widget class="QGroupBox" name="groupBox3" > <property name="title" > <string>Fields displayed when only one email arrives</string> </property> @@ -150,7 +150,7 @@ </widget> </item> <item row="0" column="0" > - <widget class="Q3GroupBox" name="groupBox1" > + <widget class="QGroupBox" name="groupBox1" > <property name="title" > <string>Tray Icon</string> </property> @@ -186,12 +186,6 @@ <header>kurlrequester.h</header> </customwidget> <customwidget> - <class>Q3GroupBox</class> - <extends>QGroupBox</extends> - <header>Qt3Support/Q3GroupBox</header> - <container>1</container> - </customwidget> - <customwidget> <class>Q3ButtonGroup</class> <extends>Q3GroupBox</extends> <header>Qt3Support/Q3ButtonGroup</header> commit 10d6b633e7d583dcb78388f7f4537efab7981399 Author: Luís Pereira <lui...@gm...> Date: Wed Jun 3 04:00:40 2009 -0700 Refactors GMail::checkGMail() a little bit Actually url and prefsUrl should be moved to an Private d class. Later on! Signed-off-by: Luís Pereira <lui...@gm...> diff --git a/src/gmail.cpp b/src/gmail.cpp index bb3d960..da02e8b 100644 --- a/src/gmail.cpp +++ b/src/gmail.cpp @@ -439,29 +439,28 @@ void GMail::checkGMail() emit checkStart(); QString url; + QLatin1String prefsUrl = QLatin1String( + QUrl::toPercentEncoding(Prefs::searchFor())); if(!isGAP4D) { url = QString(gGMailCheckURL).arg( (Prefs::useHTTPS() ? "https" : "http" ), - QLatin1String(QUrl::toPercentEncoding(Prefs::searchFor()))); - - url.replace('@','%'); + prefsUrl); } else { url = QString(gGAP4DCheckURL).arg( (Prefs::useHTTPS() ? "https" : "http" ), useDomain, - QLatin1String(QUrl::toPercentEncoding(Prefs::searchFor()))); - - url.replace('@','%'); + prefsUrl); } + url.replace('@','%'); if (d->buffer) { kDebug() << k_funcinfo << "d->buffer isn't empty. Shouldn't happen" << endl; - return; + return; } d->buffer = new QBuffer; d->buffer->open(QIODevice::WriteOnly); commit fe088e52641c6aafefcdc7538c1604fb9b75a89f Author: Luís Pereira <lui...@gm...> Date: Wed Jun 3 03:28:14 2009 -0700 Replaces deprecated KUrl::encode_string() By QLatin1String(QUrl::toPercentEncoding()) Signed-off-by: Luís Pereira <lui...@gm...> diff --git a/src/gmail.cpp b/src/gmail.cpp index a1b8108..bb3d960 100644 --- a/src/gmail.cpp +++ b/src/gmail.cpp @@ -199,9 +199,10 @@ void GMail::slotGetWalletPassword(const QString& pass) } str = QString(LoginPOSTFormat).arg( - KUrl::encode_string(useUsername), - KUrl::encode_string(pass) - ).replace('@','%'); + QLatin1String(QUrl::toPercentEncoding(useUsername)), + QLatin1String(QUrl::toPercentEncoding(pass))); + str.replace('@','%'); + kDebug() << k_funcinfo << "Requesting login URL" << endl; loginRedirection = ""; @@ -439,21 +440,24 @@ void GMail::checkGMail() QString url; - if(!isGAP4D) + if(!isGAP4D) { url = QString(gGMailCheckURL).arg( (Prefs::useHTTPS() ? "https" : "http" ), - KUrl::encode_string(Prefs::searchFor()) - ).replace('@','%'); - else + QLatin1String(QUrl::toPercentEncoding(Prefs::searchFor()))); + + url.replace('@','%'); + } else { url = QString(gGAP4DCheckURL).arg( (Prefs::useHTTPS() ? "https" : "http" ), useDomain, - KUrl::encode_string(Prefs::searchFor()) - ).replace('@','%'); + QLatin1String(QUrl::toPercentEncoding(Prefs::searchFor()))); + + url.replace('@','%'); + } if (d->buffer) { kDebug() << k_funcinfo << "d->buffer isn't empty. Shouldn't happen" << endl; commit 4de25a01c4350e42e2757ccc59fbd99e6269de73 Author: Luís Pereira <lui...@gm...> Date: Wed Jun 3 03:35:45 2009 -0700 Replaces deprecated QString::find() QString::find() replaced by QString::contains() Signed-off-by: Luís Pereira <lui...@gm...> diff --git a/src/gmail.cpp b/src/gmail.cpp index 2669f0d..a1b8108 100644 --- a/src/gmail.cpp +++ b/src/gmail.cpp @@ -141,7 +141,7 @@ void GMail::checkLoginParams() useDomain = ""; isGAP4D = false; - if( mUsername.find("@") != -1 ) { + if( mUsername.contains("@") ) { if ( QString::compare(mUsername.section("@",1),"gmail.com") != 0 && QString::compare(mUsername.section("@",1),"googlemail.com") != 0) { @@ -268,9 +268,9 @@ void GMail::slotLoginResult(KJob *job) if( redirection == QString::null ) { if(!isLoggedIn(false)) { - if(mLoginBuffer.find("onload") != -1 && ( - mLoginBuffer.find("FixForm") != -1 || - mLoginBuffer.find("start_time") != -1)) { + if(mLoginBuffer.contains("onload") && ( + mLoginBuffer.contains("FixForm") || + mLoginBuffer.contains("start_time") )) { mLoginLock->unlock(); emit loginDone(false, mLoginFromTimer, i18n("Invalid username or password")); @@ -282,9 +282,9 @@ void GMail::slotLoginResult(KJob *job) emit loginDone(false, mLoginFromTimer, i18n("GMail's login procedure has changed, check for new version")); return; } - } else if (mLoginBuffer.find("?ui=html") != -1 && ( - mLoginBuffer.find("nocheckbrowser") != -1 || - mLoginBuffer.find("noscript") != -1 )) { + } else if (mLoginBuffer.contains("?ui=html") && ( + mLoginBuffer.contains("nocheckbrowser") || + mLoginBuffer.contains("noscript") )) { kDebug() << k_funcinfo << "Google is performing dirty JS check, bypassing it" << endl; if (loginRedirection.isEmpty()) { |