Rename a number of old tq methods that are no longer tq specific

1 files changed, 82 insertions, 82 deletions

diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 2197cf32..5641c6cd 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -33,7 +33,7 @@
 #include <ktempfile.h>
 
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
@@ -46,10 +46,10 @@
 #include <tqdir.h>
 #include <tqheader.h>
 #include <tqwmatrix.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqregexp.h>
 #include <tqimage.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 
@@ -87,7 +87,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.tqunicode())
+        switch (ch.unicode())
         {
         case 38: // &
         {
@@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
             {
                 if (!codec->canEncode(ch))
                 {
-                    strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
+                    strReturn+=TQString("&#%1;").arg(ch.unicode());
                     break;
                 }
             }
@@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str
         {
             if (!codec->canEncode(ch))
             {
-                strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
+                strReturn+=TQString("&#%1;").arg(ch.unicode());
                 continue;
             }
         }
@@ -211,7 +211,7 @@ void KPrWebPresentation::loadConfig()
     if ( num <= slideInfos.count() ) {
         for ( unsigned int i = 0; i < num; i++ )
         {
-            TQString key = TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i );
+            TQString key = TQString::fromLatin1( "SlideTitle%1" ).arg( i );
             if ( cfg.hasKey( key ) )
             {
                 // We'll assume that the selected pages haven't changed... Hmm.
@@ -245,7 +245,7 @@ void KPrWebPresentation::saveConfig()
     cfg.writeEntry( "Slides", slideInfos.count() );
 
     for ( unsigned int i = 0; i < slideInfos.count(); i++ )
-        cfg.writeEntry( TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle );
+        cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).arg( i ), slideInfos[ i ].slideTitle );
 
     cfg.writeEntry( "BackColor", backColor );
     cfg.writeEntry( "TitleColor", titleColor );
@@ -310,7 +310,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
     for ( unsigned int i = 0; i < slideInfos.count(); i++ ) {
         int pgNum = slideInfos[i].pageNumber;
         view->getCanvas()->drawPageInPix( pix, pgNum, zoom, true /*force real variable value*/ );
-        filename = TQString( "%1/pics/slide_%2.png" ).tqarg( path ).tqarg( i + 1 );
+        filename = TQString( "%1/pics/slide_%2.png" ).arg( path ).arg( i + 1 );
 
         KTempFile tmp;
         pix.save( tmp.name(), "PNG" );
@@ -395,8 +395,8 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
 
         unsigned int pgNum = i + 1; // pgquiles # elpauer . org - I think this is a bug, seems to be an overflow if we have max_unsigned_int slides
         KTempFile tmp;
-        TQString dest= TQString( "%1/html/slide_%2.html" ).tqarg( path ).tqarg( pgNum );
-        TQString next= TQString( "slide_%2.html" ).tqarg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works
+        TQString dest= TQString( "%1/html/slide_%2.html" ).arg( path ).arg( pgNum );
+        TQString next= TQString( "slide_%2.html" ).arg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works
 
         TQFile file( tmp.name() );
         file.open( IO_WriteOnly );
@@ -480,7 +480,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
             streamOut << "<a href=\"" << next << "\">";
 
 	    streamOut << "<img src=\"../pics/slide_" << pgNum << ".png\" border=\"0\" alt=\""
-                      << i18n( "Slide %1" ).tqarg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">";
+                      << i18n( "Slide %1" ).arg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">";
 
 	    if ( i < slideInfos.count() - 1 )
                 streamOut << "</a>";
@@ -509,9 +509,9 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
             if (email.isEmpty())
                 htmlAuthor=escapeHtmlText( codec, author );
             else
-                htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
+                htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
             streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                          .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) );
+                                          .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
 
             streamOut << "    </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n";
         }
@@ -532,7 +532,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
 {
     TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding );
     KTempFile tmp;
-    TQString dest = TQString( "%1/index.html" ).tqarg( path );
+    TQString dest = TQString( "%1/index.html" ).arg( path );
     TQFile file( tmp.name() );
     file.open( IO_WriteOnly );
     TQTextStream streamOut( &file );
@@ -560,9 +560,9 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
 
     // footer: author name, e-mail
     TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) :
-                         TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
+                         TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
     streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                      .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) );
+                                      .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
 
     streamOut << "</body>\n</html>\n";
     file.close();
@@ -664,63 +664,63 @@ void KPrWebPresentationWizard::setupPage1()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page1 );
-    TQGridLayout *tqlayout = new TQGridLayout( canvas, 7, 2,
+    TQGridLayout *layout = new TQGridLayout( canvas, 7, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
+    helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
     helptext->setText( i18n( "Enter your name, email address and "
                              "the title of the web presentation. "
                              "Also enter the output directory where the "
                              "web presentation should be saved. " ) );
-    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Author:"), canvas );
-    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or "
                                   "organization that should be named as the author of "
                                   "the presentation.") );
