diff options
Diffstat (limited to 'konsole')
26 files changed, 605 insertions, 504 deletions
diff --git a/konsole/README.ports b/konsole/README.ports index 06c3b6c13..71f3ae154 100644 --- a/konsole/README.ports +++ b/konsole/README.ports @@ -19,7 +19,6 @@ Lars Doelle <lars.doelle@on-line.de> Platform Experts ---------------- -- Tru64 - Thomas Leitner <tom@radar.tu-graz.ac.at> - Solaris - Stephan Kulow <coolo@kde.org> - FreeBSD - ? - HP-UX - ? diff --git a/konsole/fonts/CMakeLists.txt b/konsole/fonts/CMakeLists.txt index e61aa959b..379f357e2 100644 --- a/konsole/fonts/CMakeLists.txt +++ b/konsole/fonts/CMakeLists.txt @@ -19,14 +19,16 @@ install( CODE "execute_process( COMMAND mkfontdir \$ENV{DESTDIR}${DATA_INSTALL_D # FIXME generating fonts can be improved -add_custom_target( console8x16.pcf.gz ALL ) -add_custom_command( TARGET console8x16.pcf.gz +add_custom_target( konsole-font-8x16 ALL + DEPENDS console8x16.pcf.gz ) +add_custom_command( OUTPUT console8x16.pcf.gz COMMAND bdftopcf -o console8x16.pcf ${CMAKE_CURRENT_SOURCE_DIR}/console8x16.bdf COMMAND gzip -f --best console8x16.pcf DEPENDS console8x16.bdf ) -add_custom_target( 9x15.pcf.gz ALL ) -add_custom_command( TARGET 9x15.pcf.gz +add_custom_target( konsole-font-9x15 ALL + DEPENDS 9x15.pcf.gz ) +add_custom_command( OUTPUT 9x15.pcf.gz COMMAND bdftopcf -o 9x15.pcf ${CMAKE_CURRENT_SOURCE_DIR}/9x15.bdf COMMAND gzip -f --best 9x15.pcf DEPENDS 9x15.bdf ) diff --git a/konsole/konsole/CMakeLists.txt b/konsole/konsole/CMakeLists.txt index 4f6c9285d..26fa93d70 100644 --- a/konsole/konsole/CMakeLists.txt +++ b/konsole/konsole/CMakeLists.txt @@ -78,5 +78,5 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${DL_LIBRARIES} + LINK tdeprint-shared tdeio-shared ${XRENDER_LIBRARIES} ${CMAKE_DL_LIBS} ) diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 2148ec03c..5e7aefa5b 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -80,7 +80,7 @@ #include <errno.h> #include <termios.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kpty.h> @@ -171,12 +171,12 @@ void TEPty::setWriteable(bool writeable) TEPty::TEPty() { m_bufferFull = false; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(dataReceived(TDEProcess *,char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(donePty())); - connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(writeReady())); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(dataReceived(TDEProcess *,char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(donePty())); + connect(this, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(writeReady())); setUsePty(All, false); // utmp will be overridden later } diff --git a/konsole/konsole/TEPty.h b/konsole/konsole/TEPty.h index 05a453f31..6ebf19bd0 100644 --- a/konsole/konsole/TEPty.h +++ b/konsole/konsole/TEPty.h @@ -23,7 +23,7 @@ #include <config.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqsocketnotifier.h> #include <tqstrlist.h> #include <tqvaluelist.h> diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 2302cf81a..33dcf7f79 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -410,17 +410,17 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) bY = bX = 1; cb = TQApplication::clipboard(); - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); scrollbar = new TQScrollBar(this); scrollbar->setCursor( TQt::arrowCursor ); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); blinkT = new TQTimer(this); - connect(blinkT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkEvent())); + connect(blinkT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkEvent())); blinkCursorT = new TQTimer(this); - connect(blinkCursorT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursorEvent())); + connect(blinkCursorT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursorEvent())); setMouseMarks(true); setColorTable(base_color_table); // init color table @@ -977,7 +977,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); mResizeTimer = new TQTimer(this); - connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); + connect(mResizeTimer, TQ_SIGNAL(timeout()), mResizeWidget, TQ_SLOT(hide())); } TQString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines); mResizeLabel->setText(sizeStr); @@ -1254,13 +1254,13 @@ void TEWidget::scrollChanged(int) void TEWidget::setScroll(int cursor, int slines) { //kdDebug(1211)<<"TEWidget::setScroll() disconnect()"<<endl; - disconnect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + disconnect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() setRange()"<<endl; scrollbar->setRange(0,slines); //kdDebug(1211)<<"TEWidget::setScroll() setSteps()"<<endl; scrollbar->setSteps(1,lines); scrollbar->setValue(cursor); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() done"<<endl; } @@ -1696,7 +1696,7 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) } possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void TEWidget::wheelEvent( TQWheelEvent* ev ) @@ -1870,15 +1870,15 @@ void TEWidget::setSelection(const TQString& t) { // Disconnect signal while WE set the clipboard TQClipboard *cb = TQApplication::clipboard(); - TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); cb->setSelectionMode( true ); cb->setText(t); cb->setSelectionMode( false ); - TQObject::connect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); } void TEWidget::copyClipboard() @@ -1972,13 +1972,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) } if ( e->type() == TQEvent::Enter ) { - TQObject::disconnect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } if ( e->type() == TQEvent::Leave ) { - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } return TQFrame::eventFilter( obj, e ); } @@ -2124,7 +2124,7 @@ void TEWidget::Bell(bool visibleSession, TQString message) bellTimer.start(BELLVISUAL_DELAY,true); swapColorTable(); - TQTimer::singleShot(200,this,TQT_SLOT(swapColorTable())); + TQTimer::singleShot(200,this,TQ_SLOT(swapColorTable())); } } @@ -2270,7 +2270,7 @@ void TEWidget::dropEvent(TQDropEvent* event) m_drop->insertItem( "cp", cp ); m_drop->insertItem( "ln", ln ); m_drop->insertItem( "mv", mv ); - connect(m_drop, TQT_SIGNAL(activated(int)), TQT_SLOT(drop_menu_activated(int))); + connect(m_drop, TQ_SIGNAL(activated(int)), TQ_SLOT(drop_menu_activated(int))); }; // The current behaviour when url(s) are dropped is // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index a9c026fea..1d303089d 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -81,10 +81,10 @@ TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui) { //kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl; - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); //kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl; initTokenizer(); //kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl; @@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } TEmulation::changeGUI(newgui); - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } /*! @@ -1204,8 +1204,8 @@ void TEmuVt102::setConnect(bool c) TEmulation::setConnect(c); if (gui) { - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } if (c) { // refresh mouse mode @@ -1219,8 +1219,8 @@ void TEmuVt102::setConnect(bool c) else scrolllock_set_off(); #endif - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } } diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 943d2f205..4a4c709e4 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -110,8 +110,8 @@ TEmulation::TEmulation(TEWidget* w) screen[1] = new TEScreen(gui->Lines(),gui->Columns()); scr = screen[0]; - TQObject::connect(&bulk_timer1, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); - TQObject::connect(&bulk_timer2, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer1, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer2, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); connectGUI(); setKeymap(0); // Default keymap } @@ -121,28 +121,28 @@ TEmulation::TEmulation(TEWidget* w) void TEmulation::connectGUI() { - TQObject::connect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::connect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::connect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::connect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::connect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::connect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::connect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::connect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::connect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::connect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::connect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::connect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::connect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::connect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } /*! @@ -153,28 +153,28 @@ void TEmulation::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::disconnect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::disconnect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::disconnect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::disconnect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::disconnect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } gui=newgui; connectGUI(); diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index 7a2b3f566..6400598f6 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -30,7 +30,7 @@ #include <tqobject.h> #include <tqintdict.h> #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <stdio.h> diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index ebfc76a24..1c435165c 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -99,7 +99,7 @@ Time to start a requirement list. #include <tdefontdialog.h> #include <kkeydialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpainter.h> #include <tdemenubar.h> #include <tdemessagebox.h> @@ -132,7 +132,7 @@ Time to start a requirement list. #include <kiconloader.h> #include <kstringhandler.h> #include <ktip.h> -#include <kprocctrl.h> +#include <tdeprocctrl.h> #include <ktabwidget.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> @@ -184,7 +184,7 @@ void KonsoleFontSelectAction::slotActivated(int index) { } template class TQPtrDict<TESession>; -template class TQIntDict<KSimpleConfig>; +template class TQIntDict<TDESimpleConfig>; template class TQPtrDict<TDERadioAction>; #define DEFAULT_HISTORY_SIZE 1000 @@ -290,7 +290,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,m_filterData(0) { isRestored = b_inRestore; - connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose())); + connect( &m_closeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCouldNotClose())); no2command.setAutoDelete(true); menubar = menuBar(); @@ -298,8 +298,8 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo TDEAcceleratorManager::setNoAccel( menubar ); sessionNumberMapper = new TQSignalMapper( this ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -317,7 +317,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (currentSize != size()) defaultSize = size(); - KSimpleConfig *co; + TDESimpleConfig *co; if (!type.isEmpty()) setDefaultSession(type+".desktop"); co = defaultSession(); @@ -331,7 +331,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (isRestored) { n_tabbar = wanted_tabbar; - TDEConfig *c = TDEApplication::kApplication()->sessionConfig(); + TDEConfig *c = tdeApp->sessionConfig(); // c->setDesktopGroup(); // Reads from wrong group b_dynamicTabHide = c->readBoolEntry("DynamicTabHide", false); } @@ -359,9 +359,9 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (te) te->setScrollbarLocation(TEWidget::SCRNONE); } -// connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged())); +// connect(tdeApp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged())); - kapp->dcopClient()->setDefaultObject( "konsole" ); + tdeApp->dcopClient()->setDefaultObject( "konsole" ); } @@ -476,23 +476,23 @@ void Konsole::makeGUI() if (m_menuCreated) return; if (m_tabbarSessionsCommands) - disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); m_menuCreated=true; // Remove the empty separator Qt inserts if the menu is empty on popup, @@ -506,7 +506,7 @@ void Konsole::makeGUI() TDEActionCollection* actions = actionCollection(); // Send Signal Menu ------------------------------------------------------------- - if (kapp->authorizeTDEAction("send_signal")) + if (tdeApp->authorizeTDEAction("send_signal")) { m_signals = new TDEPopupMenu(this); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); @@ -517,7 +517,7 @@ void Konsole::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); TDEAcceleratorManager::manage( m_signals ); } @@ -571,28 +571,28 @@ void Konsole::makeGUI() //bookmarks menu if (bookmarkHandler) - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( enterURL( const TQString&, const TQString& ))); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( enterURL( const TQString&, const TQString& ))); if (bookmarkHandlerSession) - connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( newSession( const TQString&, const TQString& ))); + connect( bookmarkHandlerSession, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( newSession( const TQString&, const TQString& ))); if (m_bookmarks) - connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarks, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); if (m_bookmarksSession) - connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarksSession, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); // Schema Options Menu ----------------------------------------------------- m_schema = new TDEPopupMenu(this); m_schema->setCheckable(true); TDEAcceleratorManager::manage( m_schema ); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); // Keyboard Options Menu --------------------------------------------------- m_keytab = new TDEPopupMenu(this); m_keytab->setCheckable(true); TDEAcceleratorManager::manage( m_keytab ); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); //options menu if (m_options) @@ -602,7 +602,7 @@ void Konsole::makeGUI() // Tabbar selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, - TQT_SLOT(slotSelectTabbar()), actions, "tabbar" ); + TQ_SLOT(slotSelectTabbar()), actions, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom"); selectTabbar->setItems(tabbaritems); @@ -610,7 +610,7 @@ void Konsole::makeGUI() // Scrollbar selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, - TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); + TQ_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); selectScrollbar->setItems(scrollitems); @@ -626,7 +626,7 @@ void Konsole::makeGUI() // Select Bell selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, - TQT_SLOT(slotSelectBell()), actions, "bell"); + TQ_SLOT(slotSelectBell()), actions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") << i18n("System &Notification") @@ -641,45 +641,45 @@ void Konsole::makeGUI() actions, 0L ); m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "fontsizeup" ), 0, this, - TQT_SLOT( biggerFont() ), actions, + TQ_SLOT( biggerFont() ), actions, "enlarge_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "fontsizedown" ), 0, this, - TQT_SLOT( smallerFont() ), actions, + TQ_SLOT( smallerFont() ), actions, "shrink_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, - TQT_SLOT( slotSelectFont() ), actions, + TQ_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ), SmallIconSet( "font-x-generic" ), 0, this, - TQT_SLOT( slotInstallBitmapFonts() ), actions, + TQ_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); } m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQ_SLOT(slotSetEncoding()), actions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); selectSetEncoding->setCurrentItem (0); selectSetEncoding->plug(m_options); - if (kapp->authorizeTDEAction("keyboard")) + if (tdeApp->authorizeTDEAction("keyboard")) m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); // Schema - if (kapp->authorizeTDEAction("schema")) + if (tdeApp->authorizeTDEAction("schema")) m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema); // Select size if (!b_fixedSize) { selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this, - TQT_SLOT(slotSelectSize()), actions, "size"); + TQ_SLOT(slotSelectSize()), actions, "size"); TQStringList sizeitems; sizeitems << i18n("40x15 (&Small)") << i18n("80x24 (&VT100)") @@ -693,13 +693,13 @@ void Konsole::makeGUI() } TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this, - TQT_SLOT(slotHistoryType()), actions, "history"); + TQ_SLOT(slotHistoryType()), actions, "history"); historyType->plug(m_options); m_options->insertSeparator(); TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, - TQT_SLOT(slotSaveSettings()), actions, "save_default"); + TQ_SLOT(slotSaveSettings()), actions, "save_default"); save_settings->plug(m_options); m_options->insertSeparator(); @@ -708,9 +708,9 @@ void Konsole::makeGUI() m_options->insertSeparator(); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); - TDEAction *configure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actions); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); + TDEAction *configure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actions); configure->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) @@ -722,13 +722,13 @@ void Konsole::makeGUI() { m_help->insertSeparator(1); m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"), - this, TQT_SLOT(showTip()), 0, -1, 2); + this, TQ_SLOT(showTip()), 0, -1, 2); } //the different session menus buildSessionMenus(); - connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int))); + connect(m_session, TQ_SIGNAL(activated(int)), TQ_SLOT(newSession(int))); // Right mouse button menu if (m_rightButton) @@ -736,7 +736,7 @@ void Konsole::makeGUI() updateRMBMenu(); // show menubar / exit fullscreen TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this, - TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end"); + TQ_SLOT(slotSetSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_rightButton); m_copyClipboard->plug(m_rightButton); @@ -744,7 +744,7 @@ void Konsole::makeGUI() m_openSelection = new TDEPopupMenu(this); m_rightButton->insertItem( i18n("&Open.."), m_openSelection ); - connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection())); + connect(m_openSelection, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotOpenSelection())); if (m_signals) m_rightButton->insertItem(i18n("&Send Signal"), m_signals); @@ -822,26 +822,26 @@ void Konsole::makeGUI() if (!m_detachSession) { m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->plug(m_tabPopupMenu); m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this, - TQT_SLOT(slotTabRenameSession()) ); + TQ_SLOT(slotTabRenameSession()) ); m_tabPopupMenu->insertSeparator(); m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("activity"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); m_tabMonitorActivity->plug(m_tabPopupMenu); m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("silence"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); m_tabMonitorSilence->plug(m_tabPopupMenu); m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, - TQT_SLOT( slotTabToggleMasterMode() ), this); + TQ_SLOT( slotTabToggleMasterMode() ), this); m_tabMasterMode->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); @@ -849,30 +849,30 @@ void Konsole::makeGUI() { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } m_moveSessionLeft->plug(m_tabPopupMenu); if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } m_moveSessionRight->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQT_SLOT(slotTabSelectColor()) ); - m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQT_SLOT(slotTabResetColor()) ); + m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQ_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQ_SLOT(slotTabResetColor()) ); m_tabPopupMenu->insertSeparator(); m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu ); m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu ); - connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ), - TQT_SLOT( activateSession( int ) ) ); + connect( m_tabPopupTabsMenu, TQ_SIGNAL( activated ( int ) ), + TQ_SLOT( activateSession( int ) ) ); m_tabPopupMenu->insertSeparator(); m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this, - TQT_SLOT(slotTabCloseSession()) ); + TQ_SLOT(slotTabCloseSession()) ); if (m_options) { // Fill tab bar context menu @@ -887,16 +887,16 @@ void Konsole::makeGUI() viewOptions->setItems(options); viewOptions->setCurrentItem(m_tabViewMode); viewOptions->plug(m_tabbarPopupMenu); - connect(viewOptions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTabSetViewOptions(int))); + connect(viewOptions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTabSetViewOptions(int))); slotTabSetViewOptions(m_tabViewMode); TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this, - TQT_SLOT( slotTabbarToggleDynamicHide() ), this); + TQ_SLOT( slotTabbarToggleDynamicHide() ), this); dynamicTabHideOption->setChecked(b_dynamicTabHide); dynamicTabHideOption->plug(m_tabbarPopupMenu); TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"), - 0, this, TQT_SLOT( slotToggleAutoResizeTabs() ), this); + 0, this, TQ_SLOT( slotToggleAutoResizeTabs() ), this); m_autoResizeTabs->setChecked(b_autoResizeTabs); m_autoResizeTabs->plug(m_tabbarPopupMenu); } @@ -952,23 +952,23 @@ void Konsole::makeTabWidget() TDEAcceleratorManager::setNoAccel( tabwidget ); - connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int))); - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession())); - connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*))); - connect(tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), - TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); - connect(tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)), - TQT_SLOT(slotTabbarContextMenu(const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(movedTab(int,int)), TQ_SLOT(slotMovedTab(int,int))); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick(TQWidget*)), TQ_SLOT(slotRenameSession())); + connect(tabwidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(activateSession(TQWidget*))); + connect(tabwidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), + TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)), + TQ_SLOT(slotTabbarContextMenu(const TQPoint &))); - if (kapp->authorize("shell_access")) { - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession())); + if (tdeApp->authorize("shell_access")) { + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession())); m_newSessionButton = new TQToolButton( tabwidget ); TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu")); m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) ); m_newSessionButton->adjustSize(); m_newSessionButton->setPopup( m_tabbarSessionsCommands ); - connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession())); + connect(m_newSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(newSession())); tabwidget->setCornerWidget( m_newSessionButton, BottomLeft ); m_newSessionButton->installEventFilter(this); @@ -977,7 +977,7 @@ void Konsole::makeTabWidget() m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) ); m_removeSessionButton->adjustSize(); m_removeSessionButton->setEnabled(false); - connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession())); + connect(m_removeSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(confirmCloseCurrentSession())); tabwidget->setCornerWidget( m_removeSessionButton, BottomRight ); } @@ -1016,10 +1016,10 @@ bool Konsole::eventFilter( TQObject *o, TQEvent *ev ) void Konsole::makeBasicGUI() { - if (kapp->authorize("shell_access")) { + if (tdeApp->authorize("shell_access")) { m_tabbarSessionsCommands = new TDEPopupMenu( this ); TDEAcceleratorManager::manage( m_tabbarSessionsCommands ); - connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int))); + connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int))); } m_session = new TDEPopupMenu(this); @@ -1028,7 +1028,7 @@ void Konsole::makeBasicGUI() TDEAcceleratorManager::manage( m_edit ); m_view = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_view ); - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) { bookmarkHandler = new KonsoleBookmarkHandler( this, true ); m_bookmarks = bookmarkHandler->menu(); @@ -1036,20 +1036,20 @@ void Konsole::makeBasicGUI() bookmarks_menu_check(); } - if (kapp->authorizeTDEAction("settings")) { + if (tdeApp->authorizeTDEAction("settings")) { m_options = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_options ); } - if (kapp->authorizeTDEAction("help")) + if (tdeApp->authorizeTDEAction("help")) m_help = helpMenu(0, false); - if (kapp->authorizeTDEAction("konsole_rmb")) { + if (tdeApp->authorizeTDEAction("konsole_rmb")) { m_rightButton = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_rightButton ); } - if (kapp->authorizeTDEAction("bookmarks")) + if (tdeApp->authorizeTDEAction("bookmarks")) { // Bookmarks that open new sessions. bookmarkHandlerSession = new KonsoleBookmarkHandler( this, false ); @@ -1062,20 +1062,20 @@ void Konsole::makeBasicGUI() // programs. if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); m_session_id=menubar->insertItem(m_session_string , m_session); m_edit_id=menubar->insertItem(m_edit_string, m_edit); @@ -1090,78 +1090,78 @@ void Konsole::makeBasicGUI() m_shortcuts = new TDEActionCollection(this); m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this, - TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); + TQ_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this, - TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); + TQ_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this, - TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); + TQ_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this, - TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); + TQ_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this, - TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); + TQ_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this, - TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); + TQ_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this, - TQT_SLOT(slotFindNext()), m_shortcuts, "find_next"); + TQ_SLOT(slotFindNext()), m_shortcuts, "find_next"); m_findNext->setEnabled(b_histEnabled); m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this, - TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); + TQ_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); m_findPrevious->setEnabled( b_histEnabled ); m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this, - TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); + TQ_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); m_saveHistory->setEnabled(b_histEnabled ); m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this, - TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); + TQ_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); m_clearHistory->setEnabled(b_histEnabled); m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0, - this, TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); + this, TQ_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); if (!m_detachSession) { m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->setEnabled(false); m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this, - TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); + TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); - if (kapp->authorizeTDEAction("zmodem_upload")) + if (tdeApp->authorizeTDEAction("zmodem_upload")) m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ), TQt::CTRL+TQt::ALT+TQt::Key_U, this, - TQT_SLOT( slotZModemUpload() ), + TQ_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), SmallIconSet("activity"), 0, this, - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), SmallIconSet("silence"), 0, this, - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, - TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); + TQ_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this, - TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); + TQ_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this ); - connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(updateFullScreen(bool))); + connect( m_fullscreen,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(updateFullScreen(bool))); m_fullscreen->setChecked(b_fullscreen); m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this, - TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); + TQ_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); //help menu if (m_help) @@ -1170,42 +1170,42 @@ void Konsole::makeBasicGUI() // "Configure Shortcuts"). m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this, - TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); - m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); - m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQT_SLOT( close() ), m_shortcuts, "file_quit"); + TQ_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); + m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQ_SLOT( slotPrint() ), m_shortcuts, "file_print"); + m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQ_SLOT( close() ), m_shortcuts, "file_quit"); TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); - new TDEAction(i18n("New Session"), shortcut, this, TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); - new TDEAction(i18n("List Sessions"), 0, this, TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); + new TDEAction(i18n("New Session"), shortcut, this, TQ_SLOT(newSession()), m_shortcuts, "new_session"); + new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQ_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new TDEAction(i18n("List Sessions"), 0, this, TQ_SLOT(listSessions()), m_shortcuts, "list_sessions"); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, - this, TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); + this, TQ_SLOT(prevSession()), m_shortcuts, "previous_session"); new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, - this, TQT_SLOT(nextSession()), m_shortcuts, "next_session"); + this, TQ_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQ_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } - new TDEAction(i18n("Enlarge Font"), 0, this, TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); - new TDEAction(i18n("Shrink Font"), 0, this, TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); + new TDEAction(i18n("Enlarge Font"), 0, this, TQ_SLOT(biggerFont()), m_shortcuts, "bigger_font"); + new TDEAction(i18n("Shrink Font"), 0, this, TQ_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQ_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { @@ -1217,7 +1217,7 @@ void Konsole::makeBasicGUI() m_sessionList = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_sessionList ); - connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int))); + connect(m_sessionList, TQ_SIGNAL(activated(int)), TQ_SLOT(activateSession(int))); } /** @@ -1239,7 +1239,7 @@ void Konsole::activateMenu() */ bool Konsole::queryClose() { - if(kapp->sessionSaving()) + if(tdeApp->sessionSaving()) // saving session - do not even think about doing any kind of cleanup here return true; @@ -1487,7 +1487,7 @@ void Konsole::slotSaveSessionsProfile() if ( TQFile::exists( path ) ) TQFile::remove( path ); - KSimpleConfig cfg( path ); + TDESimpleConfig cfg( path ); savePropertiesInternal(&cfg,1); saveMainWindowSettings(&cfg); } @@ -1990,7 +1990,7 @@ void Konsole::slotToggleMenubar() { } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); - TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle())); + TQTimer::singleShot(5000,this,TQ_SLOT(updateTitle())); } updateRMBMenu(); } @@ -2142,12 +2142,12 @@ void Konsole::reparseConfiguration() b_sessionShortcutsMapped = false; // Mappings may have to be changed...get a fresh mapper. - disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + disconnect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); delete sessionNumberMapper; sessionNumberMapper = new TQSignalMapper( this ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); sl_sessionShortCuts.clear(); buildSessionMenus(); @@ -2380,12 +2380,12 @@ void Konsole::disableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2403,12 +2403,12 @@ void Konsole::enableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + connect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2503,7 +2503,7 @@ void Konsole::runSession(TESession* s) // give some time to get through the // resize events before starting up. - TQTimer::singleShot(100,s,TQT_SLOT(run())); + TQTimer::singleShot(100,s,TQ_SLOT(run())); } void Konsole::addSession(TESession* s) @@ -2537,7 +2537,7 @@ void Konsole::addSession(TESession* s) s->IconName(), 0, this, - TQT_SLOT(activateSession()), + TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -2676,7 +2676,7 @@ void Konsole::activateSession(TESession *s) } ra->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack + TQTimer::singleShot(1,this,TQ_SLOT(allowPrevNext())); // hack, hack, hack tabwidget->showPage( se->widget() ); te = se->widget(); @@ -2797,7 +2797,7 @@ void Konsole::allowPrevNext() notifySessionState(se,NOTIFYNORMAL); } -KSimpleConfig *Konsole::defaultSession() +TDESimpleConfig *Konsole::defaultSession() { if (!m_defaultSession) { TDEConfig * config = TDEGlobal::config(); @@ -2810,7 +2810,7 @@ KSimpleConfig *Konsole::defaultSession() void Konsole::setDefaultSession(const TQString &filename) { delete m_defaultSession; - m_defaultSession = new KSimpleConfig(locate("appdata", filename), true /* read only */); + m_defaultSession = new TDESimpleConfig(locate("appdata", filename), true /* read only */); m_defaultSession->setDesktopGroup(); b_showstartuptip = m_defaultSession->readBoolEntry("Tips", true); @@ -2819,13 +2819,13 @@ void Konsole::setDefaultSession(const TQString &filename) void Konsole::newSession(const TQString &pgm, const TQStrList &args, const TQString &term, const TQString &icon, const TQString &title, const TQString &cwd) { - KSimpleConfig *co = defaultSession(); + TDESimpleConfig *co = defaultSession(); newSession(co, pgm, args, term, icon, title, cwd); } TQString Konsole::newSession() { - KSimpleConfig *co = defaultSession(); + TDESimpleConfig *co = defaultSession(); return newSession(co, TQString::null, TQStrList()); } @@ -2845,7 +2845,7 @@ void Konsole::newSession(int i) return; } - KSimpleConfig* co = no2command.find(i); + TDESimpleConfig* co = no2command.find(i); if (co) { newSession(co); resetScreenSessions(); @@ -2868,7 +2868,7 @@ void Konsole::newSessionTabbar(int i) return; } - KSimpleConfig* co = no2command.find(i); + TDESimpleConfig* co = no2command.find(i); if (co) { newSession(co); resetScreenSessions(); @@ -2877,15 +2877,15 @@ void Konsole::newSessionTabbar(int i) TQString Konsole::newSession(const TQString &type) { - KSimpleConfig *co; + TDESimpleConfig *co; if (type.isEmpty()) co = defaultSession(); else - co = new KSimpleConfig(locate("appdata", type + ".desktop"), true /* read only */); + co = new TDESimpleConfig(locate("appdata", type + ".desktop"), true /* read only */); return newSession(co); } -TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrList &args, +TQString Konsole::newSession(TDESimpleConfig *co, TQString program, const TQStrList &args, const TQString &_term,const TQString &_icon, const TQString &_title, const TQString &_cwd) { @@ -2953,8 +2953,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis TEWidget* te_old = te; te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); if (te_old) { initTEWidget(te, te_old); } @@ -2975,38 +2975,38 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis s->setMetaAsAltMode(b_metaAsAlt); // If you add any new signal-slot connection below, think about doing it in konsolePart too - connect( s,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*))); - connect( s, TQT_SIGNAL(updateTitle(TESession*)), - this, TQT_SLOT(updateTitle(TESession*))); - connect( s, TQT_SIGNAL(notifySessionState(TESession*, int)), - this, TQT_SLOT(notifySessionState(TESession*, int))); - connect( s, TQT_SIGNAL(disableMasterModeConnections()), - this, TQT_SLOT(disableMasterModeConnections())); - connect( s, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections())); - connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - this, TQT_SLOT(slotRenameSession(TESession*, const TQString&))); - connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)), - this, TQT_SLOT(changeColumns(int)) ); - connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)), - this, TQT_SLOT(changeColLin(int,int))); - connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)), - this, TQT_SLOT(notifySize(int,int))); - connect( s, TQT_SIGNAL(zmodemDetected(TESession*)), - this, TQT_SLOT(slotZModemDetected(TESession*))); - connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)), - this, TQT_SLOT(slotUpdateSessionConfig(TESession*))); - connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)), - this, TQT_SLOT(slotResizeSession(TESession*, TQSize))); - connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)), - this,TQT_SLOT(changeTabTextColor(TESession*, int))); + connect( s,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*))); + connect( s, TQ_SIGNAL(updateTitle(TESession*)), + this, TQ_SLOT(updateTitle(TESession*))); + connect( s, TQ_SIGNAL(notifySessionState(TESession*, int)), + this, TQ_SLOT(notifySessionState(TESession*, int))); + connect( s, TQ_SIGNAL(disableMasterModeConnections()), + this, TQ_SLOT(disableMasterModeConnections())); + connect( s, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections())); + connect( s, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + this, TQ_SLOT(slotRenameSession(TESession*, const TQString&))); + connect( s->getEmulation(), TQ_SIGNAL(changeColumns(int)), + this, TQ_SLOT(changeColumns(int)) ); + connect( s->getEmulation(), TQ_SIGNAL(changeColLin(int,int)), + this, TQ_SLOT(changeColLin(int,int))); + connect( s->getEmulation(), TQ_SIGNAL(ImageSizeChanged(int,int)), + this, TQ_SLOT(notifySize(int,int))); + connect( s, TQ_SIGNAL(zmodemDetected(TESession*)), + this, TQ_SLOT(slotZModemDetected(TESession*))); + connect( s, TQ_SIGNAL(updateSessionConfig(TESession*)), + this, TQ_SLOT(slotUpdateSessionConfig(TESession*))); + connect( s, TQ_SIGNAL(resizeSession(TESession*, TQSize)), + this, TQ_SLOT(slotResizeSession(TESession*, TQSize))); + connect( s, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( s, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(changeTabTextColor(TESession*, int)), + this,TQ_SLOT(changeTabTextColor(TESession*, int))); s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession s->setSchemaNo(schmno); @@ -3048,7 +3048,7 @@ void Konsole::newSession(const TQString& sURL, const TQString& title) KURL url = KURL(sURL); if ((url.protocol() == "file") && (url.hasPath())) { - KSimpleConfig *co = defaultSession(); + TDESimpleConfig *co = defaultSession(); path = url.path(); newSession(co, TQString::null, TQStrList(), TQString::null, TQString::null, title.isEmpty() ? path : title, path); @@ -3149,7 +3149,7 @@ void Konsole::doneSession(TESession* s) // Since the timer approach only works at good weather, // the whole construction is not suited to what it // should do. Affected is the TEEmulation::setConnect. - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } else close(); @@ -3394,7 +3394,7 @@ void Konsole::buildSessionMenus() createSessionMenus(); - if (kapp->authorizeTDEAction("file_print")) + if (tdeApp->authorizeTDEAction("file_print")) { m_session->insertSeparator(); m_print->plug(m_session); @@ -3433,11 +3433,11 @@ static void insertItemSorted(TDEPopupMenu *menu, const TQIconSet &iconSet, const void Konsole::addSessionCommand(const TQString &path) { - KSimpleConfig* co; + TDESimpleConfig* co; if (path.isEmpty()) - co = new KSimpleConfig(locate("appdata", "shell.desktop"), true /* read only */); + co = new TDESimpleConfig(locate("appdata", "shell.desktop"), true /* read only */); else - co = new KSimpleConfig(path,true); + co = new TDESimpleConfig(path,true); co->setDesktopGroup(); TQString typ = co->readEntry("Type"); TQString txt = co->readEntry("Name"); @@ -3482,7 +3482,7 @@ void Konsole::addSessionCommand(const TQString &path) } else { sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() ); } - connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) ); + connect( sessionAction, TQ_SIGNAL( activated() ), sessionNumberMapper, TQ_SLOT( map() ) ); sessionNumberMapper->setMapping( sessionAction, cmd_serial ); } @@ -3494,7 +3494,7 @@ void Konsole::loadSessionCommands() cmd_serial = 99; cmd_first_screen = -1; - if (!kapp->authorize("shell_access")) + if (!tdeApp->authorize("shell_access")) return; addSessionCommand(TQString::null); @@ -3518,7 +3518,7 @@ void Konsole::createSessionMenus() return; } - KSimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID]; + TDESimpleConfig *cfg = no2command[SESSION_NEW_SHELL_ID]; TQString txt = cfg->readEntry("Name"); TQString icon = cfg->readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), @@ -3536,7 +3536,7 @@ void Konsole::createSessionMenus() m_session->insertSeparator(); m_tabbarSessionsCommands->insertSeparator(); - TQIntDictIterator<KSimpleConfig> it( no2command ); + TQIntDictIterator<TDESimpleConfig> it( no2command ); for ( ; it.current(); ++it ) { if ( it.currentKey() == SESSION_NEW_SHELL_ID ) continue; @@ -3567,7 +3567,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) { KTempFile *tmpFile = new KTempFile(); tmpFile->setAutoDelete(true); - KSimpleConfig *co = new KSimpleConfig(tmpFile->name()); + TDESimpleConfig *co = new TDESimpleConfig(tmpFile->name()); co->setDesktopGroup(); co->writeEntry("Name", socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); @@ -3583,7 +3583,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) void Konsole::loadScreenSessions() { - if (!kapp->authorize("shell_access")) + if (!tdeApp->authorize("shell_access")) return; TQCString screenDir = getenv("SCREENDIR"); if (screenDir.isEmpty()) @@ -3752,31 +3752,31 @@ void Konsole::detachSession(TESession* _se) { TESession *from = from_it.current(); if(from->isMasterMode()) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + _se->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() ); - disconnect( _se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( _se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + disconnect( _se, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); - disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); - disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); + disconnect( _se,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + disconnect( _se,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); + disconnect( _se,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); // TODO: "type" isn't passed properly Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis, @@ -3800,7 +3800,7 @@ void Konsole::detachSession(TESession* _se) { else se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } if (sessions.count()==1) @@ -3828,8 +3828,8 @@ void Konsole::attachSession(TESession* session) te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); te->resize(se_widget->size()); te->setSize(se_widget->Columns(), se_widget->Lines()); @@ -3845,7 +3845,7 @@ void Konsole::attachSession(TESession* session) TQString title=session->Title(); TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(), - 0, this, TQT_SLOT(activateSession()), m_shortcuts); + 0, this, TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -3859,20 +3859,20 @@ void Konsole::attachSession(TESession* session) if (m_menuCreated) ra->plug(m_view); - connect( session,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + connect( session,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); + connect( session,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + connect( session,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); - connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); - connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); + connect( session,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); + connect( session->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + connect( session->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + connect( session->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); - connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + connect( session, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); activateSession(session); } @@ -3934,7 +3934,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, TQHBoxLayout *hb = new TQHBoxLayout(mainFrame); m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool))); + connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHistEnable(bool))); m_label = new TQLabel(i18n("&Number of lines: "), mainFrame); @@ -3945,7 +3945,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_label->setBuddy( m_size ); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -4039,8 +4039,8 @@ void Konsole::slotFindHistory() { if( !m_finddialog ) { m_finddialog = new KonsoleFind( this, "konsolefind", false); - connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind())); - connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone())); + connect(m_finddialog,TQ_SIGNAL(search()),this,TQ_SLOT(slotFind())); + connect(m_finddialog,TQ_SIGNAL(done()),this,TQ_SLOT(slotFindDone())); } TQString string; @@ -4059,7 +4059,7 @@ void Konsole::slotOpenSelection() delete m_filterData; m_openSelection->clear(); - disconnect(m_openSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenURI(int))); + disconnect(m_openSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenURI(int))); TQString selection = se->getEmulation()->getSelection(); TQString curdir = baseURL().path(); @@ -4074,7 +4074,7 @@ void Konsole::slotOpenSelection() KURIFilter::self()->filterURI( *(m_filterData) ); m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); - connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); + connect(m_openSelection, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenURI(int))); } void Konsole::slotOpenURI(int) @@ -4230,7 +4230,7 @@ void Konsole::slotZModemUpload() void Konsole::slotZModemDetected(TESession *session) { - if (!kapp->authorize("zmodem_download")) return; + if (!tdeApp->authorize("zmodem_download")) return; if(se != session) activateSession(session); @@ -4345,8 +4345,8 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) { m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" ); - connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) ); - connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) ); + connect( m_asRegExp, TQ_SIGNAL( toggled(bool) ), m_editRegExp, TQ_SLOT( setEnabled(bool) ) ); + connect( m_editRegExp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditRegExp() ) ); m_editRegExp->setEnabled( false ); } } diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index b5e1f926b..7af520661 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -28,7 +28,7 @@ #include <tdemainwindow.h> #include <kdialogbase.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <keditcl.h> #include <twinmodule.h> @@ -257,8 +257,8 @@ private slots: void slotSetEncoding(); private: - KSimpleConfig *defaultSession(); - TQString newSession(KSimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(), + TDESimpleConfig *defaultSession(); + TQString newSession(TDESimpleConfig *co, TQString pgm = TQString::null, const TQStrList &args = TQStrList(), const TQString &_term = TQString::null, const TQString &_icon = TQString::null, const TQString &_title = TQString::null, const TQString &_cwd = TQString::null); void readProperties(TDEConfig *config, const TQString &schema, bool globalConfigOnly); @@ -298,9 +298,9 @@ private: TQPtrDict<TDERadioAction> session2action; TQPtrList<TESession> sessions; - TQIntDict<KSimpleConfig> no2command; + TQIntDict<TDESimpleConfig> no2command; - KSimpleConfig* m_defaultSession; + TDESimpleConfig* m_defaultSession; TQString m_defaultSessionFilename; KTabWidget* tabwidget; diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 405d83b28..ca275d40b 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -39,7 +39,7 @@ #include <krun.h> #include <kstdaction.h> #include <tqlabel.h> -#include <kprocctrl.h> +#include <tdeprocctrl.h> #include <tqcheckbox.h> #include <tqspinbox.h> @@ -153,8 +153,8 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje setWidget(te); te->setFocus(); - connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)), - this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te,TQ_SIGNAL(configureRequest(TEWidget*,int,int,int)), + this,TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -214,7 +214,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje applySettingsToGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( autoShowShell() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( autoShowShell() ) ); } void konsolePart::autoShowShell() @@ -240,10 +240,10 @@ void konsolePart::doneSession(TESession*) if (se && b_autoDestroy) { // kdDebug(1211) << "doneSession - disconnecting done" << endl; - disconnect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); se->setConnect(false); - //TQTimer::singleShot(100,se,TQT_SLOT(terminate())); + //TQTimer::singleShot(100,se,TQ_SLOT(terminate())); // kdDebug(1211) << "se->terminate()" << endl; se->terminate(); } @@ -252,7 +252,7 @@ void konsolePart::doneSession(TESession*) void konsolePart::sessionDestroyed() { // kdDebug(1211) << "sessionDestroyed()" << endl; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); se = 0; if (b_autoDestroy) delete this; @@ -275,7 +275,7 @@ konsolePart::~konsolePart() while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1)) ; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // kdDebug(1211) << "Deleting se session" << endl; delete se; se=0; @@ -325,14 +325,14 @@ void konsolePart::emitOpenURLRequest(const TQString &cwd) void konsolePart::makeGUI() { - if (!kapp->authorizeTDEAction("konsole_rmb")) + if (!tdeApp->authorizeTDEAction("konsole_rmb")) return; actions = new TDEActionCollection( (TDEMainWindow*)parentWidget ); settingsActions = new TDEActionCollection( (TDEMainWindow*)parentWidget ); // Send Signal Menu ------------------------------------------------------------- - if (kapp->authorizeTDEAction("send_signal")) + if (tdeApp->authorizeTDEAction("send_signal")) { m_signals = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); @@ -343,17 +343,17 @@ void konsolePart::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); } // Settings Menu ---------------------------------------------------------------- - if (kapp->authorizeTDEAction("settings")) + if (tdeApp->authorizeTDEAction("settings")) { m_options = new TDEPopupMenu((TDEMainWindow*)parentWidget); // Scrollbar selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, - TQT_SLOT(slotSelectScrollbar()), settingsActions); + TQ_SLOT(slotSelectScrollbar()), settingsActions); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); @@ -363,7 +363,7 @@ void konsolePart::makeGUI() // Select Bell m_options->insertSeparator(); selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, - TQT_SLOT(slotSelectBell()), settingsActions, "bell"); + TQ_SLOT(slotSelectBell()), settingsActions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") @@ -374,13 +374,13 @@ void konsolePart::makeGUI() selectBell->plug(m_options); m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); - m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQ_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQ_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQ_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQ_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -388,34 +388,34 @@ void konsolePart::makeGUI() selectSetEncoding->plug(m_options); // Keyboard Options Menu --------------------------------------------------- - if (kapp->authorizeTDEAction("keyboard")) + if (tdeApp->authorizeTDEAction("keyboard")) { m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_keytab->setCheckable(true); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); } // Schema Options Menu ----------------------------------------------------- - if (kapp->authorizeTDEAction("schema")) + if (tdeApp->authorizeTDEAction("schema")) { m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_schema->setCheckable(true); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema); } TDEAction *historyType = new TDEAction(i18n("&History..."), "history", 0, this, - TQT_SLOT(slotHistoryType()), settingsActions, "history"); + TQ_SLOT(slotHistoryType()), settingsActions, "history"); historyType->plug(m_options); m_options->insertSeparator(); // Select line spacing selectLineSpacing = new TDESelectAction(i18n("Li&ne Spacing"), SmallIconSet("format-justify-left"), 0, this, - TQT_SLOT(slotSelectLineSpacing()), settingsActions ); + TQ_SLOT(slotSelectLineSpacing()), settingsActions ); TQStringList lineSpacingList; lineSpacingList @@ -433,35 +433,35 @@ void konsolePart::makeGUI() // Blinking Cursor blinkingCursor = new TDEToggleAction (i18n("Blinking &Cursor"), - 0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions); + 0, this,TQ_SLOT(slotBlinkingCursor()), settingsActions); blinkingCursor->plug(m_options); // Frame on/off showFrame = new TDEToggleAction(i18n("Show Fr&ame"), 0, - this, TQT_SLOT(slotToggleFrame()), settingsActions); + this, TQ_SLOT(slotToggleFrame()), settingsActions); showFrame->setCheckedState(i18n("Hide Fr&ame")); showFrame->plug(m_options); // Meta key as Alt key metaAsAlt = new TDEToggleAction(i18n("Me&ta key as Alt key"), 0, - this, TQT_SLOT(slotToggleMetaAsAltMode()), settingsActions); + this, TQ_SLOT(slotToggleMetaAsAltMode()), settingsActions); metaAsAlt->plug(m_options); // Word Connectors TDEAction *WordSeps = new TDEAction(i18n("Wor&d Connectors..."), 0, this, - TQT_SLOT(slotWordSeps()), settingsActions); + TQ_SLOT(slotWordSeps()), settingsActions); WordSeps->plug(m_options); // Use Konsole's Settings m_options->insertSeparator(); m_useKonsoleSettings = new TDEToggleAction( i18n("&Use Konsole's Settings"), - 0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); + 0, this, TQ_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); m_useKonsoleSettings->plug(m_options); // Save Settings m_options->insertSeparator(); TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, - TQT_SLOT(saveProperties()), actions, "save_default"); + TQ_SLOT(saveProperties()), actions, "save_default"); saveSettings->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) m_options->insertTearOffHandle(); @@ -470,15 +470,15 @@ void konsolePart::makeGUI() // Popup Menu ------------------------------------------------------------------- m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget); TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, te, - TQT_SLOT(setSelectionEnd()), actions, "selection_end"); + TQ_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, - te, TQT_SLOT(copyClipboard()), actions, "edit_copy"); + te, TQ_SLOT(copyClipboard()), actions, "edit_copy"); copyClipboard->plug(m_popupMenu); TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0, - te, TQT_SLOT(pasteClipboard()), actions, "edit_paste"); + te, TQ_SLOT(pasteClipboard()), actions, "edit_paste"); pasteClipboard->plug(m_popupMenu); if (m_signals) @@ -494,7 +494,7 @@ void konsolePart::makeGUI() } TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "window-close", 0, this, - TQT_SLOT(closeCurrentSession()), actions, "close_session"); + TQ_SLOT(closeCurrentSession()), actions, "close_session"); closeSession->plug(m_popupMenu); if (TDEGlobalSettings::insertTearOffHandle()) m_popupMenu->insertTearOffHandle(); @@ -1011,15 +1011,15 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - TQObject::connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotHistEnable(bool))); + TQObject::connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotHistEnable(bool))); m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame); m_size->setValue(histSize); m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited")); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -1121,42 +1121,42 @@ void konsolePart::newSession() { se = new TESession(te, "xterm", parentWidget->winId()); } - connect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); - connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), - this,TQT_SLOT(emitOpenURLRequest(const TQString &)) ); - connect( se, TQT_SIGNAL( updateTitle(TESession*) ), - this, TQT_SLOT( updateTitle(TESession*) ) ); - connect( se, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections()) ); - connect( se, TQT_SIGNAL( processExited(TDEProcess *) ), - this, TQT_SIGNAL( processExited(TDEProcess *) ) ); - connect( se, TQT_SIGNAL( receivedData( const TQString& ) ), - this, TQT_SIGNAL( receivedData( const TQString& ) ) ); - connect( se, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); - connect( se, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( se, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), - this, TQT_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); + connect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); + connect( se,TQ_SIGNAL(openURLRequest(const TQString &)), + this,TQ_SLOT(emitOpenURLRequest(const TQString &)) ); + connect( se, TQ_SIGNAL( updateTitle(TESession*) ), + this, TQ_SLOT( updateTitle(TESession*) ) ); + connect( se, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections()) ); + connect( se, TQ_SIGNAL( processExited(TDEProcess *) ), + this, TQ_SIGNAL( processExited(TDEProcess *) ) ); + connect( se, TQ_SIGNAL( receivedData( const TQString& ) ), + this, TQ_SIGNAL( receivedData( const TQString& ) ) ); + connect( se, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); + connect( se, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( se, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), + this, TQ_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); // We ignore the following signals - //connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - // this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) ); - //connect( se->getEmulation(), TQT_SIGNAL(changeColumns(int)), - // this, TQT_SLOT(changeColumns(int)) ); - //connect( se, TQT_SIGNAL(disableMasterModeConnections()), - // this, TQT_SLOT(disableMasterModeConnections()) ); + //connect( se, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + // this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)) ); + //connect( se->getEmulation(), TQ_SIGNAL(changeColumns(int)), + // this, TQ_SLOT(changeColumns(int)) ); + //connect( se, TQ_SIGNAL(disableMasterModeConnections()), + // this, TQ_SLOT(disableMasterModeConnections()) ); applyProperties(); se->setConnect(true); // se->run(); - connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + connect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // setFont( n_font ); // we do this here, to make TEWidget recalculate // its geometry.. } diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp index 098cd16d4..5159dfca7 100644 --- a/konsole/konsole/konsole_wcwidth.cpp +++ b/konsole/konsole/konsole_wcwidth.cpp @@ -213,7 +213,7 @@ int string_width( const TQString &txt ) { int w = 0; - for ( uint i = 1; i < txt.length(); ++i ) { + for ( uint i = 0; i < txt.length(); ++i ) { w += konsole_wcwidth(txt[i].unicode()); } return w; diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp index 13af12ca5..8316455ac 100644 --- a/konsole/konsole/konsolebookmarkhandler.cpp +++ b/konsole/konsole/konsolebookmarkhandler.cpp @@ -19,7 +19,7 @@ // Born as tdelibs/tdeio/tdefile/tdefilebookmarkhandler.cpp #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kshell.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> @@ -55,12 +55,12 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel m_file = locateLocal( "data", "konsole/bookmarks.xml" ); KBookmarkManager *manager = KBookmarkManager::managerForFile( m_file, false); - manager->setEditorOptions(kapp->caption(), false); + manager->setEditorOptions(tdeApp->caption(), false); manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); + connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); if (toplevel) { m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index 77b86882b..d52175b0e 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -17,7 +17,7 @@ */ #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include "konsole.h" @@ -36,14 +36,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the TQT_SLOT() macro thinks we want + * They are named differently because the TQ_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotAboutToShow() ) ); - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow2() ) ); } /* @@ -113,7 +113,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name TDEAction * action = new TDEAction( text, bm.icon(), 0, - this, TQT_SLOT( slotBookmarkSelected() ), + this, TQ_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index f3ca3ea19..6aea6d6a4 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -34,13 +34,12 @@ #include <dcopclient.h> #include <tqsocketnotifier.h> -// KDE -#include <kuniqueapplication.h> +// TDE #include <tdecmdlineargs.h> #include <tdelocale.h> #include <tdeglobalsettings.h> #include <kdebug.h> -#include <kcrash.h> +#include <tdecrash.h> #include <kpty.h> #include <kuser.h> #include <tdeglobal.h> @@ -80,7 +79,7 @@ KWrited::KWrited() : TQTextEdit() pty->open(); pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY")); TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this); - connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int))); + connect(sn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(block_in(int))); TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName()); setCaption(txt); @@ -116,7 +115,7 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos ) TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos ); menu->insertItem( i18n( "Clear Messages" ), - this, TQT_SLOT( clearText() ), + this, TQ_SLOT( clearText() ), 0, -1, 0 ); return menu; @@ -136,7 +135,7 @@ KWritedModule::~KWritedModule() } extern "C" -KDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) +TDE_EXPORT KDEDModule* create_kwrited( const TQCString& obj ) { return new KWritedModule( obj ); } diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 4039362e3..21bbbe66c 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -37,7 +37,7 @@ #include <tdecmdlineargs.h> #include <kimageio.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> #include <tdeio/netaccess.h> #include <tdemessagebox.h> @@ -46,7 +46,7 @@ #include "konsole.h" -#if defined(Q_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 +#if defined(TQ_WS_X11) && defined(HAVE_XRENDER) && TQT_VERSION >= 0x030300 #define COMPOSITE #endif @@ -150,7 +150,7 @@ public: /* --| main |------------------------------------------------------ */ -extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) +extern "C" int TDE_EXPORT kdemain(int argc, char* argv[]) { setgid(getgid()); setuid(getuid()); // drop privileges @@ -289,7 +289,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) eargs.append( args->arg(i) ); if (title.isEmpty() && - (kapp->caption() == kapp->aboutData()->programName())) + (tdeApp->caption() == tdeApp->aboutData()->programName())) { title = TQFile::decodeName(shell); // program executed in the title bar } @@ -413,7 +413,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) } } - if (!kapp->authorizeTDEAction("size")) + if (!tdeApp->authorizeTDEAction("size")) fixed_size = true; // /////////////////////////////////////////////// diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8778a1ee9..cf80136f3 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -55,7 +55,7 @@ #include <tqdir.h> #include <tqdatetime.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> @@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().text(); + m_table[fi].color = tdeApp->palette().active().text(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().base(); + m_table[fi].color = tdeApp->palette().active().base(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index dcfe9fee4..4a3b1975e 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -26,10 +26,10 @@ #include <tdemessagebox.h> #include <knotifyclient.h> #include <tdelocale.h> -#include <kprocio.h> +#include <tdeprocio.h> #include <krun.h> #include <kshell.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <tqfile.h> @@ -78,10 +78,10 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T em = new TEmuVt102(te); font_h = te-> fontHeight(); font_w = te-> fontWidth(); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); term = _term; winId = _winId; @@ -89,17 +89,17 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T setPty( new TEPty() ); - connect( em, TQT_SIGNAL( changeTitle( int, const TQString & ) ), - this, TQT_SLOT( setUserTitle( int, const TQString & ) ) ); - connect( em, TQT_SIGNAL( notifySessionState(int) ), - this, TQT_SLOT( notifySessionState(int) ) ); + connect( em, TQ_SIGNAL( changeTitle( int, const TQString & ) ), + this, TQ_SLOT( setUserTitle( int, const TQString & ) ) ); + connect( em, TQ_SIGNAL( notifySessionState(int) ), + this, TQ_SLOT( notifySessionState(int) ) ); monitorTimer = new TQTimer(this); - connect(monitorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(monitorTimerDone())); + connect(monitorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(monitorTimerDone())); - connect( em, TQT_SIGNAL( zmodemDetected() ), this, TQT_SLOT(slotZModemDetected())); + connect( em, TQ_SIGNAL( zmodemDetected() ), this, TQ_SLOT(slotZModemDetected())); - connect( em, TQT_SIGNAL( changeTabTextColor( int ) ), - this, TQT_SLOT( changeTabTextColor( int ) ) ); + connect( em, TQ_SIGNAL( changeTabTextColor( int ) ), + this, TQ_SLOT( changeTabTextColor( int ) ) ); //kdDebug(1211)<<"TESession ctor() done"<<endl; } @@ -110,23 +110,23 @@ void TESession::setPty(TEPty *_sh) delete sh; } sh = _sh; - connect( sh, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); + connect( sh, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); //kdDebug(1211)<<"TESession ctor() sh->setSize()"<<endl; sh->setSize(te->Lines(),te->Columns()); // not absolutely nessesary sh->useUtf8(em->utf8()); //kdDebug(1211)<<"TESession ctor() connecting"<<endl; - connect( sh,TQT_SIGNAL(block_in(const char*,int)),this,TQT_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)),this,TQ_SLOT(onRcvBlock(const char*,int)) ); - connect( em,TQT_SIGNAL(sndBlock(const char*,int)),sh,TQT_SLOT(send_bytes(const char*,int)) ); - connect( em,TQT_SIGNAL(lockPty(bool)),sh,TQT_SLOT(lockPty(bool)) ); - connect( em,TQT_SIGNAL(useUtf8(bool)),sh,TQT_SLOT(useUtf8(bool)) ); + connect( em,TQ_SIGNAL(sndBlock(const char*,int)),sh,TQ_SLOT(send_bytes(const char*,int)) ); + connect( em,TQ_SIGNAL(lockPty(bool)),sh,TQ_SLOT(lockPty(bool)) ); + connect( em,TQ_SIGNAL(useUtf8(bool)),sh,TQ_SLOT(useUtf8(bool)) ); - connect( sh,TQT_SIGNAL(done(int)), this,TQT_SLOT(done(int)) ); + connect( sh,TQ_SIGNAL(done(int)), this,TQ_SLOT(done(int)) ); if (!sh->error().isEmpty()) - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } void TESession::ptyError() @@ -143,10 +143,10 @@ void TESession::ptyError() void TESession::changeWidget(TEWidget* w) { - TQObject::disconnect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::disconnect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); te=w; em->changeGUI(w); font_h = te->fontHeight(); @@ -155,10 +155,10 @@ void TESession::changeWidget(TEWidget* w) te->setDefaultBackColor(modifiedBackground); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); } void TESession::setProgram( const TQString &_pgm, const TQStrList &_args ) @@ -177,11 +177,11 @@ void TESession::run() TQString pexec = TDEGlobal::dirs()->findExe(exec); if ( pexec.isEmpty() ) { kdError()<<"can not execute "<<exec<<endl; - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); return; } - TQString appId=kapp->dcopClient()->appId(); + TQString appId=tdeApp->dcopClient()->appId(); TQString cwd_save = TQDir::currentDirPath(); if (!initial_cwd.isEmpty()) @@ -194,7 +194,7 @@ void TESession::run() ("DCOPRef("+appId+","+sessionId+")").latin1()); if (result < 0) { // Error in opening pseudo teletype kdWarning()<<"Unable to open a pseudo teletype!"<<endl; - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } sh->setErase(em->getErase()); @@ -311,7 +311,7 @@ bool TESession::closeSession() if (!sh->isRunning() || !sendSignal(SIGHUP)) { // Forced close. - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); } return true; } @@ -341,8 +341,8 @@ void TESession::renameSession(const TQString &name) TESession::~TESession() { //kdDebug(1211) << "disconnnecting..." << endl; - TQObject::disconnect( sh, TQT_SIGNAL( done(int) ), - this, TQT_SLOT( done(int) ) ); + TQObject::disconnect( sh, TQ_SIGNAL( done(int) ), + this, TQ_SLOT( done(int) ) ); delete em; delete sh; @@ -605,7 +605,7 @@ void TESession::slotZModemDetected() { if (!zmodemBusy) { - TQTimer::singleShot(10, this, TQT_SLOT(emitZModemDetected())); + TQTimer::singleShot(10, this, TQ_SLOT(emitZModemDetected())); zmodemBusy = true; } } @@ -624,7 +624,7 @@ void TESession::cancelZModem() void TESession::startZModem(const TQString &zmodem, const TQString &dir, const TQStringList &list) { zmodemBusy = true; - zmodemProc = new KProcIO; + zmodemProc = new TDEProcIO; (*zmodemProc) << zmodem << "-v"; for(TQStringList::ConstIterator it = list.begin(); @@ -636,26 +636,26 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T if (!dir.isEmpty()) zmodemProc->setWorkingDirectory(dir); - zmodemProc->start(KProcIO::NotifyOnExit, false); + zmodemProc->start(TDEProcIO::NotifyOnExit, false); - // Override the read-processing of KProcIO - disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); - connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)), - this, TQT_SLOT(zmodemDone())); + // Override the read-processing of TDEProcIO + disconnect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); + connect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemStatus(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (processExited(TDEProcess *)), + this, TQ_SLOT(zmodemDone())); - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, i18n("ZModem Progress")); - connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(zmodemDone())); + connect(zmodemProgress, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(zmodemDone())); zmodemProgress->show(); } @@ -720,9 +720,9 @@ void TESession::zmodemDone() zmodemProc = 0; zmodemBusy = false; - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this ,TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - disconnect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this ,TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); sh->send_bytes("\030\030\030\030", 4); // Abort sh->send_bytes("\001\013\n", 3); // Try to get prompt back diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h index 3b5f211fa..0b4dbed50 100644 --- a/konsole/konsole/session.h +++ b/konsole/konsole/session.h @@ -31,7 +31,7 @@ #include "sessioniface.h" -class KProcIO; +class TDEProcIO; class TDEProcess; class ZModemDialog; @@ -222,7 +222,7 @@ private: // ZModem bool zmodemBusy; - KProcIO* zmodemProc; + TDEProcIO* zmodemProc; ZModemDialog* zmodemProgress; // Color/Font Changes by ESC Sequences diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp index b4f16dd49..230fc7f9a 100644 --- a/konsole/konsole/zmodem_dialog.cpp +++ b/konsole/konsole/zmodem_dialog.cpp @@ -32,7 +32,7 @@ ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption textEdit = new TQTextEdit(this); textEdit->setMinimumSize(400, 100); setMainWidget(textEdit); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClose())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClose())); } void ZModemDialog::addProgressText(const TQString &txt) diff --git a/konsole/other/CMakeLists.txt b/konsole/other/CMakeLists.txt index 564bf3504..39992673e 100644 --- a/konsole/other/CMakeLists.txt +++ b/konsole/other/CMakeLists.txt @@ -28,7 +28,8 @@ install( Linux.schema XTerm.schema vim.schema DarkPicture.schema LightPicture.schema Transparent.schema GreenTint.schema Transparent_MC.schema GreenTint_MC.schema Transparent_lightbg.schema - Transparent_darkbg.schema LightPaper.schema + Transparent_darkbg.schema LightPaper.schema Solarized.schema + SolarizedLight.schema linux.keytab vt100.keytab vt420pc.keytab x11r5.keytab solaris.keytab README.Schema README.KeyTab README.default.Keytab DESTINATION ${DATA_INSTALL_DIR}/konsole diff --git a/konsole/other/LICENSE.Solarized-themes b/konsole/other/LICENSE.Solarized-themes new file mode 100644 index 000000000..ee08d7e44 --- /dev/null +++ b/konsole/other/LICENSE.Solarized-themes @@ -0,0 +1,20 @@ +Copyright (c) 2011 Ethan Schoonover + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/konsole/other/Solarized.schema b/konsole/other/Solarized.schema new file mode 100644 index 000000000..ab98e4f06 --- /dev/null +++ b/konsole/other/Solarized.schema @@ -0,0 +1,40 @@ +# Solarized color scheme by Ethan Schoonover +# +# https://ethanschoonover.com/solarized/ + +title Solarized + +# foreground colors + +# note that the default background color is flagged +# to become transparent when an image is present. + +# slot transparent bold +# | | | +# V V--color--V V V + +color 0 131 148 150 0 0 # regular foreground color +color 1 0 43 54 1 0 # regular background color + +color 2 7 54 66 0 0 # regular color 0 Black +color 3 220 50 47 0 0 # regular color 1 Red +color 4 133 153 0 0 0 # regular color 2 Green +color 5 181 137 0 0 0 # regular color 3 Yellow +color 6 38 139 210 0 0 # regular color 4 Blue +color 7 211 54 130 0 0 # regular color 5 Magenta +color 8 42 161 152 0 0 # regular color 6 Cyan +color 9 238 232 213 0 0 # regular color 7 White + +# intensive colors + +color 10 147 161 161 0 0 # intensive foreground color +color 11 7 54 66 1 0 # intensive background color + +color 12 0 43 54 0 0 # intensive color 0 +color 13 203 75 22 0 0 # intensive color 1 +color 14 88 110 117 0 0 # intensive color 2 +color 15 101 123 131 0 0 # intensive color 3 +color 16 131 148 150 0 0 # intensive color 4 +color 17 108 113 196 0 0 # intensive color 5 +color 18 147 161 161 0 0 # intensive color 6 +color 19 253 246 227 0 0 # intensive color 7 diff --git a/konsole/other/SolarizedLight.schema b/konsole/other/SolarizedLight.schema new file mode 100644 index 000000000..61905f535 --- /dev/null +++ b/konsole/other/SolarizedLight.schema @@ -0,0 +1,40 @@ +# Solarized Light color scheme by Ethan Schoonover +# +# https://ethanschoonover.com/solarized/ + +title Solarized Light + +# foreground colors + +# note that the default background color is flagged +# to become transparent when an image is present. + +# slot transparent bold +# | | | +# V V--color--V V V + +color 0 101 123 131 0 0 # regular foreground color +color 1 253 246 227 1 0 # regular background color + +color 2 7 54 66 0 0 # regular color 0 Black +color 3 220 50 47 0 0 # regular color 1 Red +color 4 133 153 0 0 0 # regular color 2 Green +color 5 181 137 0 0 0 # regular color 3 Yellow +color 6 38 139 210 0 0 # regular color 4 Blue +color 7 211 54 130 0 0 # regular color 5 Magenta +color 8 42 161 152 0 0 # regular color 6 Cyan +color 9 238 232 213 0 0 # regular color 7 White + +# intensive colors + +color 10 88 110 117 0 0 # intensive foreground color +color 11 238 232 213 1 0 # intensive background color + +color 12 0 43 54 0 0 # intensive color 0 +color 13 203 75 22 0 0 # intensive color 1 +color 14 88 110 117 0 0 # intensive color 2 +color 15 101 123 131 0 0 # intensive color 3 +color 16 131 148 150 0 0 # intensive color 4 +color 17 108 113 196 0 0 # intensive color 5 +color 18 147 161 161 0 0 # intensive color 6 +color 19 253 246 227 0 0 # intensive color 7 diff --git a/konsole/terminalhere/terminalhere.cpp b/konsole/terminalhere/terminalhere.cpp index ece2ac30e..0fffd7538 100644 --- a/konsole/terminalhere/terminalhere.cpp +++ b/konsole/terminalhere/terminalhere.cpp @@ -21,7 +21,7 @@ #include <tdelocale.h> #include <tdeconfig.h> #include <tdeglobal.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdestartupinfo.h> #include <stdlib.h> @@ -32,7 +32,7 @@ TerminalHere::TerminalHere() : TDEApplication() { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General"); TQString term = config->readPathEntry("TerminalApplication", "konsole"); |