[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace
From: Arto Hytönen <amthpublic () gmail ! com>
Date: 2007-08-27 4:31:52
Message-ID: 1188189112.892860.31922.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 705066 by amth:
includes, include guards and typos fixed
M +3 -3 kcheckpass/kcheckpass-enums.h
M +3 -3 kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.h
M +1 -1 kcontrol/kthememanager/ktheme.h
M +4 -4 kcontrol/randr/outputgraphicsitem.cpp
M +3 -5 kdm/kfrontend/krootimage.h
M +1 -1 kmenuedit/menufile.h
M +1 -2 ksysguard/gui/SensorDisplayLib/DancingBars.cc
M +1 -1 ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
M +1 -1 ksysguard/gui/SensorDisplayLib/LogFile.h
M +1 -2 ksysguard/gui/SensorDisplayLib/MultiMeter.cc
M +1 -1 ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
M +5 -0 kwin/clients/modernsystem/btnhighcolor.h
M +4 -0 kwin/clients/modernsystem/buttondata.h
M +3 -4 kwin/clients/modernsystem/modernsys.h
M +3 -3 kwin/effects/videorecord.h
M +1 -1 kwin/events.cpp
M +5 -0 kwin/kcmkwin/kwindecoration/pixmaps.h
M +4 -3 kwin/kcmkwin/kwinoptions/windows.h
M +3 -3 kwin/lib/kwineffects.h
M +3 -3 libs/plasma/packages_p.h
M +4 -3 solid/bluez/bluez-bluetoothsecurityadaptor.h
M +3 -4 solid/networkmanager/NetworkManager-dbushelper.h
--- trunk/KDE/kdebase/workspace/kcheckpass/kcheckpass-enums.h #705065:705066
@@ -34,8 +34,8 @@
* Other parts were taken from kscreensaver's passwd.cpp
*****************************************************************/
-#ifndef KCHECKPASS-ENUMS_H
-#define KCHECKPASS-ENUMS_H
+#ifndef KCHECKPASS_ENUMS_H
+#define KCHECKPASS_ENUMS_H
#ifdef __cplusplus
extern "C" {
@@ -67,4 +67,4 @@
}
#endif
-#endif // KCHECKPASS-ENUMS_H
+#endif // KCHECKPASS_ENUMS_H
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/strigi-analyzer/FontThroughAnalyzer.h \
#705065:705066 @@ -20,8 +20,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef FONTTHROUGHTANALYZER_H
-#define FONTTHROUGHTANALYZER_H
+#ifndef FONTTHROUGHANALYZER_H
+#define FONTTHROUGHANALYZER_H
#include <strigi/streamthroughanalyzer.h>
@@ -52,4 +52,4 @@
Strigi::AnalysisResult *analysisResult;
};
-#endif // FONTTHROUGHTANALYZER_H
+#endif // FONTTHROUGHANALYZER_H
--- trunk/KDE/kdebase/workspace/kcontrol/kthememanager/ktheme.h #705065:705066
@@ -19,7 +19,7 @@
#ifndef KTHEME_H
#define KTHEME_H
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
#include <QPointer>
#include <QWidget>
--- trunk/KDE/kdebase/workspace/kcontrol/randr/outputgraphicsitem.cpp #705065:705066
@@ -83,7 +83,7 @@
if (oldTop)
oldTop->setBottom(output);
- // check wheter we have a left->top or a right->top to update the pointers
+ // check whether we have a left->top or a right->top to update the pointers
if (m_left && m_left->top())
{
OutputGraphicsItem *item = m_left->top();
@@ -118,7 +118,7 @@
if (oldBottom)
oldBottom->setTop(output);
- // check wheter we have a left->bottom or a right->bottom to update the pointers
+ // check whether we have a left->bottom or a right->bottom to update the pointers
if (m_left && m_left->bottom())
{
OutputGraphicsItem *item = m_left->bottom();
@@ -153,7 +153,7 @@
if (oldLeft)
oldLeft->setRight(output);
- // check wheter we have a top->left or a bottom->left to update the pointers
+ // check whether we have a top->left or a bottom->left to update the pointers
if (m_top && m_top->left())
{
OutputGraphicsItem *item = m_top->left();
@@ -188,7 +188,7 @@
if (oldRight)
oldRight->setLeft(output);
- // check wheter we have a top->right or a bottom->right to update the pointers
+ // check whether we have a top->right or a bottom->right to update the pointers
if (m_top && m_top->right())
{
OutputGraphicsItem *item = m_top->right();
--- trunk/KDE/kdebase/workspace/kdm/kfrontend/krootimage.h #705065:705066
@@ -19,16 +19,14 @@
*/
-#ifndef __KDMDESKTOP_H__
-#define __KDMDESKTOP_H__
+#ifndef __KDM_KROOTIMAGE_H__
+#define __KDM_KROOTIMAGE_H__
-
#include <bgrender.h>
#include <QApplication>
#include <QTimer>
-
class MyApplication : public QApplication
{
Q_OBJECT
@@ -45,4 +43,4 @@
QTimer timer;
};
-#endif
+#endif // __KDM_KROOTIMAGE_H__
--- trunk/KDE/kdebase/workspace/kmenuedit/menufile.h #705065:705066
@@ -19,7 +19,7 @@
#ifndef __menufile_h__
#define __menufile_h__
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
//Added by qt3to4:
#include <Q3PtrList>
--- trunk/KDE/kdebase/workspace/ksysguard/gui/SensorDisplayLib/DancingBars.cc \
#705065:705066 @@ -19,13 +19,12 @@
*/
#include <QCheckBox>
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
#include <QLineEdit>
#include <QListView>
#include <QPushButton>
#include <QSpinBox>
-
#include <kdebug.h>
#include <klocale.h>
#include <knumvalidator.h>
--- trunk/KDE/kdebase/workspace/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc \
#705065:705066 @@ -18,7 +18,7 @@
*/
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
#include <QtGui/QImage>
#include <QtGui/QToolTip>
--- trunk/KDE/kdebase/workspace/ksysguard/gui/SensorDisplayLib/LogFile.h \
#705065:705066 @@ -25,7 +25,7 @@
class QListWidget;
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
#include <QTimerEvent>
#include <QResizeEvent>
--- trunk/KDE/kdebase/workspace/ksysguard/gui/SensorDisplayLib/MultiMeter.cc \
#705065:705066 @@ -21,11 +21,10 @@
#include <math.h>
#include <stdlib.h>
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
#include <QtGui/QLCDNumber>
#include <QtGui/QResizeEvent>
-
#include <kdebug.h>
#include <ksgrd/SensorManager.h>
--- trunk/KDE/kdebase/workspace/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc \
#705065:705066 @@ -19,7 +19,7 @@
*/
#include <QCheckBox>
-#include <Qt/qdom.h>
+#include <QtXml/qdom.h>
#include <QMenu>
#include <QSpinBox>
--- trunk/KDE/kdebase/workspace/kwin/clients/modernsystem/btnhighcolor.h \
#705065:705066 @@ -1,3 +1,6 @@
+#ifndef __BTNHIGHCOLOR_H
+#define __BTNHIGHCOLOR_H
+
/* XPM */
static const char * btnhighcolor_xpm[] = {
"14 15 75 1",
@@ -91,3 +94,5 @@
" .GcHAAAAF0<. ",
" ..I5kk5I.. ",
" J..... "};
+
+#endif // __BTNHIGHCOLOR_H
--- trunk/KDE/kdebase/workspace/kwin/clients/modernsystem/buttondata.h #705065:705066
@@ -1,3 +1,6 @@
+#ifndef __BUTTONDATA_H
+#define __BUTTONDATA_H
+
/* Image bits processed by KPixmap2Bitmaps */
#define lowcolor_mask_width 14
@@ -40,3 +43,4 @@
0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x08,0x19,0x0d,0x08,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00 };
+#endif // __BUTTONDATA_H
--- trunk/KDE/kdebase/workspace/kwin/clients/modernsystem/modernsys.h #705065:705066
@@ -1,11 +1,10 @@
-#ifndef __MODSYSTEMCLIENT_H
-#define __MODSYSTEMCLIENT_H
+#ifndef __MODERNSYS_H
+#define __MODERNSYS_H
#include <QBitmap>
#include <kcommondecoration.h>
#include <kdecorationfactory.h>
-
namespace ModernSystem {
class ModernSys;
@@ -68,4 +67,4 @@
}
-#endif
+#endif // __MODERNSYS_H
--- trunk/KDE/kdebase/workspace/kwin/effects/videorecord.h #705065:705066
@@ -8,8 +8,8 @@
License. See the file "COPYING" for the exact licensing terms.
******************************************************************/
-#ifndef KWIN_VIDEO_H
-#define KWIN_VIDEO_H
+#ifndef KWIN_VIDEORECORD_H
+#define KWIN_VIDEORECORD_H
#include <kwineffects.h>
@@ -40,4 +40,4 @@
} // namespace
-#endif
+#endif // KWIN_VIDEORECORD_H
--- trunk/KDE/kdebase/workspace/kwin/events.cpp #705065:705066
@@ -1073,7 +1073,7 @@
if( isActive() && !workspace()->forcedGlobalMouseGrab()) // see \
Workspace::establishTabBoxGrab() {
// first grab all modifier combinations
- XGrabButton( display(), AnyButton, AnyModifier, wrapperId(), FALSE,
+ XGrabButton( display(), AnyButton, AnyModifier, wrapperId(), false,
ButtonPressMask,
GrabModeSync, GrabModeAsync,
None, None );
--- trunk/KDE/kdebase/workspace/kwin/kcmkwin/kwindecoration/pixmaps.h #705065:705066
@@ -28,6 +28,9 @@
*/
+#ifndef KWINDECORATION_PIXMAPS_H
+#define KWINDECORATION_PIXMAPS_H
+
// Button icon bitmap data which is hopefully generic enough to be recognized by \
everyone.
// close.xbm:
@@ -108,3 +111,5 @@
0xac, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0x00, 0x00 };
// vim: ts=4
+
+#endif // KWINDECORATION_PIXMAPS_H
--- trunk/KDE/kdebase/workspace/kwin/kcmkwin/kwinoptions/windows.h #705065:705066
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifndef __KWINDOWCONFIG_H__
-#define __KWINDOWCONFIG_H__
+#ifndef __KKWMWINDOWS_H__
+#define __KKWMWINDOWS_H__
#include <QWidget>
#include <kcmodule.h>
@@ -237,4 +237,5 @@
QComboBox* focusStealing;
QCheckBox* hideUtilityWindowsForInactive;
};
-#endif
+
+#endif // __KKWMWINDOWS_H__
--- trunk/KDE/kdebase/workspace/kwin/lib/kwineffects.h #705065:705066
@@ -10,8 +10,8 @@
// TODO MIT or some other license, perhaps move to some lib
-#ifndef KWIN_LIB_EFFECTS_H
-#define KWIN_LIB_EFFECTS_H
+#ifndef KWINEFFECTS_H
+#define KWINEFFECTS_H
#include <kwinglobals.h>
@@ -652,4 +652,4 @@
} // namespace
-#endif
+#endif // KWINEFFECTS_H
--- trunk/KDE/kdebase/workspace/libs/plasma/packages_p.h #705065:705066
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA. *
*******************************************************************************/
-#ifndef PACKAGES_P_H //krazy:exclude=includes
-#define PACKAGES_P_H
+#ifndef LIBS_PLASMA_PACKAGES_P_H
+#define LIBS_PLASMA_PACKAGES_P_H
#include <plasma/packagestructure.h>
@@ -39,4 +39,4 @@
} // namespace Plasma
-#endif // PACKAGES_P_H
+#endif // LIBS_PLASMA_PACKAGES_P_H
--- trunk/KDE/kdebase/workspace/solid/bluez/bluez-bluetoothsecurityadaptor.h \
#705065:705066 @@ -18,9 +18,10 @@
Boston, MA 02110-1301, USA.
*/
-#ifndef __BLUEZ_SECURITY_ADAPTOR
-#define __BLUEZ_SECURITY_ADAPTOR
+#ifndef __BLUEZ_BLUETOOTHSECURITYADAPTOR_H
+#define __BLUEZ_BLUETOOTHSECURITYADAPTOR_H
+
#include "bluez-bluetoothsecurity.h"
#include <QtDBus>
@@ -60,5 +61,5 @@
QDBusInterface *manager;
QDBusConnection conn;
};
-#endif
+#endif // __BLUEZ_BLUETOOTHSECURITYADAPTOR_H
--- trunk/KDE/kdebase/workspace/solid/networkmanager/NetworkManager-dbushelper.h \
#705065:705066 @@ -17,8 +17,8 @@
*/
-#ifndef SOLID_NM_DBUS_HELPER
-#define SOLID_NM_DBUS_HELPER
+#ifndef SOLID_NETWORKMANAGER_DBUSHELPER_H
+#define SOLID_NETWORKMANAGER_DBUSHELPER_H
#include <QList>
#include <QVariant>
@@ -38,5 +38,4 @@
static QList<QVariant> doSerialize(Solid::Control::AuthenticationWpaEnterprise \
*, const QString & essid, QList<QVariant> & args, bool * error); };
-#endif
-
+#endif // SOLID_NETWORKMANAGER_DBUSHELPER_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic