Fixed broken references and other bugs

Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data

apps/launcher/settings/gamesettings.cpp

@@ -6,8 +6,6 @@
 #include <QRegExp>
 #include <QMap>
 
-#include <QDebug>
-
 #include <components/files/configurationmanager.hpp>
 
 #include <boost/version.hpp>

apps/launcher/settings/settingsbase.hpp

@@ -7,8 +7,6 @@
 #include <QRegExp>
 #include <QMap>
 
-#include <QDebug>
-
 template <class Map>
 class SettingsBase
 {

apps/opencs/model/doc/document.cpp

@@ -1,9 +1,6 @@
-
 #include "document.hpp"
-
 #include <cassert>
 
-#include <QDebug>
 void CSMDoc::Document::load (const std::vector<boost::filesystem::path>::const_iterator& begin,
     const std::vector<boost::filesystem::path>::const_iterator& end, bool lastAsModified)
 {

apps/opencs/model/settings/settingsitem.cpp

@@ -1,5 +1,7 @@
 #include "settingsitem.hpp"
 
+#include <QStringList>
+
 bool CSMSettings::SettingsItem::updateItem (const QStringList *values)
 {
     QStringList::ConstIterator it = values->begin();
@@ -66,10 +68,21 @@ bool CSMSettings::SettingsItem::updateItem(int valueListIndex)
 
 bool CSMSettings::SettingsItem::validate (const QString &value)
 {
-    //validation required only if a value list or min/max value pair has been provided
+    //if there is no value list or value pair, there is no validation to do
-    bool isValid = (mValueList->find(value) != mValueList->end());
+    bool isValid = !(!mValueList->isEmpty() || mValuePair);
 
-    if (!isValid && mValuePair)
+    if (!isValid && !mValueList->isEmpty())
+    {
+        for (QStringList::Iterator it = mValueList->begin(); it != mValueList->end(); ++it)
+    //    foreach (QString listItem, *mValueList)
+        {
+            isValid = (value == *it);
+
+            if (isValid)
+                break;
+        }
+    }
+    else if (!isValid && mValuePair)
     {
         int numVal = value.toInt();
 

apps/opencs/model/settings/usersettings.cpp

@@ -9,16 +9,12 @@
 #include <QTextCodec>
 
 #include <QFile>
-
 #include <QDebug>
 
 #include <components/files/configurationmanager.hpp>
-
 #include "settingcontainer.hpp"
-
 #include <boost/version.hpp>
 
-#include <QDebug>
 /**
  * Workaround for problems with whitespaces in paths in older versions of Boost library
  */

apps/opencs/view/doc/view.cpp

@@ -8,7 +8,6 @@
 #include <QMdiArea>
 #include <QDockWidget>
 #include <QtGui/QApplication>
-#include <QDebug>
 
 #include "../../model/doc/document.hpp"
 #include "../world/subviews.hpp"

apps/opencs/view/doc/viewmanager.cpp

@@ -21,7 +21,6 @@
 #include <QPushButton>
 #include <QtGui/QApplication>
 
-#include <QDebug>
 void CSVDoc::ViewManager::updateIndices()
 {
     std::map<CSMDoc::Document *, std::pair<int, int> > documents;

apps/opencs/view/settings/proxyblock.cpp

@@ -53,6 +53,8 @@ bool CSVSettings::ProxyBlock::updateProxiedSettings()
 
         bool success = false;
         int i = 0;
+
+        //find the value index of the selected value in the proxy setting
         for (; i < mValueList->size(); ++i)
         {
             success =  (value == mValueList->at(i));
@@ -64,6 +66,7 @@ bool CSVSettings::ProxyBlock::updateProxiedSettings()
         if (!success)
             return false;
 
+        // update the containing the proxied item's name
         foreach (QStringList *list, mProxyList)
         {
             if ( list->at(0) == block->objectName())

apps/opencs/view/settings/usersettingsdialog.cpp

@@ -12,10 +12,6 @@
 
 #include <QGridLayout>
 
-#include "samplepage.hpp"
-
-#include <QDebug>
-
 #include "editorpage.hpp"
 #include "windowpage.hpp"
 

apps/opencs/view/settings/windowpage.cpp

@@ -64,12 +64,14 @@ CSVSettings::GroupBlockDef *CSVSettings::WindowPage::buildCustomWindowSize()
     SettingsItemDef *widthItem = new SettingsItemDef ("Width", "640");
     widthItem->widget = WidgetDef (Widget_LineEdit);
     widthItem->widget.widgetWidth = 45;
+    widthItem->widget.inputMask = "9999";
 
     //custom height
     SettingsItemDef *heightItem = new SettingsItemDef ("Height", "480");
     heightItem->widget = WidgetDef (Widget_LineEdit);
     heightItem->widget.widgetWidth = 45;
     heightItem->widget.caption = "x";
+    heightItem->widget.inputMask = "9999";
 
     block->settingItems << widthItem << heightItem;
     block->widgetOrientation = Orient_Horizontal;

components/fileorderlist/model/datafilesmodel.cpp

@@ -2,7 +2,6 @@
 #include <QTextCodec>
 #include <QFileInfo>
 #include <QDir>
-#include <QDebug>
 
 #include <stdexcept>
 
@@ -12,6 +11,8 @@
 
 #include "datafilesmodel.hpp"
 
+#include <QDebug>
+
 DataFilesModel::DataFilesModel(QObject *parent) :
     QAbstractTableModel(parent)
 {