Ticket #376: includes.cleanup.patch

File includes.cleanup.patch, 14.4 KB (added by mythtv@…, 19 years ago)

  • libs/libmyth/audiooutputbase.h

     
    1 #ifndef AUDIOOUTPUTBASE
    2 #define AUDIOOUTPUTBASE
     1#ifndef _LIBMYTH_AUDIOOUTPUTBASE_H_
     2#define _LIBMYTH_AUDIOOUTPUTBASE_H_
    33
    4 #include <iostream>
    5 #include <pthread.h>
    6 using namespace std;
    7 
    8 #include <qstring.h>
    9 #include <qmutex.h>
    10 
    114#include "audiooutput.h"
    125#include "samplerate.h"
    13 #include "SoundTouch.h"
    146
     7namespace soundtouch { class SoundTouch; }
     8
    159#define AUDBUFSIZE 768000
    1610
    1711class AudioOutputBase : public AudioOutput
    1812{
    1913 public:
    20     AudioOutputBase(QString audiodevice, int laudio_bits,
    21                     int laudio_channels, int laudio_samplerate,
    22                     AudioOutputSource source, bool set_initial_vol);
     14    AudioOutputBase(QString audiodevice,
     15                    AudioOutputSource source,
     16                    bool set_initial_vol);
    2317    virtual ~AudioOutputBase();
    2418
    2519    // reconfigure sound out for new params
    2620    virtual void Reconfigure(int audio_bits,
    27                              int audio_channels, int audio_samplerate);
     21                             int audio_channels,
     22                             int audio_samplerate);
    2823   
    2924    // do AddSamples calls block?
    3025    virtual void SetBlocking(bool blocking);
    … …  
    159154    long current_seconds;
    160155    long source_bitrate;   
    161156   
    162 
     157 private:
     158    AudioOutputBase();
     159    AudioOutputBase(const AudioOutputBase&);
     160    AudioOutputBase& operator=(const AudioOutputBase&);
    163161};
    164162
    165 #endif
    166 
     163#endif//_LIBMYTH_AUDIOOUTPUTBASE_H_

  • libs/libmyth/util.h

     
    1 #ifndef UTIL_H_
    2 #define UTIL_H_
     1#ifndef _LIBMYTH_UTIL_H_
     2#define _LIBMYTH_UTIL_H_
    33
    4 #include <qsocket.h>
    5 #include <qstringlist.h>
    6 #include <qdatetime.h>
    74#include <qcolor.h>
     5#include <qdatetime.h>
     6#include <qstringlist.h>
    87
    9 #include <time.h>
    10 
    118#define MYTH_SYSTEM_DONT_BLOCK_LIRC          0x1 //< myth_system() flag to avoid blocking
    129#define MYTH_SYSTEM_DONT_BLOCK_JOYSTICK_MENU 0x2 //< myth_system() flag to avoid blocking
    1310
    14 class QPixmap;
     11class QFont;
    1512class QImage;
    1613class QPainter;
    17 class QFont;
     14class QPixmap;
     15class QSocket;
     16class QSocketDevice;
    1817
    1918class MythTimer
    2019{
    … …  
    7574bool getUptime(time_t &uptime);
    7675bool getMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM);
    7776
    78 #endif // UTIL_H_
     77#endif//_LIBMYTH_UTIL_H_

  • libs/libmyth/audiooutputalsa.cpp

     
    1313AudioOutputALSA::AudioOutputALSA(QString audiodevice, int laudio_bits,
    1414                                 int laudio_channels, int laudio_samplerate,
    1515                                 AudioOutputSource source, bool set_initial_vol)
    16               : AudioOutputBase(audiodevice, laudio_bits,
    17                               laudio_channels, laudio_samplerate, source, set_initial_vol)
     16              : AudioOutputBase(audiodevice, source, set_initial_vol)
    1817{
    1918    // our initalisation
    2019    pcm_handle = NULL;

  • libs/libmyth/audiooutputca.cpp

     
    3939AudioOutputCA::AudioOutputCA(QString audiodevice, int laudio_bits,
    4040                             int laudio_channels, int laudio_samplerate,
    4141                             AudioOutputSource source, bool set_initial_vol)
    42              : AudioOutputBase(audiodevice, laudio_bits,
    43                                laudio_channels, laudio_samplerate,
    44                                source, set_initial_vol)
     42             : AudioOutputBase(audiodevice, source, set_initial_vol)
    4543{
    4644    // Create private data
    4745    coreaudio_data = new CoreAudioData();

  • libs/libmyth/themedmenu.h

     
    1 #ifndef THEMEDMENU_H_
    2 #define THEMEDMENU_H_
     1#ifndef _LIBMYTH_THEMEDMENU_H_
     2#define _LIBMYTH_THEMEDMENU_H_
    33
    4 #include <qvaluelist.h>
    5 #include <qdom.h>
    6 #include <qmap.h>
    7 
    84#include "mythdialogs.h"
    95
    10 #include <vector>
    11 
    12 using namespace std;
    13 
    146class ThemedMenuPrivate;
    157
    168class ThemedMenu : public MythDialog
    … …  
    4335    ThemedMenuPrivate *d;
    4436};
    4537
    46 #endif
     38#endif//_LIBMYTH_THEMEDMENU_H_

  • libs/libmyth/volumebase.cpp

     
    1 #include <qstring.h>
    2 #include <cstdio>
    3 #include <cstdlib>
    4 
    5 using namespace std;
    61#include "volumebase.h"
    72
     3#include "mythcontext.h"
     4
     5#include <qstring.h>
     6
    87VolumeBase::VolumeBase()
    98{
    109    volume = 80;

  • libs/libmyth/audiooutputjack.cpp

     
    2424AudioOutputJACK::AudioOutputJACK(QString audiodevice, int laudio_bits,
    2525                                 int laudio_channels, int laudio_samplerate,
    2626                                 AudioOutputSource source, bool set_initial_vol)
    27                : AudioOutputBase(audiodevice, laudio_bits, laudio_channels,
    28                                  laudio_samplerate, source, set_initial_vol)
     27               : AudioOutputBase(audiodevice, source, set_initial_vol)
    2928{
    3029    // Initialise the Jack output layer
    3130    JACK_Init();

  • libs/libmyth/audiooutputbase.cpp

     
    1 #include <qstring.h>
    2 #include <cstdio>
    3 #include <cstdlib>
    4 #include <cmath>
    5 #include <pthread.h>
    6 
    7 using namespace std;
    81#include "audiooutputbase.h"
    92
    10 #include <iostream>
    11 #include <qdatetime.h>
     3#include "SoundTouch.h"
     4
    125#include <sys/time.h>
    13 #include <unistd.h>
     6#include <cmath>
    147
    15 
    16 AudioOutputBase::AudioOutputBase(QString audiodevice, int,
    17                                  int, int,
    18                                  AudioOutputSource source, bool set_initial_vol)
     8AudioOutputBase::AudioOutputBase(QString audiodevice,
     9                                 AudioOutputSource source,
     10                                 bool set_initial_vol)
    1911{
    2012    pthread_mutex_init(&audio_buflock, NULL);
    2113    pthread_mutex_init(&avsync_lock, NULL);

  • libs/libmyth/util.cpp

     
     1#include "util.h"
     2
    13// C++ headers
    24#include <iostream>
    35using namespace std;
    … …  
    2830#include <qpainter.h>
    2931#include <qpixmap.h>
    3032#include <qfont.h>
     33#include <qsocket.h>
    3134
    3235// Myth headers
    3336#include "mythconfig.h"
    3437#include "exitcodes.h"
    35 #include "util.h"
    3638#include "mythcontext.h"
    3739
    3840#ifdef CONFIG_DARWIN

  • libs/libmyth/themedmenu.cpp

     
    1 #include <qlayout.h>
    2 #include <qpushbutton.h>
    3 #include <qbuttongroup.h>
    4 #include <qlabel.h>
    5 #include <qcursor.h>
    6 #include <qapplication.h>
    7 #include <qpixmap.h>
    8 #include <qbitmap.h>
    9 #include <qpainter.h>
    10 #include <qimage.h>
    11 #include <qdir.h>
    12 #include <qdom.h>
     1#include "themedmenu.h"
    132
    14 #include <iostream>
    15 #include <cmath>
    16 using namespace std;
    17 
     3#include "dialogbox.h"
    184#include "exitcodes.h"
    19 #include "themedmenu.h"
     5#include "lcddevice.h"
    206#include "mythcontext.h"
    21 #include "util.h"
    227#include "mythplugin.h"
    23 #include "dialogbox.h"
    24 #include "lcddevice.h"
    258
     9#include <cmath>
     10#include <qbitmap.h>
    2611
    27 
    2812extern QMap<QString, fontProp> globalFontMap;
    2913
    3014struct TextAttributes

  • libs/libmyth/xmlparse.h

     
    1 #ifndef XMLPARSE_H_
    2 #define XMLPARSE_H_
     1#ifndef _LIBMYTH_XMLPARSE_H_
     2#define _LIBMYTH_XMLPARSE_H_
    33
    44#include "uitypes.h"
    5 #include "mythcontext.h"
    6 #include <qimage.h>
    7 #include <qrect.h>
    8 #include <qlabel.h>
    9 #include <qdom.h>
    105
    116class XMLParse
    127{
    … …  
    6560    QString fontSizeType;
    6661};
    6762
    68 #endif
     63#endif//_LIBMYTH_XMLPARSE_H_

  • libs/libmyth/audiooutputoss.cpp

     
    2828AudioOutputOSS::AudioOutputOSS(QString audiodevice, int laudio_bits,
    2929                               int laudio_channels, int laudio_samplerate,
    3030                               AudioOutputSource source, bool set_initial_vol)
    31               : AudioOutputBase(audiodevice, laudio_bits,
    32                               laudio_channels, laudio_samplerate, source, set_initial_vol)
     31              : AudioOutputBase(audiodevice, source, set_initial_vol)
    3332{
    3433    // our initalisation
    3534    audiofd = -1;

  • libs/libmyth/volumebase.h

     
    1 #ifndef VOLUMEBASE
    2 #define VOLUMEBASE
     1#ifndef _LIBMYTH_VOLUMEBASE_H_
     2#define _LIBMYTH_VOLUMEBASE_H_
    33
    4 #include <iostream>
    5 using namespace std;
    6 
    7 #include <qstring.h>
    8 #include "mythcontext.h"
    9 
    104typedef enum {
    115    MUTE_OFF = 0,
    126    MUTE_LEFT,
    … …  
    4539
    4640};
    4741
    48 #endif
    49 
     42#endif//_LIBMYTH_VOLUMEBASE_H_

  • libs/libmyth/dialogbox.cpp

     
     1#include "dialogbox.h"
     2
    13#include <iostream>
    24using namespace std;
    35
    … …  
    810#include <qcursor.h>
    911#include <qapplication.h>
    1012
    11 #include "dialogbox.h"
    1213#include "mythcontext.h"
    1314#include "mythwidgets.h"
    1415
    … …  
    5657    box->addWidget(button, 0);
    5758}
    5859
     60bool DialogBox::getCheckBoxState(void)
     61{
     62    return checkbox ? checkbox->isChecked() : false;
     63}
     64
    5965void DialogBox::buttonPressed(int which)
    6066{
    6167    if (buttongroup->find(which) != checkbox)

  • libs/libmyth/audiooutputarts.cpp

     
    1010AudioOutputARTS::AudioOutputARTS(QString audiodevice, int audio_bits,
    1111                                 int audio_channels, int audio_samplerate,
    1212                                 AudioOutputSource source, bool set_initial_vol)
    13               : AudioOutputBase(audiodevice, audio_bits, audio_channels,
    14                                 audio_samplerate, source, set_initial_vol)
     13              : AudioOutputBase(audiodevice, source, set_initial_vol)
    1514{
    1615    // our initalisation
    1716    pcm_handle = NULL;

  • libs/libmyth/xmlparse.cpp

     
    1 #include <iostream>
    2 using namespace std;
     1#include "xmlparse.h"
    32
    4 #include <cmath>
     3#include "mythcontext.h"
     4#include "uilistbtntype.h"
    55
     6#include <cmath>
    67#include <qapplication.h>
    78
    8 #include "uilistbtntype.h"
    9 #include "xmlparse.h"
    10 
    119QMap<QString, fontProp> globalFontMap;
    1210
    1311XMLParse::XMLParse(void)

  • libs/libmyth/dialogbox.h

     
    1 #ifndef DIALOGBOX_H_
    2 #define DIALOGBOX_H_
     1#ifndef _LIBMYTH_DIALOGBOX_H_
     2#define _LIBMYTH_DIALOGBOX_H_
    33
    4 #include <qcheckbox.h>
    5 
    64#include "mythdialogs.h"
    75
    8 class QVBoxLayout;
    96class QButtonGroup;
     7class QCheckBox;
    108class QString;
     9class QVBoxLayout;
    1110
    1211class DialogBox : public MythDialog
    1312{
    … …  
    1817
    1918    void AddButton(const QString &title);
    2019
    21     bool getCheckBoxState(void) {  if (checkbox) return checkbox->isChecked();
    22                                    return false; }
     20    bool getCheckBoxState(void);
     21
    2322  protected slots:
    2423    void buttonPressed(int which);
    2524
    2625  private:
    2726    QVBoxLayout *box;
    2827    QButtonGroup *buttongroup;
    29 
    3028    QCheckBox *checkbox;
    3129};
    3230
    33 #endif
     31#endif//_LIBMYTH_DIALOGBOX_H_

  • libs/libmyth/audiooutputnull.cpp

     
    1919AudioOutputNULL::AudioOutputNULL(QString audiodevice, int laudio_bits,
    2020                                 int laudio_channels, int laudio_samplerate,
    2121                                 AudioOutputSource source, bool set_initial_vol)
    22                : AudioOutputBase(audiodevice, laudio_bits, laudio_channels,
    23                                  laudio_samplerate, source, set_initial_vol)
     22               : AudioOutputBase(audiodevice, source, set_initial_vol)
    2423{
    2524    locked_audio_channels = laudio_channels;
    2625    locked_audio_bits = laudio_bits;

  • libs/libmyth/mythcontext.cpp

     
     1#include "mythcontext.h"
     2
    13#include <qapplication.h>
    24#include <qsqldatabase.h>
    35#include <qimage.h>
    … …  
    1012#include <qnetwork.h>
    1113#include <qwaitcondition.h>
    1214
     15#include <qsocket.h>
    1316#include <qsocketdevice.h>
    1417#include <qhostaddress.h>
    1518
    … …  
    1821#include <queue>
    1922
    2023#include "config.h"
    21 #include "mythcontext.h"
    2224#include "oldsettings.h"
    2325#include "themedmenu.h"
    2426#include "util.h"

  • programs/mythbackend/filetransfer.cpp

     
    11#include <qapplication.h>
    22#include <qdatetime.h>
     3#include <qsocket.h>
    34
    45#include <unistd.h>
    56#include <iostream>