summaryrefslogtreecommitdiffstats
path: root/quanta/src
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/src')
-rw-r--r--quanta/src/document.cpp10
-rw-r--r--quanta/src/document.h6
-rw-r--r--quanta/src/dtds.cpp4
-rw-r--r--quanta/src/quanta.cpp26
-rw-r--r--quanta/src/quanta.h6
-rw-r--r--quanta/src/quanta_init.cpp24
-rw-r--r--quanta/src/quantadoc.cpp16
-rw-r--r--quanta/src/quantadoc.h2
-rw-r--r--quanta/src/quantaview.cpp6
-rw-r--r--quanta/src/viewmanager.cpp8
10 files changed, 54 insertions, 54 deletions
diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 0f0d9933..963e27a0 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -2212,7 +2212,7 @@ void Document::slotCompletionAborted()
}
/** Ask for user confirmation if the file was changed outside. */
-void Document::checkDirtytqStatus()
+void Document::checkDirtyStatus()
{
TQString fileName;
if (url().isLocalFile())
@@ -2576,9 +2576,9 @@ bool Document::hasChanged()
return b;
}
-void Document::setChanged(bool newtqStatus)
+void Document::setChanged(bool newStatus)
{
- changed = newtqStatus;
+ changed = newStatus;
}
void Document::paste()
@@ -3056,10 +3056,10 @@ void Document::slotFileDirty(const TQString& fileName)
{
if ( url().path() == fileName && !dirty() )
{
- setDirtytqStatus(true);
+ setDirtyStatus(true);
if (this == ViewManager::ref()->activeDocument())
{
- checkDirtytqStatus();
+ checkDirtyStatus();
}
}
}
diff --git a/quanta/src/document.h b/quanta/src/document.h
index ff76fbb3..d4a6f4c7 100644
--- a/quanta/src/document.h
+++ b/quanta/src/document.h
@@ -143,9 +143,9 @@ work correctly. */
void codeCompletionHintRequested();
/** Returns the dirty status. */
bool dirty() const {return m_dirty;};
- void setDirtytqStatus(bool status) {m_dirty = status;};
+ void setDirtyStatus(bool status) {m_dirty = status;};
/** Ask for user confirmation if the file was changed outside. */
- void checkDirtytqStatus();
+ void checkDirtyStatus();
/** Save the document and reset the dirty status. */
void save();
/** Save the document under a new name and calculate the new md5sum. */
@@ -159,7 +159,7 @@ work correctly. */
/** Returns the changed status since the last query. Resets changed.*/
bool hasChanged();
/** Sets the changed status.*/
- void setChanged(bool newtqStatus);
+ void setChanged(bool newStatus);
/** Paste the contents of clipboard into the document */
void paste();
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 7a6538f6..055114d2 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -272,10 +272,10 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
TQString dirName = dirURL.path(1);
if (TQFile::exists(dirName + "common.tag"))
readTagFile(dirName + "common.tag", dtd, 0L);
- //bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
+ //bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
emit enableIdleTimer(false);
KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L);
- //quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+ //quantaApp->slotEnableIdleTimer(idleTimerStatus);
emit enableIdleTimer(true);
TQString tmpStr;
KURL::List::ConstIterator end_f = files.constEnd();
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index ee054cbe..495848aa 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -258,7 +258,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm(
m_parserEnabled = true;
cursorLine = 0;
cursorCol = 0;
- emit eventHappened("quanta_start", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
+ emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString());
setAcceptDrops(true);
tabWidget()->installEventFilter(this);
}
@@ -433,7 +433,7 @@ void QuantaApp::slotFileSave()
Document *w = view->document();
if (w)
{
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
if (w->isUntitled())
slotFileSaveAs();
else
@@ -457,7 +457,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave)
if (w)
{
KURL oldURL = w->url();
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
if (!w->isUntitled() && oldURL.isLocalFile())
{
fileWatcher->removeFile(oldURL.path());
@@ -557,7 +557,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly)
KURL url;
int query;
KURL projectTemplateURL;
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
TQString localTemplateDir = locateLocal("data", resourceDir + "templates/");
do {
@@ -684,7 +684,7 @@ void QuantaApp::slotFileCloseAll()
part->write(" ");
part->end();
- slotNewtqStatus();
+ slotNewStatus();
}
void QuantaApp::slotFileQuit()
@@ -711,7 +711,7 @@ void QuantaApp::slotStatusMsg(const TQString &msg)
statusbarTimer->stop();
statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS);
statusBar()->tqrepaint();
- kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
+ kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers);
statusbarTimer->start(10000, true);
}
@@ -915,7 +915,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo)
}
}
-void QuantaApp::slotNewtqStatus()
+void QuantaApp::slotNewStatus()
{
fileRecent->setEnabled(true);
actionCollection()->action("project_open_recent")->setEnabled(true);
@@ -1356,7 +1356,7 @@ void QuantaApp::slotOptions()
m_htmlPart->end();
reparse(true);
- slotNewtqStatus();
+ slotNewStatus();
}
m_config->sync();
@@ -1437,7 +1437,7 @@ void QuantaApp::slotShowPreviewWidget(bool show)
}
}
-void QuantaApp::slotChangePreviewtqStatus()
+void QuantaApp::slotChangePreviewStatus()
{
if (qConfig.previewPosition == "Editor")
{
@@ -1525,7 +1525,7 @@ void QuantaApp::newDebuggerPosition(const TQString &file, int lineNumber)
void QuantaApp::openFile(const TQString &file, int lineNumber, int columnNumber)
{
gotoFileAndLine(file, lineNumber, columnNumber);
- slotNewtqStatus();
+ slotNewStatus();
}
void QuantaApp::slotNewLineColumn()
@@ -1795,7 +1795,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl
TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii());
QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true);
tb->loadState(element);
- tb->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+ tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
//kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl;
if (toolbarTab->iconText() == KToolBar::IconTextBottom)
@@ -3122,7 +3122,7 @@ void QuantaApp::focusInEvent(TQFocusEvent* e)
if (w)
{
w->view()->setFocus();
- w->checkDirtytqStatus();
+ w->checkDirtyStatus();
}
}
@@ -4160,7 +4160,7 @@ bool QuantaApp::queryClose()
{
saveOptions();
// kdDebug(24000) << "Quanta will exit" << endl;
- emit eventHappened("quanta_exit", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString());
+ emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString());
} else
slotFileNew();
return canExit;
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index 1b7231e4..ade90e54 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -282,9 +282,9 @@ public slots:
unexpected things may happen. */
void slotStatusMsg(const TQString &text);
- void slotNewtqStatus();
+ void slotNewStatus();
void slotNewLineColumn();
-// void slotUpdatetqStatus(TQWidget*);FIXME:
+// void slotUpdateStatus(TQWidget*);FIXME:
/** tqrepaint preview */
void slotRepaintPreview();
@@ -298,7 +298,7 @@ public slots:
- hide if the preview was in the editor area
- update if the preview is in a toolview
*/
- void slotChangePreviewtqStatus();
+ void slotChangePreviewStatus();
/** Called when the preview widget got or lost the focus */
void slotPreviewHasFocus(bool focus);
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index 5239c8de..47d3cd9a 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -268,7 +268,7 @@ void QuantaInit::initQuanta()
TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int)));
m_quanta->slotFileNew();
- m_quanta->slotNewtqStatus();
+ m_quanta->slotNewStatus();
initToolBars();
Project::ref()->setProjectToolbarVisible(m_quanta->factory()->container("project_toolbar", m_quanta)->isShown());
Project::ref()->slotShowProjectToolbar(Project::ref()->hasProject());
@@ -356,16 +356,16 @@ void QuantaInit::initStatusBar()
void QuantaInit::initDocument()
{
m_quanta->m_doc = new QuantaDoc(0L);
- connect(m_quanta->m_doc, TQT_SIGNAL(newtqStatus()),
- TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
+ connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()),
+ TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
}
void QuantaInit::initProject()
{
Project *m_project = Project::ref(m_quanta);
- connect(m_project, TQT_SIGNAL(getTreetqStatus(TQStringList *)),
- pTab, TQT_SLOT(slotGetTreetqStatus(TQStringList *)));
+ connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)),
+ pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *)));
connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)),
TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &)));
connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)),
@@ -424,8 +424,8 @@ void QuantaInit::initProject()
connect(m_project, TQT_SIGNAL(messages(const TQString&)),
m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&)));
- connect(m_project, TQT_SIGNAL(newtqStatus()),
- TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus()));
+ connect(m_project, TQT_SIGNAL(newStatus()),
+ TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus()));
connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)),
TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &)));
@@ -438,10 +438,10 @@ void QuantaInit::initProject()
connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)),
m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&)));
- connect(pTab, TQT_SIGNAL(changeUploadtqStatus(const KURL&, int)),
+ connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)),
m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int)));
- connect(pTab, TQT_SIGNAL(changeDocumentFoldertqStatus(const KURL&, bool)),
- m_project, TQT_SLOT(slotChangeDocumentFoldertqStatus(const KURL&, bool)));
+ connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)),
+ m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool)));
connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash()));
@@ -679,7 +679,7 @@ void QuantaInit::openLastFiles()
if (w) //w==0 might happen on quick close on startup
{
m_quanta->setTitle(w->url().prettyURL(0, KURL::StripFileProtocol) );
-// m_quanta->slotUpdatetqStatus(w);//FIXME:
+// m_quanta->slotUpdateStatus(w);//FIXME:
}
}
@@ -1622,7 +1622,7 @@ int QuantaInit::runningQuantas()
int i = 0;
for (QCStringList::iterator it = list.begin(); it != list.end(); ++it)
{
- if (TQString(*it).tqstartsWith("quanta", false))
+ if (TQString(*it).startsWith("quanta", false))
++i;
}
return i;
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 797c1172..53a54598 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -132,7 +132,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
else // select opened
if (switchToExisting)
{
- view->document()->checkDirtytqStatus();
+ view->document()->checkDirtyStatus();
if (view != ViewManager::ref()->activeView())
{
view->activate();
@@ -147,7 +147,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting )
void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
bool switchToExisting, bool readOnly)
{
- bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false);
+ bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false);
KURL url = urlToOpen;
if (url.isLocalFile())
{
@@ -158,7 +158,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
TQString encoding = a_encoding;
if (!newDocument(url, switchToExisting))
{
- quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+ quantaApp->slotEnableIdleTimer(idleTimerStatus);
return;
}
Document *w = ViewManager::ref()->activeDocument();
@@ -211,15 +211,15 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding,
highlightIf->setHlMode(htmlIdx);
}
}
- emit newtqStatus();
+ emit newStatus();
}
- quantaApp->slotEnableIdleTimer(idleTimertqStatus);
+ quantaApp->slotEnableIdleTimer(idleTimerStatus);
}
void QuantaDoc::slotOpeningFailed(const KURL &url)
{
Q_UNUSED(url);
- bool signaltqStatus = signalsBlocked();
+ bool signalStatus = signalsBlocked();
blockSignals(false);
emit hideSplash();
//Seems to be not needed anymore since KDE 3.2, but keep until it's completely verified
@@ -227,7 +227,7 @@ void QuantaDoc::slotOpeningFailed(const KURL &url)
KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)));
*/
ViewManager::ref()->removeActiveView();
- blockSignals(signaltqStatus);
+ blockSignals(signalStatus);
}
void QuantaDoc::slotOpeningCompleted(const KURL &url)
@@ -240,7 +240,7 @@ void QuantaDoc::slotOpeningCompleted(const KURL &url)
quantaApp->reparse(true);
if (url.isLocalFile())
quantaApp->debugger()->fileOpened(url.prettyURL(0, KURL::StripFileProtocol));
- quantaApp->slotNewtqStatus();
+ quantaApp->slotNewStatus();
quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol));
Project::ref()->loadCursorPosition(w->url(), dynamic_cast<KTextEditor::ViewCursorInterface*>(w->view()));
emit eventHappened("after_open", url.url(), TQString());
diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h
index 0da3ff5e..ac7069d9 100644
--- a/quanta/src/quantadoc.h
+++ b/quanta/src/quantadoc.h
@@ -48,7 +48,7 @@ public slots:
void slotOpeningFailed(const KURL &url);
signals:
- void newtqStatus();
+ void newStatus();
void hideSplash();
void eventHappened(const TQString&, const TQString&, const TQString& );
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index cb4c8ef9..4bb46717 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -1021,7 +1021,7 @@ void QuantaView::activated()
ToolbarTabWidget::ref()->reparent(this, 0, TQPoint(), qConfig.enableDTDToolbar);
m_viewLayout->addWidget(ToolbarTabWidget::ref(), 0 , 0);
quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view());
- m_document->checkDirtytqStatus();
+ m_document->checkDirtyStatus();
StructTreeView::ref()->useOpenLevelSetting = true;
quantaApp->slotLoadToolbarForDTD(m_document->getDTDIdentifier());
@@ -1125,7 +1125,7 @@ bool QuantaView::saveDocument(const KURL& url)
return false; //saving to a local file failed
} else //successful saving to a local file
{
- m_document->setDirtytqStatus(false);
+ m_document->setDirtyStatus(false);
m_document->removeBackup(quantaApp->config());
fileWatcher->addFile(m_document->url().path());
// kdDebug(24000) << "addFile[saveDocument, 2]: " << m_document->url().path() << endl;
@@ -1176,7 +1176,7 @@ void QuantaView::slotSavingFailed(const TQString &error)
void QuantaView::slotSavingCompleted()
{
m_saveResult = true;
- m_document->setDirtytqStatus(false);
+ m_document->setDirtyStatus(false);
m_document->removeBackup(quantaApp->config());
if (m_eventLoopStarted)
tqApp->exit_loop();
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index 6a6294e3..23fbb063 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -95,7 +95,7 @@ QuantaView* ViewManager::createView(const TQString &caption)
connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn()));
connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn()));
connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *)));
- connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewtqStatus()));
+ connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus()));
disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 );
connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*)));
connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&)));
@@ -139,7 +139,7 @@ void ViewManager::createNewDocument()
quantaApp->setFocusProxy(w->view());
w->view()->setFocusPolicy(TQ_WheelFocus);
- connect( v, TQT_SIGNAL(newtqStatus()), quantaApp, TQT_SLOT(slotNewtqStatus()));
+ connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus()));
quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active
view->addDocument(w);
@@ -226,7 +226,7 @@ void ViewManager::slotViewActivated(KMdiChildView *view)
parser->clearGroups();
parser->setSAParserEnabled(true);
quantaApp->reparse(true); //FIXME
- quantaApp->slotNewtqStatus();
+ quantaApp->slotNewStatus();
quantaApp->slotNewLineColumn();
typingInProgress = false; //need to reset, as it's set to true in the above slots
m_lastActiveView = qView;
@@ -528,7 +528,7 @@ bool ViewManager::closeAll(bool createNew)
if (createNew)
{
createNewDocument();
- quantaApp->slotNewtqStatus();
+ quantaApp->slotNewStatus();
}
emit filesClosed(true);
return true;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 08:09:27 +0000