From dc6b8e72fed2586239e3514819238c520636c9d9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:54:04 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1157656 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- quanta/messages/annotationoutput.cpp | 102 +++++++++++++++++------------------ quanta/messages/annotationoutput.h | 28 +++++----- quanta/messages/messageitem.cpp | 24 ++++----- quanta/messages/messageitem.h | 16 +++--- quanta/messages/messageoutput.cpp | 56 +++++++++---------- quanta/messages/messageoutput.h | 22 ++++---- 6 files changed, 124 insertions(+), 124 deletions(-) (limited to 'quanta/messages') diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 8c8d7d90..48ebb7fd 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -10,15 +10,15 @@ // // -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -35,7 +35,7 @@ #include "quantacommon.h" #include "viewmanager.h" -AnnotationOutput::AnnotationOutput(QWidget *parent, const char *name) +AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) : KTabWidget(parent, name) { m_currentFileAnnotations = new MessageOutput(this); @@ -50,7 +50,7 @@ AnnotationOutput::AnnotationOutput(QWidget *parent, const char *name) m_yourAnnotations->setLineWidth(2); addTab(m_yourAnnotations, i18n("For You")); - connect(m_yourAnnotations, SIGNAL(executed(QListViewItem*)), SLOT(yourAnnotationsItemExecuted(QListViewItem *))); + connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); m_allAnnotations = new KListView(this); m_allAnnotations->addColumn("1", -1); @@ -59,14 +59,14 @@ AnnotationOutput::AnnotationOutput(QWidget *parent, const char *name) m_allAnnotations->header()->hide(); m_allAnnotations->setSorting(1); m_allAnnotations->setLineWidth(2); - connect(m_allAnnotations, SIGNAL(executed(QListViewItem*)), SLOT(allAnnotationsItemExecuted(QListViewItem *))); + connect(m_allAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); addTab(m_allAnnotations, i18n("All Files")); - connect(this, SIGNAL(currentChanged(QWidget*)), SLOT(tabChanged(QWidget*))); + connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(tabChanged(TQWidget*))); - m_updateTimer = new QTimer(this); - connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateNextFile())); + m_updateTimer = new TQTimer(this); + connect(m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateNextFile())); m_yourAnnotationsNum = 0; } @@ -75,16 +75,16 @@ AnnotationOutput::~AnnotationOutput() { } -void AnnotationOutput::tabChanged(QWidget *w) +void AnnotationOutput::tabChanged(TQWidget *w) { if (w == m_allAnnotations || w == m_yourAnnotations) readAnnotations(); } -void AnnotationOutput::insertAnnotation(uint line, const QString& fileName, const QPair& annotation) +void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const QPair& annotation) { line++; - QString s = i18n("Line %1: %2").arg(line).arg(annotation.first); + TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first); s.replace('\n', ' '); m_currentFileAnnotations->showMessage(line, 1, fileName, s); } @@ -106,8 +106,8 @@ void AnnotationOutput::readAnnotations() } KURL baseURL = Project::ref()->projectBaseURL(); - QStringList openedItems; - QListViewItem *item = m_allAnnotations->firstChild(); + TQStringList openedItems; + TQListViewItem *item = m_allAnnotations->firstChild(); while (item) { if (item->isOpen()) @@ -119,7 +119,7 @@ void AnnotationOutput::readAnnotations() m_fileNames.clear(); m_lines.clear(); - QStringList yourOpenedItems; + TQStringList yourOpenedItems; item = m_yourAnnotations->firstChild(); while (item) { @@ -134,17 +134,17 @@ void AnnotationOutput::readAnnotations() m_yourLines.clear(); m_yourAnnotationsNum = 0; - QDomElement annotationElement = Project::ref()->dom()->firstChild().firstChild().namedItem("annotations").toElement(); + TQDomElement annotationElement = Project::ref()->dom()->firstChild().firstChild().namedItem("annotations").toElement(); if (annotationElement.isNull()) return; - QString yourself = Project::ref()->yourself().lower(); - QStringList roles = Project::ref()->yourRoles(); - QDomNodeList nodes = annotationElement.childNodes(); + TQString yourself = Project::ref()->yourself().lower(); + TQStringList roles = Project::ref()->yourRoles(); + TQDomNodeList nodes = annotationElement.childNodes(); int count = nodes.count(); for (int i = 0; i < count; i++) { - QDomElement el = nodes.item(i).toElement(); - QString fileName = el.attribute("url"); + TQDomElement el = nodes.item(i).toElement(); + TQString fileName = el.attribute("url"); KURL u = baseURL; QuantaCommon::setUrl(u, fileName); u = QExtFileInfo::toAbsolute(u, baseURL); @@ -152,13 +152,13 @@ void AnnotationOutput::readAnnotations() { bool ok; int line = el.attribute("line").toInt(&ok, 10); - QString text = el.attribute("text"); - QString receiver = el.attribute("receiver"); + TQString text = el.attribute("text"); + TQString receiver = el.attribute("receiver"); text.replace('\n',' '); - QString lineText = QString("%1").arg(line); + TQString lineText = TQString("%1").arg(line); if (lineText.length() < 20) { - QString s; + TQString s; s.fill('0', 20 - lineText.length()); lineText.prepend(s); } @@ -205,7 +205,7 @@ void AnnotationOutput::readAnnotations() } } -void AnnotationOutput::writeAnnotations(const QString &fileName, const QMap > &a_annotations) +void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap > &a_annotations) { m_annotatedFileItems.clear(); m_fileNames.clear(); @@ -215,23 +215,23 @@ void AnnotationOutput::writeAnnotations(const QString &fileName, const QMap > annotations = a_annotations; - QDomDocument *dom = Project::ref()->dom(); - QDomElement annotationElement = dom->firstChild().firstChild().namedItem("annotations").toElement(); + TQMap > annotations = a_annotations; + TQDomDocument *dom = Project::ref()->dom(); + TQDomElement annotationElement = dom->firstChild().firstChild().namedItem("annotations").toElement(); if (annotationElement.isNull()) { annotationElement = dom->createElement("annotations"); dom->firstChild().firstChild().appendChild(annotationElement); } - QDomNode n = annotationElement.firstChild(); + TQDomNode n = annotationElement.firstChild(); while ( !n.isNull() ) { - QDomElement el = n.toElement(); - QString fName = el.attribute("url"); - QDomNode n2 = n.nextSibling(); + TQDomElement el = n.toElement(); + TQString fName = el.attribute("url"); + TQDomNode n2 = n.nextSibling(); if (fileName == fName) { - QString text = el.attribute("text"); + TQString text = el.attribute("text"); bool ok; int line = el.attribute("line").toInt(&ok, 10); if (!annotations.contains(line) || (annotations[line].first != text)) @@ -243,9 +243,9 @@ void AnnotationOutput::writeAnnotations(const QString &fileName, const QMap >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it) + for (TQMap >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it) { - QDomElement el = dom->createElement("annotation"); + TQDomElement el = dom->createElement("annotation"); el.setAttribute("url", fileName); el.setAttribute("line", it.key()); el.setAttribute("text", it.data().first); @@ -259,7 +259,7 @@ void AnnotationOutput::writeAnnotations(const QString &fileName, const QMap (item->parent()) != m_allAnnotations) { @@ -268,7 +268,7 @@ void AnnotationOutput::allAnnotationsItemExecuted(QListViewItem *item) emit clicked(m_fileNames[item], 0, 0); } -void AnnotationOutput::yourAnnotationsItemExecuted(QListViewItem *item) +void AnnotationOutput::yourAnnotationsItemExecuted(TQListViewItem *item) { if (dynamic_cast (item->parent()) != m_yourAnnotations) { @@ -292,25 +292,25 @@ void AnnotationOutput::updateAnnotations() void AnnotationOutput::updateAnnotationForFile(const KURL& url) { - static const QRegExp rx("-->|\\*/"); + static const TQRegExp rx("-->|\\*/"); if (!ViewManager::ref()->isOpened(url) && QuantaCommon::checkMimeGroup(url, "text" )) { // kdDebug(24000) << "Testing " << url << endl; - QFile f(url.path()); + TQFile f(url.path()); if (f.open(IO_ReadOnly)) { - QMap > annotations; + TQMap > annotations; uint i = 0; - QTextStream stream(&f); - stream.setEncoding(QTextStream::UnicodeUTF8); - QString line; + TQTextStream stream(&f); + stream.setEncoding(TQTextStream::UnicodeUTF8); + TQString line; while (!stream.atEnd()) { line = stream.readLine(); int pos = line.find("@annotation"); if (pos != -1) { - QString receiver; + TQString receiver; pos += 11; if (line[pos] == '(') { diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h index 0c5ab748..50e293d6 100644 --- a/quanta/messages/annotationoutput.h +++ b/quanta/messages/annotationoutput.h @@ -38,12 +38,12 @@ class AnnotationOutput : public KTabWidget { Q_OBJECT public: - AnnotationOutput(QWidget *parent = 0, const char *name = 0); + AnnotationOutput(TQWidget *parent = 0, const char *name = 0); ~AnnotationOutput(); MessageOutput *currentFileAnnotations() const {return m_currentFileAnnotations;} KListView *allAnnotations() const {return m_allAnnotations;} - void writeAnnotations(const QString &fileName, const QMap > &annotations); + void writeAnnotations(const TQString &fileName, const TQMap > &annotations); public slots: /** @@ -52,16 +52,16 @@ public slots: void updateAnnotations(); void readAnnotations(); void clearAnnotations(); - void insertAnnotation(uint line, const QString& fileName, const QPair& annotation); + void insertAnnotation(uint line, const TQString& fileName, const QPair& annotation); private slots: - void tabChanged(QWidget *w); - void allAnnotationsItemExecuted(QListViewItem *item); - void yourAnnotationsItemExecuted(QListViewItem *item); + void tabChanged(TQWidget *w); + void allAnnotationsItemExecuted(TQListViewItem *item); + void yourAnnotationsItemExecuted(TQListViewItem *item); void slotUpdateNextFile(); signals: - void clicked(const QString& fname, int line, int col); + void clicked(const TQString& fname, int line, int col); private: /** @@ -72,17 +72,17 @@ private: MessageOutput *m_currentFileAnnotations; KListView *m_allAnnotations; - QDict m_annotatedFileItems; - QMap m_fileNames; - QMap m_lines; + TQDict m_annotatedFileItems; + TQMap m_fileNames; + TQMap m_lines; uint m_yourAnnotationsNum; KListView *m_yourAnnotations; - QDict m_yourFileItems; - QMap m_yourFileNames; - QMap m_yourLines; + TQDict m_yourFileItems; + TQMap m_yourFileNames; + TQMap m_yourLines; - QTimer *m_updateTimer; + TQTimer *m_updateTimer; KURL::List m_files; uint m_fileIndex; }; diff --git a/quanta/messages/messageitem.cpp b/quanta/messages/messageitem.cpp index 7f906041..dc1c7ad8 100644 --- a/quanta/messages/messageitem.cpp +++ b/quanta/messages/messageitem.cpp @@ -16,11 +16,11 @@ ***************************************************************************/ #include "messageitem.h" -#include +#include #include -MessageItem::MessageItem( QListBox * listbox, const QString &text, int line, int column, const QString &fname ) - :QListBoxText(listbox,text),lineNumber(line),columnNumber(column),filename(fname) +MessageItem::MessageItem( TQListBox * listbox, const TQString &text, int line, int column, const TQString &fname ) + :TQListBoxText(listbox,text),lineNumber(line),columnNumber(column),filename(fname) { } @@ -30,14 +30,14 @@ int MessageItem::line() return lineNumber; } else { // try to find first number in text - QString s = text(); - int pos = s.find( QRegExp("[0-9]")); + TQString s = text(); + int pos = s.find( TQRegExp("[0-9]")); if ( pos == -1 ) return lineNumber; int pos2 = pos; while ( s[pos2].isDigit() ) pos2++; - QString snum = s.mid(pos, pos2-pos); + TQString snum = s.mid(pos, pos2-pos); return snum.toInt(); } @@ -50,8 +50,8 @@ int MessageItem::column() return columnNumber; } else { - QString s = text(); - QRegExp exp("(?:\\D|^)(\\d{1,4})(?:\\D|$)"); + TQString s = text(); + TQRegExp exp("(?:\\D|^)(\\d{1,4})(?:\\D|$)"); int pos = exp.search(s); if ( pos == -1 ) @@ -64,12 +64,12 @@ int MessageItem::column() } } -QString MessageItem::fileName() +TQString MessageItem::fileName() { if (filename.isEmpty()) { - QString fname; - QString s = text(); + TQString fname; + TQString s = text(); int pos = s.find(i18n("File: ")); if (pos != -1) { @@ -85,7 +85,7 @@ QString MessageItem::fileName() return filename; } -void MessageItem::addText(const QString &t) +void MessageItem::addText(const TQString &t) { setText( text() + t ); } diff --git a/quanta/messages/messageitem.h b/quanta/messages/messageitem.h index 01e04b35..64894e25 100644 --- a/quanta/messages/messageitem.h +++ b/quanta/messages/messageitem.h @@ -19,34 +19,34 @@ #ifndef MESSAGEITEM_H #define MESSAGEITEM_H -#include +#include /** - Like QListBoxText with storing of filename and line in it. + Like TQListBoxText with storing of filename and line in it. */ -class MessageItem : public QListBoxText { +class MessageItem : public TQListBoxText { public: - MessageItem( QListBox *listbox, const QString &text = QString::null, int line = -1, int column = -1, const QString &fname = QString::null); + MessageItem( TQListBox *listbox, const TQString &text = TQString::null, int line = -1, int column = -1, const TQString &fname = TQString::null); /** return line number for file , associated with this message */ int line(); /** return column number for file , associated with this message */ int column(); /** return name of file , associated with this message */ - QString fileName(); + TQString fileName(); void setLine(int line) { lineNumber = line; } void setColumn(int line) { columnNumber = line; } - void setFileName(const QString &fileName ) { filename = fileName; } - void addText(const QString &text); + void setFileName(const TQString &fileName ) { filename = fileName; } + void addText(const TQString &text); private: // line number and filename , associated with this line int lineNumber; ///< the line of the item. -1 if not defined int columnNumber; ///< the column of the item. -1 if not defined - QString filename; ///< the filename (URL) of the item. Empty if not defined + TQString filename; ///< the filename (URL) of the item. Empty if not defined }; diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 6b89aaa9..de4627ca 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -25,40 +25,40 @@ #include // Qt includes -#include -#include -#include +#include +#include +#include #include "messageoutput.h" #include "messageitem.h" -MessageOutput::MessageOutput(QWidget *parent, const char *name ) - : QListBox(parent,name) +MessageOutput::MessageOutput(TQWidget *parent, const char *name ) + : TQListBox(parent,name) { m_maxItems = 2000; - QPalette pal = palette(); - pal.setColor(QColorGroup::HighlightedText, pal.color(QPalette::Normal, QColorGroup::Text)); - pal.setColor(QColorGroup::Highlight, pal.color(QPalette::Normal, QColorGroup::Mid)); + TQPalette pal = palette(); + pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Normal, TQColorGroup::Text)); + pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Normal, TQColorGroup::Mid)); setPalette(pal); setFocusPolicy( NoFocus ); m_popupMenu = new KPopupMenu(this); - connect(this, SIGNAL(contextMenuRequested(QListBoxItem*, const QPoint&)), - this, SLOT(showMenu(QListBoxItem*, const QPoint&))); - m_popupMenu->insertItem( SmallIconSet("editcopy"), i18n("&Copy"), this, SLOT(copyContent()) ) ; - m_popupMenu->insertItem( SmallIconSet("filesaveas"), i18n("&Save As..."), this, SLOT(saveContent()) ) ; + connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + m_popupMenu->insertItem( SmallIconSet("editcopy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; + m_popupMenu->insertItem( SmallIconSet("filesaveas"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ; m_popupMenu->insertSeparator(); - m_popupMenu->insertItem( SmallIconSet("editclear"), i18n("Clear"), this, SLOT(clear()) ) ; + m_popupMenu->insertItem( SmallIconSet("editclear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ; - connect( this, SIGNAL(clicked(QListBoxItem*)), SLOT(clickItem(QListBoxItem*)) ); + connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) ); } MessageOutput::~MessageOutput() { } -MessageItem *MessageOutput::insertItem(const QString& s) +MessageItem *MessageOutput::insertItem(const TQString& s) { checkMaxItems(); MessageItem *it = new MessageItem(this, s); @@ -66,7 +66,7 @@ MessageItem *MessageOutput::insertItem(const QString& s) return it; } -void MessageOutput::addToLastItem(const QString& s) +void MessageOutput::addToLastItem(const TQString& s) { int ind = count() - 1; if ( ind != -1 ) { @@ -78,10 +78,10 @@ void MessageOutput::addToLastItem(const QString& s) } } -void MessageOutput::showMessage(int line, int col, const QString &fileName, const QString& s, bool append) +void MessageOutput::showMessage(int line, int col, const TQString &fileName, const TQString& s, bool append) { MessageItem *it = 0L; - QString message = s; + TQString message = s; int endPos; if ( !count() || (!append && !text(count()-1).stripWhiteSpace().isEmpty()) ) it = insertItem(""); @@ -109,7 +109,7 @@ void MessageOutput::showMessage(int line, int col, const QString &fileName, cons setBottomItem(count()>0?count()-1:0); } -void MessageOutput::showMessage(const QString& s, bool append) +void MessageOutput::showMessage(const TQString& s, bool append) { showMessage(-1, -1, "", s, append); } @@ -121,7 +121,7 @@ void MessageOutput::checkMaxItems() removeItem( index(firstItem()) ); } -void MessageOutput::clickItem( QListBoxItem * l_item ) +void MessageOutput::clickItem( TQListBoxItem * l_item ) { MessageItem *item = dynamic_cast(l_item); if ( item ) { @@ -131,14 +131,14 @@ void MessageOutput::clickItem( QListBoxItem * l_item ) } } -void MessageOutput::showMenu( QListBoxItem*, const QPoint& l_point ) +void MessageOutput::showMenu( TQListBoxItem*, const TQPoint& l_point ) { m_popupMenu->exec(l_point); } -QString MessageOutput::content() +TQString MessageOutput::content() { - QString p_content; + TQString p_content; for (uint i=0; iFile
%1
already exists. Overwrite it?") - .arg(url.path()), QString::null, i18n("Overwrite")) == KMessageBox::Cancel) + .arg(url.path()), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel) return; - QFile file(url.path()); + TQFile file(url.path()); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot save log file
%1") .arg(url.url())); return; } - QTextStream textfile(&file); + TQTextStream textfile(&file); textfile << content(); file.close(); diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index 223470bd..125b85e2 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -18,7 +18,7 @@ #ifndef MESSAGEOUTPUT_H #define MESSAGEOUTPUT_H -#include +#include class KProcess; class KPopupMenu; @@ -30,17 +30,17 @@ weblint output *@author Yacovlev Alexander & Dmitry Poplavski */ -class MessageOutput : public QListBox { +class MessageOutput : public TQListBox { Q_OBJECT public: - MessageOutput(QWidget *parent=0, const char *name=0); + MessageOutput(TQWidget *parent=0, const char *name=0); ~MessageOutput(); // Return whole content as a single string with EOLs - QString content(); + TQString content(); public slots: /** Inserts an item with the content s to the end of the list*/ - MessageItem *insertItem(const QString& s); + MessageItem *insertItem(const TQString& s); /** Insert message for each line of string (EOL-separated). @param line The line this message refers to. -1 if it's not specified (the first number is taken from the message string) @@ -49,19 +49,19 @@ public slots: @param message The message itself @param append Append the message to the previous one or start a new line. Default is false, start a new line. */ - void showMessage(int line, int column, const QString &fileName, const QString& message, bool append = false); + void showMessage(int line, int column, const TQString &fileName, const TQString& message, bool append = false); /** Insert message for each line of string (EOL-separated). @param message The message itself @param append Append the message to the previous one or start a new line. Default is false, start a new line. */ - void showMessage(const QString& message, bool append = false); + void showMessage(const TQString& message, bool append = false); /** Append message string to the last item @param line The line this message refers to. -1 if it's not specified (the first number is taken from the message string) @param column The column this message refers to. -1 if it's not specified (the second number is taken from the message string) @param fileName The URL of the file this message refers to. If empty, the string following the "File: " string in the message is used. @param message The message itself */ - void addToLastItem(const QString& message); + void addToLastItem(const TQString& message); // Copy message content to clipboard void copyContent(); // Save message content to clipboard @@ -75,12 +75,12 @@ public: void checkMaxItems(); signals: - void clicked(const QString& fname, int line, int col); + void clicked(const TQString& fname, int line, int col); protected slots: - void clickItem( QListBoxItem *); + void clickItem( TQListBoxItem *); // Show context menu - void showMenu(QListBoxItem*, const QPoint&); + void showMenu(TQListBoxItem*, const TQPoint&); private: uint m_maxItems; -- cgit v1.2.1