diff options
Diffstat (limited to 'parts/outputviews')
| -rw-r--r-- | parts/outputviews/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | parts/outputviews/appoutputviewpart.cpp | 16 | ||||
| -rw-r--r-- | parts/outputviews/appoutputviewpart.h | 2 | ||||
| -rw-r--r-- | parts/outputviews/appoutputwidget.cpp | 24 | ||||
| -rw-r--r-- | parts/outputviews/appoutputwidget.h | 2 | ||||
| -rw-r--r-- | parts/outputviews/compileerrorfilter.h | 2 | ||||
| -rw-r--r-- | parts/outputviews/directorystatusmessagefilter.h | 2 | ||||
| -rw-r--r-- | parts/outputviews/filterdlg.ui | 6 | ||||
| -rw-r--r-- | parts/outputviews/kdevappoutputview.desktop | 81 | ||||
| -rw-r--r-- | parts/outputviews/kdevmakeview.desktop | 84 | ||||
| -rw-r--r-- | parts/outputviews/makeactionfilter.h | 2 | ||||
| -rw-r--r-- | parts/outputviews/makeviewpart.cpp | 14 | ||||
| -rw-r--r-- | parts/outputviews/makeviewpart.h | 2 | ||||
| -rw-r--r-- | parts/outputviews/makewidget.cpp | 104 | ||||
| -rw-r--r-- | parts/outputviews/makewidget.h | 2 | ||||
| -rw-r--r-- | parts/outputviews/otherfilter.h | 2 |
16 files changed, 104 insertions, 249 deletions
diff --git a/parts/outputviews/CMakeLists.txt b/parts/outputviews/CMakeLists.txt index 48cf38ec..363cd291 100644 --- a/parts/outputviews/CMakeLists.txt +++ b/parts/outputviews/CMakeLists.txt @@ -29,9 +29,11 @@ link_directories( ##### other data ################################ -install( FILES - kdevappoutputview.desktop kdevmakeview.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevappoutputview.desktop kdevmakeview.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) install( FILES kdevmakeview.rc diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 3a0e0e7d..b2771a8a 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -29,12 +29,12 @@ #include "kdevpartcontroller.h" #include "settings.h" -static const KDevPluginInfo data("kdevappoutputview"); +static const KDevPluginInfo pluginData("kdevappoutputview"); typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( pluginData ) ) AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") + : KDevAppFrontend(&pluginData, parent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); @@ -51,10 +51,10 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program")); hideView(); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited())); - connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited())); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited())); + connect(m_widget, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SIGNAL(processExited())); } @@ -97,7 +97,7 @@ void AppOutputViewPart::startAppCommand(const TQString &directory, const TQStrin TQString cmd; if (inTerminal) { - cmd = Settings::terminalEmulatorName( *kapp->config() ); + cmd = Settings::terminalEmulatorName( *tdeApp->config() ); if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough? // If a directory was specified, use it cmd += TQString(" --workdir '%1'").arg(directory); diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index 1067af97..db643f54 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -22,7 +22,7 @@ class AppOutputWidget; class AppOutputViewPart : public KDevAppFrontend { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 50060339..fbc4bb4c 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -40,10 +40,10 @@ AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) : ProcessWidget(0, "app output widget"), m_part(part) { - connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*))); - connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), - TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); - TDEConfig *config = kapp->config(); + connect(this, TQ_SIGNAL(executed(TQListBoxItem*)), TQ_SLOT(slotRowSelected(TQListBoxItem*))); + connect(this, TQ_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )), + TQ_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & ))); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); setFont(config->readFontEntry("OutputViewFont")); setSelectionMode(TQListBox::Extended); @@ -251,24 +251,24 @@ void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p ) { TDEPopupMenu popup(this, "filter output"); - int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) ); + int id = popup.insertItem( i18n("Clear output"), this, TQ_SLOT(clearViewAndContents()) ); popup.setItemEnabled( id, m_contentList.size() > 0 ); - popup.insertItem( i18n("Copy selected lines"), this, TQT_SLOT(copySelected()) ); + popup.insertItem( i18n("Copy selected lines"), this, TQ_SLOT(copySelected()) ); popup.insertSeparator(); - popup.insertItem( i18n("Save unfiltered"), this, TQT_SLOT(saveAll()) ); - id = popup.insertItem( i18n("Save filtered output"), this, TQT_SLOT(saveFiltered()) ); + popup.insertItem( i18n("Save unfiltered"), this, TQ_SLOT(saveAll()) ); + id = popup.insertItem( i18n("Save filtered output"), this, TQ_SLOT(saveFiltered()) ); popup.setItemEnabled( id, m_filter.m_isActive ); popup.insertSeparator(); - id = popup.insertItem( i18n("Clear filter"), this, TQT_SLOT(clearFilter()) ); + id = popup.insertItem( i18n("Clear filter"), this, TQ_SLOT(clearFilter()) ); popup.setItemEnabled( id, m_filter.m_isActive ); - popup.insertItem( i18n("Edit filter"), this, TQT_SLOT(editFilter() ) ); + popup.insertItem( i18n("Edit filter"), this, TQ_SLOT(editFilter() ) ); popup.insertSeparator(); - popup.insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) ); + popup.insertItem( i18n("Hide view"), this, TQ_SLOT(hideView()) ); popup.exec(p); } @@ -339,7 +339,7 @@ void AppOutputWidget::copySelected() if (isSelected(i)) buffer += item(i)->text() + "\n"; } - kapp->clipboard()->setText(buffer, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(buffer, TQClipboard::Clipboard); } void AppOutputWidget::addPartialStderrLine(const TQCString & line) diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h index 9e5810ea..9c95b879 100644 --- a/parts/outputviews/appoutputwidget.h +++ b/parts/outputviews/appoutputwidget.h @@ -21,7 +21,7 @@ class AppOutputViewPart; class AppOutputWidget : public ProcessWidget { - Q_OBJECT + TQ_OBJECT friend class AppOutputViewPart; public: diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h index 81a78020..e703baaf 100644 --- a/parts/outputviews/compileerrorfilter.h +++ b/parts/outputviews/compileerrorfilter.h @@ -21,7 +21,7 @@ class MakeItem; class CompileErrorFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h index 13d23d02..dbcd4424 100644 --- a/parts/outputviews/directorystatusmessagefilter.h +++ b/parts/outputviews/directorystatusmessagefilter.h @@ -20,7 +20,7 @@ class ExitingDirectoryItem; class DirectoryStatusMessageFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/filterdlg.ui b/parts/outputviews/filterdlg.ui index eae824f3..07a8d1f5 100644 --- a/parts/outputviews/filterdlg.ui +++ b/parts/outputviews/filterdlg.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/parts/outputviews/kdevappoutputview.desktop b/parts/outputviews/kdevappoutputview.desktop index f84de45e..b217e421 100644 --- a/parts/outputviews/kdevappoutputview.desktop +++ b/parts/outputviews/kdevappoutputview.desktop @@ -1,81 +1,12 @@ [Desktop Entry] -Type=Service -Exec=blubb -Comment=Application Output View -Comment[ca]=Visor de l'eixida de les aplicacions -Comment[da]=Program-uddata fremvisning -Comment[de]=Anwendungsausgabe für TDevelop -Comment[el]=Προβολή εξόδου εφαρμογής -Comment[es]=Visor de la salida de las aplicaciones -Comment[et]=Rakenduse väljundi vaade -Comment[eu]=Aplikazioen irteera ikustailua -Comment[fa]=نمای خروجی کاربرد -Comment[fr]=Fenêtre de sortie d'une application -Comment[gl]=Vista da saída da aplicación -Comment[hi]=अनुप्रयोग आउटपुट व्यू -Comment[hu]=Alkalmazáskimenet-megjelenítő -Comment[it]=Vista dell'output dell'applicazione -Comment[ja]=アプリケーション出力ビュー -Comment[ms]=Lihat Keluaran Aplikasi -Comment[nds]=Programmutgaav-Kieker -Comment[ne]=अनुप्रयोग निर्गत दृश्य -Comment[nl]=Weergave van toepassingsuitvoer -Comment[pl]=Widok wyjścia programu -Comment[pt]=Vista do Resultado da Aplicação -Comment[pt_BR]=Visão da Saída do Aplicativo -Comment[ru]=Окно вывода приложения -Comment[sk]=Pohľad na výstup aplikácie -Comment[sl]=Prikaz programskega izhoda -Comment[sr]=Приказ излаза апликације -Comment[sr@Latn]=Prikaz izlaza aplikacije -Comment[sv]=Programutmatningsvy -Comment[ta]=பயன்பாட்டு வெளியீட்டுக் காட்சி -Comment[tg]=Тирезаи хориҷ кардани гузориш -Comment[tr]=Uygulama Çıktı Görünümü -Comment[zh_CN]=应用程序输出查看器 -Comment[zh_TW]=應用程式輸出檢視 Name=KDevAppOutputView -Name[da]=TDevelop Program-uddata fremvisning -Name[de]=Anwendungsausgabe (TDevelop) -Name[hi]=के-डेव-एप्प-आउटपुट-व्यू -Name[nds]=Programmutgaav-Kieker (TDevelop) -Name[pl]=KDevAppWidokWyjścia -Name[sk]=KDev pohľad na výstup aplikácie -Name[sv]=TDevelop programutmatningsvy -Name[ta]=KDevApp வெளியீட்டுக் காட்சி -Name[zh_TW]=TDevelop 應用程式輸出檢視 + GenericName=Application Output View -GenericName[ca]=Visor de l'eixida de les aplicacions -GenericName[da]=Program-uddata fremvisning -GenericName[de]=Anwendungsausgabe -GenericName[el]=Προβολή εξόδου εφαρμογής -GenericName[es]=Visor de la salida de las aplicaciones -GenericName[et]=Rakenduse väljundi vaade -GenericName[eu]=Aplikazioen irteera ikustailua -GenericName[fa]=نمای خروجی کاربرد -GenericName[fr]=Fenêtre de sortie d'une application -GenericName[gl]=Vista da saída da aplicación -GenericName[hi]=अनुप्रयोग आउटपुट व्यू -GenericName[hu]=Alkalmazáskimenet-megjelenítő -GenericName[it]=Visualizza l'output dell'applicazione -GenericName[ja]=アプリケーション出力ビュー -GenericName[nds]=Programmutgaav-Kieker -GenericName[ne]=अनुप्रयोग निर्गत दृश्य -GenericName[nl]=Weergave van toepassingsuitvoer -GenericName[pl]=Widok wyjścia programu -GenericName[pt]=Vista do Resultado da Aplicação -GenericName[pt_BR]=Visão da Saída do Aplicativo -GenericName[ru]=Окно вывода приложения -GenericName[sk]=Pohľad na výstup aplikácie -GenericName[sl]=Prikaz programskega izhoda -GenericName[sr]=Приказ излаза апликације -GenericName[sr@Latn]=Prikaz izlaza aplikacije -GenericName[sv]=Programutmatningsvy -GenericName[ta]=பயன்பாட்டு வெளியீட்டுக் காட்சி -GenericName[tg]=Тирезаи хориҷ кардани гузориш -GenericName[tr]=Uygulama Çıktı Görünümü -GenericName[zh_CN]=应用程序输出查看器 -GenericName[zh_TW]=應用程式輸出檢視 + +Comment=Application Output View + +Type=Service +Exec=blubb Icon=application-x-executable X-TDE-ServiceTypes=TDevelop/AppFrontend X-TDE-Library=libkdevappview diff --git a/parts/outputviews/kdevmakeview.desktop b/parts/outputviews/kdevmakeview.desktop index 67ba6345..35b85992 100644 --- a/parts/outputviews/kdevmakeview.desktop +++ b/parts/outputviews/kdevmakeview.desktop @@ -1,84 +1,12 @@ [Desktop Entry] -Type=Service -Exec=blubb -Comment=Compiler Frontend -Comment[ca]=Entorn per al compilador -Comment[da]=Grænseflade til oversætter -Comment[de]=Make-Ausgabe für TDevelop -Comment[el]=Πρόγραμμα μεταγλωττιστή -Comment[es]=Entorno para el compilador -Comment[et]=Kompilaatori kasutajaliides -Comment[eu]=Konpiladore interfazea -Comment[fa]=پایانۀ مترجم -Comment[fr]=Interface pour le compilateur -Comment[ga]=Comhéadan Tiomsaitheora -Comment[gl]=Frontal para o compilador -Comment[hi]=कम्पायलर फ्रन्टएण्ड -Comment[hu]=Grafikus felület fordítóprogramokhoz -Comment[it]=Interfaccia al compilatore -Comment[ja]=コンパイラフロントエンド -Comment[ms]=Frontend Penghimpun -Comment[nds]=Kompilerer-Böversiet -Comment[ne]=कम्पाइलर फ्रन्टइन्ड -Comment[nl]=Compiler-frontend -Comment[pl]=Interfejs do kompilatora -Comment[pt]=Interface de Compilador -Comment[pt_BR]=Frontend do Compilador -Comment[ru]=Интерфейс к компилятору -Comment[sk]=Rozhranie kompilátora -Comment[sl]=Vmesnik prevajalnika -Comment[sr]=Кориснички интерфејс за преводилац -Comment[sr@Latn]=Korisnički interfejs za prevodilac -Comment[sv]=Kompilatorgränssnitt -Comment[ta]=முன்பகுதி தொகுப்பான் -Comment[tg]=Интерфейс ба талфифгар -Comment[tr]=Derleyici Önucu -Comment[zh_CN]=编译器前端 -Comment[zh_TW]=編譯器前端介面 Name=KDevMakeView -Name[da]=TDevelop Make-visning -Name[de]=Make-Ausgabe (TDevelop) -Name[hi]=के-डेव-मेक-व्यू -Name[nds]=Make-Kieker (TDevelop) -Name[pl]=KDevWIdokMake -Name[sk]=KDev pohľad na make -Name[sv]=TDevelop byggvy -Name[ta]=KDev காட்சியாக்கு -Name[zh_TW]=TDevelop Make 檢視 + GenericName=Compiler Frontend -GenericName[ca]=Entorn per al compilador -GenericName[da]=Grænseflade til oversætter -GenericName[de]=Make-Ausgabe -GenericName[el]=Πρόγραμμα μεταγλωττιστή -GenericName[es]=Entorno para el compilador -GenericName[et]=Kompilaatori kasutajaliides -GenericName[eu]=Konpiladore interfazea -GenericName[fa]=پایانۀ مترجم -GenericName[fr]=Interface pour le compilateur -GenericName[ga]=Comhéadan Tiomsaitheora -GenericName[gl]=Frontal para o compilador -GenericName[hi]=कम्पायलर फ्रन्टएण्ड -GenericName[hu]=Grafikus felület fordítóprogramokhoz -GenericName[it]=Interfaccia al compilatore -GenericName[ja]=コンパイラフロントエンド -GenericName[ms]=Frontend Penghimpun -GenericName[nds]=Kompilerer-Böversiet -GenericName[ne]=कम्पाइलर फ्रन्टइन्ड -GenericName[nl]=Compiler-frontend -GenericName[pl]=Interfejs do kompilatora -GenericName[pt]=Interface de Compilador -GenericName[pt_BR]=Frontend do Compilador -GenericName[ru]=Интерфейс к компилятору -GenericName[sk]=Rozhranie kompilátor -GenericName[sl]=Vmesnik prevajalnika -GenericName[sr]=Кориснички интерфејс преводиоца -GenericName[sr@Latn]=Korisnički interfejs prevodioca -GenericName[sv]=Kompilatorgränssnitt -GenericName[ta]=முன் பகுதி தொகுப்பான் -GenericName[tg]=Интерфейс ба талфифгар -GenericName[tr]=Derleyici Önucu -GenericName[zh_CN]=编译器前端 -GenericName[zh_TW]=編譯器前端介面 + +Comment=Compiler Frontend + +Type=Service +Exec=blubb Icon=konsole X-TDE-ServiceTypes=TDevelop/MakeFrontend X-TDE-Library=libkdevmakeview diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h index f030f555..bf71a9e0 100644 --- a/parts/outputviews/makeactionfilter.h +++ b/parts/outputviews/makeactionfilter.h @@ -22,7 +22,7 @@ class ActionItem; class MakeActionFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 8b441e94..d1b1df76 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -26,12 +26,12 @@ #include "makewidget.h" -static const KDevPluginInfo data("kdevmakeview"); +static const KDevPluginInfo pluginData("kdevmakeview"); typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( pluginData ) ) MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) - : KDevMakeFrontend(&data, parent, name) + : KDevMakeFrontend(&pluginData, parent, name) { setInstance(MakeViewFactory::instance()); @@ -52,17 +52,17 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages")); TDEAction *action; - action = new TDEAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()), + action = new TDEAction( i18n("&Next Error"), Key_F4, m_widget, TQ_SLOT(nextError()), actionCollection(), "view_next_error"); action->setToolTip( i18n("Go to the next error") ); action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from.")); - action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()), + action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQ_SLOT(prevError()), actionCollection(), "view_previous_error"); action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from.")); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); } diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h index 89f2a8bd..b11d2f54 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -22,7 +22,7 @@ class MakeWidget; class MakeViewPart : public KDevMakeFrontend { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 029efdc6..f4287262 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -25,10 +25,10 @@ #include <kdebug.h> #include <tdelocale.h> #include <knotifyclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeglobal.h> -#include <kstandarddirs.h> -#include <kinstance.h> +#include <tdestandarddirs.h> +#include <tdeinstance.h> #include <kstatusbar.h> #include <tdeapplication.h> #include <tdeconfig.h> @@ -42,7 +42,7 @@ #include <tqfileinfo.h> #include <tqclipboard.h> #include <tqpopupmenu.h> -#include <tqrichtext_p.h> +#include <private/tqrichtext_p.h> #include <stdlib.h> #include <limits.h> @@ -178,44 +178,44 @@ MakeWidget::MakeWidget(MakeViewPart *part) dirstack.setAutoDelete(true); - childproc = new TDEProcess(TQT_TQOBJECT(this)); + childproc = new TDEProcess(this); procLineMaker = new ProcessLineMaker( childproc ); - connect( procLineMaker, TQT_SIGNAL(receivedStdoutLine(const TQCString&)), - this, TQT_SLOT(insertStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedStderrLine(const TQCString&)), - this, TQT_SLOT(insertStderrLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStdoutLine(const TQCString&)), - this, TQT_SLOT(storePartialStdoutLine(const TQCString&) )); - connect( procLineMaker, TQT_SIGNAL(receivedPartialStderrLine(const TQCString&)), - this, TQT_SLOT(storePartialStderrLine(const TQCString&) )); - - connect( childproc, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotProcessExited(TDEProcess*) )) ; - - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(EnteringDirectoryItem*)), - this, TQT_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); - connect( &m_directoryStatusFilter, TQT_SIGNAL(item(ExitingDirectoryItem*)), - this, TQT_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); - connect( &m_errorFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_actionFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - connect( &m_otherFilter, TQT_SIGNAL(item(MakeItem*)), - this, TQT_SLOT(insertItem(MakeItem*)) ); - - connect( verticalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(verticScrollingOn()) ); - connect( verticalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(verticScrollingOff()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderPressed()), - this, TQT_SLOT(horizScrollingOn()) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderReleased()), - this, TQT_SLOT(horizScrollingOff()) ); + connect( procLineMaker, TQ_SIGNAL(receivedStdoutLine(const TQCString&)), + this, TQ_SLOT(insertStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedStderrLine(const TQCString&)), + this, TQ_SLOT(insertStderrLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStdoutLine(const TQCString&)), + this, TQ_SLOT(storePartialStdoutLine(const TQCString&) )); + connect( procLineMaker, TQ_SIGNAL(receivedPartialStderrLine(const TQCString&)), + this, TQ_SLOT(storePartialStderrLine(const TQCString&) )); + + connect( childproc, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotProcessExited(TDEProcess*) )) ; + + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(EnteringDirectoryItem*)), + this, TQ_SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) ); + connect( &m_directoryStatusFilter, TQ_SIGNAL(item(ExitingDirectoryItem*)), + this, TQ_SLOT(slotExitedDirectory(ExitingDirectoryItem*)) ); + connect( &m_errorFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_actionFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + connect( &m_otherFilter, TQ_SIGNAL(item(MakeItem*)), + this, TQ_SLOT(insertItem(MakeItem*)) ); + + connect( verticalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(verticScrollingOn()) ); + connect( verticalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(verticScrollingOff()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderPressed()), + this, TQ_SLOT(horizScrollingOn()) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderReleased()), + this, TQ_SLOT(horizScrollingOff()) ); // this slot doesn't exist anymore -// connect( m_part->partController(), TQT_SIGNAL(loadedFile(const KURL&)), -// this, TQT_SLOT(slotDocumentOpened(const KURL&)) ); +// connect( m_part->partController(), TQ_SIGNAL(loadedFile(const KURL&)), +// this, TQ_SLOT(slotDocumentOpened(const KURL&)) ); } MakeWidget::~MakeWidget() @@ -342,7 +342,7 @@ void MakeWidget::copy() selection.replace(""","\""); selection.replace("&","&"); - kapp->clipboard()->setText(selection, TQClipboard::Clipboard); + tdeApp->clipboard()->setText(selection, TQClipboard::Clipboard); } void MakeWidget::nextError() @@ -389,7 +389,7 @@ void MakeWidget::prevError() void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e ) { TQTextEdit::contentsMouseReleaseEvent(e); - if ( e->button() != Qt::LeftButton ) + if ( e->button() != TQt::LeftButton ) return; searchItem(paragraphAt(e->pos())); } @@ -527,7 +527,7 @@ void MakeWidget::searchItem(int parag) void MakeWidget::insertStdoutLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) sline = TQString::fromAscii( stdoutbuf+line ); @@ -542,7 +542,7 @@ void MakeWidget::insertStdoutLine( const TQCString& line ) void MakeWidget::insertStderrLine( const TQCString& line ) { TQString sline; - bool forceCLocale = TDEConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); + bool forceCLocale = TDEConfigGroup( tdeApp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true ); if( forceCLocale ) { sline = TQString( stderrbuf+line ); @@ -588,7 +588,7 @@ void MakeWidget::slotProcessExited(TDEProcess *) // and its TDEProcess object can be reused. if (childproc->normalExit() && !childproc->exitStatus()) { - TQTimer::singleShot(0, this, TQT_SLOT(startNextJob())); + TQTimer::singleShot(0, this, TQ_SLOT(startNextJob())); // if (commandList.isEmpty()) // The last command on the list was successful so restore the // output view to what it had before the compilation process started @@ -698,23 +698,23 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) pMenu->setCheckable(true); pMenu->insertSeparator(); - int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_SLOT(toggleLineWrapping()) ); + int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQ_SLOT(toggleLineWrapping()) ); pMenu->setItemChecked(id, m_bLineWrapping); pMenu->setWhatsThis(id, i18n("<b>Line wrapping</b><p>Enables or disables wrapping of command lines displayed.")); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_SLOT(slotVeryShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQ_SLOT(slotVeryShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Very short compiler output</b><p>Displays only warnings, errors and the file names which are compiled.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eVeryShort); - id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_SLOT(slotShortCompilerOutput()) ); + id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQ_SLOT(slotShortCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Short compiler output</b><p>Suppresses all the compiler flags and formats to something readable.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eShort); - id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_SLOT(slotFullCompilerOutput()) ); + id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQ_SLOT(slotFullCompilerOutput()) ); pMenu->setWhatsThis(id, i18n("<b>Full compiler output</b><p>Displays unmodified compiler output.")); pMenu->setItemChecked(id, m_compilerOutputLevel == eFull); pMenu->insertSeparator(); - id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_SLOT(toggleShowDirNavigMessages())); + id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQ_SLOT(toggleShowDirNavigMessages())); pMenu->setWhatsThis(id, i18n("<b>Show directory navigation messages</b><p>Shows <b>cd</b> commands that are executed while building.")); pMenu->setItemChecked(id, DirectoryItem::getShowDirectoryMessages()); @@ -724,7 +724,7 @@ TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos ) void MakeWidget::toggleLineWrapping() { m_bLineWrapping = !m_bLineWrapping; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("LineWrapping", m_bLineWrapping); pConfig->sync(); @@ -759,7 +759,7 @@ void MakeWidget::slotFullCompilerOutput() { setTextFormat( TQt::RichText ); setC void MakeWidget::setCompilerOutputLevel(EOutputLevel level) { m_compilerOutputLevel = level; - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("CompilerOutputLevel", (int) level); pConfig->sync(); @@ -769,7 +769,7 @@ void MakeWidget::setCompilerOutputLevel(EOutputLevel level) void MakeWidget::toggleShowDirNavigMessages() { DirectoryItem::setShowDirectoryMessages( !DirectoryItem::getShowDirectoryMessages() ); - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("MakeOutputView"); pConfig->writeEntry("ShowDirNavigMsg", DirectoryItem::getShowDirectoryMessages()); pConfig->sync(); @@ -778,7 +778,7 @@ void MakeWidget::toggleShowDirNavigMessages() void MakeWidget::updateSettingsFromConfig() { - TDEConfig *pConfig = kapp->config(); + TDEConfig *pConfig = tdeApp->config(); pConfig->setGroup("General Options"); TQFont outputFont = pConfig->readFontEntry("OutputViewFont"); setFont(outputFont); diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h index b01c95c4..127ae064 100644 --- a/parts/outputviews/makewidget.h +++ b/parts/outputviews/makewidget.h @@ -36,7 +36,7 @@ namespace KTextEditor { class Document; } class MakeWidget : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h index 4bfc0733..849ecab9 100644 --- a/parts/outputviews/otherfilter.h +++ b/parts/outputviews/otherfilter.h @@ -20,7 +20,7 @@ class MakeItem; class OtherFilter : public TQObject, public OutputFilter { -Q_OBJECT +TQ_OBJECT public: |
