generic: normalize include guards

kcontrol/desktoppaths/globalpaths.h

@@ -27,8 +27,8 @@
 // Desktop menus, paths
 // (c) David Faure 2000
 
-#ifndef __GLOBALPATHS_H
-#define __GLOBALPATHS_H
+#ifndef GLOBALPATHS_H
+#define GLOBALPATHS_H
 
 #include <kcmodule.h>
 #include <kio/global.h>

kcontrol/input/core/bitmaps.h

@@ -17,8 +17,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __BITMAPS_H
-#define __BITMAPS_H
+#ifndef BITMAPS_H
+#define BITMAPS_H
 
 
 static const char* const arrow_large_black_xpm[] = {

kcontrol/input/core/themepage.h

@@ -16,8 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef __THEMEPAGE_H
-#define __THEMEPAGE_H
+#ifndef THEMEPAGE_H
+#define THEMEPAGE_H
 
 class QTreeWidget;
 class QTreeWidgetItem;
@@ -48,6 +48,6 @@ class ThemePage : public QWidget
 		QString currentTheme, selectedTheme;
 };
 
-#endif // __THEMEPAGE_H
+#endif // THEMEPAGE_H
 
 // vim: set noet ts=4 sw=4:

kcontrol/knotify/knotify.h

@@ -20,8 +20,8 @@
 */
 
 
-#ifndef _KNOTIFY_H
-#define _KNOTIFY_H
+#ifndef KNOTIFY_H
+#define KNOTIFY_H
 
 
 #include <kcmodule.h>

kcontrol/smartcard/smartcard.h

@@ -18,8 +18,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#ifndef _KCM_SMARTCARD_H
-#define _KCM_SMARTCARD_H
+#ifndef KCM_SMARTCARD_H
+#define KCM_SMARTCARD_H
 
 #include <config-workspace.h>
 

keditfiletype/kservicelistwidget.h

@@ -19,8 +19,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KSERVICELISTWIDGET_H
-#define _KSERVICELISTWIDGET_H
+#ifndef KSERVICELISTWIDGET_H
+#define KSERVICELISTWIDGET_H
 
 #include <QGroupBox>
 #include <QListWidget>

keditfiletype/newtypedlg.h

@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _NEWTYPEDLG_H
-#define _NEWTYPEDLG_H
+#ifndef NEWTYPEDLG_H
+#define NEWTYPEDLG_H
 
 #include <kdialog.h>
 

kglobalaccel/kglobalaccel_qws.h

@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KGLOBALACCEL_QWS_H
-#define _KGLOBALACCEL_QWS_H
+#ifndef KGLOBALACCEL_QWS_H
+#define KGLOBALACCEL_QWS_H
 
 #include <QWidget>
 
@@ -59,4 +59,4 @@ private:
 	GlobalShortcutsRegistry* m_owner;
 };
 
-#endif // _KGLOBALACCEL_QWS_H
+#endif // KGLOBALACCEL_QWS_H

kglobalaccel/kglobalaccel_x11.h

@@ -17,8 +17,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KGLOBALACCEL_X11_H
-#define _KGLOBALACCEL_X11_H
+#ifndef KGLOBALACCEL_X11_H
+#define KGLOBALACCEL_X11_H
 
 #include <QWidget>
 
@@ -69,4 +69,4 @@ private:
     GlobalShortcutsRegistry *m_owner;
 };
 
-#endif // _KGLOBALACCEL_X11_H
+#endif // KGLOBALACCEL_X11_H

kinfocenter/Modules/usbview/kcmusb.h

@@ -8,8 +8,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef _KCMUSB_H
-#define _KCMUSB_H
+#ifndef KCMUSB_H
+#define KCMUSB_H
 
 #include <QMap>
 

krunner/interfaces/default/resultview.h

@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#ifndef ResultView_H
-#define ResultView_H
+#ifndef RESULTVIEW_H
+#define RESULTVIEW_H
 
 #include <KDebug>
 

ksplash/ksplashx/kcpuinfo.h

@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __KCPUINFO_H
-#define __KCPUINFO_H
+#ifndef KCPUINFO_H
+#define KCPUINFO_H
 
 
 /**

ksplash/ksplashx/pixmap.h

@@ -41,8 +41,8 @@
 **
 **********************************************************************/
 
-#ifndef _PIXMAP_H
-#define _PIXMAP_H
+#ifndef PIXMAP_H
+#define PIXMAP_H
 
 #include "qnamespace.h"
 

ksplash/ksplashx/qglobal.h

@@ -41,8 +41,8 @@
 **
 **********************************************************************/
 
-#ifndef _QGLOBAL_H
-#define _QGLOBAL_H
+#ifndef QGLOBAL_H
+#define QGLOBAL_H
 
 #include "defs.h"
 

ksplash/ksplashx/scale.h

@@ -77,8 +77,8 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef _SCALE_H
-#define _SCALE_H
+#ifndef SCALE_H
+#define SCALE_H
 
 #include <qimage.h>
 

ksplash/ksplashx/splash.h

