diff options
Diffstat (limited to 'servers/gpib_server_lin/src')
| -rw-r--r-- | servers/gpib_server_lin/src/Makefile.am | 2 | ||||
| -rw-r--r-- | servers/gpib_server_lin/src/main.cpp | 12 | 
2 files changed, 7 insertions, 7 deletions
| diff --git a/servers/gpib_server_lin/src/Makefile.am b/servers/gpib_server_lin/src/Makefile.am index a6194eb..a09c7d3 100644 --- a/servers/gpib_server_lin/src/Makefile.am +++ b/servers/gpib_server_lin/src/Makefile.am @@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_gpibserver  remotefpga_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp  remotefpga_gpibserver_METASOURCES = AUTO -remotefpga_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla -lgpib +remotefpga_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib  KDE_OPTIONS = nofinal diff --git a/servers/gpib_server_lin/src/main.cpp b/servers/gpib_server_lin/src/main.cpp index dd9258a..10342ba 100644 --- a/servers/gpib_server_lin/src/main.cpp +++ b/servers/gpib_server_lin/src/main.cpp @@ -45,16 +45,16 @@ static const char version[] = "v0.0.1";  int main(int argc, char *argv[])  { -	KAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("RemoteFPGA GPIB Server"), -		version, description, KAboutData::License_GPL, +	TDEAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("RemoteFPGA GPIB Server"), +		version, description, TDEAboutData::License_GPL,  		"(c) 2012, Timothy Pearson");  		aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); -	KCmdLineArgs::init( argc, argv, &aboutData ); -	KApplication::disableAutoDcopRegistration(); +	TDECmdLineArgs::init( argc, argv, &aboutData ); +	TDEApplication::disableAutoDcopRegistration(); -	KApplication app(false, false); +	TDEApplication app(false, false); -	KStartupInfo::appStarted(); +	TDEStartupInfo::appStarted();  	KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_gpibserver.conf", false);  	config.setGroup("Server"); | 
