From c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:31 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 94844816550ad672ccfcdc25659c625546239998. --- kpresenter/autoformEdit/AFChoose.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kpresenter/autoformEdit/AFChoose.cpp') diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp index d33675ab..ccbfc0e8 100644 --- a/kpresenter/autoformEdit/AFChoose.cpp +++ b/kpresenter/autoformEdit/AFChoose.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include @@ -86,7 +86,7 @@ void AFChoose::setupTabs() for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next()) { grpPtr->tab = new TQVBox(this); - TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) ); + TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined tqshape by clicking on it then clicking the OK button (or just double-click on the tqshape). You can then insert the tqshape onto your slide by drawing the area with the mouse pointer." ) ); grpPtr->loadWid = new KIconCanvas(grpPtr->tab); // Changes for the new KIconCanvas (Werner) TQDir d( grpPtr->dir.absFilePath() ); @@ -137,7 +137,7 @@ void AFChoose::setupTabs() continue; // Invalid .desktop file } } - grpPtr->loadWid->setBackgroundColor(colorGroup().base()); + grpPtr->loadWid->setBackgroundColor(tqcolorGroup().base()); grpPtr->loadWid->setResizeMode(TQIconView::Adjust); grpPtr->loadWid->sort(); connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)), @@ -148,7 +148,7 @@ void AFChoose::setupTabs() TQT_SLOT(slotDoubleClick())); grpPtr->label = new TQLabel(grpPtr->tab); grpPtr->label->setText(" "); - grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height()); + grpPtr->label->setMaximumHeight(grpPtr->label->tqsizeHint().height()); addTab(grpPtr->tab,grpPtr->name); } } -- cgit v1.2.1