From a372f822fe1b3fad682bf6796cb62da4f13a31db Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:55:52 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit b8a4f26c42f6d41e8251b60357f1a6990c1e8ad8.
---
 k9author/k9menuedit.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'k9author/k9menuedit.cpp')

diff --git a/k9author/k9menuedit.cpp b/k9author/k9menuedit.cpp
index b50bcc9..e9a018b 100644
--- a/k9author/k9menuedit.cpp
+++ b/k9author/k9menuedit.cpp
@@ -17,7 +17,7 @@
 #include "k9title.h"
 #include "k9newdvd.h"
 #include <tqwmatrix.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kfontdialog.h>
 #include "k9menubutton.h"
 #include <kurlrequester.h>
@@ -153,7 +153,7 @@ void k9MenuEdit::cbPosTitleActivated(int _value) {
 
 void k9MenuEdit::setBackgroundImage(const TQImage &_image) {
     m_background=_image;
-    m_canvas->setBackgroundPixmap(TQPixmap(_image));
+    m_canvas->tqsetBackgroundPixmap(TQPixmap(_image));
     emit backgroundImageChanged(_image);
 }
 
@@ -219,7 +219,7 @@ void k9MenuEdit::setFormat(const eFormat& _value) {
     TQImage img=pix.convertToImage().smoothScale(720,m_imageHeight);
     m_canvas->resize(720,m_imageHeight);
     m_menuEditor->setMaximumSize(TQSize(724,m_imageHeight+4));
-    m_canvas->setBackgroundPixmap(TQPixmap(img));
+    m_canvas->tqsetBackgroundPixmap(TQPixmap(img));
 }
 
 
@@ -242,7 +242,7 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
     disconnect (this,TQT_SIGNAL(endScriptChanged(const TQString&)),0,0);
     cbEnd->setEnabled(true);
     m_menuEditor->clearSelection();
-    lTitle->setText(i18n("Title %1 Menu").arg(_title->getNum()+1));
+    lTitle->setText(i18n("Title %1 Menu").tqarg(_title->getNum()+1));
     setCanvas(_title->getMenu()->getCanvas());
     m_menuType=TITLEMENU;
     cbStart->clear();
@@ -266,8 +266,8 @@ void k9MenuEdit::titleSelected(k9Title *_title) {
     k9NewDVD *newDVD=(k9NewDVD*)_title->parent() ;
     k9NewDVDItems *items=newDVD->getTitles();
     for (k9Title *title=items->first();title;title=items->next()) {
-        cbEnd->insertItem(i18n("Play Title %1").arg(title->getNum()+1));
-        TQString script=TQString("g6=%1; call vmgm menu;" ).arg(title->getNum()+1);
+        cbEnd->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1));
+        TQString script=TQString("g6=%1; call vmgm menu;" ).tqarg(title->getNum()+1);
         m_endScripts << script;
     }
     for (int i=0;i<m_endScripts.count();i++ ){
@@ -292,9 +292,9 @@ void k9MenuEdit::rootSelected(k9NewDVD *_newDVD) {
     m_startScripts << "";
     k9NewDVDItems *items=_newDVD->getTitles();
     for (k9Title *title=items->first();title;title=items->next()) {
-        cbStart->insertItem(i18n("Play Title %1").arg(title->getNum()+1));
-       // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).arg(title->getNum()+1);
-        TQString script=TQString("g6=%1;" ).arg(title->getNum()+1);
+        cbStart->insertItem(i18n("Play Title %1").tqarg(title->getNum()+1));
+       // TQString script=TQString("if (g5==0) {g5=1; jump title %1;}" ).tqarg(title->getNum()+1);
+        TQString script=TQString("g6=%1;" ).tqarg(title->getNum()+1);
         m_startScripts << script;
         if (script==_newDVD->getRootMenu()->getStartScript())
             cbStart->setCurrentItem(cbStart->count()-1);
-- 
cgit v1.2.1