Clean up some unused stuff

Signed-off-by: Michele Calgaro <[email protected]>

11 files changed, 8 insertions, 133 deletions

diff --git a/icons/__TODO/Icon1.png b/icons/__TODO/Icon1.png
deleted file mode 100755
index 7144147..0000000
--- a/icons/__TODO/Icon1.png
+++ /dev/null
diff --git a/icons/__TODO/edit-select-all.png b/icons/__TODO/edit-select-all.png
deleted file mode 100755
index 107fc60..0000000
--- a/icons/__TODO/edit-select-all.png
+++ /dev/null
diff --git a/icons/__TODO/format-justify-left.png b/icons/__TODO/format-justify-left.png
deleted file mode 100755
index ba0e914..0000000
--- a/icons/__TODO/format-justify-left.png
+++ /dev/null
diff --git a/icons/__TODO/icon2.ico b/icons/__TODO/icon2.ico
deleted file mode 100755
index c784369..0000000
--- a/icons/__TODO/icon2.ico
+++ /dev/null
diff --git a/icons/__TODO/icon2.png b/icons/__TODO/icon2.png
deleted file mode 100755
index 337d353..0000000
--- a/icons/__TODO/icon2.png
+++ /dev/null
diff --git a/icons/__TODO/icon3.png b/icons/__TODO/icon3.png
deleted file mode 100755
index b6b6a9e..0000000
--- a/icons/__TODO/icon3.png
+++ /dev/null
diff --git a/icons/__TODO/qt_logo.png b/icons/__TODO/qt_logo.png
deleted file mode 100755
index 332f2ad..0000000
--- a/icons/__TODO/qt_logo.png
+++ /dev/null
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FindDialog</class>
- <widget class="TQDialog" name="FindDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>347</width>
-    <height>227</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Find</string>
-  </property>
-  <layout class="TQVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="TQLabel" name="label">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Find what:</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="TQComboBox" name="comboBox">
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="TQGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string>Find options</string>
-     </property>
-     <layout class="TQVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="TQCheckBox" name="checkBox">
-        <property name="text">
-         <string>Match case</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="TQCheckBox" name="checkBox_2">
-        <property name="text">
-         <string>Match whole word</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="TQCheckBox" name="checkBox_3">
-        <property name="text">
-         <string>Search forward</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="TQCheckBox" name="checkBox_4">
-        <property name="text">
-         <string>Use Regular Expressions</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>TQt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="TQHBoxLayout" name="horizontalLayout">
-     <property name="sizeConstraint">
-      <enum>TQLayout::SetMaximumSize</enum>
-     </property>
-     <item>
-      <widget class="TQPushButton" name="pushButton">
-       <property name="text">
-        <string>Find Next</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="TQPushButton" name="pushButton_2">
-       <property name="text">
-        <string>Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
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 <tqapplication.h>
@@ -29,14 +27,12 @@
 #include <tqstring.h>
 #include <tqtextcodec.h>
 
-// -- #include <algorithm>
 #include <iostream>
-// -- #include <string>
 
 #include <tclap/CmdLine.h>
 
 /*!
-    /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;
 }