Commit e4d77f38 authored by Michael Pyne's avatar Michael Pyne

Also standardize all of the JuK include header guards, to the most common style to save me

work. :)

svn path=/trunk/KDE/kdemultimedia/juk/; revision=513943
parent 71fe0152
......@@ -110,6 +110,24 @@ same order of function declarations as the header files.
Virtual functions should always be marked as such even in derrived classes where
it is not strictly necessary.
Header guards should be of the form FILENAME_H, as below (for an example file
foo.h:
/* copyright/license stuff
* blah
*/
#ifndef FOO_H
#define FOO_H
#include <qt stuff>
// classes
#endif
// vim modeline (see below)
================================================================================
Whitespace
================================================================================
......
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_ACTIONCOLLECTION_H
#define JUK_ACTIONCOLLECTION_H
#ifndef ACTIONCOLLECTION_H
#define ACTIONCOLLECTION_H
class KActionCollection;
class KAction;
......
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_CATEGORYREADERINTERFACE_H
#define JUK_CATEGORYREADERINTERFACE_H
#ifndef CATEGORYREADERINTERFACE_H
#define CATEGORYREADERINTERFACE_H
#include "tagrenameroptions.h"
//Added by qt3to4:
......@@ -119,6 +119,6 @@ public:
virtual QString fixupTrack(const QString &track, unsigned categoryNum) const;
};
#endif /* JUK_CATEGORYREADERINTERFACE_H */
#endif /* CATEGORYREADERINTERFACE_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_COVERDIALOG_H
#define JUK_COVERDIALOG_H
#ifndef COVERDIALOG_H
#define COVERDIALOG_H
#include "coverdialogbase.h"
......@@ -36,6 +36,6 @@ private slots:
void removeSelectedCover();
};
#endif /* JUK_COVERDIALOG_H */
#endif /* COVERDIALOG_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_COVERICONVIEW_H
#define JUK_COVERICONVIEW_H
#ifndef COVERICONVIEW_H
#define COVERICONVIEW_H
#include <kiconview.h>
......@@ -58,6 +58,6 @@ protected:
virtual Q3DragObject *dragObject();
};
#endif /* JUK_COVERICONVIEW_H */
#endif /* COVERICONVIEW_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_COVERMANAGER_H
#define JUK_COVERMANAGER_H
#ifndef COVERMANAGER_H
#define COVERMANAGER_H
#include <ksharedptr.h>
......@@ -260,6 +260,6 @@ public:
static QPixmap createThumbnail(const QPixmap &base);
};
#endif /* JUK_COVERMANAGER_H */
#endif /* COVERMANAGER_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,9 +13,8 @@
* *
***************************************************************************/
#ifndef _DELETEDIALOG_H
#define _DELETEDIALOG_H
#ifndef DELETEDIALOG_H
#define DELETEDIALOG_H
#include <qcheckbox.h>
//Added by qt3to4:
......
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_EXAMPLEOPTIONS_H
#define JUK_EXAMPLEOPTIONS_H
#ifndef EXAMPLEOPTIONS_H
#define EXAMPLEOPTIONS_H
#include <qdialog.h>
//Added by qt3to4:
......@@ -61,6 +61,6 @@ class ExampleOptionsDialog : public QDialog
ExampleOptions *m_options;
};
#endif /* JUK_EXAMPLEOPTIONS_H */
#endif /* EXAMPLEOPTIONS_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_FILEHANDLE_H
#define JUK_FILEHANDLE_H
#ifndef FILEHANDLE_H
#define FILEHANDLE_H
#include <qstringlist.h>
//Added by qt3to4:
......
......@@ -14,8 +14,8 @@
* *
***************************************************************************/
#ifndef JUK_FILERENAMER_H
#define JUK_FILERENAMER_H
#ifndef FILERENAMER_H
#define FILERENAMER_H
#include <qstring.h>
#include <q3valuevector.h>
......@@ -540,6 +540,6 @@ private:
bool moveFile(const QString &src, const QString &dest);
};
#endif /* JUK_FILERENAMER_H */
#endif /* FILERENAMER_H */
// vim: set et sw=4 tw=0 sta:
......@@ -14,8 +14,8 @@
* *
***************************************************************************/
#ifndef JUK_FILERENAMERCONFIGDLG_H
#define JUK_FILERENAMERCONFIGDLG_H
#ifndef FILERENAMERCONFIGDLG_H
#define FILERENAMERCONFIGDLG_H
class FileRenamerWidget;
......
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_FILERENAMEROPTIONS_H
#define JUK_FILERENAMEROPTIONS_H
#ifndef FILERENAMEROPTIONS_H
#define FILERENAMEROPTIONS_H
#include <kdialogbase.h>
#include "filerenameroptionsbase.h"
......@@ -74,6 +74,6 @@ private:
unsigned m_categoryNumber;
};
#endif /* JUK_FILERENAMEROPTIONS_H */
#endif /* FILERENAMEROPTIONS_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef JUK_TAGRENAMEROPTIONS_H
#define JUK_TAGRENAMEROPTIONS_H
#ifndef TAGRENAMEROPTIONS_H
#define TAGRENAMEROPTIONS_H
// Insert all new tag types before NumTypes, that way NumTypes will always be
// the count of valid tag types.
......@@ -168,6 +168,6 @@ private:
TagType m_category;
};
#endif /* JUK_TAGRENAMEROPTIONS_H */
#endif /* TAGRENAMEROPTIONS_H */
// vim: set et sw=4 tw=0 sta:
//Added by qt3to4:
#include <Q3ValueList>
/***************************************************************************
begin : Wed Sep 22 2004
copyright : (C) 2004 by Michael Pyne
......@@ -15,10 +13,11 @@
* *
***************************************************************************/
#ifndef _TAGTRANSACTIONMANAGER_H
#define _TAGTRANSACTIONMANAGER_H
#ifndef TAGTRANSACTIONMANAGER_H
#define TAGTRANSACTIONMANAGER_H
//Added by qt3to4:
#include <Q3ValueList>
class PlaylistItem;
class QWidget;
......@@ -210,6 +209,6 @@ class TagTransactionManager : public QObject
static TagTransactionManager *m_manager; ///< used by instance()
};
#endif /* _TAGTRANSACTIONMANAGER_H */
#endif /* TAGTRANSACTIONMANAGER_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef _TRACKSEQUENCEITERATOR_H
#define _TRACKSEQUENCEITERATOR_H
#ifndef TRACKSEQUENCEITERATOR_H
#define TRACKSEQUENCEITERATOR_H
#include "playlistitem.h"
#include "playlistsearch.h"
......@@ -227,6 +227,6 @@ private:
PlaylistSearch m_albumSearch;
};
#endif /* _TRACKSEQUENCEITERATOR_H */
#endif /* TRACKSEQUENCEITERATOR_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef _TRACKSEQUENCEMANAGER_H
#define _TRACKSEQUENCEMANAGER_H
#ifndef TRACKSEQUENCEMANAGER_H
#define TRACKSEQUENCEMANAGER_H
#include <qobject.h>
......@@ -187,6 +187,6 @@ private:
bool m_initialized;
};
#endif /* _TRACKSEQUENCEMANAGER_H */
#endif /* TRACKSEQUENCEMANAGER_H */
// vim: set et sw=4 tw=0 sta:
......@@ -13,8 +13,8 @@
* *
***************************************************************************/
#ifndef _UPCOMINGPLAYLIST_H
#define _UPCOMINGPLAYLIST_H
#ifndef UPCOMINGPLAYLIST_H
#define UPCOMINGPLAYLIST_H
#include <qpointer.h>
......@@ -208,6 +208,6 @@ private:
QDataStream &operator<<(QDataStream &s, const UpcomingPlaylist &p);
QDataStream &operator>>(QDataStream &s, UpcomingPlaylist &p);
#endif /* _UPCOMINGPLAYLIST_H */
#endif /* UPCOMINGPLAYLIST_H */
// vim: set et sw=4 tw=0 sta:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment