diff options
Diffstat (limited to 'konqueror/client')
-rw-r--r-- | konqueror/client/CMakeLists.txt | 2 | ||||
-rw-r--r-- | konqueror/client/Makefile.am | 4 | ||||
-rw-r--r-- | konqueror/client/kfmclient.cpp (renamed from konqueror/client/kfmclient.cc) | 28 | ||||
-rw-r--r-- | konqueror/client/kfmclient.h | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt index 3ae477d32..fe45ce141 100644 --- a/konqueror/client/CMakeLists.txt +++ b/konqueror/client/CMakeLists.txt @@ -32,7 +32,7 @@ install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/tdecon set( target kfmclient ) set( ${target}_SRCS - kfmclient.cc + kfmclient.cpp ${CMAKE_SOURCE_DIR}/konqueror/KonquerorIface.stub ${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub ) diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am index c66ed555c..872951b4e 100644 --- a/konqueror/client/Makefile.am +++ b/konqueror/client/Makefile.am @@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = kfmclient.la INCLUDES= -I.. $(all_includes) kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version kfmclient_la_LIBADD = $(LIB_TDEIO) -kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub +kfmclient_la_SOURCES = kfmclient.cpp KonquerorIface.stub KDesktopIface.stub noinst_HEADERS = kfmclient.h METASOURCES = AUTO @@ -16,7 +16,7 @@ KonquerorIface_DIR = $(srcdir)/.. KDesktopIface_DIR = $(top_srcdir)/kdesktop messages: - $(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot + $(XGETTEXT) -kaliasLocal *.h *.cpp -o $(podir)/kfmclient.pot updatedir = $(kde_datadir)/tdeconf_update update_DATA = kfmclient_3_2.upd diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cpp index c0f0c5c69..db9d40fd3 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cpp @@ -68,7 +68,7 @@ static const TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) +extern "C" TDE_EXPORT int kdemain( int argc, char **argv ) { TDECmdLineArgs::init(argc, argv, appName, programName, description, version, false); @@ -181,7 +181,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); TQStringList allowed_parts; - // is duplicated in ../KonquerorIface.cc + // is duplicated in ../KonquerorIface.cpp allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) << TQString::fromLatin1( "konq_multicolumnview.desktop" ) << TQString::fromLatin1( "konq_sidebartng.desktop" ) @@ -323,8 +323,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co TDEStartupInfo::appStarted(); KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor] - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -423,7 +423,7 @@ void clientApp::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up // "app not found" in TDEProcessRunner, if that was the case. - TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(deref()) ); // don't access the KRun instance later, it will be deleted after calling slots if( static_cast< const KRun* >( sender())->hasError()) krun_has_error = true; @@ -504,8 +504,8 @@ bool clientApp::doIt() { checkArgumentCount(argc, 2, 2); KPropertiesDialog * p = new KPropertiesDialog( args->url(1) ); - TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() )); - TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() )); + TQObject::connect( p, TQ_SIGNAL( destroyed() ), &app, TQ_SLOT( quit() )); + TQObject::connect( p, TQ_SIGNAL( canceled() ), &app, TQ_SLOT( slotDialogCanceled() )); app.exec(); return m_ok; } @@ -520,8 +520,8 @@ bool clientApp::doIt() else if ( argc == 2 ) { KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -538,8 +538,8 @@ bool clientApp::doIt() else if ( command == "openBrowser" ) { KRun * run = new KRun( "http://default.browser", 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -553,7 +553,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -588,7 +588,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, dsturl ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -602,7 +602,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h index 1e17279c6..f46f3d06f 100644 --- a/konqueror/client/kfmclient.h +++ b/konqueror/client/kfmclient.h @@ -25,7 +25,7 @@ class clientApp : public TDEApplication { - Q_OBJECT + TQ_OBJECT public: /** Parse command-line arguments and "do it" */ static bool doIt(); |