eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

changed the qt includes to regular ones (without the .h)

Browse source
This commit is contained in:
Volker Fischer 2013-01-02 20:41:04 +00:00
parent ac5066066c
commit 87aabee220
25 changed files with 135 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux/sound.h
View file

@ -31,7 +31,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <qthread.h> #include <QThread>
#include <string.h> #include <string.h>
#include "util.h" #include "util.h"
#include "soundbase.h" #include "soundbase.h"

2
mac/sound.h
View file

@ -28,7 +28,7 @@
#include <CoreServices/CoreServices.h> #include <CoreServices/CoreServices.h>
#include <AudioUnit/AudioUnit.h> #include <AudioUnit/AudioUnit.h>
#include <CoreAudio/AudioHardware.h> #include <CoreAudio/AudioHardware.h>
#include <qmutex.h> #include <QMutex>
#include "util.h" #include "util.h"
#include "soundbase.h" #include "soundbase.h"
#include "global.h" #include "global.h"

18
src/audiomixerboard.h
View file

@ -25,15 +25,15 @@
#if !defined ( MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ ) #if !defined ( MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ )
#define MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ #define MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_
#include <qframe.h> #include <QFrame>
#include <qgroupbox.h> #include <QGroupBox>
#include <qlabel.h> #include <QLabel>
#include <qcheckbox.h> #include <QCheckBox>
#include <qlayout.h> #include <QLayout>
#include <qstring.h> #include <QString>
#include <qslider.h> #include <QSlider>
#include <qsizepolicy.h> #include <QSizePolicy>
#include <qhostaddress.h> #include <QHostAddress>
#include "global.h" #include "global.h"
#include "util.h" #include "util.h"

8
src/channel.h
View file

@ -25,10 +25,10 @@
#if !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) #if !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ )
#define CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ #define CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_
#include <qthread.h> #include <QThread>
#include <qdatetime.h> #include <QDateTime>
#include <qfile.h> #include <QFile>
#include <qtextstream.h> #include <QTextStream>
#include "global.h" #include "global.h"
#include "buffer.h" #include "buffer.h"
#include "util.h" #include "util.h"

14
src/chatdlg.h
View file

@ -22,13 +22,13 @@
* *
\******************************************************************************/ \******************************************************************************/
#include <qlabel.h> #include <QLabel>
#include <qstring.h> #include <QString>
#include <qlineedit.h> #include <QLineEdit>
#include <qpushbutton.h> #include <QPushButton>
#include <qwhatsthis.h> #include <QWhatsThis>
#include <qlayout.h> #include <QLayout>
#include <qaccessible.h> #include <QAccessible>
#include "global.h" #include "global.h"
#ifdef _WIN32 #ifdef _WIN32
# include "../windows/moc/chatdlgbase.h" # include "../windows/moc/chatdlgbase.h"

11
src/client.h
View file

@ -25,12 +25,11 @@
#if !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) #if !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ )
#define CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ #define CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_
#include <qglobal.h> #include <QHostAddress>
#include <qhostaddress.h> #include <QHostInfo>
#include <qhostinfo.h> #include <QString>
#include <qstring.h> #include <QDateTime>
#include <qdatetime.h> #include <QMessageBox>
#include <qmessagebox.h>
#include "celt.h" #include "celt.h"
#include "global.h" #include "global.h"
#include "socket.h" #include "socket.h"

24
src/clientsettingsdlg.h
View file

@ -22,18 +22,18 @@
* *
\******************************************************************************/ \******************************************************************************/
#include <qlabel.h> #include <QLabel>
#include <qstring.h> #include <QString>
#include <qlineedit.h> #include <QLineEdit>
#include <qpushbutton.h> #include <QPushButton>
#include <qprogressbar.h> #include <QProgressBar>
#include <qwhatsthis.h> #include <QWhatsThis>
#include <qtimer.h> #include <QTimer>
#include <qslider.h> #include <QSlider>
#include <qradiobutton.h> #include <QRadioButton>
#include <qmenubar.h> #include <QMenuBar>
#include <qlayout.h> #include <QLayout>
#include <qbuttongroup.h> #include <QButtonGroup>
#include "global.h" #include "global.h"
#include "client.h" #include "client.h"
#include "multicolorled.h" #include "multicolorled.h"

14
src/connectdlg.h
View file

@ -22,13 +22,13 @@
* *
\******************************************************************************/ \******************************************************************************/
#include <qlabel.h> #include <QLabel>
#include <qlineedit.h> #include <QLineEdit>
#include <qpushbutton.h> #include <QPushButton>
#include <qwhatsthis.h> #include <QWhatsThis>
#include <qtimer.h> #include <QTimer>
#include <qmutex.h> #include <QMutex>
#include <qlocale.h> #include <QLocale>
#include "global.h" #include "global.h"
#include "client.h" #include "client.h"
#ifdef _WIN32 #ifdef _WIN32

6
src/global.h
View file

