Comments would be appreciated, especially for the foreach patch.
apply in kdeplasma-addons/applets
Thanks!
Bruno
Index: lancelot/app/src/models/OpenDocuments.cpp
===================================================================
--- lancelot/app/src/models/OpenDocuments.cpp (révision 914945)
+++ lancelot/app/src/models/OpenDocuments.cpp (copie de travail)
@@ -110,17 +110,16 @@
Q_ASSERT(task);
// kDebug() << task->className() << task->classClass();
- QRegExp * extractor = NULL;
+ QRegExp extractor;
QString className = task->className();
- SupportedTask st;
- foreach (st, m_supportedTasks) {
+ foreach (const SupportedTask &st, m_supportedTasks) {
if (st.m_classPattern.exactMatch(task->className())) {
- extractor = & st.m_documentNameExtractor;
+ extractor = st.m_documentNameExtractor;
break;
}
}
- if (extractor == NULL) {
+ if (extractor.isEmpty()) {
return false;
}
@@ -135,9 +134,9 @@
QString title = task->visibleName();
QString description;
- if (extractor->exactMatch(title)) {
- title = extractor->cap(1);
- description = extractor->cap(2);
+ if (extractor.exactMatch(title)) {
+ title = extractor.cap(1);
+ description = extractor.cap(2);
}
QIcon icon = QIcon(task->icon(32, 32));
Index: lancelot/app/src/models/FolderModel.cpp
===================================================================
--- lancelot/app/src/models/FolderModel.cpp (révision 914945)
+++ lancelot/app/src/models/FolderModel.cpp (copie de travail)
@@ -61,7 +61,7 @@
void FolderModel::newItems(const KFileItemList &items)
{
- foreach (KFileItem item, items) {
+ foreach (const KFileItem &item, items) {
if (item.isDesktopFile()) {
addUrl(item.url());
} else {
Index: lancelot/libs/lancelot/layouts/NodeLayout.cpp
===================================================================
--- lancelot/libs/lancelot/layouts/NodeLayout.cpp (révision 914945)
+++ lancelot/libs/lancelot/layouts/NodeLayout.cpp (copie de travail)
@@ -159,7 +159,7 @@
QSizeF size;
- foreach (Qt::SizeHint which, sizeHintCache.keys()) {
+ foreach (const Qt::SizeHint &which, sizeHintCache.keys()) {
size = item->effectiveSizeHint(which);
size.scale(
1 / qMin(scaled.width(), qreal(1.0)),
Index: rssnow/news.cpp
===================================================================
--- rssnow/news.cpp (révision 914945)
+++ rssnow/news.cpp (copie de travail)
@@ -352,11 +352,11 @@
if (geometry().height() < minSize && !m_collapsed) {
//group all feeds together so it can fit (only a single time):
QString allfeeds;
- foreach (QString feed, m_feedlist) {
+ foreach (const QString &feed, m_feedlist) {
+ allfeeds.append(feed);
if (!feed.endsWith(' ')) {
- feed.append(" ");
+ allfeeds.append(" ");
}
- allfeeds.append(feed);
}
kDebug() << "allfeeds = " << allfeeds;
m_feedlist.clear();
Index: lancelot/libs/lancelot/widgets/PopupList.h
===================================================================
--- lancelot/libs/lancelot/widgets/PopupList.h (révision 914945)
+++ lancelot/libs/lancelot/widgets/PopupList.h (copie de travail)
@@ -46,7 +46,7 @@
* Creates a new Lancelot::PopupList
* @param parent parent item
*/
- PopupList(QWidget * parent = 0, Qt::WindowFlags f = Qt::Window);
+ explicit PopupList(QWidget * parent = 0, Qt::WindowFlags f = Qt::Window);
/**
* Destroys Lancelot::PopupList
Index: lancelot/libs/lancelot/widgets/PopupMenu.h
===================================================================
--- lancelot/libs/lancelot/widgets/PopupMenu.h (révision 914945)
+++ lancelot/libs/lancelot/widgets/PopupMenu.h (copie de travail)
@@ -45,7 +45,7 @@
* Creates a new Lancelot::PopupMenu
* @param parent parent item
*/
- PopupMenu(QWidget * parent = 0, Qt::WindowFlags f = Qt::Window);
+ explicit PopupMenu(QWidget * parent = 0, Qt::WindowFlags f = Qt::Window);
/**
* Destroys Lancelot::PopupMenu
Index: lancelot/app/src/models/Sessions.h
===================================================================
--- lancelot/app/src/models/Sessions.h (révision 914945)
+++ lancelot/app/src/models/Sessions.h (copie de travail)
@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef LANCELOTAPP_MODELS_SESSION_H
-#define LANCELOTAPP_MODELS_SESSION_H
+#ifndef LANCELOTAPP_MODELS_SESSIONS_H
+#define LANCELOTAPP_MODELS_SESSIONS_H
#include "BaseModel.h"
#include <plasma/runnermanager.h>
@@ -44,4 +44,4 @@
} // namespace Models
-#endif /* LANCELOTAPP_MODELS_SESSION_H */
+#endif /* LANCELOTAPP_MODELS_SESSIONS_H */
Index: lancelot/app/src/QtDisplay.cpp
===================================================================
--- lancelot/app/src/QtDisplay.cpp (révision 914945)
+++ lancelot/app/src/QtDisplay.cpp (copie de travail)
@@ -19,7 +19,7 @@
#include "QtDisplay.h"
-#include "config-lancelot.h"
+#include <config-lancelot.h>
#ifdef LANCELOT_HAVE_COMPOSITING
Index: lancelot/app/src/QtDisplay.h
===================================================================
--- lancelot/app/src/QtDisplay.h (révision 914945)
+++ lancelot/app/src/QtDisplay.h (copie de travail)
@@ -21,7 +21,7 @@
#ifndef QT_DISPLAY
#define QT_DISPLAY
-#include "config-lancelot.h"
+#include <config-lancelot.h>
#ifdef LANCELOT_HAVE_COMPOSITING
Index: lancelot/libs/lancelot/widgets/ActionListView.h
===================================================================
--- lancelot/libs/lancelot/widgets/ActionListView.h (révision 914945)
+++ lancelot/libs/lancelot/widgets/ActionListView.h (copie de travail)
@@ -24,8 +24,8 @@
#include <lancelot/lancelot.h>
#include <lancelot/lancelot_export.h>
-#include <KDebug>
-#include <QIcon>
+#include <KDE/KDebug>
+#include <QtGui/QIcon>
#include <lancelot/widgets/CustomListView.h>
#include <lancelot/models/ActionListViewModels.h>
Index: bballConfig.ui
===================================================================
--- bballConfig.ui (révision 914945)
+++ bballConfig.ui (copie de travail)
@@ -14,7 +14,7 @@
</property>
<layout class="QVBoxLayout" >
<item>
- <widget class="QTabWidget" name="tabWidget" >
+ <widget class="KTabWidget" name="tabWidget" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
<horstretch>0</horstretch>
@@ -277,6 +277,12 @@
<extends>QFrame</extends>
<header>kurlrequester.h</header>
</customwidget>
+ <customwidget>
+ <class>KTabWidget</class>
+ <extends>QTabWidget</extends>
+ <header>ktabwidget.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources/>
<connections>
Index: lancelot/app/src/parts/LancelotPart.cpp
===================================================================
--- lancelot/app/src/parts/LancelotPart.cpp (révision 913748)
+++ lancelot/app/src/parts/LancelotPart.cpp (copie de travail)
@@ -342,7 +342,7 @@
} else if (modelID == "FavoriteApplications") {
// We don't want to delete this one (singleton)
m_model->addModel(modelID, QIcon(), i18n("Favorite Applications"), model = Models::FavoriteApplications::instance());
- } else if (modelID.startsWith("Folder ")) {
+ } else if (modelID.startsWith(QString("Folder "))) {
modelID.remove(0, 7);
m_model->addModel(modelID,
QIcon(),
Index: weatherstation/lcd.cpp
===================================================================
--- weatherstation/lcd.cpp (révision 913748)
+++ weatherstation/lcd.cpp (copie de travail)
@@ -192,7 +192,7 @@
QString id = element.attribute("id");
if ((pos = id.lastIndexOf(':')) > -1) {
groups[id.left(pos)] << id.mid(pos + 1);
- } else if (id.startsWith("label")) {
+ } else if (id.startsWith(QString("label"))) {
int i = id.mid(5).toInt();
QRegExp rx("fill:([#0-9]+)");
if (rx.indexIn(element.attribute("style")) > -1) {
Index: twitter/twitter.cpp
===================================================================
--- twitter/twitter.cpp (révision 913748)
+++ twitter/twitter.cpp (copie de travail)
@@ -352,7 +352,7 @@
{
//kDebug() << source;
if (data.isEmpty()) {
- if (source.startsWith("Error")) {
+ if (source.startsWith(QString("Error"))) {
m_flash->kill(); //FIXME only clear it if it was showing an error msg
} else {
//this is a fake update from a new source
@@ -403,7 +403,7 @@
showTweets();
}
}
- } else if (source.startsWith("Error")) {
+ } else if (source.startsWith(QString("Error"))) {
QString desc = data["description"].toString();
if (desc == "Authentication required"){
Index: lancelot/app/src/models/Places.cpp
===================================================================
--- lancelot/app/src/models/Places.cpp (révision 913748)
+++ lancelot/app/src/models/Places.cpp (copie de travail)
@@ -40,9 +40,9 @@
// We don't want to use addUrl, because of the icons
add(
i18n("Home Folder"),
- getenv("HOME"),
+ qgetenv("HOME"),
KIcon("user-home"),
- getenv("HOME")
+ qgetenv("HOME")
);
add(
_______________________________________________
Plasma-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/plasma-devel