-    tqlayout->addWidget( label1, 2, 0 );
+    layout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n("Title:"), canvas );
-    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall "
                                   "presentation." ) );
-    tqlayout->addWidget( label2, 3, 0 );
+    layout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas );
-    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label3, i18n("This is where you enter the email address of the "
                                   "person or organization that is responsible for "
                                   "the presentation.") );
-    tqlayout->addWidget( label3, 4, 0 );
+    layout->addWidget( label3, 4, 0 );
 
     TQLabel *label4 = new TQLabel( i18n("Path:"), canvas );
-    label4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label4->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label4, i18n("The value entered for the path is the directory "
                                   "where the presentation will be saved. If it does "
                                   "not exist, you'll be asked if you want to create "
                                   "the directory or abort the creation.") );
-    tqlayout->addWidget( label4, 5, 0 );
+    layout->addWidget( label4, 5, 0 );
 
     author = new KLineEdit( webPres.getAuthor(), canvas );
     TQWhatsThis::add( author, i18n("This is where you enter the name of the person or "
                                   "organization that should be named as the author of "
                                   "the presentation.") );
-    tqlayout->addWidget( author, 2, 1 );
+    layout->addWidget( author, 2, 1 );
 
     title = new KLineEdit( webPres.getTitle(), canvas );
     TQWhatsThis::add( title, i18n("This is where you enter the title of the overall "
                                  "presentation." ) );
-    tqlayout->addWidget( title, 3, 1 );
+    layout->addWidget( title, 3, 1 );
 
     email = new KLineEdit( webPres.getEmail(), canvas );
     TQWhatsThis::add( email, i18n("This is where you enter the email address of the "
                                  "person or organization that is responsible for "
                                  "the presentation.") );
-    tqlayout->addWidget( email, 4, 1 );
+    layout->addWidget( email, 4, 1 );
 
     path=new KURLRequester( canvas );
     path->setMode( KFile::Directory);
@@ -729,11 +729,11 @@ void KPrWebPresentationWizard::setupPage1()
                                 "where the presentation will be saved. If it does "
                                 "not exist, you'll be asked if you want to create "
                                 "the directory or abort the creation.") );
-    tqlayout->addWidget( path, 5, 1 );
+    layout->addWidget( path, 5, 1 );
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    tqlayout->addMultiCell( spacer, 6, 6, 0, 1 );
+    layout->addMultiCell( spacer, 6, 6, 0, 1 );
 
     connect(path, TQT_SIGNAL(textChanged(const TQString&)),
             this,TQT_SLOT(slotChoosePath(const TQString&)));
@@ -762,43 +762,43 @@ void KPrWebPresentationWizard::setupPage2()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page2 );
-    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     TQString help = i18n("Here you can configure the style of the web pages.");
     help += i18n( "You can also specify the zoom for the slides." );
     helptext->setText(help);
 
-    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas );
-    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n( "This selection allows you to specify "
                                    "the size of the slide image." ) );
-    tqlayout->addWidget( label1, 2, 0 );
+    layout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas );
-    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
 
-    tqlayout->addWidget( label2, 3, 0 );
+    layout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas );
-    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    tqlayout->addWidget( label3, 4, 0 );
+    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    layout->addWidget( label3, 4, 0 );
 
     zoom = new KIntNumInput( webPres.getZoom(), canvas );
     TQWhatsThis::add( zoom, i18n( "This selection allows you to specify "
                                  "the size of the slide image." ) );
-    tqlayout->addWidget( zoom, 2, 1 );
+    layout->addWidget( zoom, 2, 1 );
     zoom->setSuffix( " %" );
     zoom->setRange( 25, 1000, 5 );
 
     encoding = new KComboBox( false, canvas );
-    tqlayout->addWidget( encoding, 3, 1 );
+    layout->addWidget( encoding, 3, 1 );
 
     // Fill encoding combo
     // Stolen from tdelibs/kate/part/katedialogs.cpp
@@ -819,7 +819,7 @@ void KPrWebPresentationWizard::setupPage2()
     }
 
     doctype = new KComboBox( false, canvas );
-    tqlayout->addWidget( doctype, 4, 1 );
+    layout->addWidget( doctype, 4, 1 );
     doctype->insertItem( "HTML 4.01", -1 );
     doctype->insertItem( "XHTML 1.0", -1 );
 
@@ -827,7 +827,7 @@ void KPrWebPresentationWizard::setupPage2()
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
+    layout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page2, i18n( "Step 2: Configure HTML" ) );
 