@ -50,9 +50,9 @@ LED bar: lbr
#if !defined ( GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ ) #if !defined ( GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ )
#define GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ #define GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_
#include <qstring.h> #include <QString>
#include <qevent.h> #include <QEvent>
#include <qdebug.h> #include <QDebug>
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <string> #include <string>

22
src/llconclientdlg.h
View file

@ -22,17 +22,17 @@
* *
\******************************************************************************/ \******************************************************************************/
#include <qlabel.h> #include <QLabel>
#include <qstring.h> #include <QString>
#include <qlineedit.h> #include <QLineEdit>
#include <qpushbutton.h> #include <QPushButton>
#include <qprogressbar.h> #include <QProgressBar>
#include <qwhatsthis.h> #include <QWhatsThis>
#include <qtimer.h> #include <QTimer>
#include <qslider.h> #include <QSlider>
#include <qradiobutton.h> #include <QRadioButton>
#include <qmenubar.h> #include <QMenuBar>
#include <qlayout.h> #include <QLayout>
#include "global.h" #include "global.h"
#include "client.h" #include "client.h"
#include "settings.h" #include "settings.h"

21
src/llconserverdlg.h
View file

@ -22,16 +22,17 @@
* *
\******************************************************************************/ \******************************************************************************/
#include <qlabel.h> #include <QCloseEvent>
#include <qlistview.h> #include <QLabel>
#include <qtimer.h> #include <QListView>
#include <qpixmap.h> #include <QTimer>
#include <qthread.h> #include <QPixmap>
#include <qslider.h> #include <QThread>
#include <qmenubar.h> #include <QSlider>
#include <qlayout.h> #include <QMenuBar>
#include <qsystemtrayicon.h> #include <QLayout>
#include <qsettings.h> #include <QSystemTrayIcon>
#include <QSettings>
#include "global.h" #include "global.h"
#include "server.h" #include "server.h"
#include "settings.h" #include "settings.h"

8
src/main.cpp
View file

@ -22,10 +22,10 @@
* *
\******************************************************************************/ \******************************************************************************/
#include <qapplication.h> #include <QApplication>
#include <qmessagebox.h> #include <QMessageBox>
#include <qdir.h> #include <QDir>
#include <qtextstream.h> #include <QTextStream>
#include "global.h" #include "global.h"
#include "llconclientdlg.h" #include "llconclientdlg.h"
#include "llconserverdlg.h" #include "llconserverdlg.h"

10
src/multicolorled.h
View file

@ -32,11 +32,11 @@
#if !defined ( _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ ) #if !defined ( _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ )
#define _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ #define _MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_
#include <qlabel.h> #include <QLabel>
#include <qpixmap.h> #include <QPixmap>
#include <qtimer.h> #include <QTimer>
#include <qtreewidget.h> #include <QTreeWidget>
#include <qicon.h> #include <QIcon>
#include "global.h" #include "global.h"

8
src/multicolorledbar.h
View file

@ -25,10 +25,10 @@
#if !defined ( _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_ ) #if !defined ( _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_ )
#define _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_ #define _MULTCOLORLEDBAR_H__FD6B49B5_87DF_48DD_E1606C2AC__INCLUDED_
#include <qframe.h> #include <QFrame>
#include <qpixmap.h> #include <QPixmap>
#include <qtimer.h> #include <QTimer>
#include <qlayout.h> #include <QLayout>
#include "util.h" #include "util.h"
#include "global.h" #include "global.h"

7
src/protocol.h
View file

@ -25,10 +25,9 @@
#if !defined ( PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ ) #if !defined ( PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ )
#define PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ #define PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_
#include <qglobal.h> #include <QMutex>
#include <qmutex.h> #include <QTimer>
#include <qtimer.h> #include <QDateTime>
#include <qdatetime.h>
#include <list> #include <list>
#include "global.h" #include "global.h"
#include "util.h" #include "util.h"

8
src/server.h
View file

@ -25,10 +25,10 @@
#if !defined ( SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ ) #if !defined ( SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ )
#define SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ #define SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_
#include <qobject.h> #include <QObject>
#include <qtimer.h> #include <QTimer>
#include <qdatetime.h> #include <QDateTime>
#include <qhostaddress.h> #include <QHostAddress>
#include "celt.h" #include "celt.h"
#include "global.h" #include "global.h"
#include "socket.h" #include "socket.h"

4
src/serverlist.cpp
View file

