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

Luís Pereira lpereira-guest at alioth.debian.org
Tue Jul 21 17:15:29 UTC 2009


The following commit has been merged in the kde4-port branch:
commit f6923600d9de5e958faf22d0a9f58d81f8b076e5
Author: Luís Pereira <luis.artur.pereira at gmail.com>
Date:   Tue Jul 21 09:30:18 2009 -0700

    Ran $SVN/trunk/KDE/kdesdk/scripts/qt4/convert-newq4headers.pl
    
    Signed-off-by: Luís Pereira <luis.artur.pereira at gmail.com>
---
 src/gmail.cpp            |    8 ++++----
 src/gmail.h              |    4 ++--
 src/gmailparser.cpp      |    2 +-
 src/gmailparser.h        |    6 +++---
 src/gmailwalletmanager.h |    4 ++--
 src/jsprotocol.h         |    2 +-
 src/kcheckgmailcore.cpp  |    4 ++--
 src/kcheckgmailcore.h    |    2 +-
 src/kcheckgmailtray.cpp  |    8 ++++----
 src/kcheckgmailtray.h    |    6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/gmail.cpp b/src/gmail.cpp
index f2838ce..ae2e128 100644
--- a/src/gmail.cpp
+++ b/src/gmail.cpp
@@ -34,9 +34,9 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <qmutex.h>
-#include <qregexp.h>
-#include <qtimer.h>
+#include <QMutex>
+#include <QRegExp>
+#include <QTimer>
 #include <QtDBus/QtDBus>
 #include <QtDBus/QDBusError>
 //Added by qt3to4:
@@ -47,7 +47,7 @@
 #include <kcharsets.h>
 
 #ifdef DUMP_PAGES
-#include <qfile.h>
+#include <QFile>
 #endif
 
 #define MILLISECS(x) (x * 1000)
diff --git a/src/gmail.h b/src/gmail.h
index 56e2158..0c9a119 100644
--- a/src/gmail.h
+++ b/src/gmail.h
@@ -20,8 +20,8 @@
 #ifndef GMAIL_H
 #define GMAIL_H
 
-#include <qobject.h>
-#include <qstring.h>
+#include <QObject>
+#include <QString>
 #include <kurl.h>
 
 #include "gmailwalletmanager.h"
diff --git a/src/gmailparser.cpp b/src/gmailparser.cpp
index e048f44..4ca0842 100644
--- a/src/gmailparser.cpp
+++ b/src/gmailparser.cpp
@@ -26,7 +26,7 @@
 #include "prefs.h"
 
 #include <kdebug.h>
-#include <qregexp.h>
+#include <QRegExp>
 //Added by qt3to4:
 #include <QList>
 #include <klocale.h>
diff --git a/src/gmailparser.h b/src/gmailparser.h
index abfd794..6071c99 100644
--- a/src/gmailparser.h
+++ b/src/gmailparser.h
@@ -20,9 +20,9 @@
 #ifndef GMAIL_PARSER_H
 #define GMAIL_PARSER_H
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <QObject>
+#include <QString>
+#include <QStringList>
 #include <qmap.h>
 #include <QVector>
 //#include <vector>
diff --git a/src/gmailwalletmanager.h b/src/gmailwalletmanager.h
index bb99b3b..dcbf695 100644
--- a/src/gmailwalletmanager.h
+++ b/src/gmailwalletmanager.h
@@ -1,8 +1,8 @@
 #ifndef __GMAIL_WALLET_MANAGER_H
 #define __GMAIL_WALLET_MANAGER_H
 
-#include <qobject.h>
-#include <qmutex.h>
+#include <QObject>
+#include <QMutex>
 #include <kwallet.h>
 
 
diff --git a/src/jsprotocol.h b/src/jsprotocol.h
index 47d20bc..a3e1918 100644
--- a/src/jsprotocol.h
+++ b/src/jsprotocol.h
@@ -20,7 +20,7 @@
 #ifndef KCHECKGMAIL_JSPROTOCOL_H
 #define KCHECKGMAIL_JSPROTOCOL_H
 
-#include <qobject.h>
+#include <QObject>
 
 #include "gmailparser.h"
 #include "gmail.h"
diff --git a/src/kcheckgmailcore.cpp b/src/kcheckgmailcore.cpp
index e8180b0..005ad5d 100644
--- a/src/kcheckgmailcore.cpp
+++ b/src/kcheckgmailcore.cpp
@@ -48,8 +48,8 @@
 #include <knotification.h>
 #include <QDBusConnection>
 
-#include <qfile.h>
-#include <qtooltip.h>
+#include <QFile>
+#include <QToolTip>
 #include <QHash>
 #include <QSignalMapper>
 //Added by qt3to4:
diff --git a/src/kcheckgmailcore.h b/src/kcheckgmailcore.h
index faa6159..6a0172b 100644
--- a/src/kcheckgmailcore.h
+++ b/src/kcheckgmailcore.h
@@ -20,7 +20,7 @@
 #ifndef KCHECKGMAIL_CORE_H
 #define KCHECKGMAIL_CORE_H
 
-#include <qobject.h>
+#include <QObject>
 
 #include <kdebug.h>
 
diff --git a/src/kcheckgmailtray.cpp b/src/kcheckgmailtray.cpp
index d5a4fb7..3ae361a 100644
--- a/src/kcheckgmailtray.cpp
+++ b/src/kcheckgmailtray.cpp
@@ -30,10 +30,10 @@
 #include <kiconeffect.h>
 #include <kglobalsettings.h>
 
-#include <qpainter.h>
-#include <qtimer.h>
-#include <qtooltip.h>
-#include <qbitmap.h>
+#include <QPainter>
+#include <QTimer>
+#include <QToolTip>
+#include <QBitmap>
 //#include <Q3MimeSourceFactory>
 #include <QDesktopWidget>
 //Added by qt3to4:
diff --git a/src/kcheckgmailtray.h b/src/kcheckgmailtray.h
index 4ff0158..40fb4c9 100644
--- a/src/kcheckgmailtray.h
+++ b/src/kcheckgmailtray.h
@@ -23,9 +23,9 @@
 
 #include <ksystemtrayicon.h>
 #include <kiconeffect.h>
-#include <qpixmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
+#include <QPixmap>
+#include <QString>
+#include <QStringList>
 #include <qmap.h>
 //Added by qt3to4:
 #include <QMouseEvent>

-- 
KCheckGMail's Development repository



More information about the pkg-kde-commits mailing list