@@ -852,40 +852,40 @@ void KPrWebPresentationWizard::setupPage3()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page3 );
-    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     helptext->setText( i18n( "Now you can customize the colors of the web pages." ) );
-    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas );
-    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    tqlayout->addWidget( label1, 2, 0 );
+    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    layout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas );
-    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    tqlayout->addWidget( label2, 3, 0 );
+    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    layout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas );
-    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    tqlayout->addWidget( label3, 4, 0 );
+    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    layout->addWidget( label3, 4, 0 );
 
     textColor = new KColorButton( webPres.getTextColor(), canvas );
-    tqlayout->addWidget( textColor, 2, 1 );
+    layout->addWidget( textColor, 2, 1 );
 
     titleColor = new KColorButton( webPres.getTitleColor(), canvas );
-    tqlayout->addWidget( titleColor, 3, 1 );
+    layout->addWidget( titleColor, 3, 1 );
 
     backColor = new KColorButton( webPres.getBackColor(), canvas );
-    tqlayout->addWidget( backColor, 4, 1 );
+    layout->addWidget( backColor, 4, 1 );
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
+    layout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page3, i18n( "Step 3: Customize Colors" ) );
 
@@ -909,11 +909,11 @@ void KPrWebPresentationWizard::setupPage4()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page4 );
-    TQGridLayout *tqlayout = new TQGridLayout( canvas, 3, 2,
+    TQGridLayout *layout = new TQGridLayout( canvas, 3, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     helptext->setText( i18n( "Here you can specify titles for "
                              "each slide. Click on a slide in "
                              "the list and then enter the title "
@@ -921,19 +921,19 @@ void KPrWebPresentationWizard::setupPage4()
                              "click on a title, KPresenter "
                              "mainview will display the slide.") );
 
-    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
     TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas );
-    label->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    tqlayout->addWidget( label, 1, 0 );
+    label->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    layout->addWidget( label, 1, 0 );
 
     slideTitle = new KLineEdit( canvas );
-    tqlayout->addWidget( slideTitle, 1, 1 );
+    layout->addWidget( slideTitle, 1, 1 );
     connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this,
              TQT_SLOT( slideTitleChanged( const TQString & ) ) );
 
     slideTitles = new KListView( canvas );
-    tqlayout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 );
+    layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 );
     slideTitles->addColumn( i18n( "No." ) );
     slideTitles->addColumn( i18n( "Slide Title" ) );
     connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
@@ -977,60 +977,60 @@ void KPrWebPresentationWizard::setupPage5()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page5 );
-    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     TQString help = i18n("Here you can configure some options for unattended "
                         "presentations, such as time elapsed before automatically advance to "
                         "the next slide, looping and the presence of headers.");
     helptext->setText(help);
 
-    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas );
-    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n( "This selection allows you to specify "
                                    "the time between slides." ) );
-    tqlayout->addWidget( label1, 2, 0 );
+    layout->addWidget( label1, 2, 0 );
 
     timeBetweenSlides = new KIntNumInput( webPres.getTimeBetweenSlides(), canvas );
     timeBetweenSlides->setSpecialValueText(i18n( "Disabled" ));
     TQWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify "
                                  "the time between slides." ) );
-    tqlayout->addWidget( timeBetweenSlides, 2, 1 );
+    layout->addWidget( timeBetweenSlides, 2, 1 );
     timeBetweenSlides->setSuffix( " seconds" );
     timeBetweenSlides->setRange( 0, 900, 1 );
 
-    tqlayout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 );
+    layout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 );
 
     writeHeader=new TQCheckBox( i18n("Write header to the slides"), canvas);
     TQWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you "
                                        "want to write the navigation buttons on top "
                                        "of the slide." ) );
     writeHeader->setChecked( webPres.wantHeader() );
-    tqlayout->addWidget( writeHeader, 3, 1);
+    layout->addWidget( writeHeader, 3, 1);
 
     writeFooter=new TQCheckBox( i18n("Write footer to the slides"), canvas);
     TQWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you "
                                        "want to write an imprint consisting on the author "
                                        "and the software used to create these slides." ) );
     writeFooter->setChecked( webPres.wantFooter() );
-    tqlayout->addWidget( writeFooter, 4, 1);
+    layout->addWidget( writeFooter, 4, 1);
 
     loopSlides=new TQCheckBox( i18n("Loop presentation"), canvas);
     TQWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you "
                                        "want the presentation to start again once "
                                        "the latest slide is reached." ) );
     loopSlides->setChecked( webPres.wantLoopSlides() );
-    tqlayout->addWidget( loopSlides, 5, 1);
+    layout->addWidget( loopSlides, 5, 1);
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
+    layout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page5, i18n( "Step 5: Options for Unattended Presentations" ) );
 
@@ -1081,7 +1081,7 @@ void KPrWebPresentationWizard::pageChanged()
         {
             TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
                                 "Do you want create it?</qt>" );
-            if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ),
+            if( KMessageBox::questionYesNo( this, msg.arg( pathname ),
                                             i18n( "Directory Not Found" ) )
                 == KMessageBox::Yes)
             {