diff options
Diffstat (limited to 'quanta/src/document.cpp')
-rw-r--r-- | quanta/src/document.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index c5530dae..49b3d195 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -200,25 +200,25 @@ Document::Document(KTextEditor::Document *doc, //path of the backup copy file of the document m_backupPathValue = TQString(); - connect( m_doc, TQT_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), - this, TQT_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); + connect( m_doc, TQ_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), + this, TQ_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); - connect( m_view, TQT_SIGNAL(completionAborted()), - this, TQT_SLOT( slotCompletionAborted()) ); + connect( m_view, TQ_SIGNAL(completionAborted()), + this, TQ_SLOT( slotCompletionAborted()) ); - connect( m_view, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - this, TQT_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); + connect( m_view, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); - connect( m_view, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), - this, TQT_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); - connect( m_doc, TQT_SIGNAL(textChanged()), TQT_SLOT(slotTextChanged())); + connect( m_view, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), + this, TQ_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); + connect( m_doc, TQ_SIGNAL(textChanged()), TQ_SLOT(slotTextChanged())); - connect(m_view, TQT_SIGNAL(gotFocus(Kate::View*)), TQT_SIGNAL(editorGotFocus())); + connect(m_view, TQ_SIGNAL(gotFocus(Kate::View*)), TQ_SIGNAL(editorGotFocus())); - connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotFileDirty(const TQString&))); + connect(fileWatcher, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotFileDirty(const TQString&))); -// connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(slotMarksChanged())); - connect(m_doc, TQT_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQT_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); +// connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(slotMarksChanged())); + connect(m_doc, TQ_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQ_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); } @@ -725,7 +725,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) /* if (completion.type == "charCompletion") { m_lastCompletionList = getCharacterCompletions(completion.userdata); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } else*/ if (completion.type == "attribute") { @@ -736,7 +736,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) if (tag) { m_lastCompletionList = getAttributeValueCompletions(tag->name(), completion.text); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } } } else @@ -755,7 +755,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) { m_lastLine = line; m_lastCol = col - 1; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedScriptAutoCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedScriptAutoCompletion())); } } } @@ -859,7 +859,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(string[0].unicode()); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -872,7 +872,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(c); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -2236,7 +2236,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -2252,7 +2252,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); md5sum = context.hexDigest(); kdDebug(24000) << "MD5 sum of current doc: " << m_md5sum << endl; kdDebug(24000) << "MD5 sum of doc on disc : " << md5sum << endl; @@ -2323,7 +2323,7 @@ bool Document::saveAs(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -2367,7 +2367,7 @@ void Document::slotTextChanged() { kdDebug(24000) << "Delayed text changed called." << endl; //delay the handling, otherwise we may get wrong values for (line,column) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedTextChanged())); delayedTextChangedEnabled = false; } } @@ -2378,7 +2378,7 @@ void Document::slotDelayedTextChanged(bool forced) { kdDebug(24000) << "Reparsing delayed!" << endl; parser->setParsingNeeded(true); - TQTimer::singleShot(1000, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDelayedTextChanged())); reparseEnabled = false; delayedTextChangedEnabled = false; return; @@ -2872,8 +2872,8 @@ void Document::open(const KURL &url, const TQString &encoding) m_encoding = encoding; m_codec = TQTextCodec::codecForName(m_encoding.ascii()); } - connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + connect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + connect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); if (!openURL(url)) slotOpeningFailed(TQString()); if (!url.isLocalFile()) @@ -2897,8 +2897,8 @@ void Document::slotOpeningCompleted() m_modifTime = TQFileInfo(u.path()).lastModified(); // kdDebug(24000) << "addFile[Document::open]: " << u.path() << endl; } - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); m_dirty = false; m_view->setFocus(); processDTD(); @@ -2911,8 +2911,8 @@ void Document::slotOpeningFailed(const TQString &errorMessage) Q_UNUSED(errorMessage); //TODO: append the error message to our own error message if (!url().isLocalFile()) tqApp->exit_loop(); - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); emit openingFailed(url()); } @@ -3115,7 +3115,7 @@ void Document::setAnnotationText(uint line, const TQString& text) markIf->removeMark(line, KTextEditor::MarkInterface::markType08); } else { - m_annotations.insert(line, tqMakePair(text, TQString(""))); + m_annotations.insert(line, qMakePair(text, TQString(""))); if (markIf) markIf->setMark(line, KTextEditor::MarkInterface::markType08); uint line, column; @@ -3147,7 +3147,7 @@ void Document::setAnnotationText(uint line, const TQString& text) s.prepend(commentBegin + " "); s.append(" " + commentEnd + "\n"); insertText(s, true, true); - emit showAnnotation(line, "", tqMakePair(text, TQString(""))); + emit showAnnotation(line, "", qMakePair(text, TQString(""))); } } @@ -3181,7 +3181,7 @@ bool Document::openURL(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } |