summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/AboutDialog.cpp4
-rw-r--r--src/IndentHandler.cpp52
-rw-r--r--src/MainWindow.cpp120
-rw-r--r--src/__TODO/AboutDialogGraphicsView.cpp12
-rw-r--r--src/__TODO/UiGuiIndentServer.cpp14
-rw-r--r--src/debugging/TSLogger.cpp4
-rwxr-xr-xsrc/main.cpp2
7 files changed, 104 insertions, 104 deletions
diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index e604852..ba70156 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -99,8 +99,8 @@ AboutDialog::AboutDialog(TQWidget *parent, WFlags flags) :
m_scrollSpeed = 100;
m_timer = new TQTimer(this);
- connect(m_timer, SIGNAL(timeout()), this, SLOT(scroll()));
- connect(okButton, SIGNAL(clicked()), this, SLOT(accept()));
+ connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scroll()));
+ connect(okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
}
/*
diff --git a/src/IndentHandler.cpp b/src/IndentHandler.cpp
index 6056f37..f7508e3 100644
--- a/src/IndentHandler.cpp
+++ b/src/IndentHandler.cpp
@@ -92,14 +92,14 @@ IndentHandler::IndentHandler(int indenterID, MainWindow *mainWindow, TQWidget *p
if (m_mainWindow)
{
- connect((TQObject*)m_mainWindow->actionLoadIndenterConfigFile, SIGNAL(activated()),
- this, SLOT(openConfigFileDialog()));
- connect((TQObject*)m_mainWindow->actionSaveIndenterConfigFile, SIGNAL(activated()),
- this, SLOT(saveasIndentCfgFileDialog()));
- connect((TQObject*)m_mainWindow->actionCreateShellScript, SIGNAL(activated()),
- this, SLOT(createIndenterCallShellScript()));
- connect((TQObject*)m_mainWindow->actionResetIndenterParameters, SIGNAL(activated()),
- this, SLOT(resetIndenterParameter()));
+ connect((TQObject*)m_mainWindow->actionLoadIndenterConfigFile, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(openConfigFileDialog()));
+ connect((TQObject*)m_mainWindow->actionSaveIndenterConfigFile, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(saveasIndentCfgFileDialog()));
+ connect((TQObject*)m_mainWindow->actionCreateShellScript, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(createIndenterCallShellScript()));
+ connect((TQObject*)m_mainWindow->actionResetIndenterParameters, TQ_SIGNAL(activated()),
+ this, TQ_SLOT(resetIndenterParameter()));
}
// create vertical layout box, into which the toolbox will be added
@@ -115,13 +115,13 @@ IndentHandler::IndentHandler(int indenterID, MainWindow *mainWindow, TQWidget *p
// Create the indenter selection combo box.
m_indenterSelectionCombobox = new TQComboBox(this);
m_indenterSelectionCombobox->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
- connect(m_indenterSelectionCombobox, SIGNAL(activated(int)), this, SLOT(setIndenter(int)));
+ connect(m_indenterSelectionCombobox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setIndenter(int)));
hboxLayout->addWidget(m_indenterSelectionCombobox);
// Create the indenter parameter help button.
m_indenterParameterHelpButton = new TQToolButton(this);
m_indenterParameterHelpButton->setIconSet(TQPixmap(TQString(APP_ICONS_PATH)+ "help.png"));
- connect(m_indenterParameterHelpButton, SIGNAL(clicked()), this, SLOT(showIndenterManual()));
+ connect(m_indenterParameterHelpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showIndenterManual()));
hboxLayout->addWidget(m_indenterParameterHelpButton);
// create a toolbox and set its resize behavior
@@ -331,7 +331,7 @@ TQString IndentHandler::callExecutableIndenter(const TQString &sourceCode, const
TQString parameterParameterFile;
TQProcess indentProcess;
- TQObject::connect(&indentProcess, SIGNAL(processExited()), this, SLOT(indenterProcessFinished()));
+ TQObject::connect(&indentProcess, TQ_SIGNAL(processExited()), this, TQ_SLOT(indenterProcessFinished()));
// Generate the parameter string that will be saved to the indenters config file
TQString parameterString = getParameterString();
@@ -701,12 +701,12 @@ bool IndentHandler::loadConfigFile(const TQString &filePathName)
}
// Disconnect and reconnect the signal, otherwise it is emitted each time the value is set
- disconnect(pNumeric.spinBox, SIGNAL(valueChanged(int)),
- this, SLOT(handleChangedIndenterSettings()));
+ disconnect(pNumeric.spinBox, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(handleChangedIndenterSettings()));
pNumeric.spinBox->setValue(paramValue);
pNumeric.valueEnabledChkBox->setChecked(found);
- connect(pNumeric.spinBox, SIGNAL(valueChanged(int)),
- this, SLOT(handleChangedIndenterSettings()));
+ connect(pNumeric.spinBox, TQ_SIGNAL(valueChanged(int)),
+ this, TQ_SLOT(handleChangedIndenterSettings()));
}
// Search for name of each string parameter and set it.
@@ -1064,9 +1064,9 @@ void IndentHandler::readIndentIniFile(const TQString &iniFilePath)
"/ValueDefault").toInt());
m_paramNumerics.append(paramNumeric);
- TQObject::connect(spinBox, SIGNAL(valueChanged(int)), this,
- SLOT(handleChangedIndenterSettings()));
- TQObject::connect(chkBox, SIGNAL(clicked()), this, SLOT(handleChangedIndenterSettings()));
+ TQObject::connect(spinBox, TQ_SIGNAL(valueChanged(int)), this,
+ TQ_SLOT(handleChangedIndenterSettings()));
+ TQObject::connect(chkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleChangedIndenterSettings()));
}
// edit type is boolean so create a checkbox
else if (editType == "boolean")
@@ -1104,7 +1104,7 @@ void IndentHandler::readIndentIniFile(const TQString &iniFilePath)
"/ValueDefault").toBool());
m_paramBooleans.append(paramBoolean);
- TQObject::connect(chkBox, SIGNAL(clicked()), this, SLOT(handleChangedIndenterSettings()));
+ TQObject::connect(chkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleChangedIndenterSettings()));
}
// edit type is numeric so create a line edit with label
else if (editType == "string")
@@ -1159,9 +1159,9 @@ void IndentHandler::readIndentIniFile(const TQString &iniFilePath)
"/ValueDefault").toString());
m_paramStrings.append(paramString);
- TQObject::connect(lineEdit, SIGNAL(returnPressed()), this,
- SLOT(handleChangedIndenterSettings()));
- TQObject::connect(chkBox, SIGNAL(clicked()), this, SLOT(handleChangedIndenterSettings()));
+ TQObject::connect(lineEdit, TQ_SIGNAL(returnPressed()), this,
+ TQ_SLOT(handleChangedIndenterSettings()));
+ TQObject::connect(chkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleChangedIndenterSettings()));
}
// edit type is multiple so create a combobox with label
else if (editType == "multiple")
@@ -1218,9 +1218,9 @@ void IndentHandler::readIndentIniFile(const TQString &iniFilePath)
"/ValueDefault").toInt());
m_paramMultiples.append(paramMultiple);
- TQObject::connect(comboBox, SIGNAL(activated(int)), this,
- SLOT(handleChangedIndenterSettings()));
- TQObject::connect(chkBox, SIGNAL(clicked()), this, SLOT(handleChangedIndenterSettings()));
+ TQObject::connect(comboBox, TQ_SIGNAL(activated(int)), this,
+ TQ_SLOT(handleChangedIndenterSettings()));
+ TQObject::connect(chkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(handleChangedIndenterSettings()));
}
}
}
@@ -1351,7 +1351,7 @@ TQString IndentHandler::getIndenterCfgFile()
bool IndentHandler::createIndenterCallString()
{
TQProcess indentProcess(this);
- TQObject::connect(&indentProcess, SIGNAL(processExited()), this, SLOT(indenterProcessFinished()));
+ TQObject::connect(&indentProcess, TQ_SIGNAL(processExited()), this, TQ_SLOT(indenterProcessFinished()));
if (m_indenterFileName.isEmpty())
{
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index f674d30..6edcd5d 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -114,11 +114,11 @@ MainWindow::MainWindow(TQString file2OpenOnStart, TQWidget *parent) :
//m_aboutDialog = new AboutDialog(this, WStyle_Splash);
m_aboutDialog = new AboutDialog(this);
///-- _aboutDialogGraphicsView = new AboutDialogGraphicsView(m_aboutDialog, this);
- connect(actionAboutUniversalIndentGUITQt, SIGNAL(activated()), this, SLOT(showAboutDialog()));
+ connect(actionAboutUniversalIndentGUITQt, TQ_SIGNAL(activated()), this, TQ_SLOT(showAboutDialog()));
// Generate settings dialog box
m_settingsDialog = new UiGuiSettingsDialog(this, m_settings);
- connect(actionShowSettings, SIGNAL(activated()), m_settingsDialog, SLOT(showDialog()));
+ connect(actionShowSettings, TQ_SIGNAL(activated()), m_settingsDialog, TQ_SLOT(showDialog()));
if (TQFile::exists(file2OpenOnStart))
{
@@ -205,60 +205,60 @@ void MainWindow::initMainWindow()
m_currentEncoding = m_settings->getValueByName("FileEncoding").toString();
// Register the syntax highlighting setting in the menu to the settings object.
- connect(actionEnableSyntaxHighlighting, SIGNAL(toggled(bool)),
- m_settings, SLOT(handleValueChangeFromExtern(bool)));
- connect(m_settings, SIGNAL(syntaxHighlightingEnabled(bool)),
- actionEnableSyntaxHighlighting, SLOT(setOn(bool)));
+ connect(actionEnableSyntaxHighlighting, TQ_SIGNAL(toggled(bool)),
+ m_settings, TQ_SLOT(handleValueChangeFromExtern(bool)));
+ connect(m_settings, TQ_SIGNAL(syntaxHighlightingEnabled(bool)),
+ actionEnableSyntaxHighlighting, TQ_SLOT(setOn(bool)));
actionEnableSyntaxHighlighting->setOn(
m_settings->getValueByName("SyntaxHighlightingEnabled").toBool());
// Tell the highlighter if it has to be enabled or disabled.
- connect(m_settings, SIGNAL(syntaxHighlightingEnabled(bool)), this, SLOT(turnHighlightOnOff(bool)));
+ connect(m_settings, TQ_SIGNAL(syntaxHighlightingEnabled(bool)), this, TQ_SLOT(turnHighlightOnOff(bool)));
// Register the load last file setting in the menu to the settings object
- connect(actionLoadLastOpenedFileOnStartup, SIGNAL(toggled(bool)),
- m_settings, SLOT(handleValueChangeFromExtern(bool)));
- connect(m_settings, SIGNAL(loadLastOpenedFileOnStartup(bool)),
- actionLoadLastOpenedFileOnStartup, SLOT(setOn(bool)));
+ connect(actionLoadLastOpenedFileOnStartup, TQ_SIGNAL(toggled(bool)),
+ m_settings, TQ_SLOT(handleValueChangeFromExtern(bool)));
+ connect(m_settings, TQ_SIGNAL(loadLastOpenedFileOnStartup(bool)),
+ actionLoadLastOpenedFileOnStartup, TQ_SLOT(setOn(bool)));
actionLoadLastOpenedFileOnStartup->setOn(
m_settings->getValueByName("LoadLastOpenedFileOnStartup").toBool());
// Register the white space setting in the menu to the settings object.
- connect(actionWhiteSpaceIsVisible, SIGNAL(toggled(bool)),
- m_settings, SLOT(handleValueChangeFromExtern(bool)));
- connect(m_settings, SIGNAL(whiteSpaceIsVisible(bool)),
- actionWhiteSpaceIsVisible, SLOT(setOn(bool)));
+ connect(actionWhiteSpaceIsVisible, TQ_SIGNAL(toggled(bool)),
+ m_settings, TQ_SLOT(handleValueChangeFromExtern(bool)));
+ connect(m_settings, TQ_SIGNAL(whiteSpaceIsVisible(bool)),
+ actionWhiteSpaceIsVisible, TQ_SLOT(setOn(bool)));
actionWhiteSpaceIsVisible->setOn(m_settings->getValueByName("WhiteSpaceIsVisible").toBool());
// Tell the TQScintilla editor if it has to show white space.
- connect(m_settings, SIGNAL(whiteSpaceIsVisible(bool)), this, SLOT(setWhiteSpaceVisibility(bool)));
+ connect(m_settings, TQ_SIGNAL(whiteSpaceIsVisible(bool)), this, TQ_SLOT(setWhiteSpaceVisibility(bool)));
// Register the indenter parameter tooltip setting in the menu to the settings object
- connect(actionIndenterParameterTooltipsEnabled, SIGNAL(toggled(bool)),
- m_settings, SLOT(handleValueChangeFromExtern(bool)));
- connect(m_settings, SIGNAL(indenterParameterTooltipsEnabled(bool)),
- actionIndenterParameterTooltipsEnabled, SLOT(setOn(bool)));
+ connect(actionIndenterParameterTooltipsEnabled, TQ_SIGNAL(toggled(bool)),
+ m_settings, TQ_SLOT(handleValueChangeFromExtern(bool)));
+ connect(m_settings, TQ_SIGNAL(indenterParameterTooltipsEnabled(bool)),
+ actionIndenterParameterTooltipsEnabled, TQ_SLOT(setOn(bool)));
actionIndenterParameterTooltipsEnabled->setOn(
m_settings->getValueByName("IndenterParameterTooltipsEnabled").toBool());
// Connect the remaining menu items.
- connect(actionOpenSourceFile, SIGNAL(activated()), this, SLOT(openSourceFileDialog()));
- connect(actionSaveSourceFile, SIGNAL(activated()), this, SLOT(saveSourceFile()));
- connect(actionSaveSourceFileAs, SIGNAL(activated()), this, SLOT(saveasSourceFileDialog()));
- connect(actionExportPDF, SIGNAL(activated()), this, SLOT(exportToPDF()));
- connect(actionExportHTML, SIGNAL(activated()), this, SLOT(exportToHTML()));
- connect(m_settings, SIGNAL(indenterParameterTooltipsEnabled(bool)),
- this, SLOT(setIndenterParameterTooltips(bool)));
+ connect(actionOpenSourceFile, TQ_SIGNAL(activated()), this, TQ_SLOT(openSourceFileDialog()));
+ connect(actionSaveSourceFile, TQ_SIGNAL(activated()), this, TQ_SLOT(saveSourceFile()));
+ connect(actionSaveSourceFileAs, TQ_SIGNAL(activated()), this, TQ_SLOT(saveasSourceFileDialog()));
+ connect(actionExportPDF, TQ_SIGNAL(activated()), this, TQ_SLOT(exportToPDF()));
+ connect(actionExportHTML, TQ_SIGNAL(activated()), this, TQ_SLOT(exportToHTML()));
+ connect(m_settings, TQ_SIGNAL(indenterParameterTooltipsEnabled(bool)),
+ this, TQ_SLOT(setIndenterParameterTooltips(bool)));
-///-- connect(actionShowLog, SIGNAL(activated()),
-///-- debugging::TSLogger::getInstance(), SLOT(show()));
+///-- connect(actionShowLog, TQ_SIGNAL(activated()),
+///-- debugging::TSLogger::getInstance(), TQ_SLOT(show()));
// Init the menu for selecting one of the recently opened files.
initRecentlyOpenedList();
updateRecentlyOpenedList();
- connect(popupMenuRecentlyOpenedFiles, SIGNAL(highlighted(int)),
- this, SLOT(recentlyOpenedFileHighlighted(int)));
- connect(popupMenuRecentlyOpenedFiles, SIGNAL(activated(int)),
- this, SLOT(openFileFromRecentlyOpenedList(int)));
- connect(m_settings, SIGNAL(recentlyOpenedListSize(int)), this, SLOT(updateRecentlyOpenedList()));
+ connect(popupMenuRecentlyOpenedFiles, TQ_SIGNAL(highlighted(int)),
+ this, TQ_SLOT(recentlyOpenedFileHighlighted(int)));
+ connect(popupMenuRecentlyOpenedFiles, TQ_SIGNAL(activated(int)),
+ this, TQ_SLOT(openFileFromRecentlyOpenedList(int)));
+ connect(m_settings, TQ_SIGNAL(recentlyOpenedListSize(int)), this, TQ_SLOT(updateRecentlyOpenedList()));
updateWindowTitle();
}
@@ -278,19 +278,19 @@ void MainWindow::initToolBar()
m_toolBarWidget->cbEnableSyntaxHL->hide();
m_toolBarWidget->pbOpenSourceFile->setIconSet(TQPixmap(ICONS_PATH + "document-open.png"));
- connect(m_toolBarWidget->pbOpenSourceFile, SIGNAL(clicked()), this, SLOT(openSourceFileDialog()));
+ connect(m_toolBarWidget->pbOpenSourceFile, TQ_SIGNAL(clicked()), this, TQ_SLOT(openSourceFileDialog()));
m_toolBarWidget->pbAbout->setIconSet(TQPixmap(ICONS_PATH + "info.png"));
- connect(m_toolBarWidget->pbAbout, SIGNAL(clicked()), this, SLOT(showAboutDialog()));
+ connect(m_toolBarWidget->pbAbout, TQ_SIGNAL(clicked()), this, TQ_SLOT(showAboutDialog()));
m_toolBarWidget->pbExit->setIconSet(TQPixmap(ICONS_PATH + "system-log-out.png"));
- connect(m_toolBarWidget->pbExit, SIGNAL(clicked()), this, SLOT(close()));
+ connect(m_toolBarWidget->pbExit, TQ_SIGNAL(clicked()), this, TQ_SLOT(close()));
// Settings a pixmap hides the text in TQt3
//m_toolBarWidget->cbLivePreview->setPixmap(TQPixmap(ICONS_PATH + "live-preview.png"));
- connect(m_toolBarWidget->cbLivePreview, SIGNAL(toggled(bool)), this, SLOT(previewTurnedOnOff(bool)));
- connect(m_toolBarWidget->cbLivePreview, SIGNAL(toggled(bool)),
- actionLiveIndentPreview, SLOT(setOn(bool)));
+ connect(m_toolBarWidget->cbLivePreview, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(previewTurnedOnOff(bool)));
+ connect(m_toolBarWidget->cbLivePreview, TQ_SIGNAL(toggled(bool)),
+ actionLiveIndentPreview, TQ_SLOT(setOn(bool)));
}
/*
@@ -329,7 +329,7 @@ void MainWindow::initTextEditor()
// Handle the width of tabs in spaces
int tabWidth = m_settings->getValueByName("TabWidth").toInt();
m_qSciSourceCodeEditor->setTabWidth(tabWidth);
- connect(m_settings, SIGNAL(tabWidth(int)), m_qSciSourceCodeEditor, SLOT(setTabWidth(int)));
+ connect(m_settings, TQ_SIGNAL(tabWidth(int)), m_qSciSourceCodeEditor, TQ_SLOT(setTabWidth(int)));
// TODO not available in TQScintilla 1.71
// Remember a pointer to the scrollbar of the TQScintilla widget used to keep
@@ -339,15 +339,15 @@ void MainWindow::initTextEditor()
// Add a column row indicator to the status bar.
m_textEditLineColumnInfoLabel = new TQLabel(tr("Line %1, Column %2").arg(1).arg(1), this);
statusBar()->addWidget(m_textEditLineColumnInfoLabel, 0, true);
- connect(m_qSciSourceCodeEditor, SIGNAL(cursorPositionChanged(int,int)),
- this, SLOT(setStatusBarCursorPosInfo(int, int)));
+ connect(m_qSciSourceCodeEditor, TQ_SIGNAL(cursorPositionChanged(int,int)),
+ this, TQ_SLOT(setStatusBarCursorPosInfo(int, int)));
// Connect the text editor to dependent functions.
- connect(m_qSciSourceCodeEditor, SIGNAL(textChanged()), this, SLOT(sourceCodeChangedHelperSlot()));
+ connect(m_qSciSourceCodeEditor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(sourceCodeChangedHelperSlot()));
// TODO signal 'linesChanged' is not available in TQScintilla 1.71.
// Use textChanged for now and check for line number changes in the slot
- //connect(m_qSciSourceCodeEditor, SIGNAL(linesChanged()), this, SLOT(numberOfLinesChanged()));
- connect(m_qSciSourceCodeEditor, SIGNAL(textChanged()), this, SLOT(numberOfLinesChanged()));
+ //connect(m_qSciSourceCodeEditor, TQ_SIGNAL(linesChanged()), this, TQ_SLOT(numberOfLinesChanged()));
+ connect(m_qSciSourceCodeEditor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(numberOfLinesChanged()));
numberOfLinesChanged();
}
@@ -423,7 +423,7 @@ bool MainWindow::initApplicationLanguage()
tqApp->installTranslator(m_uiGuiTranslator);
}
- connect(m_settings, SIGNAL(language(int)), this, SLOT(languageChanged(int)) );
+ connect(m_settings, TQ_SIGNAL(language(int)), this, TQ_SLOT(languageChanged(int)) );
return translationFileLoaded;
}
@@ -441,8 +441,8 @@ void MainWindow::initIndenter()
m_centralSplitter->moveToFirst(m_indentHandler);
// If settings for the indenter have changed, let the main window know aboud it.
- connect(m_indentHandler, SIGNAL(indenterSettingsChanged()), this,
- SLOT(indentSettingsChangedSlot()));
+ connect(m_indentHandler, TQ_SIGNAL(indenterSettingsChanged()), this,
+ TQ_SLOT(indentSettingsChangedSlot()));
// Set this true, so the indenter is called at first program start
m_indentSettingsChanged = true;
@@ -644,12 +644,12 @@ void MainWindow::updateSourceView()
if (m_previewToggled)
{
- disconnect(m_qSciSourceCodeEditor, SIGNAL(textChanged()),
- this, SLOT(sourceCodeChangedHelperSlot()));
+ disconnect(m_qSciSourceCodeEditor, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(sourceCodeChangedHelperSlot()));
m_qSciSourceCodeEditor->setText(m_sourceViewContent);
m_previewToggled = false;
- connect(m_qSciSourceCodeEditor, SIGNAL(textChanged()),
- this, SLOT(sourceCodeChangedHelperSlot()));
+ connect(m_qSciSourceCodeEditor, TQ_SIGNAL(textChanged()),
+ this, TQ_SLOT(sourceCodeChangedHelperSlot()));
}
///-- m_textEditVScrollBar->setValue(_textEditLastScrollPos);
@@ -691,7 +691,7 @@ void MainWindow::turnHighlightOnOff(bool turnOn)
*/
void MainWindow::sourceCodeChangedHelperSlot()
{
- TQTimer::singleShot(0, this, SLOT(sourceCodeChangedSlot()));
+ TQTimer::singleShot(0, this, TQ_SLOT(sourceCodeChangedSlot()));
}
/*
@@ -1172,12 +1172,12 @@ void MainWindow::createEncodingMenu()
}
m_encodingActionGroup->addTo(popupMenuEncoding);
- connect(m_encodingActionGroup, SIGNAL(selected(TQAction*)),
- this, SLOT(encodingChanged(TQAction*)));
+ connect(m_encodingActionGroup, TQ_SIGNAL(selected(TQAction*)),
+ this, TQ_SLOT(encodingChanged(TQAction*)));
m_saveEncodedActionGroup->addTo(popupMenuSaveEncoded);
- connect(m_saveEncodedActionGroup, SIGNAL(selected(TQAction*)),
- this, SLOT(saveAsOtherEncoding(TQAction*)));
+ connect(m_saveEncodedActionGroup, TQ_SIGNAL(selected(TQAction*)),
+ this, TQ_SLOT(saveAsOtherEncoding(TQAction*)));
}
/*
@@ -1254,8 +1254,8 @@ void MainWindow::createHighlighterMenu()
}
m_highlighterActionGroup->addTo(popupMenuHighlighter);
- connect(m_highlighterActionGroup , SIGNAL(selected(TQAction*)),
- m_highlighter, SLOT(setHighlighterByAction(TQAction*)));
+ connect(m_highlighterActionGroup , TQ_SIGNAL(selected(TQAction*)),
+ m_highlighter, TQ_SLOT(setHighlighterByAction(TQAction*)));
}
/*
diff --git a/src/__TODO/AboutDialogGraphicsView.cpp b/src/__TODO/AboutDialogGraphicsView.cpp
index b9b527b..1a6a7ea 100644
--- a/src/__TODO/AboutDialogGraphicsView.cpp
+++ b/src/__TODO/AboutDialogGraphicsView.cpp
@@ -74,7 +74,7 @@ AboutDialogGraphicsView::AboutDialogGraphicsView(AboutDialog *aboutDialog, TQWid
setCacheMode(TQGraphicsView::CacheBackground);
setViewportUpdateMode(TQGraphicsView::BoundingRectViewportUpdate);
- connect(_aboutDialog, SIGNAL(finished(int)), this, SLOT(hide()));
+ connect(_aboutDialog, TQ_SIGNAL(finished(int)), this, TQ_SLOT(hide()));
//setWindowOpacity(0.9);
@@ -86,7 +86,7 @@ AboutDialogGraphicsView::AboutDialogGraphicsView(AboutDialog *aboutDialog, TQWid
_timeLine->setFrameRange(270, 0);
//_timeLine->setUpdateInterval(10);
//_timeLine->setCurveShape(TQTimeLine::EaseInCurve);
- connect(_timeLine, SIGNAL(frameChanged(int)), this, SLOT(updateStep(int)));
+ connect(_timeLine, TQ_SIGNAL(frameChanged(int)), this, TQ_SLOT(updateStep(int)));
}
AboutDialogGraphicsView::~AboutDialogGraphicsView(void)
@@ -150,7 +150,7 @@ void AboutDialogGraphicsView::show()
//_aboutDialogAsSplashScreen->show();
TQGraphicsView::show();
- connect(_timeLine, SIGNAL(finished()), this, SLOT(showAboutDialog()));
+ connect(_timeLine, TQ_SIGNAL(finished()), this, TQ_SLOT(showAboutDialog()));
_timeLine->setDirection(TQTimeLine::Forward);
_timeLine->start();
}
@@ -176,7 +176,7 @@ void AboutDialogGraphicsView::updateStep(int step)
void AboutDialogGraphicsView::showAboutDialog()
{
//hide();
- disconnect(_timeLine, SIGNAL(finished()), this, SLOT(showAboutDialog()));
+ disconnect(_timeLine, TQ_SIGNAL(finished()), this, TQ_SLOT(showAboutDialog()));
_aboutDialog->move(int(_parentWindow->geometry().x() +
(_parentWindow->geometry().width() - _graphicsProxyWidget->geometry().width()) / 2),
_parentWindow->y() + _windowTitleBarWidth - _windowPosOffset);
@@ -204,7 +204,7 @@ void AboutDialogGraphicsView::hide()
//_aboutDialogAsSplashScreen->show();
TQGraphicsView::show();
- connect(_timeLine, SIGNAL(finished()), this, SLOT(hideReally()));
+ connect(_timeLine, TQ_SIGNAL(finished()), this, TQ_SLOT(hideReally()));
_timeLine->setDirection(TQTimeLine::Backward);
_timeLine->start();
}
@@ -214,7 +214,7 @@ void AboutDialogGraphicsView::hide()
*/
void AboutDialogGraphicsView::hideReally()
{
- disconnect(_timeLine, SIGNAL(finished()), this, SLOT(hideReally()));
+ disconnect(_timeLine, TQ_SIGNAL(finished()), this, TQ_SLOT(hideReally()));
TQGraphicsView::hide();
_parentWindow->activateWindow();
}
diff --git a/src/__TODO/UiGuiIndentServer.cpp b/src/__TODO/UiGuiIndentServer.cpp
index 8584650..76b18d6 100644
--- a/src/__TODO/UiGuiIndentServer.cpp
+++ b/src/__TODO/UiGuiIndentServer.cpp
@@ -72,7 +72,7 @@ void UiGuiIndentServer::startServer()
}
}
- connect(_tcpServer, SIGNAL(newConnection()), this, SLOT(handleNewConnection()));
+ connect(_tcpServer, TQ_SIGNAL(newConnection()), this, TQ_SLOT(handleNewConnection()));
_readyForHandleRequest = true;
_blockSize = 0;
}
@@ -92,9 +92,9 @@ void UiGuiIndentServer::stopServer()
void UiGuiIndentServer::handleNewConnection()
{
TQTcpSocket *clientConnection = _tcpServer->nextPendingConnection();
- connect(clientConnection, SIGNAL(disconnected()), clientConnection, SLOT(deleteLater()));
+ connect(clientConnection, TQ_SIGNAL(disconnected()), clientConnection, TQ_SLOT(deleteLater()));
- connect(clientConnection, SIGNAL(readyRead()), this, SLOT(handleReceivedData()));
+ connect(clientConnection, TQ_SIGNAL(readyRead()), this, TQ_SLOT(handleReceivedData()));
}
void UiGuiIndentServer::handleReceivedData()
@@ -157,8 +157,8 @@ void UiGuiIndentServer::sendMessage(const TQString &message)
out.device()->seek(0);
out << (tquint32)(_dataToSend.size() - sizeof(tquint32));
- connect(_currentClientConnection, SIGNAL(bytesWritten(qint64)), this,
- SLOT(checkIfReadyForHandleRequest()));
+ connect(_currentClientConnection, TQ_SIGNAL(bytesWritten(qint64)), this,
+ TQ_SLOT(checkIfReadyForHandleRequest()));
_currentClientConnection->write(_dataToSend);
}
@@ -168,8 +168,8 @@ void UiGuiIndentServer::checkIfReadyForHandleRequest()
{
TQString dataToSendStr = _dataToSend.right(_dataToSend.size() - sizeof(tquint32));
tqDebug() << "checkIfReadyForHandleRequest _dataToSend was: " << dataToSendStr;
- disconnect(_currentClientConnection, SIGNAL(bytesWritten(qint64)), this,
- SLOT(checkIfReadyForHandleRequest()));
+ disconnect(_currentClientConnection, TQ_SIGNAL(bytesWritten(qint64)), this,
+ TQ_SLOT(checkIfReadyForHandleRequest()));
_readyForHandleRequest = true;
}
}
diff --git a/src/debugging/TSLogger.cpp b/src/debugging/TSLogger.cpp
index c79dacb..caa29ad 100644
--- a/src/debugging/TSLogger.cpp
+++ b/src/debugging/TSLogger.cpp
@@ -91,8 +91,8 @@ TSLogger::TSLogger(int verboseLevel) :
m_logFileInitState = NOTINITIALZED;
- connect(m_TSLoggerDialogForm->openLogFileFolderToolButton, SIGNAL(clicked()), this,
- SLOT(openLogFileFolder()));
+ connect(m_TSLoggerDialogForm->openLogFileFolderToolButton, TQ_SIGNAL(clicked()), this,
+ TQ_SLOT(openLogFileFolder()));
// Make the main application not to wait for the logging window to close.
setAttribute(TQt::WA_QuitOnClose, false);
diff --git a/src/main.cpp b/src/main.cpp
index c71d80f..dded8ed 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
try
{
- app.connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); // TODO: remove when no longer needed
+ app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); // TODO: remove when no longer needed
returnValue = app.exec();
}
catch (std::exception &ex)