diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h index 913aea03..6bd3a004 100755 --- a/src/audiomixerboard.h +++ b/src/audiomixerboard.h @@ -28,12 +28,12 @@ #if !defined ( MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ ) #define MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "global.h" #include "util.h" diff --git a/src/channel.h b/src/channel.h index cd58a25d..31181af4 100755 --- a/src/channel.h +++ b/src/channel.h @@ -25,8 +25,8 @@ #if !defined ( CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) #define CHANNEL_HOIH9345KJH98_3_4344_BB23945IUHF1912__INCLUDED_ -#include -#include +#include +#include #include "global.h" #include "buffer.h" #include "audiocompr.h" diff --git a/src/client.h b/src/client.h index 44af2916..b7564c7f 100755 --- a/src/client.h +++ b/src/client.h @@ -25,11 +25,11 @@ #if !defined ( CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) #define CLIENT_HOIHGE76GEKJH98_3_43445KJIUHF1912__INCLUDED_ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "global.h" #include "socket.h" #include "resample.h" diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h index 35f202f6..255c633c 100755 --- a/src/clientsettingsdlg.h +++ b/src/clientsettingsdlg.h @@ -22,17 +22,17 @@ * \******************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "global.h" #include "client.h" #include "multicolorled.h" diff --git a/src/gig.png b/src/gig.png new file mode 100755 index 00000000..36cc7489 Binary files /dev/null and b/src/gig.png differ diff --git a/src/global.h b/src/global.h index f7e0b902..ecf1bc2f 100755 --- a/src/global.h +++ b/src/global.h @@ -25,9 +25,9 @@ #if !defined ( GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ ) #define GLOBAL_H__3B123453_4344_BB2B_23E7A0D31912__INCLUDED_ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h index 0d452d72..11d037b8 100755 --- a/src/llconclientdlg.h +++ b/src/llconclientdlg.h @@ -22,17 +22,17 @@ * \******************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "global.h" #include "client.h" #include "multicolorled.h" diff --git a/src/llconclientdlgbase.ui b/src/llconclientdlgbase.ui index a8dc153d..17119c84 100755 --- a/src/llconclientdlgbase.ui +++ b/src/llconclientdlgbase.ui @@ -51,7 +51,7 @@ - gig.png + :/new/prefix1/gig.png true diff --git a/src/llconserverdlg.h b/src/llconserverdlg.h index 451e2313..73aec7d0 100755 --- a/src/llconserverdlg.h +++ b/src/llconserverdlg.h @@ -22,14 +22,14 @@ * \******************************************************************************/ -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "global.h" #include "server.h" #include "multicolorled.h" diff --git a/src/main.cpp b/src/main.cpp index 68bccdc8..510fcef7 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -107,6 +107,10 @@ cerr << "logging "; // Application object QApplication app ( argc, argv, bUseGUI ); + // init resources + extern int qInitResources(); + qInitResources(); + if ( bIsClient ) { // client diff --git a/src/multicolorled.h b/src/multicolorled.h index dca6c775..4efb02a6 100755 --- a/src/multicolorled.h +++ b/src/multicolorled.h @@ -33,9 +33,9 @@ #if !defined ( AFX_MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ ) #define AFX_MULTCOLORLED_H__FD6B49B5_87DF_48DD_A873_804E1606C2AC__INCLUDED_ -#include -#include -#include +#include +#include +#include #include #include #include "global.h" diff --git a/src/protocol.h b/src/protocol.h index c02eafa2..522cd1d7 100755 --- a/src/protocol.h +++ b/src/protocol.h @@ -25,9 +25,9 @@ #if !defined ( PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ ) #define PROTOCOL_H__3B123453_4344_BB2392354455IUHF1912__INCLUDED_ -#include -#include -#include +#include +#include +#include #include #include "global.h" #include "util.h" diff --git a/src/resources.qrc b/src/resources.qrc new file mode 100755 index 00000000..4eec9b0b --- /dev/null +++ b/src/resources.qrc @@ -0,0 +1,5 @@ + + + gig.png + + diff --git a/src/server.h b/src/server.h index a99d84fa..eeb3813d 100755 --- a/src/server.h +++ b/src/server.h @@ -25,10 +25,10 @@ #if !defined ( SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ ) #define SERVER_HOIHGE7LOKIH83JH8_3_43445KJIUHF1912__INCLUDED_ -#include -#include -#include -#include +#include +#include +#include +#include #include "global.h" #include "socket.h" #include "channel.h" diff --git a/src/socket.h b/src/socket.h index f0b1acdf..cbfdb76a 100755 --- a/src/socket.h +++ b/src/socket.h @@ -25,10 +25,10 @@ #if !defined ( SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ ) #define SOCKET_HOIHGE76GEKJH98_3_4344_BB23945IUHF1912__INCLUDED_ -#include -#include -#include -#include +#include +#include +#include +#include #include #include "global.h" #include "channel.h" diff --git a/src/util.h b/src/util.h index 08821b75..c10ad847 100755 --- a/src/util.h +++ b/src/util.h @@ -25,12 +25,12 @@ #if !defined ( UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ ) #define UTIL_HOIH934256GEKJH98_3_43445KJIUHF1912__INCLUDED_ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include "global.h" using namespace std; // because of the library: "vector"