summaryrefslogtreecommitdiffstats
path: root/parts/outputviews
diff options
context:
space:
mode:
Diffstat (limited to 'parts/outputviews')
-rw-r--r--parts/outputviews/appoutputviewpart.cpp32
-rw-r--r--parts/outputviews/appoutputviewpart.h16
-rw-r--r--parts/outputviews/appoutputwidget.cpp102
-rw-r--r--parts/outputviews/appoutputwidget.h24
-rw-r--r--parts/outputviews/commandcontinuationfilter.cpp4
-rw-r--r--parts/outputviews/commandcontinuationfilter.h6
-rw-r--r--parts/outputviews/compileerrorfilter.cpp18
-rw-r--r--parts/outputviews/compileerrorfilter.h16
-rw-r--r--parts/outputviews/directorystatusmessagefilter.cpp72
-rw-r--r--parts/outputviews/directorystatusmessagefilter.h10
-rw-r--r--parts/outputviews/makeactionfilter.cpp34
-rw-r--r--parts/outputviews/makeactionfilter.h30
-rw-r--r--parts/outputviews/makeitem.cpp40
-rw-r--r--parts/outputviews/makeitem.h54
-rw-r--r--parts/outputviews/makeviewpart.cpp20
-rw-r--r--parts/outputviews/makeviewpart.h10
-rw-r--r--parts/outputviews/makewidget.cpp210
-rw-r--r--parts/outputviews/makewidget.h54
-rw-r--r--parts/outputviews/otherfilter.cpp2
-rw-r--r--parts/outputviews/otherfilter.h6
-rw-r--r--parts/outputviews/outputfilter.cpp2
-rw-r--r--parts/outputviews/outputfilter.h4
22 files changed, 383 insertions, 383 deletions
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp
index 79a62471..a21cf7db 100644
--- a/parts/outputviews/appoutputviewpart.cpp
+++ b/parts/outputviews/appoutputviewpart.cpp
@@ -11,8 +11,8 @@
#include "appoutputviewpart.h"
-#include <qwhatsthis.h>
-#include <qdir.h>
+#include <tqwhatsthis.h>
+#include <tqdir.h>
#include <kdebug.h>
#include <klocale.h>
#include <kaction.h>
@@ -33,7 +33,7 @@ static const KDevPluginInfo data("kdevappoutputview");
typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory;
K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) )
-AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QStringList &)
+AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &)
: KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart")
{
setInstance(AppViewFactory::instance());
@@ -43,7 +43,7 @@ AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QS
m_widget = new AppOutputWidget(this);
m_widget->setIcon( SmallIcon("openterm") );
m_widget->setCaption(i18n("Application Output"));
- QWhatsThis::add(m_widget, i18n("<b>Application output</b><p>"
+ TQWhatsThis::add(m_widget, i18n("<b>Application output</b><p>"
"The stdout/stderr output window is a replacement for "
"terminal-based application communication. Running terminal "
"applications use this instead of a terminal window."));
@@ -51,10 +51,10 @@ AppOutputViewPart::AppOutputViewPart(QObject *parent, const char *name, const QS
mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program"));
hideView();
- connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)),
- this, SLOT(slotStopButtonClicked(KDevPlugin*)) );
- connect(m_widget, SIGNAL(processExited(KProcess*)), this, SLOT(slotProcessExited()));
- connect(m_widget, SIGNAL(processExited(KProcess*)), SIGNAL(processExited()));
+ connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+ this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
+ connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited()));
+ connect(m_widget, TQT_SIGNAL(processExited(KProcess*)), TQT_SIGNAL(processExited()));
}
@@ -92,15 +92,15 @@ void AppOutputViewPart::slotProcessExited()
* If inTerminal is true, the program is started in an external
* konsole.
*/
-void AppOutputViewPart::startAppCommand(const QString &directory, const QString &program, bool inTerminal)
+void AppOutputViewPart::startAppCommand(const TQString &directory, const TQString &program, bool inTerminal)
{
- QString cmd;
+ TQString cmd;
if (inTerminal) {
cmd = Settings::terminalEmulatorName( *kapp->config() );
if ( cmd == "konsole" && !directory.isNull() ) { // isn't setting the working directory below enough?
// If a directory was specified, use it
- cmd += QString(" --workdir '%1'").arg(directory);
+ cmd += TQString(" --workdir '%1'").arg(directory);
}
cmd += " -e /bin/sh -c '";
cmd += program;
@@ -114,7 +114,7 @@ void AppOutputViewPart::startAppCommand(const QString &directory, const QString
if ( directory.isNull() )
// use the user's home directory
- m_widget->startJob(QDir::homeDirPath(), cmd);
+ m_widget->startJob(TQDir::homeDirPath(), cmd);
else
// use the supplied directory
m_widget->startJob(directory, cmd);
@@ -132,13 +132,13 @@ bool AppOutputViewPart::isRunning()
}
-void AppOutputViewPart::insertStdoutLine(const QCString &line)
+void AppOutputViewPart::insertStdoutLine(const TQCString &line)
{
m_widget->insertStdoutLine(line);
}
-void AppOutputViewPart::insertStderrLine(const QCString &line)
+void AppOutputViewPart::insertStderrLine(const TQCString &line)
{
m_widget->insertStderrLine(line);
}
@@ -165,12 +165,12 @@ bool AppOutputViewPart::isViewVisible()
return m_viewIsVisible;
}
-void AppOutputViewPart::addPartialStderrLine(const QCString & line)
+void AppOutputViewPart::addPartialStderrLine(const TQCString & line)
{
m_widget->addPartialStderrLine(line);
}
-void AppOutputViewPart::addPartialStdoutLine(const QCString & line)
+void AppOutputViewPart::addPartialStdoutLine(const TQCString & line)
{
m_widget->addPartialStdoutLine(line);
}
diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h
index 76d708f9..b0b0982a 100644
--- a/parts/outputviews/appoutputviewpart.h
+++ b/parts/outputviews/appoutputviewpart.h
@@ -12,7 +12,7 @@
#ifndef _APPOUTPUTVIEWSPART_H_
#define _APPOUTPUTVIEWSPART_H_
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include "kdevappfrontend.h"
#include "KDevAppFrontendIface.h"
@@ -25,16 +25,16 @@ class AppOutputViewPart : public KDevAppFrontend
Q_OBJECT
public:
- AppOutputViewPart( QObject *parent, const char *name, const QStringList & );
+ AppOutputViewPart( TQObject *parent, const char *name, const TQStringList & );
~AppOutputViewPart();
- virtual void startAppCommand(const QString &directory, const QString &command, bool inTerminal);
+ virtual void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal);
virtual void stopApplication();
virtual bool isRunning();
- virtual void insertStdoutLine(const QCString &line);
- virtual void insertStderrLine(const QCString &line);
- virtual void addPartialStdoutLine(const QCString &line);
- virtual void addPartialStderrLine(const QCString &line);
+ virtual void insertStdoutLine(const TQCString &line);
+ virtual void insertStderrLine(const TQCString &line);
+ virtual void addPartialStdoutLine(const TQCString &line);
+ virtual void addPartialStderrLine(const TQCString &line);
virtual void clearView();
void hideView();
void showView();
@@ -48,7 +48,7 @@ private slots:
void slotProcessExited();
private:
- QGuardedPtr<AppOutputWidget> m_widget;
+ TQGuardedPtr<AppOutputWidget> m_widget;
KDevAppFrontendIface *m_dcop;
bool m_viewIsVisible;
};
diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp
index e3c3810a..c58065a2 100644
--- a/parts/outputviews/appoutputwidget.cpp
+++ b/parts/outputviews/appoutputwidget.cpp
@@ -14,13 +14,13 @@
#include "appoutputwidget.h"
-#include <qregexp.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qclipboard.h>
+#include <tqregexp.h>
+#include <tqbuttongroup.h>
+#include <tqcheckbox.h>
+#include <tqradiobutton.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include <tqclipboard.h>
#include <klocale.h>
#include <kdebug.h>
@@ -40,13 +40,13 @@
AppOutputWidget::AppOutputWidget(AppOutputViewPart* part)
: ProcessWidget(0, "app output widget"), m_part(part)
{
- connect(this, SIGNAL(executed(QListBoxItem*)), SLOT(slotRowSelected(QListBoxItem*)));
- connect(this, SIGNAL(rightButtonClicked( QListBoxItem *, const QPoint & )),
- SLOT(slotContextMenu( QListBoxItem *, const QPoint & )));
+ connect(this, TQT_SIGNAL(executed(TQListBoxItem*)), TQT_SLOT(slotRowSelected(TQListBoxItem*)));
+ connect(this, TQT_SIGNAL(rightButtonClicked( TQListBoxItem *, const TQPoint & )),
+ TQT_SLOT(slotContextMenu( TQListBoxItem *, const TQPoint & )));
KConfig *config = kapp->config();
config->setGroup("General Options");
setFont(config->readFontEntry("OutputViewFont"));
- setSelectionMode(QListBox::Extended);
+ setSelectionMode(TQListBox::Extended);
}
void AppOutputWidget::clearViewAndContents()
@@ -70,11 +70,11 @@ void AppOutputWidget::childFinished(bool normal, int status)
}
-void AppOutputWidget::slotRowSelected(QListBoxItem* row)
+void AppOutputWidget::slotRowSelected(TQListBoxItem* row)
{
- static QRegExp assertMatch("ASSERT: \\\"([^\\\"]+)\\\" in ([^\\( ]+) \\(([\\d]+)\\)");
- static QRegExp lineInfoMatch("\\[([^:]+):([\\d]+)\\]");
- static QRegExp rubyErrorMatch("([^:\\s]+\\.rb):([\\d]+):?.*$");
+ static TQRegExp assertMatch("ASSERT: \\\"([^\\\"]+)\\\" in ([^\\( ]+) \\(([\\d]+)\\)");
+ static TQRegExp lineInfoMatch("\\[([^:]+):([\\d]+)\\]");
+ static TQRegExp rubyErrorMatch("([^:\\s]+\\.rb):([\\d]+):?.*$");
if (row) {
if (assertMatch.exactMatch(row->text())) {
@@ -87,7 +87,7 @@ void AppOutputWidget::slotRowSelected(QListBoxItem* row)
m_part->mainWindow()->statusBar()->message(row->text(), 10000);
m_part->mainWindow()->lowerView(this);
} else if (rubyErrorMatch.search(row->text()) != -1) {
- QString file;
+ TQString file;
if (rubyErrorMatch.cap(1).startsWith("/")) {
file = rubyErrorMatch.cap(1);
} else {
@@ -101,7 +101,7 @@ void AppOutputWidget::slotRowSelected(QListBoxItem* row)
}
-void AppOutputWidget::insertStdoutLine(const QCString &line)
+void AppOutputWidget::insertStdoutLine(const TQCString &line)
{
// kdDebug(9004) << k_funcinfo << line << endl;
@@ -110,17 +110,17 @@ void AppOutputWidget::insertStdoutLine(const QCString &line)
m_part->showView();
}
- QString sline;
+ TQString sline;
if( !stdoutbuf.isEmpty() )
{
- sline = QString::fromLocal8Bit( stdoutbuf+line );
+ sline = TQString::fromLocal8Bit( stdoutbuf+line );
stdoutbuf.truncate( 0 );
}else
{
- sline = QString::fromLocal8Bit( line );
+ sline = TQString::fromLocal8Bit( line );
}
- m_contentList.append(QString("o-")+sline);
+ m_contentList.append(TQString("o-")+sline);
if ( filterSingleLine( sline ) )
{
ProcessWidget::insertStdoutLine( sline.local8Bit() );
@@ -128,7 +128,7 @@ void AppOutputWidget::insertStdoutLine(const QCString &line)
}
-void AppOutputWidget::insertStderrLine(const QCString &line)
+void AppOutputWidget::insertStderrLine(const TQCString &line)
{
// kdDebug(9004) << k_funcinfo << line << endl;
@@ -138,17 +138,17 @@ void AppOutputWidget::insertStderrLine(const QCString &line)
}
- QString sline;
+ TQString sline;
if( !stderrbuf.isEmpty() )
{
- sline = QString::fromLocal8Bit( stderrbuf+line );
+ sline = TQString::fromLocal8Bit( stderrbuf+line );
stderrbuf.truncate( 0 );
}else
{
- sline = QString::fromLocal8Bit( line );
+ sline = TQString::fromLocal8Bit( line );
}
- m_contentList.append(QString("e-")+sline);
+ m_contentList.append(TQString("e-")+sline);
if ( filterSingleLine( sline ) )
{
ProcessWidget::insertStderrLine( sline.local8Bit() );
@@ -162,7 +162,7 @@ void AppOutputWidget::editFilter()
dlg.regularExpression->setChecked( m_filter.m_isRegExp );
dlg.filterString->setText( m_filter.m_filterString );
- if ( dlg.exec() == QDialog::Accepted )
+ if ( dlg.exec() == TQDialog::Accepted )
{
m_filter.m_caseSensitive = dlg.caseSensitive->isChecked();
m_filter.m_isRegExp = dlg.regularExpression->isChecked();
@@ -174,13 +174,13 @@ void AppOutputWidget::editFilter()
}
}
-bool AppOutputWidget::filterSingleLine(const QString & line)
+bool AppOutputWidget::filterSingleLine(const TQString & line)
{
if ( !m_filter.m_isActive ) return true;
if ( m_filter.m_isRegExp )
{
- return ( line.find( QRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
+ return ( line.find( TQRegExp( m_filter.m_filterString, m_filter.m_caseSensitive, false ) ) != -1 );
}
else
{
@@ -192,7 +192,7 @@ void AppOutputWidget::reinsertAndFilter()
{
//copy the first item from the listbox
//if a programm was started, this contains the issued command
- QString issuedCommand;
+ TQString issuedCommand;
if ( count() > 0 )
{
setTopItem(0);
@@ -208,12 +208,12 @@ void AppOutputWidget::reinsertAndFilter()
}
//grep through the list for items matching the filter...
- QStringList strListFound;
+ TQStringList strListFound;
if ( m_filter.m_isActive )
{
if ( m_filter.m_isRegExp )
{
- strListFound = m_contentList.grep( QRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
+ strListFound = m_contentList.grep( TQRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
}
else
{
@@ -226,7 +226,7 @@ void AppOutputWidget::reinsertAndFilter()
}
//... and reinsert the found items into the listbox
- for ( QStringList::Iterator it = strListFound.begin(); it != strListFound.end(); ++it )
+ for ( TQStringList::Iterator it = strListFound.begin(); it != strListFound.end(); ++it )
{
if ((*it).startsWith("o-"))
{
@@ -247,28 +247,28 @@ void AppOutputWidget::clearFilter()
reinsertAndFilter();
}
-void AppOutputWidget::slotContextMenu( QListBoxItem *, const QPoint &p )
+void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p )
{
KPopupMenu popup(this, "filter output");
- int id = popup.insertItem( i18n("Clear output"), this, SLOT(clearViewAndContents()) );
+ int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) );
popup.setItemEnabled( id, m_contentList.size() > 0 );
- popup.insertItem( i18n("Copy selected lines"), this, SLOT(copySelected()) );
+ popup.insertItem( i18n("Copy selected lines"), this, TQT_SLOT(copySelected()) );
popup.insertSeparator();
- popup.insertItem( i18n("Save unfiltered"), this, SLOT(saveAll()) );
- id = popup.insertItem( i18n("Save filtered output"), this, SLOT(saveFiltered()) );
+ popup.insertItem( i18n("Save unfiltered"), this, TQT_SLOT(saveAll()) );
+ id = popup.insertItem( i18n("Save filtered output"), this, TQT_SLOT(saveFiltered()) );
popup.setItemEnabled( id, m_filter.m_isActive );
popup.insertSeparator();
- id = popup.insertItem( i18n("Clear filter"), this, SLOT(clearFilter()) );
+ id = popup.insertItem( i18n("Clear filter"), this, TQT_SLOT(clearFilter()) );
popup.setItemEnabled( id, m_filter.m_isActive );
- popup.insertItem( i18n("Edit filter"), this, SLOT(editFilter() ) );
+ popup.insertItem( i18n("Edit filter"), this, TQT_SLOT(editFilter() ) );
popup.insertSeparator();
- popup.insertItem( i18n("Hide view"), this, SLOT(hideView()) );
+ popup.insertItem( i18n("Hide view"), this, TQT_SLOT(hideView()) );
popup.exec(p);
}
@@ -290,16 +290,16 @@ void AppOutputWidget::saveFiltered()
void AppOutputWidget::saveOutputToFile(bool useFilter)
{
- QString filename = KFileDialog::getSaveFileName();
+ TQString filename = KFileDialog::getSaveFileName();
if ( filename.isEmpty() ) return;
- QStringList contents;
+ TQStringList contents;
if ( useFilter && m_filter.m_isActive )
{
if ( m_filter.m_isRegExp )
{
- contents = m_contentList.grep( QRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
+ contents = m_contentList.grep( TQRegExp(m_filter.m_filterString, m_filter.m_caseSensitive, false ) );
}
else
{
@@ -311,14 +311,14 @@ void AppOutputWidget::saveOutputToFile(bool useFilter)
contents = m_contentList;
}
- QFile file( filename );
+ TQFile file( filename );
if ( file.open( IO_WriteOnly ) )
{
- QTextStream ostream( &file );
- QStringList::ConstIterator it = contents.begin();
+ TQTextStream ostream( &file );
+ TQStringList::ConstIterator it = contents.begin();
while( it != contents.end() )
{
- QString line = *it;
+ TQString line = *it;
if ( line.startsWith("o-") || line.startsWith("e-") )
{
line.remove( 0, 2 );
@@ -333,7 +333,7 @@ void AppOutputWidget::saveOutputToFile(bool useFilter)
void AppOutputWidget::copySelected()
{
uint n = count();
- QString buffer;
+ TQString buffer;
for (uint i = 0; i < n; i++)
{
if (isSelected(i))
@@ -342,12 +342,12 @@ void AppOutputWidget::copySelected()
kapp->clipboard()->setText(buffer, QClipboard::Clipboard);
}
-void AppOutputWidget::addPartialStderrLine(const QCString & line)
+void AppOutputWidget::addPartialStderrLine(const TQCString & line)
{
stderrbuf += line;
}
-void AppOutputWidget::addPartialStdoutLine(const QCString & line)
+void AppOutputWidget::addPartialStdoutLine(const TQCString & line)
{
stdoutbuf += line;
}
diff --git a/parts/outputviews/appoutputwidget.h b/parts/outputviews/appoutputwidget.h
index 9a0d1e71..0673f106 100644
--- a/parts/outputviews/appoutputwidget.h
+++ b/parts/outputviews/appoutputwidget.h
@@ -12,7 +12,7 @@
#ifndef _APPOUTPUTWIDGET_H_
#define _APPOUTPUTWIDGET_H_
-#include <qstringlist.h>
+#include <tqstringlist.h>
#include <kregexp.h>
#include "processwidget.h"
@@ -29,12 +29,12 @@ public:
// clears our own store and the one of our base ProcessWidget
public slots:
- void slotRowSelected(QListBoxItem* row);
- void insertStdoutLine(const QCString &line);
- void insertStderrLine(const QCString &line);
- void addPartialStdoutLine(const QCString &line);
- void addPartialStderrLine(const QCString &line);
- void slotContextMenu(QListBoxItem *, const QPoint &);
+ void slotRowSelected(TQListBoxItem* row);
+ void insertStdoutLine(const TQCString &line);
+ void insertStderrLine(const TQCString &line);
+ void addPartialStdoutLine(const TQCString &line);
+ void addPartialStderrLine(const TQCString &line);
+ void slotContextMenu(TQListBoxItem *, const TQPoint &);
void hideView();
void clearViewAndContents();
void clearFilter();
@@ -47,9 +47,9 @@ private:
virtual void childFinished(bool normal, int status);
void saveOutputToFile( bool useFilter );
void reinsertAndFilter();
- bool filterSingleLine( const QString & line );
+ bool filterSingleLine( const TQString & line );
- QStringList m_contentList;
+ TQStringList m_contentList;
struct OutputFilter
{
@@ -57,13 +57,13 @@ private:
bool m_isActive;
bool m_isRegExp;
bool m_caseSensitive;
- QString m_filterString;
+ TQString m_filterString;
};
AppOutputViewPart* m_part;
OutputFilter m_filter;
- QCString stdoutbuf;
- QCString stderrbuf;
+ TQCString stdoutbuf;
+ TQCString stderrbuf;
};
#endif
diff --git a/parts/outputviews/commandcontinuationfilter.cpp b/parts/outputviews/commandcontinuationfilter.cpp
index 474cec15..e33a7a6a 100644
--- a/parts/outputviews/commandcontinuationfilter.cpp
+++ b/parts/outputviews/commandcontinuationfilter.cpp
@@ -10,7 +10,7 @@
***************************************************************************/
#include "commandcontinuationfilter.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kdebug.h>
CommandContinuationFilter::CommandContinuationFilter( OutputFilter& next )
@@ -18,7 +18,7 @@ CommandContinuationFilter::CommandContinuationFilter( OutputFilter& next )
{
}
-void CommandContinuationFilter::processLine( const QString& line )
+void CommandContinuationFilter::processLine( const TQString& line )
{
int index=line.length()-1;
while (index>=0)
diff --git a/parts/outputviews/commandcontinuationfilter.h b/parts/outputviews/commandcontinuationfilter.h
index d0239caf..fff8e5aa 100644
--- a/parts/outputviews/commandcontinuationfilter.h
+++ b/parts/outputviews/commandcontinuationfilter.h
@@ -13,17 +13,17 @@
#define CommandContinuationFilter_h
#include "outputfilter.h"
-#include <qstring.h>
+#include <tqstring.h>
class CommandContinuationFilter : public OutputFilter
{
public:
CommandContinuationFilter( OutputFilter& );
- void processLine( const QString& line );
+ void processLine( const TQString& line );
private:
- QString m_text;
+ TQString m_text;
};
#endif
diff --git a/parts/outputviews/compileerrorfilter.cpp b/parts/outputviews/compileerrorfilter.cpp
index f8246346..9d48f1c8 100644
--- a/parts/outputviews/compileerrorfilter.cpp
+++ b/parts/outputviews/compileerrorfilter.cpp
@@ -23,7 +23,7 @@ CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int
{
}
-CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int line, int text, QString comp )
+CompileErrorFilter::ErrorFormat::ErrorFormat( const char * regExp, int file, int line, int text, TQString comp )
: expression( regExp )
, fileGroup( file )
, lineGroup( line )
@@ -75,13 +75,13 @@ CompileErrorFilter::ErrorFormat* CompileErrorFilter::errorFormats()
}
-void CompileErrorFilter::processLine( const QString& line )
+void CompileErrorFilter::processLine( const TQString& line )
{
bool hasmatch = false;
- QString file;
+ TQString file;
int lineNum = 0;
- QString text;
- QString compiler;
+ TQString text;
+ TQString compiler;
int i = 0;
bool isWarning = false;
bool isInstantiationInfo = false;
@@ -89,7 +89,7 @@ void CompileErrorFilter::processLine( const QString& line )
ErrorFormat* format = &errFormats[i];
while( !format->expression.isEmpty() )
{
- QRegExp& regExp = format->expression;
+ TQRegExp& regExp = format->expression;
if ( regExp.search( line ) != -1 ) {
hasmatch = true;
@@ -97,7 +97,7 @@ void CompileErrorFilter::processLine( const QString& line )
lineNum = regExp.cap( format->lineGroup ).toInt() - 1;
text = regExp.cap( format->textGroup );
compiler = format->compiler;
- QString cap = regExp.cap(3);
+ TQString cap = regExp.cap(3);
if (cap.contains("warning:", false) || cap.contains("Warnung:", false))
isWarning = true;
if (regExp.cap(3).contains("instantiated from", false)) {
@@ -112,8 +112,8 @@ void CompileErrorFilter::processLine( const QString& line )
if( hasmatch )
{
// Add hacks for error strings you want excluded here
- if( text.find( QString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0
- || text.find( QString::fromLatin1("for each function it appears in.)") ) >= 0 )
+ if( text.find( TQString::fromLatin1("(Each undeclared identifier is reported only once") ) >= 0
+ || text.find( TQString::fromLatin1("for each function it appears in.)") ) >= 0 )
hasmatch = false;
}
diff --git a/parts/outputviews/compileerrorfilter.h b/parts/outputviews/compileerrorfilter.h
index d07495cf..2f67adaf 100644
--- a/parts/outputviews/compileerrorfilter.h
+++ b/parts/outputviews/compileerrorfilter.h
@@ -12,14 +12,14 @@
#ifndef CompileErrorFilter_h
#define CompileErrorFilter_h
-#include <qobject.h>
-#include <qregexp.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqregexp.h>
+#include <tqvaluelist.h>
#include "outputfilter.h"
class MakeItem;
-class CompileErrorFilter : public QObject, public OutputFilter
+class CompileErrorFilter : public TQObject, public OutputFilter
{
Q_OBJECT
@@ -30,16 +30,16 @@ public:
{
ErrorFormat() {}
ErrorFormat( const char *, int, int, int );
- ErrorFormat( const char *, int, int, int, QString );
- QRegExp expression;
+ ErrorFormat( const char *, int, int, int, TQString );
+ TQRegExp expression;
int fileGroup;
int lineGroup;
int textGroup;
- QString compiler;
+ TQString compiler;
};
static ErrorFormat* errorFormats();
- void processLine( const QString& line );
+ void processLine( const TQString& line );
signals:
void item( MakeItem* );
diff --git a/parts/outputviews/directorystatusmessagefilter.cpp b/parts/outputviews/directorystatusmessagefilter.cpp
index 5738f41d..02629797 100644
--- a/parts/outputviews/directorystatusmessagefilter.cpp
+++ b/parts/outputviews/directorystatusmessagefilter.cpp
@@ -13,7 +13,7 @@
#include "directorystatusmessagefilter.moc"
#include "makeitem.h"
-#include <qregexp.h>
+#include <tqregexp.h>
#include <kdebug.h>
DirectoryStatusMessageFilter::DirectoryStatusMessageFilter( OutputFilter& next )
@@ -21,9 +21,9 @@ DirectoryStatusMessageFilter::DirectoryStatusMessageFilter( OutputFilter& next )
{
}
-void DirectoryStatusMessageFilter::processLine( const QString& line )
+void DirectoryStatusMessageFilter::processLine( const TQString& line )
{
- QString dir;
+ TQString dir;
if ( matchEnterDir( line, dir ) )
{
emit item( new EnteringDirectoryItem( dir, line ) );
@@ -40,7 +40,7 @@ void DirectoryStatusMessageFilter::processLine( const QString& line )
// simple helper function - checks whether we entered a new directory
// (locale and Utf8 aware)
-bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString& dir )
+bool DirectoryStatusMessageFilter::matchEnterDir( const TQString& line, TQString& dir )
{
// make outputs localised strings in Utf8 for entering/leaving directories...
static const unsigned short fr_enter[] =
@@ -70,28 +70,28 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString&
0x412,0x445,0x43e,0x434,0x20,0x432,0x20,0x43a,0x430,0x442,0x430,0x43b,0x43e,0x433
};
- static const QString fr_e( (const QChar*)fr_enter, sizeof(fr_enter) / 2 );
- static const QString pl_e( (const QChar*)pl_enter, sizeof(pl_enter) / 2 );
- static const QString ja_e( (const QChar*)ja_enter, sizeof(ja_enter) / 2 );
- static const QString ko_e( (const QChar*)ko_enter, sizeof(ko_enter) / 2 );
- static const QString ko_b( (const QChar*)ko_behind, sizeof(ko_behind) / 2 );
- static const QString pt_br_e( (const QChar*)pt_br_enter, sizeof(pt_br_enter) / 2 );
- static const QString ru_e( (const QChar*)ru_enter, sizeof(ru_enter) / 2 );
- static const QString en_e("Entering directory");
- static const QString de_e1("Wechsel in das Verzeichnis Verzeichnis");
- static const QString de_e2("Wechsel in das Verzeichnis");
- static const QString es_e("Cambiando a directorio");
- static const QString nl_e("Binnengaan van directory");
+ static const TQString fr_e( (const TQChar*)fr_enter, sizeof(fr_enter) / 2 );
+ static const TQString pl_e( (const TQChar*)pl_enter, sizeof(pl_enter) / 2 );
+ static const TQString ja_e( (const TQChar*)ja_enter, sizeof(ja_enter) / 2 );
+ static const TQString ko_e( (const TQChar*)ko_enter, sizeof(ko_enter) / 2 );
+ static const TQString ko_b( (const TQChar*)ko_behind, sizeof(ko_behind) / 2 );
+ static const TQString pt_br_e( (const TQChar*)pt_br_enter, sizeof(pt_br_enter) / 2 );
+ static const TQString ru_e( (const TQChar*)ru_enter, sizeof(ru_enter) / 2 );
+ static const TQString en_e("Entering directory");
+ static const TQString de_e1("Wechsel in das Verzeichnis Verzeichnis");
+ static const TQString de_e2("Wechsel in das Verzeichnis");
+ static const TQString es_e("Cambiando a directorio");
+ static const TQString nl_e("Binnengaan van directory");
//@todo: other translations!
- // we need a QRegExp because KRegExp is not Utf8 aware.
+ // we need a TQRegExp because KRegExp is not Utf8 aware.
// 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- static QRegExp dirChange(QString::fromLatin1(".*: (.+) (`|") + QChar(0x00BB) + QString::fromLatin1(")(.*)('|") + QChar(0x00AB) + QString::fromLatin1(")(.*)"));
- static QRegExp enEnter(QString::fromLatin1(".*: Entering directory"));
+ static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
+ static TQRegExp enEnter(TQString::fromLatin1(".*: Entering directory"));
kdDebug(9004) << "Directory filter line " << line << endl;
- // avoid QRegExp if possible. This regex performs VERY badly with large inputs,
+ // avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
// and the input required is very short if these strings match.
if(line.find(en_e) > -1 ||
line.find(fr_e) > -1 ||
@@ -118,7 +118,7 @@ bool DirectoryStatusMessageFilter::matchEnterDir( const QString& line, QString&
// simple helper function - checks whether we left a directory
// (locale and Utf8 aware).
-bool DirectoryStatusMessageFilter::matchLeaveDir( const QString& line, QString& dir )
+bool DirectoryStatusMessageFilter::matchLeaveDir( const TQString& line, TQString& dir )
{
static const unsigned short fr_leave[] =
{ 'Q','u','i','t','t','e',' ','l','e',' ','r',0xe9,'p','e','r','t','o','i','r','e'
@@ -143,26 +143,26 @@ bool DirectoryStatusMessageFilter::matchLeaveDir( const QString& line, QString&
0x20,0xb514,0xb809,0xd1a0,0xb9ac
};
- static const QString fr_l( (const QChar*)fr_leave, sizeof(fr_leave) / 2 );
- static const QString ja_l( (const QChar*)ja_leave, sizeof(ja_leave) / 2 );
- static const QString ko_l( (const QChar*)ko_leave, sizeof(ko_leave) / 2 );
- static const QString ko_b( (const QChar*)ko_behind, sizeof(ko_behind) / 2 );
- static const QString pt_br_l( (const QChar*)pt_br_leave, sizeof(pt_br_leave) / 2 );
- static const QString ru_l( (const QChar*)ru_leave, sizeof(ru_leave) / 2 );
- static const QString en_l("Leaving directory");
- static const QString de_l1("Verlassen des Verzeichnisses Verzeichnis");
- static const QString de_l2("Verlassen des Verzeichnisses");
- static const QString es_l("Saliendo directorio");
- static const QString nl_l("Verdwijnen uit directory");
- static const QString po_l("Opuszczam katalog");
+ static const TQString fr_l( (const TQChar*)fr_leave, sizeof(fr_leave) / 2 );
+ static const TQString ja_l( (const TQChar*)ja_leave, sizeof(ja_leave) / 2 );
+ static const TQString ko_l( (const TQChar*)ko_leave, sizeof(ko_leave) / 2 );
+ static const TQString ko_b( (const TQChar*)ko_behind, sizeof(ko_behind) / 2 );
+ static const TQString pt_br_l( (const TQChar*)pt_br_leave, sizeof(pt_br_leave) / 2 );
+ static const TQString ru_l( (const TQChar*)ru_leave, sizeof(ru_leave) / 2 );
+ static const TQString en_l("Leaving directory");
+ static const TQString de_l1("Verlassen des Verzeichnisses Verzeichnis");
+ static const TQString de_l2("Verlassen des Verzeichnisses");
+ static const TQString es_l("Saliendo directorio");
+ static const TQString nl_l("Verdwijnen uit directory");
+ static const TQString po_l("Opuszczam katalog");
- // we need a QRegExp because KRegExp is not Utf8 aware.
+ // we need a TQRegExp because KRegExp is not Utf8 aware.
// 0x00AB is LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
// 0X00BB is RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- static QRegExp dirChange(QString::fromLatin1(".*: (.+) (`|") + QChar(0x00BB) + QString::fromLatin1(")(.*)('|") + QChar(0x00AB) + QString::fromLatin1(")(.*)"));
+ static TQRegExp dirChange(TQString::fromLatin1(".*: (.+) (`|") + TQChar(0x00BB) + TQString::fromLatin1(")(.*)('|") + TQChar(0x00AB) + TQString::fromLatin1(")(.*)"));
- // avoid QRegExp if possible. This regex performs VERY badly with large inputs,
+ // avoid TQRegExp if possible. This regex performs VERY badly with large inputs,
// and the input required is very short if these strings match.
if(line.find(en_l) > -1 ||
line.find(fr_l) > -1 ||
diff --git a/parts/outputviews/directorystatusmessagefilter.h b/parts/outputviews/directorystatusmessagefilter.h
index 18972487..0d57e52d 100644
--- a/parts/outputviews/directorystatusmessagefilter.h
+++ b/parts/outputviews/directorystatusmessagefilter.h
@@ -12,28 +12,28 @@
#ifndef DirectoryStatusMessageFilter_h
#define DirectoryStatusMessageFilter_h
-#include <qobject.h>
+#include <tqobject.h>
#include "outputfilter.h"
class EnteringDirectoryItem;
class ExitingDirectoryItem;
-class DirectoryStatusMessageFilter : public QObject, public OutputFilter
+class DirectoryStatusMessageFilter : public TQObject, public OutputFilter
{
Q_OBJECT
public:
DirectoryStatusMessageFilter( OutputFilter& );
- void processLine( const QString& line );
+ void processLine( const TQString& line );
signals:
void item( EnteringDirectoryItem* );
void item( ExitingDirectoryItem* );
private:
- bool matchEnterDir( const QString& line, QString& dir );
- bool matchLeaveDir( const QString& line, QString& dir );
+ bool matchEnterDir( const TQString& line, TQString& dir );
+ bool matchLeaveDir( const TQString& line, TQString& dir );
};
#endif
diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp
index bbcc61fb..4edaae2b 100644
--- a/parts/outputviews/makeactionfilter.cpp
+++ b/parts/outputviews/makeactionfilter.cpp
@@ -9,7 +9,7 @@
* *
***************************************************************************/
-#include <qdatetime.h>
+#include <tqdatetime.h>
#include <kdebug.h>
#include "makeactionfilter.h"
@@ -20,7 +20,7 @@
//#define DEBUG
-MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QString& _tool, const char * regExp, int file )
+MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, const TQString& _tool, const char * regExp, int file )
: m_action( _action )
, m_expression( regExp )
, m_tool( _tool )
@@ -29,7 +29,7 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, const QStr
{
}
-MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool, int file, const char * regExp)
+MakeActionFilter::ActionFormat::ActionFormat( const TQString& _action, int tool, int file, const char * regExp)
: m_action( _action )
, m_expression( regExp )
, m_tool()
@@ -38,19 +38,19 @@ MakeActionFilter::ActionFormat::ActionFormat( const QString& _action, int tool,
{
}
-QString MakeActionFilter::ActionFormat::tool()
+TQString MakeActionFilter::ActionFormat::tool()
{
if (m_toolGroup==-1)
return m_tool;
return m_expression.cap(m_toolGroup);
}
-QString MakeActionFilter::ActionFormat::file()
+TQString MakeActionFilter::ActionFormat::file()
{
return m_expression.cap(m_fileGroup);
}
-bool MakeActionFilter::ActionFormat::matches(const QString& line)
+bool MakeActionFilter::ActionFormat::matches(const TQString& line)
{
return ( m_expression.search( line ) != -1 );
}
@@ -96,13 +96,13 @@ MakeActionFilter::ActionFormat* MakeActionFilter::actionFormats()
ActionFormat( i18n("compiling"), "dcopidl2cpp", "dcopidl2cpp (?:\\S* )*([^\\s;]+)", 1 ),
ActionFormat( i18n("installing"), 1, 1, "-- Installing (.*)" ), //cmake
- ActionFormat( QString::null, QString::null, 0, 0 )
+ ActionFormat( TQString::null, TQString::null, 0, 0 )
};
return formats;
}
-void MakeActionFilter::processLine( const QString& line )
+void MakeActionFilter::processLine( const TQString& line )
{
ActionItem* actionItem = matchLine( line );
if ( actionItem != NULL )
@@ -115,10 +115,10 @@ void MakeActionFilter::processLine( const QString& line )
}
}
-ActionItem* MakeActionFilter::matchLine( const QString& line )
+ActionItem* MakeActionFilter::matchLine( const TQString& line )
{
#ifdef DEBUG
- QTime t;
+ TQTime t;
t.start();
#endif
/// \FIXME This is very slow, possibly due to the regexr matching. It can take
@@ -148,23 +148,23 @@ ActionItem* MakeActionFilter::matchLine( const QString& line )
struct TestItem
{
TestItem() {}
- TestItem( const QString& _line, const QString& _action, const QString& _tool, const QString& _file )
+ TestItem( const TQString& _line, const TQString& _action, const TQString& _tool, const TQString& _file )
: line( _line )
, action( _action )
, tool( _tool )
, file( _file )
{}
- QString line;
- QString action;
- QString tool;
- QString file;
+ TQString line;
+ TQString action;
+ TQString tool;
+ TQString file;
};
#ifdef DEBUG
void MakeActionFilter::test()
{
- static QValueList<TestItem> testItems = QValueList<TestItem>()
+ static TQValueList<TestItem> testItems = TQValueList<TestItem>()
<< TestItem( // simple qmake compile
"g++ -c -pipe -Wall -W -O2 -DQT_NO_DEBUG -I/home/john/src/kde/qt-copy/mkspecs/default -I. "
@@ -282,7 +282,7 @@ void MakeActionFilter::test()
"compiling", "g++", "quanta_init.cpp")
;
- QValueList<TestItem>::const_iterator it = testItems.begin();
+ TQValueList<TestItem>::const_iterator it = testItems.begin();
for( ; it != testItems.end(); ++it )
{
ActionItem* actionItem = matchLine( (*it).line );
diff --git a/parts/outputviews/makeactionfilter.h b/parts/outputviews/makeactionfilter.h
index 66de7a3b..4f3a0e68 100644
--- a/parts/outputviews/makeactionfilter.h
+++ b/parts/outputviews/makeactionfilter.h
@@ -12,15 +12,15 @@
#ifndef MakeActionFilter_h
#define MakeActionFilter_h
-#include <qobject.h>
-#include <qregexp.h>
-#include <qvaluelist.h>
+#include <tqobject.h>
+#include <tqregexp.h>
+#include <tqvaluelist.h>
#include "outputfilter.h"
class MakeItem;
class ActionItem;
-class MakeActionFilter : public QObject, public OutputFilter
+class MakeActionFilter : public TQObject, public OutputFilter
{
Q_OBJECT
@@ -35,28 +35,28 @@ public:
{
public:
ActionFormat():m_toolGroup(-1) {}
- ActionFormat( const QString&, const QString&, const char * regExp, int file);
- ActionFormat( const QString&, int tool, int file, const char * regExp);
- QString tool();
- QString file();
- const QString& action() const {return m_action;}
- bool matches(const QString& line);
+ ActionFormat( const TQString&, const TQString&, const char * regExp, int file);
+ ActionFormat( const TQString&, int tool, int file, const char * regExp);
+ TQString tool();
+ TQString file();
+ const TQString& action() const {return m_action;}
+ bool matches(const TQString& line);
private:
- QString m_action;
- QRegExp m_expression;
- QString m_tool;
+ TQString m_action;
+ TQRegExp m_expression;
+ TQString m_tool;
int m_toolGroup;
int m_fileGroup;
};
static ActionFormat* actionFormats();
- void processLine( const QString& line );
+ void processLine( const TQString& line );
signals:
void item( MakeItem* );
private:
- static ActionItem* matchLine( const QString& line );
+ static ActionItem* matchLine( const TQString& line );
};
#endif
diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp
index c4d5a04c..218bb894 100644
--- a/parts/outputviews/makeitem.cpp
+++ b/parts/outputviews/makeitem.cpp
@@ -11,7 +11,7 @@
#include "makeitem.h"
-#include <qstylesheet.h>
+#include <tqstylesheet.h>
#include <kdebug.h>
#include <klocale.h>
@@ -22,7 +22,7 @@ MakeItem::MakeItem()
{
}
-MakeItem::MakeItem( const QString& text )
+MakeItem::MakeItem( const TQString& text )
: m_text( text )
{
}
@@ -31,7 +31,7 @@ MakeItem::~MakeItem()
{
}
-QString MakeItem::color( bool bright_bg )
+TQString MakeItem::color( bool bright_bg )
{
switch ( type() )
{
@@ -46,7 +46,7 @@ QString MakeItem::color( bool bright_bg )
}
}
-QString MakeItem::icon()
+TQString MakeItem::icon()
{
switch ( type() )
{
@@ -60,14 +60,14 @@ QString MakeItem::icon()
}
}
-QString MakeItem::text( EOutputLevel )
+TQString MakeItem::text( EOutputLevel )
{
- return QStyleSheet::escape( m_text );
+ return TQStyleSheet::escape( m_text );
}
-QString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
+TQString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
{
- QString txt = text(level);
+ TQString txt = text(level);
if (txt.isEmpty())
return "<br>";
if ( level == eFull )
@@ -76,24 +76,24 @@ QString MakeItem::formattedText( EOutputLevel level, bool bright_bg )
}
else
{
- return QString("<code>")
+ return TQString("<code>")
.append( icon() ).append("<font color=\"").append( color( bright_bg) ).append("\">")
.append( txt ).append("</font></code>").append( br() );
}
}
-QString MakeItem::br()
+TQString MakeItem::br()
{
// Qt >= 3.1 doesn't need a <br>.
#if QT_VERSION < 0x040000
- static const QString br = QString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "<br>";
+ static const TQString br = TQString::fromLatin1( qVersion() ).section( ".", 1, 1 ).toInt() > 0 ? "" : "<br>";
#else
- static const QString br;
+ static const TQString br;
#endif
return br;
}
-ErrorItem::ErrorItem( const QString& fn, int ln, const QString& tx, const QString& line, bool isWarning, bool isInstatiationInfo, const QString& compiler )
+ErrorItem::ErrorItem( const TQString& fn, int ln, const TQString& tx, const TQString& line, bool isWarning, bool isInstatiationInfo, const TQString& compiler )
: MakeItem( line )
, fileName(fn)
, lineNum(ln)
@@ -107,7 +107,7 @@ ErrorItem::~ErrorItem()
{
}
-bool ErrorItem::append( const QString& text )
+bool ErrorItem::append( const TQString& text )
{
if ( !text.startsWith(" ") )
return false;
@@ -133,34 +133,34 @@ ExitStatusItem::ExitStatusItem( bool normalExit, int exitStatus )
m_text = i18n("*** Success ***");
}
-QString ExitStatusItem::text( EOutputLevel )
+TQString ExitStatusItem::text( EOutputLevel )
{
return m_text;
}
bool DirectoryItem::m_showDirectoryMessages = true;
-QString EnteringDirectoryItem::text( EOutputLevel outputLevel )
+TQString EnteringDirectoryItem::text( EOutputLevel outputLevel )
{
if ( outputLevel < eFull )
return i18n("Entering directory %1").arg( directory );
return m_text;
}
-QString ExitingDirectoryItem::text( EOutputLevel outputLevel )
+TQString ExitingDirectoryItem::text( EOutputLevel outputLevel )
{
if ( outputLevel < eFull )
return i18n("Leaving directory %1").arg( directory );
return m_text;
}
-QString ActionItem::text( EOutputLevel outputLevel )
+TQString ActionItem::text( EOutputLevel outputLevel )
{
if ( outputLevel < eFull )
{
if ( m_tool.isEmpty() )
- return QString(m_action).append(" <b>").append(m_file).append("</b>");
- return QString(m_action).append(" <b>").append(m_file).append("</b>").append(" (").append(m_tool).append(")");
+ return TQString(m_action).append(" <b>").append(m_file).append("</b>");
+ return TQString(m_action).append(" <b>").append(m_file).append("</b>").append(" (").append(m_tool).append(")");
}
return MakeItem::text( outputLevel );
}
diff --git a/parts/outputviews/makeitem.h b/parts/outputviews/makeitem.h
index e95dd4df..94acc3e2 100644
--- a/parts/outputviews/makeitem.h
+++ b/parts/outputviews/makeitem.h
@@ -12,7 +12,7 @@
#ifndef MakeItem_h
#define MakeItem_h
-#include <qstring.h>
+#include <tqstring.h>
enum EOutputLevel
{
@@ -27,7 +27,7 @@ class MakeItem
public:
enum Type { Normal, Error, Warning, Diagnostic };
MakeItem();
- MakeItem( const QString& text );
+ MakeItem( const TQString& text );
virtual ~MakeItem();
enum DisplayModes
@@ -37,23 +37,23 @@ public:
Append = 2 // item's text can be appended (append has been overloaded)
};
virtual int displayMode() const { return ImmDisplay; }
- virtual bool append( const QString& ) { return false; }
+ virtual bool append( const TQString& ) { return false; }
virtual Type type() { return Diagnostic; }
virtual bool visible( EOutputLevel level ) { return level > eVeryShort; }
- virtual QString text( EOutputLevel );
- virtual QString formattedText( EOutputLevel, bool bright_bg );
- QString icon();
- QString color( bool bright_bg );
+ virtual TQString text( EOutputLevel );
+ virtual TQString formattedText( EOutputLevel, bool bright_bg );
+ TQString icon();
+ TQString color( bool bright_bg );
- static QString br();
+ static TQString br();
- QString m_text;
+ TQString m_text;
};
class CommandItem : public MakeItem
{
public:
- CommandItem(const QString command)
+ CommandItem(const TQString command)
: MakeItem( command )
{}
@@ -68,7 +68,7 @@ public:
Type type() { return m_normalExit && m_exitStatus == 0 ? Diagnostic : Error; }
virtual bool visible( EOutputLevel ) { return true; }
- QString text( EOutputLevel level );
+ TQString text( EOutputLevel level );
private:
bool m_normalExit;
@@ -78,7 +78,7 @@ private:
class DirectoryItem : public MakeItem
{
public:
- DirectoryItem( const QString& dir, const QString& text )
+ DirectoryItem( const TQString& dir, const TQString& text )
: MakeItem( text )
, directory( dir )
{}
@@ -88,7 +88,7 @@ public:
static void setShowDirectoryMessages( bool show ) { m_showDirectoryMessages = show; }
static bool getShowDirectoryMessages() { return m_showDirectoryMessages; }
- QString directory;
+ TQString directory;
protected:
static bool m_showDirectoryMessages;
@@ -97,7 +97,7 @@ protected:
class EnteringDirectoryItem : public DirectoryItem
{
public:
- EnteringDirectoryItem( const QString& dir, const QString& text )
+ EnteringDirectoryItem( const TQString& dir, const TQString& text )
: DirectoryItem( dir, text )
{}
bool visible( EOutputLevel )
@@ -105,13 +105,13 @@ public:
return m_showDirectoryMessages;
}
- virtual QString text( EOutputLevel );
+ virtual TQString text( EOutputLevel );
};
class ExitingDirectoryItem : public DirectoryItem
{
public:
- ExitingDirectoryItem( const QString& dir, const QString& text )
+ ExitingDirectoryItem( const TQString& dir, const TQString& text )
: DirectoryItem( dir, text )
{}
bool visible( EOutputLevel level )
@@ -119,7 +119,7 @@ public:
return m_showDirectoryMessages && level > eVeryShort;
}
- virtual QString text( EOutputLevel );
+ virtual TQString text( EOutputLevel );
};
namespace KTextEditor { class Cursor; class Document; }
@@ -127,26 +127,26 @@ namespace KTextEditor { class Cursor; class Document; }
class ErrorItem : public MakeItem
{
public:
- ErrorItem( const QString& fn, int ln, const QString& tx, const QString& line, bool isWarning, bool isInstatiationInfo, const QString& compiler );
+ ErrorItem( const TQString& fn, int ln, const TQString& tx, const TQString& line, bool isWarning, bool isInstatiationInfo, const TQString& compiler );
virtual ~ErrorItem();
- virtual bool append( const QString& text );
+ virtual bool append( const TQString& text );
virtual int displayMode() const { return DelayedDisplay | Append; }
Type type() { return m_isInstatiationInfo ? Diagnostic : (m_isWarning ? Warning : Error); }
virtual bool visible( EOutputLevel ) { return true; }
- QString fileName;
+ TQString fileName;
int lineNum;
- QString m_error;
+ TQString m_error;
bool m_isWarning;
bool m_isInstatiationInfo; ///this also implies isWarning
- QString m_compiler;
+ TQString m_compiler;
};
class ActionItem : public MakeItem
{
public:
- ActionItem( const QString& action, const QString& file, const QString& tool, const QString& line )
+ ActionItem( const TQString& action, const TQString& file, const TQString& tool, const TQString& line )
: MakeItem( line )
, m_action( action )
, m_file( file )
@@ -154,11 +154,11 @@ public:
{}
virtual bool visible( EOutputLevel ) { return true; }
- virtual QString text( EOutputLevel level );
+ virtual TQString text( EOutputLevel level );
- QString m_action;
- QString m_file;
- QString m_tool;
+ TQString m_action;
+ TQString m_file;
+ TQString m_tool;
};
#endif
diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp
index 3f2ebbd8..7c9dcb79 100644
--- a/parts/outputviews/makeviewpart.cpp
+++ b/parts/outputviews/makeviewpart.cpp
@@ -11,8 +11,8 @@
#include "makeviewpart.h"
-#include <qwhatsthis.h>
-#include <qdir.h>
+#include <tqwhatsthis.h>
+#include <tqdir.h>
#include <kdebug.h>
#include <klocale.h>
#include <kaction.h>
@@ -30,7 +30,7 @@ static const KDevPluginInfo data("kdevmakeview");
typedef KDevGenericFactory< MakeViewPart > MakeViewFactory;
K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) )
-MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList &)
+MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &)
: KDevMakeFrontend(&data, parent, name)
{
setInstance(MakeViewFactory::instance());
@@ -42,7 +42,7 @@ MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList
m_widget = new MakeWidget(this);
m_widget->setIcon( SmallIcon("exec") );
m_widget->setCaption(i18n("Messages Output"));
- QWhatsThis::add(m_widget, i18n("<b>Messages output</b><p>"
+ TQWhatsThis::add(m_widget, i18n("<b>Messages output</b><p>"
"The messages window shows the output of the compiler and "
"used build tools like make, ant, uic, dcopidl etc. "
"For compiler error messages, click on the error message. "
@@ -52,17 +52,17 @@ MakeViewPart::MakeViewPart(QObject *parent, const char *name, const QStringList
mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages"));
KAction *action;
- action = new KAction( i18n("&Next Error"), Key_F4, m_widget, SLOT(nextError()),
+ action = new KAction( i18n("&Next Error"), Key_F4, m_widget, TQT_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 KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, SLOT(prevError()),
+ action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, m_widget, TQT_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(), SIGNAL(stopButtonClicked(KDevPlugin*)),
- this, SLOT(slotStopButtonClicked(KDevPlugin*)) );
+ connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)),
+ this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) );
}
@@ -81,7 +81,7 @@ void MakeViewPart::slotStopButtonClicked(KDevPlugin* which)
m_widget->killJob();
}
-void MakeViewPart::queueCommand(const QString &dir, const QString &command)
+void MakeViewPart::queueCommand(const TQString &dir, const TQString &command)
{
m_widget->queueJob(dir, command);
}
@@ -92,7 +92,7 @@ bool MakeViewPart::isRunning()
return m_widget->isRunning();
}
-QWidget* MakeViewPart::widget()
+TQWidget* MakeViewPart::widget()
{
return m_widget.operator->();
}
diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h
index 78f969ff..808a9208 100644
--- a/parts/outputviews/makeviewpart.h
+++ b/parts/outputviews/makeviewpart.h
@@ -12,7 +12,7 @@
#ifndef _MAKEVIEWPART_H_
#define _MAKEVIEWPART_H_
-#include <qguardedptr.h>
+#include <tqguardedptr.h>
#include "kdevmakefrontend.h"
#include "KDevMakeFrontendIface.h"
@@ -25,20 +25,20 @@ class MakeViewPart : public KDevMakeFrontend
Q_OBJECT
public:
- MakeViewPart( QObject *parent, const char *name, const QStringList & );
+ MakeViewPart( TQObject *parent, const char *name, const TQStringList & );
~MakeViewPart();
- virtual QWidget* widget();
+ virtual TQWidget* widget();
virtual void updateSettingsFromConfig();
private slots:
void slotStopButtonClicked(KDevPlugin*);
protected:
- virtual void queueCommand(const QString &dir, const QString &command);
+ virtual void queueCommand(const TQString &dir, const TQString &command);
virtual bool isRunning();
private:
- QGuardedPtr<MakeWidget> m_widget;
+ TQGuardedPtr<MakeWidget> m_widget;
KDevMakeFrontendIface *m_dcop;
friend class MakeWidget;
};
diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp
index 554713c4..3ccc4608 100644
--- a/parts/outputviews/makewidget.cpp
+++ b/parts/outputviews/makewidget.cpp
@@ -33,15 +33,15 @@
#include <kapplication.h>
#include <kconfig.h>
-#include <qmessagebox.h>
-#include <qapplication.h>
-#include <qdir.h>
-#include <qimage.h>
-#include <qstylesheet.h>
-#include <qtimer.h>
-#include <qfileinfo.h>
-#include <qclipboard.h>
-#include <qpopupmenu.h>
+#include <tqmessagebox.h>
+#include <tqapplication.h>
+#include <tqdir.h>
+#include <tqimage.h>
+#include <tqstylesheet.h>
+#include <tqtimer.h>
+#include <tqfileinfo.h>
+#include <tqclipboard.h>
+#include <tqpopupmenu.h>
#include <private/qrichtext_p.h>
#include <stdlib.h>
@@ -116,7 +116,7 @@ static const char *const message_xpm[] =
class SelectionPreserver
{
public:
- SelectionPreserver( QTextEdit& textEdit, bool stayAtEnd )
+ SelectionPreserver( TQTextEdit& textEdit, bool stayAtEnd )
: m_textEdit( textEdit )
, m_atEnd( false )
{
@@ -136,18 +136,18 @@ public:
if ( m_atEnd )
{
- m_textEdit.moveCursor(QTextEdit::MoveEnd, false);
- m_textEdit.moveCursor(QTextEdit::MoveLineStart, false);//if linewrap is off we must avoid the jumping of the vertical scrollbar
+ m_textEdit.moveCursor(TQTextEdit::MoveEnd, false);
+ m_textEdit.moveCursor(TQTextEdit::MoveLineStart, false);//if linewrap is off we must avoid the jumping of the vertical scrollbar
}
}
- QTextEdit& m_textEdit;
+ TQTextEdit& m_textEdit;
bool m_atEnd;
int paraFrom, indexFrom, paraTo, indexTo;
};
MakeWidget::MakeWidget(MakeViewPart *part)
- : QTextEdit(0, "make widget")
+ : TQTextEdit(0, "make widget")
, m_directoryStatusFilter( m_errorFilter )
, m_errorFilter( m_continuationFilter )
, m_continuationFilter( m_actionFilter )
@@ -171,51 +171,51 @@ MakeWidget::MakeWidget(MakeViewPart *part)
setWrapPolicy(Anywhere);
setReadOnly(true);
- setMimeSourceFactory(new QMimeSourceFactory);
- mimeSourceFactory()->setImage("error", QImage((const char**)error_xpm));
- mimeSourceFactory()->setImage("warning", QImage((const char**)warning_xpm));
- mimeSourceFactory()->setImage("message", QImage((const char**)message_xpm));
+ setMimeSourceFactory(new TQMimeSourceFactory);
+ mimeSourceFactory()->setImage("error", TQImage((const char**)error_xpm));
+ mimeSourceFactory()->setImage("warning", TQImage((const char**)warning_xpm));
+ mimeSourceFactory()->setImage("message", TQImage((const char**)message_xpm));
dirstack.setAutoDelete(true);
childproc = new KProcess(this);
procLineMaker = new ProcessLineMaker( childproc );
- connect( procLineMaker, SIGNAL(receivedStdoutLine(const QCString&)),
- this, SLOT(insertStdoutLine(const QCString&) ));
- connect( procLineMaker, SIGNAL(receivedStderrLine(const QCString&)),
- this, SLOT(insertStderrLine(const QCString&) ));
- connect( procLineMaker, SIGNAL(receivedPartialStdoutLine(const QCString&)),
- this, SLOT(storePartialStdoutLine(const QCString&) ));
- connect( procLineMaker, SIGNAL(receivedPartialStderrLine(const QCString&)),
- this, SLOT(storePartialStderrLine(const QCString&) ));
-
- connect( childproc, SIGNAL(processExited(KProcess*)),
- this, SLOT(slotProcessExited(KProcess*) )) ;
-
- connect( &m_directoryStatusFilter, SIGNAL(item(EnteringDirectoryItem*)),
- this, SLOT(slotEnteredDirectory(EnteringDirectoryItem*)) );
- connect( &m_directoryStatusFilter, SIGNAL(item(ExitingDirectoryItem*)),
- this, SLOT(slotExitedDirectory(ExitingDirectoryItem*)) );
- connect( &m_errorFilter, SIGNAL(item(MakeItem*)),
- this, SLOT(insertItem(MakeItem*)) );
- connect( &m_actionFilter, SIGNAL(item(MakeItem*)),
- this, SLOT(insertItem(MakeItem*)) );
- connect( &m_otherFilter, SIGNAL(item(MakeItem*)),
- this, SLOT(insertItem(MakeItem*)) );
-
- connect( verticalScrollBar(), SIGNAL(sliderPressed()),
- this, SLOT(verticScrollingOn()) );
- connect( verticalScrollBar(), SIGNAL(sliderReleased()),
- this, SLOT(verticScrollingOff()) );
- connect( horizontalScrollBar(), SIGNAL(sliderPressed()),
- this, SLOT(horizScrollingOn()) );
- connect( horizontalScrollBar(), SIGNAL(sliderReleased()),
- this, SLOT(horizScrollingOff()) );
+ 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(KProcess*)),
+ this, TQT_SLOT(slotProcessExited(KProcess*) )) ;
+
+ 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()) );
// this slot doesn't exist anymore
-// connect( m_part->partController(), SIGNAL(loadedFile(const KURL&)),
-// this, SLOT(slotDocumentOpened(const KURL&)) );
+// connect( m_part->partController(), TQT_SIGNAL(loadedFile(const KURL&)),
+// this, TQT_SLOT(slotDocumentOpened(const KURL&)) );
}
MakeWidget::~MakeWidget()
@@ -225,7 +225,7 @@ MakeWidget::~MakeWidget()
delete procLineMaker;
}
-void MakeWidget::queueJob(const QString &dir, const QString &command)
+void MakeWidget::queueJob(const TQString &dir, const TQString &command)
{
commandList.append(command);
dirList.append(dir);
@@ -240,7 +240,7 @@ void MakeWidget::queueJob(const QString &dir, const QString &command)
void MakeWidget::startNextJob()
{
- QStringList::Iterator it = commandList.begin();
+ TQStringList::Iterator it = commandList.begin();
if ( it == commandList.end() )
return;
@@ -254,7 +254,7 @@ void MakeWidget::startNextJob()
m_bCompiling = false;
else
{
- QString s = currentCommand.right(currentCommand.length() - i);
+ TQString s = currentCommand.right(currentCommand.length() - i);
if ( s.contains("configure ") ||
s.contains(" Makefile.cvs") ||
s.contains(" clean") ||
@@ -270,12 +270,12 @@ void MakeWidget::startNextJob()
}
it = dirList.begin();
- QString dir = *it;
+ TQString dir = *it;
m_lastBuildDir = dir;
dirList.remove(it);
clear(); // clear the widget
- for ( QValueVector<MakeItem*>::iterator it = m_items.begin(); it != m_items.end(); ++it )
+ for ( TQValueVector<MakeItem*>::iterator it = m_items.begin(); it != m_items.end(); ++it )
delete *it;
m_items.clear();
m_paragraphToItem.clear();
@@ -290,7 +290,7 @@ void MakeWidget::startNextJob()
childproc->start(KProcess::OwnGroup, KProcess::AllOutput);
dirstack.clear();
- dirstack.push(new QString(dir));
+ dirstack.push(new TQString(dir));
m_part->mainWindow()->raiseView(this);
m_part->core()->running(m_part, true);
@@ -317,7 +317,7 @@ void MakeWidget::copy()
return;
}
- QString selection;
+ TQString selection;
for(int i = parafrom; i<=parato; i++)
selection += text(i) + "\n";
@@ -325,7 +325,7 @@ void MakeWidget::copy()
if(m_compilerOutputLevel == eShort ||
m_compilerOutputLevel == eVeryShort )
{
- QRegExp regexp("<.*>");
+ TQRegExp regexp("<.*>");
regexp.setMinimal(true);
selection.remove(regexp);
}
@@ -390,15 +390,15 @@ void MakeWidget::prevError()
KNotifyClient::beep();
}
-void MakeWidget::contentsMouseReleaseEvent( QMouseEvent* e )
+void MakeWidget::contentsMouseReleaseEvent( TQMouseEvent* e )
{
- QTextEdit::contentsMouseReleaseEvent(e);
+ TQTextEdit::contentsMouseReleaseEvent(e);
if ( e->button() != LeftButton )
return;
searchItem(paragraphAt(e->pos()));
}
-void MakeWidget::keyPressEvent(QKeyEvent *e)
+void MakeWidget::keyPressEvent(TQKeyEvent *e)
{
if (e->key() == Key_Return || e->key() == Key_Enter)
{
@@ -407,15 +407,15 @@ void MakeWidget::keyPressEvent(QKeyEvent *e)
searchItem(parag);
}
else
- QTextEdit::keyPressEvent(e);
+ TQTextEdit::keyPressEvent(e);
}
// returns the current directory for parag
-QString MakeWidget::directory(int parag) const
+TQString MakeWidget::directory(int parag) const
{
- QValueVector<MakeItem*>::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
+ TQValueVector<MakeItem*>::const_iterator it = qFind( m_items.begin(), m_items.end(), m_paragraphToItem[parag] );
if ( it == m_items.end() )
- return QString::null;
+ return TQString::null;
// run backwards over directories and figure out where we are
while ( it != m_items.begin() ) {
--it;
@@ -423,24 +423,24 @@ QString MakeWidget::directory(int parag) const
if ( edi )
return edi->directory + "/";
}
- return QString::null;
+ return TQString::null;
}
// hackish function that will return true and put string "file" in "fName" if the file
// exists
-static bool checkFileExists( const QString& file, QString& fName )
+static bool checkFileExists( const TQString& file, TQString& fName )
{
- if ( QFile::exists( file ) ) {
+ if ( TQFile::exists( file ) ) {
fName = file;
return true;
}
return false;
}
-void MakeWidget::specialCheck( const QString& file, QString& fName ) const
+void MakeWidget::specialCheck( const TQString& file, TQString& fName ) const
{
- QString firstLine = text(0);
- QRegExp rx("cd \\'(.*)\\'.*");
+ TQString firstLine = text(0);
+ TQRegExp rx("cd \\'(.*)\\'.*");
if (rx.search(firstLine) != -1)
{
KURL url(rx.cap(1)+"/", file);
@@ -454,8 +454,8 @@ void MakeWidget::specialCheck( const QString& file, QString& fName ) const
}
// Ok the "worst case", lets see if we can find a file in the project that has the same name
// obviously this will pick always the wrong file when you've got the same filename multiple times.
- QStringList files = m_part->project()->allFiles();
- for( QStringList::iterator it = files.begin() ; it != files.end(); ++it)
+ TQStringList files = m_part->project()->allFiles();
+ for( TQStringList::iterator it = files.begin() ; it != files.end(); ++it)
{
if( (*it).contains( file ) )
{
@@ -464,13 +464,13 @@ void MakeWidget::specialCheck( const QString& file, QString& fName ) const
}
}
-QString MakeWidget::guessFileName( const QString& fName, int parag ) const
+TQString MakeWidget::guessFileName( const TQString& fName, int parag ) const
{
// pathological case
if ( ! m_part->project() ) return fName;
- QString name;
- QString dir = directory( parag );
+ TQString name;
+ TQString dir = directory( parag );
if ( fName.startsWith( "/" ) )
{
@@ -497,12 +497,12 @@ QString MakeWidget::guessFileName( const QString& fName, int parag ) const
// GNU make resolves symlinks. if "name" is a real path to a file the
// project know by symlink path, we need to return the symlink path
-// QStringList projectFiles = m_part->project()->allFiles();
- QStringList projectFiles = m_part->project()->symlinkProjectFiles();
- QStringList::iterator it = projectFiles.begin();
+// TQStringList projectFiles = m_part->project()->allFiles();
+ TQStringList projectFiles = m_part->project()->symlinkProjectFiles();
+ TQStringList::iterator it = projectFiles.begin();
while ( it != projectFiles.end() )
{
- QString file = m_part->project()->projectDirectory() + "/" + *it;
+ TQString file = m_part->project()->projectDirectory() + "/" + *it;
if ( name == URLUtil::canonicalPath( file ) )
{
kdDebug(9004) << "Found file in project - " << file << " == " << name << endl;
@@ -528,31 +528,31 @@ void MakeWidget::searchItem(int parag)
}
}
-void MakeWidget::insertStdoutLine( const QCString& line )
+void MakeWidget::insertStdoutLine( const TQCString& line )
{
- QString sline;
+ TQString sline;
bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
if( forceCLocale )
- sline = QString::fromAscii( stdoutbuf+line );
+ sline = TQString::fromAscii( stdoutbuf+line );
else
- sline = QString::fromLocal8Bit( stdoutbuf+line );
+ sline = TQString::fromLocal8Bit( stdoutbuf+line );
if ( !appendToLastLine( sline ) )
m_directoryStatusFilter.processLine( sline );
stdoutbuf.truncate(0);
}
-void MakeWidget::insertStderrLine( const QCString& line )
+void MakeWidget::insertStderrLine( const TQCString& line )
{
- QString sline;
+ TQString sline;
bool forceCLocale = KConfigGroup( kapp->config(), "MakeOutputWidget" ).readBoolEntry( "ForceCLocale", true );
if( forceCLocale ) {
- sline = QString( stderrbuf+line );
+ sline = TQString( stderrbuf+line );
}
else
- sline = QString::fromLocal8Bit( stderrbuf+line );
+ sline = TQString::fromLocal8Bit( stderrbuf+line );
if ( !appendToLastLine( sline ) )
m_errorFilter.processLine( sline );
@@ -584,7 +584,7 @@ void MakeWidget::slotProcessExited(KProcess *)
insertItem( item );
displayPendingItem();
- m_part->mainWindow()->statusBar()->message( QString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
+ m_part->mainWindow()->statusBar()->message( TQString("%1: %2").arg(currentCommand).arg(item->m_text), 3000);
m_part->core()->running(m_part, false);
// Defensive programming: We emit this with a single shot timer so that we go once again
@@ -592,7 +592,7 @@ void MakeWidget::slotProcessExited(KProcess *)
// and its KProcess object can be reused.
if (childproc->normalExit() && !childproc->exitStatus())
{
- QTimer::singleShot(0, this, SLOT(startNextJob()));
+ TQTimer::singleShot(0, this, TQT_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
@@ -608,16 +608,16 @@ void MakeWidget::slotProcessExited(KProcess *)
void MakeWidget::slotEnteredDirectory( EnteringDirectoryItem* item )
{
// kdDebug(9004) << "Entering dir: " << item->directory << endl;
- QString* dir = new QString( item->directory );
+ TQString* dir = new TQString( item->directory );
dirstack.push( dir );
insertItem( item );
}
void MakeWidget::slotExitedDirectory( ExitingDirectoryItem* item )
{
- QString eDir = item->directory;
+ TQString eDir = item->directory;
// kdDebug(9004) << "Leaving dir: " << eDir << endl;
- QString *dir = dirstack.pop();
+ TQString *dir = dirstack.pop();
if (!dir)
{
kdWarning(9004) << "Left more directories than entered: " << eDir;
@@ -652,7 +652,7 @@ void MakeWidget::displayPendingItem()
append( m_pendingItem->formattedText( m_compilerOutputLevel, brightBg() ) );
}
-bool MakeWidget::appendToLastLine( const QString& text )
+bool MakeWidget::appendToLastLine( const TQString& text )
{
if ( !m_pendingItem ) return false;
if ( !m_pendingItem->append( text ) )
@@ -696,29 +696,29 @@ bool MakeWidget::brightBg()
return (v > 127);
}
-QPopupMenu* MakeWidget::createPopupMenu( const QPoint& pos )
+TQPopupMenu* MakeWidget::createPopupMenu( const TQPoint& pos )
{
- QPopupMenu* pMenu = QTextEdit::createPopupMenu(pos);
+ TQPopupMenu* pMenu = TQTextEdit::createPopupMenu(pos);
pMenu->setCheckable(true);
pMenu->insertSeparator();
- int id = pMenu->insertItem(i18n("Line Wrapping"), this, SLOT(toggleLineWrapping()) );
+ int id = pMenu->insertItem(i18n("Line Wrapping"), this, TQT_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, SLOT(slotVeryShortCompilerOutput()) );
+ id = pMenu->insertItem(i18n("Very Short Compiler Output"), this, TQT_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, SLOT(slotShortCompilerOutput()) );
+ id = pMenu->insertItem(i18n("Short Compiler Output"), this, TQT_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, SLOT(slotFullCompilerOutput()) );
+ id = pMenu->insertItem(i18n("Full Compiler Output"), this, TQT_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, SLOT(toggleShowDirNavigMessages()));
+ id = pMenu->insertItem(i18n("Show Directory Navigation Messages"), this, TQT_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());
@@ -784,7 +784,7 @@ void MakeWidget::updateSettingsFromConfig()
{
KConfig *pConfig = kapp->config();
pConfig->setGroup("General Options");
- QFont outputFont = pConfig->readFontEntry("OutputViewFont");
+ TQFont outputFont = pConfig->readFontEntry("OutputViewFont");
setFont(outputFont);
pConfig->setGroup("MakeOutputView");
m_bLineWrapping = pConfig->readBoolEntry("LineWrapping", true);
@@ -834,12 +834,12 @@ bool MakeWidget::scanErrorBackward( int parag )
return false;
}
-void MakeWidget::storePartialStderrLine(const QCString & line)
+void MakeWidget::storePartialStderrLine(const TQCString & line)
{
stderrbuf += line;
}
-void MakeWidget::storePartialStdoutLine(const QCString & line)
+void MakeWidget::storePartialStdoutLine(const TQCString & line)
{
stdoutbuf += line;
}
diff --git a/parts/outputviews/makewidget.h b/parts/outputviews/makewidget.h
index ff65eb5e..bdc7d451 100644
--- a/parts/outputviews/makewidget.h
+++ b/parts/outputviews/makewidget.h
@@ -12,11 +12,11 @@
#ifndef _MAKEWIDGET_H_
#define _MAKEWIDGET_H_
-#include <qptrstack.h>
-#include <qregexp.h>
-#include <qtextedit.h>
-#include <qvaluevector.h>
-#include <qintdict.h>
+#include <tqptrstack.h>
+#include <tqregexp.h>
+#include <tqtextedit.h>
+#include <tqvaluevector.h>
+#include <tqintdict.h>
#include "outputfilter.h"
#include "directorystatusmessagefilter.h"
@@ -42,10 +42,10 @@ public:
MakeWidget(MakeViewPart *part);
~MakeWidget();
- void queueJob(const QString &dir, const QString &command);
+ void queueJob(const TQString &dir, const TQString &command);
bool isRunning();
void updateSettingsFromConfig();
- void processLine( const QString& line );
+ void processLine( const TQString& line );
public slots:
void startNextJob();
@@ -55,14 +55,14 @@ public slots:
void copy();
protected:
- virtual QPopupMenu *createPopupMenu( const QPoint& pos );
- virtual void contentsMouseReleaseEvent( QMouseEvent* e );
+ virtual TQPopupMenu *createPopupMenu( const TQPoint& pos );
+ virtual void contentsMouseReleaseEvent( TQMouseEvent* e );
private slots:
- void insertStdoutLine(const QCString& line);
- void insertStderrLine(const QCString& line);
- void storePartialStdoutLine(const QCString& line);
- void storePartialStderrLine(const QCString& line);
+ void insertStdoutLine(const TQCString& line);
+ void insertStderrLine(const TQCString& line);
+ void storePartialStdoutLine(const TQCString& line);
+ void storePartialStderrLine(const TQCString& line);
void slotProcessExited(KProcess *);
void verticScrollingOn() { m_vertScrolling = true; }
void verticScrollingOff() { m_vertScrolling = false; }
@@ -78,11 +78,11 @@ private slots:
void insertItem( MakeItem* );
private:
- void specialCheck( const QString& file, QString& fName ) const;
- virtual void keyPressEvent(QKeyEvent *e);
+ void specialCheck( const TQString& file, TQString& fName ) const;
+ virtual void keyPressEvent(TQKeyEvent *e);
void searchItem(int parag);
- QString guessFileName( const QString& fName, int parag ) const;
- QString directory(int parag) const;
+ TQString guessFileName( const TQString& fName, int parag ) const;
+ TQString directory(int parag) const;
bool brightBg();
void refill();
void createCursor(ErrorItem* e, KTextEditor::Document* doc);
@@ -98,19 +98,19 @@ private:
void setPendingItem(MakeItem* new_item);
void displayPendingItem();
- bool appendToLastLine( const QString& text );
+ bool appendToLastLine( const TQString& text );
void setCompilerOutputLevel(EOutputLevel level);
- QStringList commandList;
- QStringList dirList;
- QString m_lastBuildDir; //stores directory of last build, for the case we don't have proper path information
- QString currentCommand;
+ TQStringList commandList;
+ TQStringList dirList;
+ TQString m_lastBuildDir; //stores directory of last build, for the case we don't have proper path information
+ TQString currentCommand;
KProcess *childproc;
ProcessLineMaker* procLineMaker;
- QPtrStack<QString> dirstack;
+ TQPtrStack<TQString> dirstack;
MakeItem* m_pendingItem;
- QValueVector<MakeItem*> m_items;
- QIntDict<MakeItem> m_paragraphToItem;
+ TQValueVector<MakeItem*> m_items;
+ TQIntDict<MakeItem> m_paragraphToItem;
long m_paragraphs;
int m_lastErrorSelected;
@@ -119,8 +119,8 @@ private:
bool m_vertScrolling, m_horizScrolling;
bool m_bCompiling;
- QCString stderrbuf;
- QCString stdoutbuf;
+ TQCString stderrbuf;
+ TQCString stdoutbuf;
bool m_bLineWrapping;
EOutputLevel m_compilerOutputLevel;
diff --git a/parts/outputviews/otherfilter.cpp b/parts/outputviews/otherfilter.cpp
index 5f14937c..cd3287c3 100644
--- a/parts/outputviews/otherfilter.cpp
+++ b/parts/outputviews/otherfilter.cpp
@@ -20,7 +20,7 @@ OtherFilter::OtherFilter()
{
}
-void OtherFilter::processLine( const QString& line )
+void OtherFilter::processLine( const TQString& line )
{
emit item( new MakeItem( line ) );
}
diff --git a/parts/outputviews/otherfilter.h b/parts/outputviews/otherfilter.h
index 9a2c6c17..3494de84 100644
--- a/parts/outputviews/otherfilter.h
+++ b/parts/outputviews/otherfilter.h
@@ -14,18 +14,18 @@
#include "outputfilter.h"
-#include <qobject.h>
+#include <tqobject.h>
class MakeItem;
-class OtherFilter : public QObject, public OutputFilter
+class OtherFilter : public TQObject, public OutputFilter
{
Q_OBJECT
public:
OtherFilter();
- virtual void processLine( const QString& line );
+ virtual void processLine( const TQString& line );
signals:
void item( MakeItem* );
diff --git a/parts/outputviews/outputfilter.cpp b/parts/outputviews/outputfilter.cpp
index 5692efce..1ea92c5f 100644
--- a/parts/outputviews/outputfilter.cpp
+++ b/parts/outputviews/outputfilter.cpp
@@ -18,7 +18,7 @@ OutputFilter::OutputFilter( OutputFilter& next )
{
}
-void OutputFilter::processLine( const QString& line )
+void OutputFilter::processLine( const TQString& line )
{
m_next.processLine( line );
}
diff --git a/parts/outputviews/outputfilter.h b/parts/outputviews/outputfilter.h
index dd84f7d7..227f793d 100644
--- a/parts/outputviews/outputfilter.h
+++ b/parts/outputviews/outputfilter.h
@@ -12,7 +12,7 @@
#ifndef OutputFilter_h
#define OutputFilter_h
-#include <qstring.h>
+#include <tqstring.h>
class OutputFilter
{
@@ -20,7 +20,7 @@ public:
OutputFilter( OutputFilter& );
virtual ~OutputFilter() {}
- virtual void processLine( const QString& line );
+ virtual void processLine( const TQString& line );
private:
OutputFilter& m_next;