@ -35,8 +35,8 @@ CServerListManager::CServerListManager ( const quint16 iNPortNum,
: iPortNumber ( iNPortNum ), : iPortNumber ( iNPortNum ),
iNumPredefinedServers ( 0 ), iNumPredefinedServers ( 0 ),
bUseDefaultCentralServerAddress ( false ), bUseDefaultCentralServerAddress ( false ),
pConnLessProtocol ( pNConLProt ), bCentServPingServerInList ( bNCentServPingServerInList ),
bCentServPingServerInList ( bNCentServPingServerInList ) pConnLessProtocol ( pNConLProt )
{ {
// set the central server address // set the central server address
SetCentralServerAddress ( sNCentServAddr ); SetCentralServerAddress ( sNCentServAddr );

10
src/serverlist.h
View file

@ -60,11 +60,11 @@ private network.
#if !defined ( SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_ ) #if !defined ( SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_ )
#define SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_ #define SERVERLIST_HOIJH8OUWEF_WFEIOBU_3_43445KJIUHF1912__INCLUDED_
#include <qobject.h> #include <QObject>
#include <qlocale.h> #include <QLocale>
#include <qlist.h> #include <QList>
#include <qtimer.h> #include <QTimer>
#include <qmutex.h> #include <QMutex>
#include "global.h" #include "global.h"
#include "util.h" #include "util.h"
#include "protocol.h" #include "protocol.h"

14
src/serverlogging.h
View file

@ -25,13 +25,13 @@
#if !defined ( SERVERLOGGING_HOIHOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ ) #if !defined ( SERVERLOGGING_HOIHOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ )
#define SERVERLOGGING_HOIHOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ #define SERVERLOGGING_HOIHOKIH83JH8_3_43445KJIUHF1912__INCLUDED_
#include <qimage.h> #include <QImage>
#include <qpainter.h> #include <QPainter>
#include <qdatetime.h> #include <QDateTime>
#include <qhostaddress.h> #include <QHostAddress>
#include <qfile.h> #include <QFile>
#include <qstring.h> #include <QString>
#include <qtimer.h> #include <QTimer>
#include "global.h" #include "global.h"
#include "util.h" #include "util.h"

10
src/settings.h
View file

@ -25,11 +25,11 @@
#if !defined ( SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_ ) #if !defined ( SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_ )
#define SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_ #define SETTINGS_H__3B0BA660_DGEG56G456G9876D31912__INCLUDED_
#include <qdom.h> #include <QDomDocument>
#include <qfile.h> #include <QFile>
#include <qsettings.h> #include <QSettings>
#include <qdir.h> #include <QDir>
#include <qtextstream.h> #include <QTextStream>
#include "global.h" #include "global.h"
#include "client.h" #include "client.h"
#include "server.h" #include "server.h"

10
src/socket.h
View file

@ -25,11 +25,11 @@
#if !defined ( SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) #if !defined ( SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ )
#define SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ #define SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_
#include <qobject.h> #include <QObject>
#include <qmessagebox.h> #include <QMessageBox>
#include <qudpsocket.h> #include <QUdpSocket>
#include <qsocketnotifier.h> #include <QSocketNotifier>
#include <qmutex.h> #include <QMutex>
#include <vector> #include <vector>
#include "global.h" #include "global.h"
#include "channel.h" #include "channel.h"

6
src/soundbase.h
View file

@ -25,9 +25,9 @@
#if !defined ( SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ ) #if !defined ( SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ )
#define SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_ #define SOUNDBASE_HOIHGEH8_3_4344456456345634565KJIUHF1912__INCLUDED_
#include <qthread.h> #include <QThread>
#include <qstring.h> #include <QString>
#include <qmessagebox.h> #include <QMessageBox>
#include "global.h" #include "global.h"
#include "util.h" #include "util.h"

8
src/testbench.h
View file

@ -25,10 +25,10 @@
#if !defined ( TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_ ) #if !defined ( TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_ )
#define TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_ #define TESTBENCH_HOIHJH8_3_43445KJIUHF1912__INCLUDED_
#include <qobject.h> #include <QObject>
#include <qtimer.h> #include <QTimer>
#include <qdatetime.h> #include <QDateTime>
#include <qhostaddress.h> #include <QHostAddress>
#include "global.h" #include "global.h"
#include "socket.h" #include "socket.h"
#include "protocol.h" #include "protocol.h"

22
src/util.h
View file

@ -25,17 +25,17 @@
#if !defined ( UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) #if !defined ( UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ )
#define UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ #define UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_
#include <qhostaddress.h> #include <QHostAddress>
#include <qhostinfo.h> #include <QHostInfo>
#include <qmenu.h> #include <QMenu>
#include <qwhatsthis.h> #include <QWhatsThis>
#include <qtextbrowser.h> #include <QTextBrowser>
#include <qlabel.h> #include <QLabel>
#include <qdatetime.h> #include <QDateTime>
#include <qfile.h> #include <QFile>
#include <qdesktopservices.h> #include <QDesktopServices>
#include <qurl.h> #include <QUrl>
#include <qlocale.h> #include <QLocale>
#include <vector> #include <vector>
#include "global.h" #include "global.h"
using namespace std; // because of the library: "vector" using namespace std; // because of the library: "vector"

4
windows/sound.h
View file

@ -26,8 +26,8 @@
#define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_ #define _SOUNDIN_H__9518A621_7F78_11D3_8C0D_EEBF182CF549__INCLUDED_
#include <windows.h> #include <windows.h>
#include <qmutex.h> #include <QMutex>
#include <qmessagebox.h> #include <QMessagebox>
#include "../src/util.h" #include "../src/util.h"
#include "../src/global.h" #include "../src/global.h"
#include "../src/soundbase.h" #include "../src/soundbase.h"