Have a special look at 6_qclasses.diff, I tested everything I could with
plasmoidviewer but some changes may be in code not used (yet).
Fix issues with the same name as the patch (without the number).
http://englishbreakfastnetwork.org/krazy/reports/kde-4.x/kdeplasma-addons/applets/index.html
apply in kdeplasma-addons/applets
Thanks!
Bruno
Index: lancelot/app/src/models/MessagesKmail.cpp
===================================================================
--- lancelot/app/src/models/MessagesKmail.cpp (révision 910278)
+++ lancelot/app/src/models/MessagesKmail.cpp (copie de travail)
@@ -128,7 +128,7 @@
QDBusReply < QString > ricon = m_folderinterface->normalIconPath();
KIcon icon;
add(
- name.value() + " (" + QString::number(unread) + ")", path,
+ name.value() + " (" + QString::number(unread) + ')', path,
KIcon(
(ricon.isValid() && !ricon.value().isEmpty())
? (ricon.value()) : "mail-folder-inbox"
Index: lancelot/app/src/models/ContactsKopete.cpp
===================================================================
--- lancelot/app/src/models/ContactsKopete.cpp (révision 910278)
+++ lancelot/app/src/models/ContactsKopete.cpp (copie de travail)
@@ -89,7 +89,7 @@
}
foreach (const QString& contact, contacts.value()) {
- QStringList contactParts = contact.split(":");
+ QStringList contactParts = contact.split(':');
if (contactParts.size() != 3) {
continue;
}
@@ -103,7 +103,7 @@
continue;
}
- QString avatarPath = m_kopeteAvatarsDir + "/" + account + "/" + contactID + ".png";
+ QString avatarPath = m_kopeteAvatarsDir + '/' + account + '/' + contactID + ".png";
add(contactName.value(), contactID,
KIcon(
(QFile::exists(avatarPath))?avatarPath:"user-online"
Index: lancelot/app/src/models/BaseModel.cpp
===================================================================
--- lancelot/app/src/models/BaseModel.cpp (révision 910278)
+++ lancelot/app/src/models/BaseModel.cpp (copie de travail)
@@ -92,7 +92,7 @@
{
int result = 0;
foreach (const QString & serviceAlternatives, serviceNames) {
- foreach (const QString & serviceName, serviceAlternatives.split("|")) {
+ foreach (const QString & serviceName, serviceAlternatives.split('|')) {
if (addService(serviceName)) {
++result;
break;
Index: lancelot/app/src/parts/LancelotPart.cpp
===================================================================
--- lancelot/app/src/parts/LancelotPart.cpp (révision 910278)
+++ lancelot/app/src/parts/LancelotPart.cpp (copie de travail)
@@ -356,7 +356,7 @@
if (loaded) {
if (!m_data.isEmpty()) {
- m_data += "\n";
+ m_data += '\n';
}
m_data += input;
saveConfig();
@@ -393,7 +393,7 @@
if (data.isEmpty()) {
return false;
}
- return loadFromList(data.split("\n"));
+ return loadFromList(data.split('\n'));
}
void LancelotPart::removeModel(int index)
@@ -404,7 +404,7 @@
delete model;
}
- QStringList configs = m_data.split("\n");
+ QStringList configs = m_data.split('\n');
configs.removeAt(index);
m_data = configs.join("\n");
Index: lancelot/app/src/Serializator.cpp
===================================================================
--- lancelot/app/src/Serializator.cpp (révision 910278)
+++ lancelot/app/src/Serializator.cpp (copie de travail)
@@ -34,11 +34,11 @@
i.next();
if (!result.isEmpty()) {
- result += "&";
+ result += '&';
}
result +=
- QUrl::toPercentEncoding(i.key()) + "=" +
+ QUrl::toPercentEncoding(i.key()) + '=' +
QUrl::toPercentEncoding(i.value());
}
return result;
@@ -48,9 +48,9 @@
{
QMap < QString , QString > result;
- QStringList items = data.split("&");
+ QStringList items = data.split('&');
foreach (const QString & item, items) {
- QStringList broken = item.split("=");
+ QStringList broken = item.split('=');
if (broken.size() != 2) {
continue;
}
Index: lancelot/libs/lancelot/Global.cpp
===================================================================
--- lancelot/libs/lancelot/Global.cpp (révision 910278)
+++ lancelot/libs/lancelot/Global.cpp (copie de travail)
@@ -321,7 +321,7 @@
if (app == "lancelot") {
app = "";
} else {
- app += "-";
+ app += '-';
}
d->confMain = new KConfig("lancelot" + app + "rc");
Index: weatherstation/weatherstation.cpp
===================================================================
--- weatherstation/weatherstation.cpp (révision 910278)
+++ weatherstation/weatherstation.cpp (copie de travail)
@@ -285,7 +285,7 @@
void WeatherStation::setHumidity(QString humidity)
{
- humidity.replace("%", "");
+ humidity.remove('%');
m_lcd->setNumber("humidity", humidity);
}
Index: weatherstation/weatherconfig.cpp
===================================================================
--- weatherstation/weatherconfig.cpp (révision 910278)
+++ weatherstation/weatherconfig.cpp (copie de travail)
@@ -133,7 +133,7 @@
if (m_dataengine) {
QVariantList plugins = m_dataengine->query("ions").values();
foreach (const QVariant& plugin, plugins) {
- QStringList pluginInfo = plugin.toString().split("|");
+ QStringList pluginInfo = plugin.toString().split('|');
providerComboBox->addItem(pluginInfo[0], pluginInfo[1]);
}
}
Index: previewer/previewwidget.cpp
===================================================================
--- previewer/previewwidget.cpp (révision 910278)
+++ previewer/previewwidget.cpp (copie de travail)
@@ -494,7 +494,7 @@
painter->setFont(font);
painter->setPen(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
painter->drawText(QRect(39, 3, contentsRect.width() - 39, 30), Qt::AlignBottom | Qt::AlignLeft,
- " " + i18n("Previewer"));
+ ' ' + i18n("Previewer"));
QFontMetrics fm(font);
int length = fm.width(i18n("Previewer") + " ");
font.setBold(false);
Index: bluemarble/kwinglutils.cpp
===================================================================
--- bluemarble/kwinglutils.cpp (révision 910278)
+++ bluemarble/kwinglutils.cpp (copie de travail)
@@ -65,7 +65,7 @@
glVersion = MAKE_GL_VERSION(glversioninfo[0].toInt(), glversioninfo[1].toInt(),
glversioninfo.count() > 2 ? glversioninfo[2].toInt() : 0);
// Get list of supported OpenGL extensions
- glExtensions = QString((const char*)glGetString(GL_EXTENSIONS)).split(" ");
+ glExtensions = QString((const char*)glGetString(GL_EXTENSIONS)).split(' ');
// handle OpenGL extensions functions
glResolveFunctions();
Index: news/news.cpp
===================================================================
--- news/news.cpp (révision 910278)
+++ news/news.cpp (copie de travail)
@@ -351,7 +351,7 @@
}
uint timeStamp = item["time"].toUInt();
QString title = item["title"].toString();
- QString description = item["description"].toString().replace(QRegExp("<[^>]*>"), "");
+ QString description = item["description"].toString().remove(QRegExp("<[^>]*>"));
QString line;
if (title != 0 && m_showTitles) {
Index: rssnow/news.cpp
===================================================================
--- rssnow/news.cpp (révision 910278)
+++ rssnow/news.cpp (copie de travail)
@@ -325,7 +325,7 @@
if (m_showdroptarget && (i == (m_layout->count() - 1))) {
m_feedlist.append(feeds);
} else {
- if (!m_feedlist[i-start].endsWith(" ")) {
+ if (!m_feedlist[i-start].endsWith(' ')) {
m_feedlist[i-start].append(" ");
}
m_feedlist[i-start].append(feeds);
@@ -353,7 +353,7 @@
//group all feeds together so it can fit (only a single time):
QString allfeeds;
foreach (QString feed, m_feedlist) {
- if (!feed.endsWith(" ")) {
+ if (!feed.endsWith(' ')) {
feed.append(" ");
}
allfeeds.append(feed);
Index: pastebin/backends/pastebinca.cpp
===================================================================
--- pastebin/backends/pastebinca.cpp (révision 910278)
+++ pastebin/backends/pastebinca.cpp (copie de travail)
@@ -44,7 +44,7 @@
}
QString url(_data);
- url.replace("SUCCESS:","");
+ url.remove("SUCCESS:");
url.prepend(QString("%1/").arg(m_server));
emit postFinished(url);
}
Index: lancelot/app/src/models/Devices.cpp
===================================================================
--- lancelot/app/src/models/Devices.cpp (révision 910278)
+++ lancelot/app/src/models/Devices.cpp (copie de travail)
@@ -39,7 +39,7 @@
namespace Models {
-#define StringCoalesce(A, B) (A == "")?(B):(A)
+#define StringCoalesce(A, B) (A.isEmpty())?(B):(A)
Devices::Devices(Type filter)
: m_filter(filter)
Index: lancelot/libs/lancelot/Global.cpp
===================================================================
--- lancelot/libs/lancelot/Global.cpp (révision 910278)
+++ lancelot/libs/lancelot/Global.cpp (copie de travail)
@@ -330,11 +330,11 @@
kDebug() << search;
QString path = KStandardDirs::locate( "data", search );
- if (path == "") {
+ if (path.isEmpty()) {
search = "desktoptheme/default/lancelot/theme.config";
path = KStandardDirs::locate( "data", search );
}
- if (path == "") {
+ if (path.isEmpty()) {
path = "lancelotrc";
}
kDebug() << path;
@@ -386,7 +386,7 @@
WidgetGroup * Instance::group(const QString & name)
{
QString groupName = name;
- if (groupName == "") {
+ if (groupName.isEmpty()) {
groupName = "Default";
}
Index: lancelot/app/src/models/FolderModel.h
===================================================================
--- lancelot/app/src/models/FolderModel.h (révision 911112)
+++ lancelot/app/src/models/FolderModel.h (copie de travail)
@@ -30,7 +30,7 @@
class FolderModel : public BaseModel {
Q_OBJECT
public:
- FolderModel(QString dirPath, QDir::SortFlags sort = QDir::NoSort);
+ explicit FolderModel(QString dirPath, QDir::SortFlags sort = QDir::NoSort);
virtual ~FolderModel();
protected:
Index: lancelot/app/src/models/OpenDocuments.h
===================================================================
--- lancelot/app/src/models/OpenDocuments.h (révision 911112)
+++ lancelot/app/src/models/OpenDocuments.h (copie de travail)
@@ -46,7 +46,7 @@
private:
class SupportedTask {
public:
- SupportedTask(const QString & classPattern = 0,
+ explicit SupportedTask(const QString & classPattern = 0,
const QString & documentNameExtractor = 0);
QRegExp m_classPattern;
QRegExp m_documentNameExtractor;
Index: lancelot/app/src/models/Applications.h
===================================================================
--- lancelot/app/src/models/Applications.h (révision 911112)
+++ lancelot/app/src/models/Applications.h (copie de travail)
@@ -28,7 +28,7 @@
class Applications : public Lancelot::PassagewayViewModel {
Q_OBJECT
public:
- Applications(QString root = "", QString title = "", QIcon icon = QIcon());
+ explicit Applications(QString root = "", QString title = "", QIcon icon = QIcon());
virtual ~Applications();
L_Override virtual QString title(int index) const;
Index: lancelot/app/src/QtDisplay.h
===================================================================
--- lancelot/app/src/QtDisplay.h (révision 911112)
+++ lancelot/app/src/QtDisplay.h (copie de travail)
@@ -51,7 +51,7 @@
class QtDisplay {
public:
- QtDisplay(char * display = 0, int screen = 0);
+ explicit QtDisplay(char * display = 0, int screen = 0);
virtual ~QtDisplay();
virtual void testDisplay();
void setupXRender();
Index: lancelot/libs/lancelot/models/PassagewayViewModels.h
===================================================================
--- lancelot/libs/lancelot/models/PassagewayViewModels.h (révision 911112)
+++ lancelot/libs/lancelot/models/PassagewayViewModels.h (copie de travail)
@@ -41,7 +41,7 @@
class LANCELOT_EXPORT PassagewayViewModelProxy: public PassagewayViewModel {
Q_OBJECT
public:
- PassagewayViewModelProxy(ActionListViewModel * model,
+ explicit PassagewayViewModelProxy(ActionListViewModel * model,
QString title = QString(), QIcon icon = QIcon());
// PassagewayViewModel
Index: lancelot/libs/lancelot/widgets/HoverIcon.h
===================================================================
--- lancelot/libs/lancelot/widgets/HoverIcon.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/HoverIcon.h (copie de travail)
@@ -55,7 +55,7 @@
* @param text title
* @param parent parent item
*/
- HoverIcon(const QString & text, QGraphicsItem * parent = 0);
+ explicit HoverIcon(const QString & text, QGraphicsItem * parent = 0);
/**
* Creates a new Lancelot::HoverIcon
Index: lancelot/libs/lancelot/widgets/PassagewayView.h
===================================================================
--- lancelot/libs/lancelot/widgets/PassagewayView.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/PassagewayView.h (copie de travail)
@@ -54,7 +54,7 @@
public:
PassagewayView(QGraphicsItem * parent = 0);
- PassagewayView(PassagewayViewModel * entranceModel,
+ explicit PassagewayView(PassagewayViewModel * entranceModel,
PassagewayViewModel * atlasModel = 0, QGraphicsItem * parent = 0);
virtual ~PassagewayView();
Index: lancelot/libs/lancelot/widgets/Panel.h
===================================================================
--- lancelot/libs/lancelot/widgets/Panel.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/Panel.h (copie de travail)
@@ -59,7 +59,7 @@
* @param title the title of the widget
* @param parent parent item
*/
- Panel(QIcon icon, QString title = QString(),
+ explicit Panel(QIcon icon, QString title = QString(),
QGraphicsItem * parent = 0);
/**
@@ -67,7 +67,7 @@
* @param title the title of the widget
* @param parent parent item
*/
- Panel(QString title, QGraphicsItem * parent = 0);
+ explicit Panel(QString title, QGraphicsItem * parent = 0);
/**
* Destroys Lancelot::Panel
Index: lancelot/libs/lancelot/widgets/CustomListView.h
===================================================================
--- lancelot/libs/lancelot/widgets/CustomListView.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/CustomListView.h (copie de travail)
@@ -113,7 +113,7 @@
Q_OBJECT
public:
CustomList(QGraphicsItem * parent = NULL);
- CustomList(CustomListItemFactory * factory,
+ explicit CustomList(CustomListItemFactory * factory,
QGraphicsItem * parent = NULL);
virtual ~CustomList();
@@ -147,7 +147,7 @@
Q_OBJECT
public:
CustomListView(QGraphicsItem * parent = NULL);
- CustomListView(CustomListItemFactory * factory,
+ explicit CustomListView(CustomListItemFactory * factory,
QGraphicsItem * parent = NULL);
virtual ~CustomListView();
Index: lancelot/libs/lancelot/widgets/ActionListView.h
===================================================================
--- lancelot/libs/lancelot/widgets/ActionListView.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/ActionListView.h (copie de travail)
@@ -118,7 +118,7 @@
class ScrollButton : public Lancelot::BasicWidget {
public:
- ScrollButton (ActionListView::ScrollDirection direction, ActionListView * list = NULL, QGraphicsItem * parent = NULL);
+ explicit ScrollButton (ActionListView::ScrollDirection direction, ActionListView * list = NULL, QGraphicsItem * parent = NULL);
void hoverEnterEvent(QGraphicsSceneHoverEvent * event);
void hoverLeaveEvent(QGraphicsSceneHoverEvent * event);
Index: lancelot/libs/lancelot/widgets/ExtenderButton.h
===================================================================
--- lancelot/libs/lancelot/widgets/ExtenderButton.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/ExtenderButton.h (copie de travail)
@@ -62,7 +62,7 @@
* @param description the description of the widget
* @param parent parent item
*/
- ExtenderButton(QString title, QString description = QString(),
+ explicit ExtenderButton(QString title, QString description = QString(),
QGraphicsItem * parent = 0);
/**
@@ -72,7 +72,7 @@
* @param description the description of the widget
* @param parent parent item
*/
- ExtenderButton(QIcon icon, QString title = QString(),
+ explicit ExtenderButton(QIcon icon, QString title = QString(),
QString description = QString(), QGraphicsItem * parent = 0);
/**
@@ -82,7 +82,7 @@
* @param description the description of the widget
* @param parent parent item
*/
- ExtenderButton(const Plasma::Svg & icon, QString title = QString(),
+ explicit ExtenderButton(const Plasma::Svg & icon, QString title = QString(),
QString description = QString(), QGraphicsItem * parent = 0);
/**
Index: lancelot/libs/lancelot/widgets/BasicWidget.h
===================================================================
--- lancelot/libs/lancelot/widgets/BasicWidget.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/BasicWidget.h (copie de travail)
@@ -66,7 +66,7 @@
* @param description the description of the widget
* @param parent parent item
*/
- BasicWidget(QString title, QString description = QString(),
+ explicit BasicWidget(QString title, QString description = QString(),
QGraphicsItem * parent = 0);
/**
@@ -76,7 +76,7 @@
* @param description the description of the widget
* @param parent parent item
*/
- BasicWidget(QIcon icon, QString title = QString(),
+ explicit BasicWidget(QIcon icon, QString title = QString(),
QString description = QString(), QGraphicsItem * parent = 0);
/**
@@ -86,7 +86,7 @@
* @param description the description of the widget
* @param parent parent item
*/
- BasicWidget(const Plasma::Svg & icon, QString title = QString(),
+ explicit BasicWidget(const Plasma::Svg & icon, QString title = QString(),
QString description = QString(), QGraphicsItem * parent = 0);
/**
Index: lancelot/libs/lancelot/widgets/ActionListView2.h
===================================================================
--- lancelot/libs/lancelot/widgets/ActionListView2.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/ActionListView2.h (copie de travail)
@@ -40,7 +40,7 @@
public:
ActionListView2(QGraphicsItem * parent = 0);
- ActionListView2(ActionListViewModel * model, QGraphicsItem * parent = 0);
+ explicit ActionListView2(ActionListViewModel * model, QGraphicsItem * parent = 0);
virtual ~ActionListView2();
void setModel(ActionListViewModel * model);
Index: previewer/previewitemmodel.h
===================================================================
--- previewer/previewitemmodel.h (révision 911112)
+++ previewer/previewitemmodel.h (copie de travail)
@@ -27,7 +27,7 @@
Q_OBJECT
public:
- PreviewItemModel(const QList<QUrl> &urls, QObject *parent = 0)
+ explicit PreviewItemModel(const QList<QUrl> &urls, QObject *parent = 0)
: QAbstractListModel(parent), urlList(urls) {}
int rowCount(const QModelIndex &parent = QModelIndex()) const;
Index: bluemarble/kwinglutils.h
===================================================================
--- bluemarble/kwinglutils.h (révision 911112)
+++ bluemarble/kwinglutils.h (copie de travail)
@@ -64,8 +64,8 @@
{
public:
GLTexture();
- GLTexture( const QImage& image, GLenum target = GL_TEXTURE_2D );
- GLTexture( const QPixmap& pixmap, GLenum target = GL_TEXTURE_2D );
+ explicit GLTexture( const QImage& image, GLenum target = GL_TEXTURE_2D );
+ explicit GLTexture( const QPixmap& pixmap, GLenum target = GL_TEXTURE_2D );
GLTexture( const QString& fileName );
GLTexture( int width, int height );
virtual ~GLTexture();
Index: paste/pastemacroexpander.h
===================================================================
--- paste/pastemacroexpander.h (révision 911112)
+++ paste/pastemacroexpander.h (copie de travail)
@@ -33,7 +33,7 @@
Url
};
- MacroParam(const QString& n = QString(), ParamType t = String) : name(n), type(t) {};
+ explicit MacroParam(const QString& n = QString(), ParamType t = String) : name(n), type(t) {};
QString name;
ParamType type;
};
Index: weatherstation/weatherconfig.cpp
===================================================================
--- weatherstation/weatherconfig.cpp (révision 911112)
+++ weatherstation/weatherconfig.cpp (copie de travail)
@@ -93,7 +93,7 @@
places[result[i + 1]] = result[i + 3];
i += 4;
} else {
- places[result[i + 1]] = QString();
+ places[result[i + 1]].clear();
i += 2;
}
}
Index: lancelot/libs/lancelot/widgets/Panel.cpp
===================================================================
--- lancelot/libs/lancelot/widgets/Panel.cpp (révision 911112)
+++ lancelot/libs/lancelot/widgets/Panel.cpp (copie de travail)
@@ -29,7 +29,7 @@
public:
Private(QIcon icon, QString title, Panel * parent)
: layoutItem(NULL),
- hasTitle(title != QString()),
+ hasTitle(!title.isEmpty()),
titleWidget(icon, title, "", parent),
q(parent)
{
@@ -38,7 +38,7 @@
Private(QString title, Panel * parent)
: layoutItem(NULL),
- hasTitle(title != QString()),
+ hasTitle(!title.isEmpty()),
titleWidget(title, "", parent),
q(parent)
{
Index: comic/config.ui
===================================================================
--- comic/config.ui (révision 911112)
+++ comic/config.ui (copie de travail)
@@ -49,7 +49,7 @@
</widget>
</item>
<item>
- <widget class="QComboBox" name="comboBox_comic" >
+ <widget class="KComboBox" name="comboBox_comic" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
Index: fileWatcher/filtersConfig.ui
===================================================================
--- fileWatcher/filtersConfig.ui (révision 911112)
+++ fileWatcher/filtersConfig.ui (copie de travail)
@@ -50,7 +50,7 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="filterLineEdit" />
+ <widget class="KLineEdit" name="filterLineEdit" />
</item>
</layout>
</item>
Index: lancelot/app/src/models/Devices.cpp
===================================================================
--- lancelot/app/src/models/Devices.cpp (révision 911112)
+++ lancelot/app/src/models/Devices.cpp (copie de travail)
@@ -20,7 +20,7 @@
#include "Devices.h"
-#include <QMessageBox>
+#include <KMessageBox>
#include <KRun>
#include <KLocalizedString>
@@ -238,7 +238,7 @@
access->disconnect(this, SLOT(deviceSetupDone(Solid::ErrorType, QVariant, const QString &)));
if (!access || !access->isAccessible()) {
- QMessageBox::critical(NULL, i18n("Failed to open"), i18n("The requested device can not be accessed."));
+ KMessageBox::error(NULL, i18n("Failed to open"), i18n("The requested device can not be accessed."));
return;
}
Index: weatherstation/weatherconfig.ui
===================================================================
--- weatherstation/weatherconfig.ui (révision 911112)
+++ weatherstation/weatherconfig.ui (copie de travail)
@@ -189,7 +189,7 @@
</widget>
</item>
<item row="6" column="1" >
- <widget class="QComboBox" name="temperatureComboBox" >
+ <widget class="KComboBox" name="temperatureComboBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -218,7 +218,7 @@
</widget>
</item>
<item row="7" column="1" >
- <widget class="QComboBox" name="pressureComboBox" >
+ <widget class="KComboBox" name="pressureComboBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -247,7 +247,7 @@
</widget>
</item>
<item row="8" column="1" >
- <widget class="QComboBox" name="speedComboBox" >
+ <widget class="KComboBox" name="speedComboBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
Index: weatherstation/weatherconfigsearch.ui
===================================================================
--- weatherstation/weatherconfigsearch.ui (révision 911112)
+++ weatherstation/weatherconfigsearch.ui (copie de travail)
@@ -24,7 +24,7 @@
</widget>
</item>
<item row="0" column="1" >
- <widget class="QLineEdit" name="cityLineEdit" />
+ <widget class="KLineEdit" name="cityLineEdit" />
</item>
<item row="1" column="0" >
<widget class="QLabel" name="providerLabel" >
@@ -57,7 +57,7 @@
<customwidgets>
<customwidget>
<class>KComboBox</class>
- <extends>QComboBox</extends>
+ <extends>KComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
</customwidgets>
Index: twitter/configuration.ui
===================================================================
--- twitter/configuration.ui (révision 911112)
+++ twitter/configuration.ui (copie de travail)
@@ -37,9 +37,9 @@
</widget>
</item>
<item row="5" column="2" >
- <widget class="QLineEdit" name="passwordEdit" >
+ <widget class="KLineEdit" name="passwordEdit" >
<property name="echoMode" >
- <enum>QLineEdit::Password</enum>
+ <enum>KLineEdit::Password</enum>
</property>
</widget>
</item>
@@ -221,7 +221,7 @@
</widget>
</item>
<item row="4" column="2" >
- <widget class="QLineEdit" name="usernameEdit" />
+ <widget class="KLineEdit" name="usernameEdit" />
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_9" >
Index: frame/config.ui
===================================================================
--- frame/config.ui (révision 911112)
+++ frame/config.ui (copie de travail)
@@ -29,7 +29,7 @@
</property>
<layout class="QVBoxLayout" >
<item>
- <widget class="QComboBox" name="pictureComboBox" >
+ <widget class="KComboBox" name="pictureComboBox" >
<item>
<property name="text" >
<string>Image</string>
@@ -290,7 +290,7 @@
</widget>
</item>
<item>
- <widget class="QComboBox" name="potdComboBox" />
+ <widget class="KComboBox" name="potdComboBox" />
</item>
<item>
<spacer name="verticalSpacer" >
Index: pastebin/pastebinConfig.ui
===================================================================
--- pastebin/pastebinConfig.ui (révision 911112)
+++ pastebin/pastebinConfig.ui (copie de travail)
@@ -13,7 +13,7 @@
</widget>
</item>
<item row="0" column="1" >
- <widget class="QComboBox" name="textServer" >
+ <widget class="KComboBox" name="textServer" >
<item>
<property name="text" >
<string>Pastebin.ca</string>
@@ -34,7 +34,7 @@
</widget>
</item>
<item row="1" column="1" >
- <widget class="QComboBox" name="imageServer" >
+ <widget class="KComboBox" name="imageServer" >
<item>
<property name="text" >
<string>Imagebin.ca</string>
@@ -49,6 +49,13 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections/>
</ui>
Index: paste/snippetconfig.ui
===================================================================
--- paste/snippetconfig.ui (révision 911112)
+++ paste/snippetconfig.ui (copie de travail)
@@ -55,7 +55,7 @@
</widget>
</item>
<item>
- <widget class="QLineEdit" name="nameEdit" />
+ <widget class="KLineEdit" name="nameEdit" />
</item>
</layout>
</item>
@@ -82,7 +82,7 @@
</widget>
</item>
<item>
- <widget class="QTextEdit" name="textEdit" >
+ <widget class="KTextEdit" name="textEdit" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -90,7 +90,7 @@
</sizepolicy>
</property>
<property name="lineWrapMode" >
- <enum>QTextEdit::NoWrap</enum>
+ <enum>KTextEdit::NoWrap</enum>
</property>
<property name="acceptRichText" >
<bool>false</bool>
Index: paste/addmacro.cpp
===================================================================
--- paste/addmacro.cpp (révision 911112)
+++ paste/addmacro.cpp (copie de travail)
@@ -18,10 +18,10 @@
#include "addmacro.h"
#include <fixx11h.h>
#include <QVBoxLayout>
-#include <QComboBox>
+#include <KComboBox>
#include <QLabel>
#include <QCheckBox>
-#include <QLineEdit>
+#include <KLineEdit>
#include <QSpinBox>
#include <KUrlRequester>
#include <KLocale>
@@ -39,7 +39,7 @@
m_layout->setMargin(0);
m_layout->setSpacing(spacingHint());
- m_macrosComboBox = new QComboBox(m_widget);
+ m_macrosComboBox = new KComboBox(m_widget);
const QMap<QString, QVariantList>& macros = PasteMacroExpander::instance().macros();
foreach (const QString& macro, macros.keys()) {
m_macrosComboBox->addItem(macros[macro][0].toString(), macro);
@@ -77,7 +77,7 @@
}
case MacroParam::String:
layout->addWidget(new QLabel(param.name + ':', m_params));
- layout->addWidget(w = new QLineEdit(m_params));
+ layout->addWidget(w = new KLineEdit(m_params));
break;
case MacroParam::Url:
layout->addWidget(new QLabel(param.name + ':'));
@@ -111,7 +111,7 @@
}
case MacroParam::String:
{
- QLineEdit* w = m_params->findChildren<QLineEdit*>(param.name)[0];
+ KLineEdit* w = m_params->findChildren<KLineEdit*>(param.name)[0];
values.append(w->text());
break;
}
Index: paste/addmacro.h
===================================================================
--- paste/addmacro.h (révision 911112)
+++ paste/addmacro.h (copie de travail)
@@ -21,7 +21,7 @@
#include <pastemacroexpander.h>
#include <KDialog>
-class QComboBox;
+class KComboBox;
class QVBoxLayout;
class AddMacro : public KDialog
@@ -37,7 +37,7 @@
void currentIndexChanged(int index);
private:
- QComboBox* m_macrosComboBox;
+ KComboBox* m_macrosComboBox;
QVBoxLayout* m_layout;
QWidget* m_widget;
QWidget* m_params;
Index: lancelot/libs/lancelot/models/ActionListViewModels.h
===================================================================
--- lancelot/libs/lancelot/models/ActionListViewModels.h (révision 911112)
+++ lancelot/libs/lancelot/models/ActionListViewModels.h (copie de travail)
@@ -126,7 +126,7 @@
*/
virtual void contextActivate(int index, QAction * context);
-public slots:
+public Q_SLOTS:
/**
* Activates the specified element
* @param index of the element that should be activated
@@ -408,7 +408,7 @@
QList< QPair< QString, QIcon > > m_modelsMetadata;
bool m_hideEmptyModels;
-private slots:
+private Q_SLOTS:
// listen to model changes
void modelUpdated();
void modelItemInserted(int index);
Index: lancelot/libs/lancelot/widgets/ActionListView.h
===================================================================
--- lancelot/libs/lancelot/widgets/ActionListView.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/ActionListView.h (copie de travail)
@@ -96,7 +96,7 @@
Q_SIGNALS:
void activated(int index);
-protected slots:
+protected Q_SLOTS:
void scrollTimer();
void itemActivated(int index);
void itemContextRequested(int index);
Index: lancelot/libs/lancelot/widgets/ExtenderButton.h
===================================================================
--- lancelot/libs/lancelot/widgets/ExtenderButton.h (révision 911112)
+++ lancelot/libs/lancelot/widgets/ExtenderButton.h (copie de travail)
@@ -138,7 +138,7 @@
L_Override virtual void paint(QPainter * painter,
const QStyleOptionGraphicsItem * option, QWidget * widget = 0);
-public slots:
+public Q_SLOTS:
/**
* Sets whether the button is checked.
* Has no effect if button is not checkable.
@@ -169,7 +169,7 @@
L_Override virtual void hoverEnterEvent(QGraphicsSceneHoverEvent * event);
L_Override virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent * event);
-protected slots:
+protected Q_SLOTS:
void activate();
private:
Index: twitter/twitter.cpp
===================================================================
--- twitter/twitter.cpp (révision 911112)
+++ twitter/twitter.cpp (copie de travail)
@@ -303,7 +303,7 @@
if (success &&
enterWalletFolder(QString::fromLatin1("Plasma-Twitter")) &&
(m_wallet->readPassword(m_username, pwd) == 0)) {
- kDebug() << "successfully retreived password from wallet";
+ kDebug() << "successfully retrieved password from wallet";
m_password = pwd;
downloadHistory();
} else if (m_password.isEmpty()) {
_______________________________________________
Plasma-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/plasma-devel
