diff --git a/icons/__TODO/Icon1.png b/icons/__TODO/Icon1.png
deleted file mode 100755
index 7144147..0000000
Binary files a/icons/__TODO/Icon1.png and /dev/null differ
diff --git a/icons/__TODO/edit-select-all.png b/icons/__TODO/edit-select-all.png
deleted file mode 100755
index 107fc60..0000000
Binary files a/icons/__TODO/edit-select-all.png and /dev/null differ
diff --git a/icons/__TODO/format-justify-left.png b/icons/__TODO/format-justify-left.png
deleted file mode 100755
index ba0e914..0000000
Binary files a/icons/__TODO/format-justify-left.png and /dev/null differ
diff --git a/icons/__TODO/icon2.ico b/icons/__TODO/icon2.ico
deleted file mode 100755
index c784369..0000000
Binary files a/icons/__TODO/icon2.ico and /dev/null differ
diff --git a/icons/__TODO/icon2.png b/icons/__TODO/icon2.png
deleted file mode 100755
index 337d353..0000000
Binary files a/icons/__TODO/icon2.png and /dev/null differ
diff --git a/icons/__TODO/icon3.png b/icons/__TODO/icon3.png
deleted file mode 100755
index b6b6a9e..0000000
Binary files a/icons/__TODO/icon3.png and /dev/null differ
diff --git a/icons/__TODO/qt_logo.png b/icons/__TODO/qt_logo.png
deleted file mode 100755
index 332f2ad..0000000
Binary files a/icons/__TODO/qt_logo.png and /dev/null differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 64f9e9a..b0db1b9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,7 +27,9 @@ set( ${target}_SRCS
AboutDialogBase.ui
MainWindowBase.ui
ToolBarWidget.ui
+ UiGuiSettingsDialogBase.ui
+ main.cpp
IndentHandler.cpp
SettingsPaths.cpp
TemplateBatchScript.cpp
@@ -37,11 +39,9 @@ set( ${target}_SRCS
UiGuiSettings.cpp
# ongoing
- UiGuiSettingsDialogBase.ui
AboutDialog.cpp
MainWindow.cpp
- main.cpp
UiGuiSettingsDialog.cpp
)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 4c71ba2..a00bb52 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -915,8 +915,10 @@ void MainWindow::previewTurnedOnOff(bool turnOn)
*/
void MainWindow::updateWindowTitle()
{
+ // TQt3 does not support the 'modified [*]' property present in Qt4's QWidget
setCaption("UniversalIndentGUI (TQt) " + TQString(PROGRAM_VERSION_STRING) +
- " [*] " + m_currentSourceFile);
+ //" [*] " + m_currentSourceFile);
+ m_currentSourceFile);
}
/*
@@ -1085,6 +1087,7 @@ void MainWindow::closeEvent(TQCloseEvent *event)
*/
bool MainWindow::maybeSave()
{
+ // TQt3 does not support the 'isWindowModified()' method present in Qt4's QWidget
///-- if (isWindowModified())
///-- {
///-- int ret = TQMessageBox::warning(this, tr("Modified code"), tr(
diff --git a/src/__TODO/FindDialog.ui b/src/__TODO/FindDialog.ui
deleted file mode 100755
index 00cc527..0000000
--- a/src/__TODO/FindDialog.ui
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
- FindDialog
-
-
-
- 0
- 0
- 347
- 227
-
-
-
- Find
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Find what:
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Find options
-
-
-
-
-
-
- Match case
-
-
-
- -
-
-
- Match whole word
-
-
-
- -
-
-
- Search forward
-
-
- true
-
-
-
- -
-
-
- Use Regular Expressions
-
-
-
-
-
-
- -
-
-
- TQt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- TQLayout::SetMaximumSize
-
-
-
-
-
- Find Next
-
-
-
- -
-
-
- Close
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main.cpp b/src/main.cpp
index 5f58b69..c923f60 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,9 +19,7 @@
#include "MainWindow.h"
-// -- #include "IndentHandler.h"
#include "SettingsPaths.h"
-// -- #include "UiGuiIniFileParser.h"
#include "UiGuiVersion.h"
#include
@@ -29,14 +27,12 @@
#include
#include
-// -- #include
#include
-// -- #include
#include
/*!
- /brief Entry point to UniversalIndentGUI application.
+ /brief Entry point to UniversalIndentGUI-TQt application.
*/
int main(int argc, char *argv[])
{
@@ -90,7 +86,6 @@ int main(int argc, char *argv[])
TQApplication app(argc, argv);
MainWindow *mainWindow = NULL;
-// -- IndentHandler *indentHandler = NULL;
// Setting UTF-8 as default 8-Bit encoding
TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("UTF-8"));
@@ -101,7 +96,7 @@ int main(int argc, char *argv[])
try
{
- app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); // TODO: remove when no longer needed
+ app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()));
returnValue = app.exec();
}
catch (std::exception &ex)
@@ -109,8 +104,6 @@ int main(int argc, char *argv[])
tqDebug(TQString() + __LINE__ + " " + __FUNCTION__ + ": Something went terribly wrong: " + ex.what());
}
-// -- delete indentHandler;
delete mainWindow;
-
return returnValue;
}