1 files changed, 19 insertions, 19 deletions

diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp
index dacb0d0f..3df6a8ee 100644
--- a/cervisia/resolvedlg.cpp
+++ b/cervisia/resolvedlg.cpp
@@ -106,27 +106,27 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
 
     TQFrame* mainWidget = makeMainWidget();
 
-    TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint());
+    TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint());
 
     TQSplitter *vertSplitter = new TQSplitter(Qt::Vertical, mainWidget);
 
     TQSplitter *splitter = new TQSplitter(Qt::Horizontal, vertSplitter);
 
     TQWidget *versionALayoutWidget = new TQWidget(splitter);
-    TQBoxLayout *versionAtqlayout = new TQVBoxLayout(versionALayoutWidget, 5);
+    TQBoxLayout *versionAlayout = new TQVBoxLayout(versionALayoutWidget, 5);
 
     TQLabel *revlabel1 = new TQLabel(i18n("Your version (A):"), versionALayoutWidget);
-    versionAtqlayout->addWidget(revlabel1);
+    versionAlayout->addWidget(revlabel1);
     diff1 = new DiffView(cfg, true, false, versionALayoutWidget);
-    versionAtqlayout->addWidget(diff1, 10);
+    versionAlayout->addWidget(diff1, 10);
 
     TQWidget* versionBLayoutWidget = new TQWidget(splitter);
-    TQBoxLayout *versionBtqlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
+    TQBoxLayout *versionBlayout = new TQVBoxLayout(versionBLayoutWidget, 5);
 
     TQLabel *revlabel2 = new TQLabel(i18n("Other version (B):"), versionBLayoutWidget);
-    versionBtqlayout->addWidget(revlabel2);
+    versionBlayout->addWidget(revlabel2);
     diff2 = new DiffView(cfg, true, false, versionBLayoutWidget);
-    versionBtqlayout->addWidget(diff2, 10);
+    versionBlayout->addWidget(diff2, 10);
 
     diff1->setPartner(diff2);
     diff2->setPartner(diff1);
@@ -140,7 +140,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
     merge = new DiffView(cfg, false, false, mergeLayoutWidget);
     mergeLayout->addWidget(merge, 10);
 
-    tqlayout->addWidget(vertSplitter);
+    layout->addWidget(vertSplitter);
 
     abutton = new TQPushButton("&A", mainWidget);
     connect( abutton, TQT_SIGNAL(clicked()), TQT_SLOT(aClicked()) );
@@ -166,17 +166,17 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name)
     forwbutton = new TQPushButton("&>>", mainWidget);
     connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) );
 
-    TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout);
-    buttontqlayout->addWidget(abutton, 1);
-    buttontqlayout->addWidget(bbutton, 1);
-    buttontqlayout->addWidget(abbutton, 1);
-    buttontqlayout->addWidget(babutton, 1);
-    buttontqlayout->addWidget(editbutton, 1);
-    buttontqlayout->addStretch(1);
-    buttontqlayout->addWidget(nofnlabel, 2);
-    buttontqlayout->addStretch(1);
-    buttontqlayout->addWidget(backbutton, 1);
-    buttontqlayout->addWidget(forwbutton, 1);
+    TQBoxLayout *buttonlayout = new TQHBoxLayout(layout);
+    buttonlayout->addWidget(abutton, 1);
+    buttonlayout->addWidget(bbutton, 1);
+    buttonlayout->addWidget(abbutton, 1);
+    buttonlayout->addWidget(babutton, 1);
+    buttonlayout->addWidget(editbutton, 1);
+    buttonlayout->addStretch(1);
+    buttonlayout->addWidget(nofnlabel, 2);
+    buttonlayout->addStretch(1);
+    buttonlayout->addWidget(backbutton, 1);
+    buttonlayout->addWidget(forwbutton, 1);
 
     connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(saveClicked()) );
     connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) );