Commit 8131ec61 authored by jcaceres's avatar jcaceres
Browse files

started to port to qt4 with qt3to4, still not compiling though

parent 81e86462
......@@ -11,7 +11,7 @@
#include "string.h"
#include "audioDevice.h"
#include "qstring.h"
#include <qtextstream.h>
#include <q3textstream.h>
jack_port_t **input_port;
jack_port_t **output_port;
jack_default_audio_sample_t **inBufPtr;
......
......@@ -7,7 +7,7 @@
#ifndef _MAINDIALOG_H_
#define _MAINDIALOG_H_
//#include "../src/ui/MainWindow.h"
#include "qptrlist.h"
#include "q3ptrlist.h"
#include "qthread.h"
#include "qstring.h"
#include "qtimer.h"
......
......@@ -3,6 +3,9 @@
#ifndef THREADCOMMEVENT_H
#define THREADCOMMEVENT_H
#include "qobject.h"
//Added by qt3to4:
#include <QEvent>
#include <QCustomEvent>
class ThreadCommEvent:public QCustomEvent
{
......
......@@ -18,14 +18,15 @@ APP_NAME_QUOTES=\\\"$APP_NAME\\\"
#echo "progen"
#qmake -project -o $APP_NAME.pro ui/ ../include/
qmake -project -o $APP_NAME.pro
qmake-qt4 -project -o $APP_NAME.pro
echo "qmake .pro built"
#Create Makefile
qmake -makefile -unix -o Makefile \
qmake-qt4 -makefile -unix -o Makefile \
"CONFIG+=qt thread warn_on debug" \
"QMAKE_CXXFLAGS+=-Wno-deprecated -pg -g" \
"QT += network qt3support" \
"INCLUDEPATH+=/usr/include/stk ../include" \
"DEFINES+=__LINUX_ALSA__ APP_NAME=$APP_NAME_QUOTES" \
"QMAKE_CLEAN+=$APP_NAME" \
......
......@@ -35,7 +35,7 @@ IPv4Addr (char *namebuf)
}
#include <qapplication.h>
#include <qtextstream.h>
#include <q3textstream.h>
/****************************************************************************
* MAIN
***************************************************************************/
......
Log for qt3to4 on Thu Mar 27 14:52:37 2008. Number of log entries: 44
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audio_input.cpp
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audio_output.cpp
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audioDevice.cpp
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audioInfo.cpp
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/circularbuffer.cpp
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/JackClient.cpp at line 14 column 21: qtextstream.h -> q3textstream.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/main.cpp at line 38 column 21: qtextstream.h -> q3textstream.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/MainDialog.cpp
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/networkInfo.cpp
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stream.cpp
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/StreamBD.cpp
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_input.cpp at line 19 column 25: QSocketDevice -> Q3SocketDevice
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_input.cpp at line 19 column 40: QSocketDevice -> Q3SocketDevice
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_output.cpp at line 17 column 25: QSocketDevice -> Q3SocketDevice
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_output.cpp at line 17 column 40: QSocketDevice -> Q3SocketDevice
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audio_input.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audio_output.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audioConsts.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audioDevice.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/audioInfo.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/circularbuffer.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/Documentation.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/input_plugin.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/JackClient.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/MainDialog.h at line 10 column 21: qptrlist.h -> q3ptrlist.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/networkInfo.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/output_plugin.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/plugin.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/process_plugin.h
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stk_process.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stream.h at line 11 column 23: qptrvector.h -> q3ptrvector.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stream.h at line 22 column 14: QPtrVector -> Q3PtrVector
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stream.h at line 24 column 14: QPtrVector -> Q3PtrVector
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stream.h at line 26 column 14: QPtrVector -> Q3PtrVector
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stream.h at line 28 column 13: QPtrVector -> Q3PtrVector
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/stream.h at line 30 column 14: QPtrVector -> Q3PtrVector
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/StreamBD.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/ThreadCommEvent.h: Added the following include directives:
#include <QEvent> #include <QCustomEvent>
No changes made to file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_input.h at line 8 column 23: qsocketdevice.h -> q3socketdevice.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_input.h at line 20 column 14: QSocketDevice -> Q3SocketDevice
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_output.h at line 4 column 23: qsocketdevice.h -> q3socketdevice.h
In file /user/j/jcaceres/svn-jacktrip/trunk/jacktrip/src/udp_output.h at line 19 column 14: QSocketDevice -> Q3SocketDevice
In file jacktrip.pro: Added entry QT += network qt3support
......@@ -8,7 +8,7 @@
#include "audioInfo.h"
#include "networkInfo.h"
#include "qthread.h"
#include "qptrvector.h"
#include "q3ptrvector.h"
/**
* @brief Connects an InputPlugin to an OutputPlugin with
......@@ -25,15 +25,15 @@ class Stream
protected:
// Vector inputs;
QPtrVector < InputPlugin > ins;
Q3PtrVector < InputPlugin > ins;
// Vector outputs;
QPtrVector < OutputPlugin > outs;
Q3PtrVector < OutputPlugin > outs;
// Vector processes;
QPtrVector < ProcessPlugin > procs;
Q3PtrVector < ProcessPlugin > procs;
// Vector circularBuffers;
QPtrVector < CircularBuffer > bufs;
Q3PtrVector < CircularBuffer > bufs;
// Vector outputLocks;
QPtrVector < QSemaphore >locks;
Q3PtrVector < QSemaphore >locks;
int insCount;
int procsCount;
int outsCount;
......
......@@ -16,7 +16,7 @@ InputPlugin ("UDP Input"), netInfo (netInfo), audInfo (audInfo)
char localhostbuf[100];
has_peer = false;
_rcvr = NULL;
sock = new QSocketDevice (QSocketDevice::Datagram); // for an unreliable UDP socket
sock = new Q3SocketDevice (Q3SocketDevice::Datagram); // for an unreliable UDP socket
sock->setAddressReusable(true);
if (gethostname (localhostbuf, 99))
{
......
......@@ -5,7 +5,7 @@
#include "udp.h"
#include "networkInfo.h"
#include "audioInfo.h"
#include <qsocketdevice.h>
#include <q3socketdevice.h>
#include <qobject.h>
/**
......@@ -20,7 +20,7 @@ class UDPInput:public InputPlugin
NetworkInfoT netInfo;
AudioInfoT audInfo;
QSocketDevice *sock;
Q3SocketDevice *sock;
bool _running;
bool has_peer;
......
......@@ -14,7 +14,7 @@ audInfo (audInfo)
{
bpp = netInfo->getDataBytesPerPacket ();
char localhostbuf[100];
sock = new QSocketDevice (QSocketDevice::Datagram);
sock = new Q3SocketDevice (Q3SocketDevice::Datagram);
sock->setAddressReusable(true);
if (gethostname (localhostbuf, 99))
{
......
#ifndef _UDP_OUTPUT_H
#define _UDP_OUTPUT_H
#include <qsocketdevice.h>
#include <q3socketdevice.h>
#include "networkInfo.h"
#include "audioInfo.h"
......@@ -21,7 +21,7 @@ class UDPOutput:public OutputPlugin // , public Semaphore
private:
int one_time_flags;
QSocketDevice *sock;
Q3SocketDevice *sock;
bool _running;
int packetIndex; // only used by netdebug mode
......
Supports Markdown
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