summaryrefslogtreecommitdiffstats
path: root/chalk/ui/kis_dlg_preferences.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:31 -0600
commitc9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (patch)
tree1ee1912ac4bb966475f0db0f2a78678661b4b4a5 /chalk/ui/kis_dlg_preferences.cc
parent94844816550ad672ccfcdc25659c625546239998 (diff)
downloadkoffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.tar.gz
koffice-c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 94844816550ad672ccfcdc25659c625546239998.
Diffstat (limited to 'chalk/ui/kis_dlg_preferences.cc')
-rw-r--r--chalk/ui/kis_dlg_preferences.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index b9313fa9..a19edebe 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -27,7 +27,7 @@
#include <tqcheckbox.h>
#include <tqcursor.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpixmap.h>
#include <tqpushbutton.h>
@@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name )
KisConfig cfg;
- m_cmbCursorShape->setCurrentItem(cfg.cursorStyle());
+ m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle());
grpDockability->setButton(cfg.dockability());
numDockerFontSize->setValue((int)cfg.dockerFontSize());
}
@@ -86,14 +86,14 @@ void GeneralTab::setDefault()
{
KisConfig cfg;
- m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
+ m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
grpDockability->setButton(cfg.getDefaultDockability());
numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize()));
}
enumCursorStyle GeneralTab::cursorStyle()
{
- return (enumCursorStyle)m_cmbCursorShape->currentItem();
+ return (enumCursorStyle)m_cmbtqCursorShape->currentItem();
}
enumKoDockability GeneralTab::dockability()
@@ -383,12 +383,12 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const
TQWidget *parent, const char *name)
: super(parent, name, true, "", Ok | Cancel)
{
- setCaption(i18n("Configure %1").arg(deviceName));
+ setCaption(i18n("Configure %1").tqarg(deviceName));
m_page = new WdgTabletDeviceSettings(this);
setMainWidget(m_page);
- resize(m_page->sizeHint());
+ resize(m_page->tqsizeHint());
for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) {
TQString axisString;