[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/runtime/kcontrol
From: John Layt <john () layt ! net>
Date: 2009-12-28 21:05:29
Message-ID: 1262034329.968876.16354.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1067077 by jlayt:
krazy fixes
M +4 -3 componentchooser/kcm_componentchooser.cpp
M +4 -2 dnssd/kcmdnssd.cpp
M +1 -1 emoticons/emoticonslist.cpp
M +3 -2 icons/icons.cpp
M +1 -0 icons/icons.h
M +2 -2 icons/iconthemes.cpp
M +4 -3 icons/main.cpp
M +2 -2 knotify/knotify.cpp
M +2 -1 locale/kcmlocale.cpp
M +2 -2 locale/toplevel.cpp
M +2 -2 locale/toplevel.h
--- trunk/KDE/kdebase/runtime/kcontrol/componentchooser/kcm_componentchooser.cpp \
#1067076:1067077 @@ -13,16 +13,17 @@
* *
***************************************************************************/
+#include "kcm_componentchooser.h"
+
//Added by qt3to4:
#include <QVBoxLayout>
+
#include <klocale.h>
-
#include <kaboutdata.h>
#include <kglobal.h>
#include <kcomponentdata.h>
+#include <KPluginFactory>
-#include "kcm_componentchooser.h"
-#include <KPluginFactory>
#include "kcm_componentchooser.moc"
K_PLUGIN_FACTORY(KCMComponentChooserFactory,
--- trunk/KDE/kdebase/runtime/kcontrol/dnssd/kcmdnssd.cpp #1067076:1067077
@@ -18,9 +18,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "kcmdnssd.h"
+
#include <sys/stat.h>
#include <config-runtime.h>
+#include <QtDBus/QtDBus>
+
//Added by qt3to4:
#include <klocale.h>
@@ -32,10 +36,8 @@
#include <kpassworddialog.h>
#include <kconfig.h>
-#include "kcmdnssd.h"
#include <dnssd/settings.h>
#include <dnssd/domainbrowser.h>
-#include <QtDBus/QtDBus>
#define MDNSD_CONF "/etc/mdnsd.conf"
#define MDNSD_PID "/var/run/mdnsd.pid"
--- trunk/KDE/kdebase/runtime/kcontrol/emoticons/emoticonslist.cpp #1067076:1067077
@@ -273,7 +273,7 @@
QListWidgetItem *itm = emoList->currentItem();
KEmoticonsTheme theme = emoMap.value(themeList->currentItem()->text());
- QString fPath = theme.emoticonsMap().key(itm->text().split(" "));
+ QString fPath = theme.emoticonsMap().key(itm->text().split(' '));
if (theme.removeEmoticon(itm->text())) {
int ret = KMessageBox::questionYesNo(this, i18n("Do you want to remove %1 \
too?", fPath), i18n("Delete emoticon")); if (ret == KMessageBox::Yes) {
--- trunk/KDE/kdebase/runtime/kcontrol/icons/icons.cpp #1067076:1067077
@@ -9,6 +9,8 @@
* License. See the file "COPYING" for the exact licensing terms.
*/
+#include "icons.h"
+
#include <stdlib.h>
#include <QCheckBox>
@@ -23,6 +25,7 @@
#include <QBoxLayout>
#include <QVBoxLayout>
#include <QListWidget>
+
#include <kcolorbutton.h>
#include <kconfig.h>
#include <kdebug.h>
@@ -32,8 +35,6 @@
#include <kseparator.h>
#include <kglobalsettings.h>
-#include "icons.h"
-
/**** KIconConfig ****/
KIconConfig::KIconConfig(const KComponentData &inst, QWidget *parent)
--- trunk/KDE/kdebase/runtime/kcontrol/icons/icons.h #1067076:1067077
@@ -18,6 +18,7 @@
#include <kcmodule.h>
#include <kdialog.h>
#include <kconfig.h>
+#include <KSharedConfig>
class QCheckBox;
class QColor;
--- trunk/KDE/kdebase/runtime/kcontrol/icons/iconthemes.cpp #1067076:1067077
@@ -16,6 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include "iconthemes.h"
+
#include <config-runtime.h>
#include <stdlib.h>
@@ -54,8 +56,6 @@
#include <kio/deletejob.h>
#include <kio/netaccess.h>
#include <ktar.h>
-
-#include "iconthemes.h"
#include <kglobalsettings.h>
static const int ThemeNameRole = Qt::UserRole + 1;
--- trunk/KDE/kdebase/runtime/kcontrol/icons/main.cpp #1067076:1067077
@@ -21,16 +21,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include "main.h"
+
//Added by qt3to4:
#include <QVBoxLayout>
#include <kaboutdata.h>
+#include <KPluginFactory>
+#include <KPluginLoader>
#include "icons.h"
#include "iconthemes.h"
-#include "main.h"
-#include <KPluginFactory>
-#include <KPluginLoader>
/**** DLL Interface ****/
K_PLUGIN_FACTORY(IconsFactory,
--- trunk/KDE/kdebase/runtime/kcontrol/knotify/knotify.cpp #1067076:1067077
@@ -19,6 +19,8 @@
*/
+#include "knotify.h"
+
#include <QLabel>
#include <QVBoxLayout>
#include <QHBoxLayout>
@@ -37,8 +39,6 @@
#include <kurlcompletion.h>
#include <kurlrequester.h>
-
-#include "knotify.h"
#include "ui_playersettings.h"
static const int COL_FILENAME = 1;
--- trunk/KDE/kdebase/runtime/kcontrol/locale/kcmlocale.cpp #1067076:1067077
@@ -23,6 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+#include "kcmlocale.h"
+
#include <QPushButton>
#include <KDebug>
@@ -30,7 +32,6 @@
#include <KConfigGroup>
#include <KStandardDirs>
-#include "kcmlocale.h"
#include "kcmlocale.moc"
#include "toplevel.h"
#include "klanguagebutton.h"
--- trunk/KDE/kdebase/runtime/kcontrol/locale/toplevel.cpp #1067076:1067077
@@ -1,8 +1,8 @@
/*
toplevel.cpp - A KControl Application
- Copyright 1998 Matthias Hoelzer
- Copyright 1999-2003 Hans Petter Bieker <bieker@kde.org>
+ Copyright (c) 1998 Matthias Hoelzer <hoelzer@physik.uni-wuerzburg.de>
+ Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
--- trunk/KDE/kdebase/runtime/kcontrol/locale/toplevel.h #1067076:1067077
@@ -3,8 +3,8 @@
written 1998 by Matthias Hoelzer
- Copyright 1998 Matthias Hoelzer.
- Copyright 1999-2003 Hans Petter Bieker <bieker@kde.org>.
+ Copyright (c) 1998 Matthias Hoelzer <hoelzer@physik.uni-wuerzburg.de>
+ Copyright (c) 1999-2003 Hans Petter Bieker <bieker@kde.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic