summaryrefslogtreecommitdiffstats
path: root/src/optiondialog.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:04 -0600
commit303e108109ce526c414e8770119134dcc2f2d7bd (patch)
tree16e7fdb1b604f30ac7b9cb7bbaeae90c34f438a6 /src/optiondialog.cpp
parentf3372e7bea9bbc288e039d85d660450220a637d8 (diff)
downloadkdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.tar.gz
kdiff3-303e108109ce526c414e8770119134dcc2f2d7bd.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
Diffstat (limited to 'src/optiondialog.cpp')
-rw-r--r--src/optiondialog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index 3f0ebf7..9b46a6d 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -22,13 +22,13 @@
#include <tqcombobox.h>
#include <tqfont.h>
#include <tqframe.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include <tqvbox.h>
#include <tqvalidator.h>
#include <tqtooltip.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqradiobutton.h>
#include <tqvbuttongroup.h>
#include <tqsettings.h>
@@ -495,7 +495,7 @@ void OptionDialog::setupOtherOptions()
new OptionToggleAction( true, "Show Statusbar", &m_bShowStatusBar, this );
new OptionNum( (int)KToolBar::Top, "ToolBarPos", &m_toolBarPos, this );
- new OptionSize( TQSize(600,400),"Geometry", &m_geometry, this );
+ new OptionSize( TQSize(600,400),"Geometry", &m_tqgeometry, this );
new OptionPoint( TQPoint(0,22), "Position", &m_position, this );
new OptionToggleAction( false, "WindowStateMaximised", &m_bMaximised, this );