@@ -18,8 +18,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
-#ifndef _SPLASH_H
-#define _SPLASH_H
+#ifndef SPLASH_H
+#define SPLASH_H
 
 #include <stdio.h>
 

ksplash/ksplashx/x11_defs.h

@@ -41,8 +41,8 @@
 **
 **********************************************************************/
 
-#ifndef _X11_DEFS_H
-#define _X11_DEFS_H
+#ifndef X11_DEFS_H
+#define X11_DEFS_H
 
 #include "qrect.h"
 

ksysguard/ksysguardd/CContLib/ccont.h

@@ -22,8 +22,8 @@
 
 */
 
-#ifndef _CCONT_H
-#define _CCONT_H
+#ifndef CCONT_H
+#define CCONT_H
 
 #ifndef NIL
 #define NIL ((void*) 0)

kwalletd/backend/blowfish.h

@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef _BLOWFISH_H
-#define _BLOWFISH_H
+#ifndef BLOWFISH_H
+#define BLOWFISH_H
 
 #include <config-kwalletbackend.h>
 

kwalletd/backend/cbc.h

@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __CBC__KO__H
-#define __CBC__KO__H
+#ifndef CBC__KO__H
+#define CBC__KO__H
 
 #include "blockcipher.h"
 

kwalletd/backend/kwalletbackend.h

@@ -19,8 +19,8 @@
  */
 
 
-#ifndef _KWALLETBACKEND_H
-#define _KWALLETBACKEND_H
+#ifndef KWALLETBACKEND_H
+#define KWALLETBACKEND_H
 
 #include <kcodecs.h>
 

kwalletd/backend/kwalletentry.h

@@ -19,8 +19,8 @@
  */
 
 
-#ifndef _KWALLETENTRY_H
-#define _KWALLETENTRY_H
+#ifndef KWALLETENTRY_H
+#define KWALLETENTRY_H
 
 #include <QtCore/QString>
 #include <QtCore/QDataStream>

kwalletmanager/src/konfigurator/konfigurator.h

@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
  */
 
-#ifndef _KWALLETKONFIGURATOR_H
-#define _KWALLETKONFIGURATOR_H
+#ifndef KWALLETKONFIGURATOR_H
+#define KWALLETKONFIGURATOR_H
 #include <kcmodule.h>
 #include <ksharedconfig.h>
 #include "ui_walletconfigwidget.h"

plasma/desktop/containments/desktop/desktoplayout.h

@@ -7,8 +7,8 @@
   (at your option) any later version.
 */
 
-#ifndef _DESKTOPLAYOUT_H
-#define _DESKTOPLAYOUT_H
+#ifndef DESKTOPLAYOUT_H
+#define DESKTOPLAYOUT_H
 
 #include <QHash>
 #include <QMap>

plasma/desktop/containments/desktop/itemspace.h

@@ -7,8 +7,8 @@
   (at your option) any later version.
 */
 
-#ifndef _ITEMSPACE_H
-#define _ITEMSPACE_H
+#ifndef ITEMSPACE_H
+#define ITEMSPACE_H
 
 #include <QRectF>
 #include <QList>

plasma/generic/applets/systemtray/ui/mouseredirectarea.h

@@ -22,8 +22,8 @@
  **********************************************************************************************************************/
 
 
-#ifndef __SYSTEMTRAY__MOUSEREDIRECTAREA_H
-#define __SYSTEMTRAY__MOUSEREDIRECTAREA_H
+#ifndef SYSTEMTRAY__MOUSEREDIRECTAREA_H
+#define SYSTEMTRAY__MOUSEREDIRECTAREA_H
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //Includes
@@ -94,4 +94,4 @@ private: //Variables
 
 } // namespace SystemTray
 
-#endif // __SYSTEMTRAY__MOUSEREDIRECTAREA_H
+#endif // SYSTEMTRAY__MOUSEREDIRECTAREA_H

plasma/generic/applets/systemtray/ui/widgetitem.h

@@ -22,8 +22,8 @@
  **********************************************************************************************************************/
 
 
-#ifndef __SYSTEMTRAY__WIDGETITEM_H
-#define __SYSTEMTRAY__WIDGETITEM_H
+#ifndef SYSTEMTRAY__WIDGETITEM_H
+#define SYSTEMTRAY__WIDGETITEM_H
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Includess
@@ -78,4 +78,4 @@ private:
 
 } //namespace SystemTray
 
-#endif // __SYSTEMTRAY__WIDGETITEM_H
+#endif // SYSTEMTRAY__WIDGETITEM_H

solid-networkstatus/tests/networkingservice.h

@@ -21,8 +21,8 @@
     without including the source code for Qt in the source distribution.
 */
 
-#ifndef _TEST_NETWORKSTATUS_SERVICE_H
-#define _TEST_NETWORKSTATUS_SERVICE_H
+#ifndef TEST_NETWORKSTATUS_SERVICE_H
+#define TEST_NETWORKSTATUS_SERVICE_H
 
 #include <KMainWindow>
 #include <solid/networking.h>