summaryrefslogtreecommitdiffstats
path: root/kexi/widget/kexieditor.cpp
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 /kexi/widget/kexieditor.cpp
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 'kexi/widget/kexieditor.cpp')
-rw-r--r--kexi/widget/kexieditor.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 6d3848ce..07627f32 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -23,7 +23,7 @@
#include <keximainwindow.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqframe.h>
#include <klocale.h>
#include <kdebug.h>
@@ -85,7 +85,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
: KexiViewBase(mainWin, parent, name)
, d(new KexiEditorPrivate())
{
- TQVBoxLayout *layout = new TQVBoxLayout(this);
+ TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
#ifdef KTEXTEDIT_BASED_SQL_EDITOR
d->view = new KTextEdit( "", TQString(), this, "kexi_editor" );
//adjust font
@@ -98,9 +98,9 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
#else
TQFrame *fr = new TQFrame(this);
fr->setFrameStyle(TQFrame::Sunken|TQFrame::WinPanel);
- layout->addWidget(fr);
- layout = new TQVBoxLayout(fr);
- layout->setMargin( 2 );
+ tqlayout->addWidget(fr);
+ tqlayout = new TQVBoxLayout(fr);
+ tqlayout->setMargin( 2 );
d->doc = KTextEditor::EditorChooser::createDocument(TQT_TQOBJECT(fr));
if (!d->doc)
@@ -121,7 +121,7 @@ KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *na
KexiEditorSharedActionConnector c(this, TQT_TQOBJECT(d->view));
d->view->installEventFilter(this);
- layout->addWidget(d->view);
+ tqlayout->addWidget(d->view);
setViewWidget(d->view, true/*focus*/);
d->view->show();
}