diff options
Diffstat (limited to 'interfaces/terminal')
| -rw-r--r-- | interfaces/terminal/kde_terminal_interface.h | 15 | ||||
| -rw-r--r-- | interfaces/terminal/test/Makefile.am | 2 | ||||
| -rw-r--r-- | interfaces/terminal/test/main.cpp (renamed from interfaces/terminal/test/main.cc) | 16 | ||||
| -rw-r--r-- | interfaces/terminal/test/main.h | 2 |
4 files changed, 17 insertions, 18 deletions
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 0624c0e8d..ff0dcb80c 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -1,4 +1,3 @@ -// // interface.h -*- C++ -*- // Copyright (C) 2002 Dominique Devriese <devriese@kde.org> // Copyright (C) 2005 Peter Rockai <me@mornfall.net> @@ -23,7 +22,7 @@ class TQString; class TQStrList; -#include <kdemacros.h> +#include <tdemacros.h> /** * TerminalInterface is an interface implemented by KonsolePart to @@ -54,13 +53,13 @@ class TQStrList; * }; * // fetch the part.. * KParts::Part* p = static_cast<KParts::Part*>( - * factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, + * factory->create( this, "tralala", "TQObject", * "KParts::ReadOnlyPart" ) ); * assert( p ); * setCentralWidget( p->widget() ); * * // cast the part to the TerminalInterface.. - * TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + * TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); * if( ! t ) * { * // This probably happens because the konsole that is installed @@ -79,8 +78,8 @@ class TQStrList; * // or connect to one of the signals. Connect to the Part object, * // not to the TerminalInterface, since the latter is no TQObject, * // and as such cannot have signals..: - * // connect( p, TQT_SIGNAL( processExited( int ) ), - * // this, TQT_SLOT( shellExited( int ) ) ); + * // connect( p, TQ_SIGNAL( processExited( int ) ), + * // this, TQ_SLOT( shellExited( int ) ) ); * // etc. * * \endcode @@ -89,7 +88,7 @@ class TQStrList; * * @author Dominique Devriese <devriese@kde.org> */ -class KDE_EXPORT TerminalInterface +class TDE_EXPORT TerminalInterface { public: /** @@ -126,7 +125,7 @@ public: @since 3.5 */ -class KDE_EXPORT ExtTerminalInterface +class TDE_EXPORT ExtTerminalInterface { public: /** diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am index 03a04301b..414159af1 100644 --- a/interfaces/terminal/test/Makefile.am +++ b/interfaces/terminal/test/Makefile.am @@ -1,6 +1,6 @@ INCLUDES=$(all_includes) check_PROGRAMS=test -test_SOURCES=main.cc +test_SOURCES=main.cpp test_LDADD=$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio test_LDFLAGS=$(all_libraries) METASOURCES=AUTO diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cpp index 8130f85d6..f0d51b259 100644 --- a/interfaces/terminal/test/main.cc +++ b/interfaces/terminal/test/main.cpp @@ -17,17 +17,17 @@ Win::Win() { KLibFactory* factory = KLibLoader::self()->factory( "libkonsolepart" ); assert( factory ); - KParts::Part* p = static_cast<KParts::Part*>( factory->create( this, "tralala", TQOBJECT_OBJECT_NAME_STRING, "KParts::ReadOnlyPart" ) ); + KParts::Part* p = factory->create( this, "tralala", "TQObject", "KParts::ReadOnlyPart" ) ; setCentralWidget( p->widget() ); - TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); t->showShellInDir( TQDir::home().path() ); // TQStrList l; // l.append( "python" ); // t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l ); - connect( p, TQT_SIGNAL( processExited( int ) ), - this, TQT_SLOT( pythonExited( int ) ) ); + connect( p, TQ_SIGNAL( processExited( int ) ), + this, TQ_SLOT( pythonExited( int ) ) ); } @@ -46,11 +46,11 @@ int main( int argc, char** argv ) void Win::pythonExited() { std::cerr << "hee, " << p << std::endl; - std::cerr << ( ::tqqt_cast<TerminalInterface>(p) ) << std::endl; + std::cerr << ( ::tqt_cast<TerminalInterface>(p) ) << std::endl; // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) ); - disconnect(p, TQT_SIGNAL( processExited() ), - this, TQT_SLOT( pythonExited() )); - TerminalInterface* t = ::tqqt_cast<TerminalInterface*>( p ); + disconnect(p, TQ_SIGNAL( processExited() ), + this, TQ_SLOT( pythonExited() )); + TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p ); TQStrList l; l.append( "echo" ); l.append( "hello world" ); diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h index 256b0840a..bf87cb041 100644 --- a/interfaces/terminal/test/main.h +++ b/interfaces/terminal/test/main.h @@ -5,7 +5,7 @@ class Win : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT KParts::Part* p; public: Win(); |