summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-18 18:13:04 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-07-31 02:45:03 +0200
commitc455f7784ecce32de2b715008036be6de62e3ba6 (patch)
tree7a624f8a2d2299301b84ff19280e926b7a215099
parentaa7d6a8f6fc637838190950ab80e394873939224 (diff)
downloadkrename-c455f7784ecce32de2b715008036be6de62e3ba6.tar.gz
krename-c455f7784ecce32de2b715008036be6de62e3ba6.zip
Rename old tq methods that no longer need a unique name
(cherry picked from commit ac765413845706cb97a80965276e2a3013576747)
-rw-r--r--krename/dateplugin.cpp4
-rw-r--r--krename/datetime.cpp2
-rw-r--r--krename/kmylistbox.cpp12
-rw-r--r--krename/krenameimpl.cpp10
-rw-r--r--krename/mydirplugin.cpp4
-rw-r--r--krename/numberdialog.cpp4
-rw-r--r--krename/permission.cpp14
-rw-r--r--krename/threadedlister.cpp4
8 files changed, 27 insertions, 27 deletions
diff --git a/krename/dateplugin.cpp b/krename/dateplugin.cpp
index e55e7ae..eb4b702 100644
--- a/krename/dateplugin.cpp
+++ b/krename/dateplugin.cpp
@@ -59,7 +59,7 @@ TQString DatePlugin::processFile(BatchRenamer* b, int i, TQString token, int )
token = token.mid( getPattern().length(), token.length() - getPattern().length() );
- TQDate d = TQDate::tqcurrentDate();
+ TQDate d = TQDate::currentDate();
TQTime t = TQTime::currentTime();
TQString tmp, text;
TQString format = "dd-MM-yyyy";
@@ -71,7 +71,7 @@ TQString DatePlugin::processFile(BatchRenamer* b, int i, TQString token, int )
token = token.lower();
if( token == "date" ) {
- return TQDateTime::tqcurrentDateTime().toString( format );
+ return TQDateTime::currentDateTime().toString( format );
} else if( token == "year" )
return TQString( "%1" ).tqarg( d.year() );
else if( token == "month" )
diff --git a/krename/datetime.cpp b/krename/datetime.cpp
index e8cd9da..077e82d 100644
--- a/krename/datetime.cpp
+++ b/krename/datetime.cpp
@@ -231,7 +231,7 @@ void MyDatePlugin::changeDT()
spinHour->setValue( TQTime::currentTime().hour());
spinMinute->setValue( TQTime::currentTime().minute());
spinSecond->setValue( TQTime::currentTime().second());
- kDate->setDate( TQDate::tqcurrentDate() );
+ kDate->setDate( TQDate::currentDate() );
}
diff --git a/krename/kmylistbox.cpp b/krename/kmylistbox.cpp
index 716cb30..134b899 100644
--- a/krename/kmylistbox.cpp
+++ b/krename/kmylistbox.cpp
@@ -161,7 +161,7 @@ void KMyListBox::addDirName( const KURL & dirname, const TQString & filter, bool
} else {
// escape hiden directories
TQString name = dirname.fileName();
- if( !hidden && name.right( 1 ) != TQString::tqfromLatin1(".") )
+ if( !hidden && name.right( 1 ) != TQString::fromLatin1(".") )
if( !isInList( dirname ) )
addDirName( dirname );
@@ -715,9 +715,9 @@ void KMyListBox::positionLabel()
}
else
{
- int x = (width() - label->tqminimumSizeHint().width()) / 2;
- int y = (height() - label->tqminimumSizeHint().height()) / 2;
- label->setGeometry( x, y, label->tqminimumSizeHint().width(), label->tqminimumSizeHint().height() );
+ int x = (width() - label->minimumSizeHint().width()) / 2;
+ int y = (height() - label->minimumSizeHint().height()) / 2;
+ label->setGeometry( x, y, label->minimumSizeHint().width(), label->minimumSizeHint().height() );
label->show();
}
}
@@ -750,7 +750,7 @@ void KMyListBoxItem::setPixmap( const TQPixmap & pix )
{
KMyListBox* box = static_cast<KMyListBox*>(this->listBox());
pm.resize( box->getPreviewSize(), box->getPreviewSize() );
- pm.fill( box->tqcolorGroup().base() );
+ pm.fill( box->colorGroup().base() );
TQPainter painter( &pm );
painter.drawPixmap( (pm.width()-pix.width())/2, (pm.height()-pix.height())/2, pix );
m_has_preview = true;
@@ -788,7 +788,7 @@ void KMyListBoxItem::paint( TQPainter *painter )
painter->drawPixmap( 3, yPos, pm);
else
{
- KPixmap pix = KPixmapEffect::selectedPixmap( pm, listBox()->tqcolorGroup().highlight() );
+ KPixmap pix = KPixmapEffect::selectedPixmap( pm, listBox()->colorGroup().highlight() );
painter->drawPixmap( 3, yPos, pix );
}
diff --git a/krename/krenameimpl.cpp b/krename/krenameimpl.cpp
index 42736e7..f150847 100644
--- a/krename/krenameimpl.cpp
+++ b/krename/krenameimpl.cpp
@@ -426,7 +426,7 @@ void KRenameImpl::setupPage2()
groupOptions->tqlayout()->setSpacing( 6 );
groupOptions->tqlayout()->setMargin( 11 );
groupOptionsLayout = new TQVBoxLayout( groupOptions->tqlayout() );
- groupOptionsLayout->tqsetAlignment( TQt::AlignTop );
+ groupOptionsLayout->setAlignment( TQt::AlignTop );
optionRename = new TQRadioButton( groupOptions );
optionRename->setText( i18n( "&Rename input files" ) );
@@ -737,10 +737,10 @@ void KRenameImpl::setupFileTab2()
buttonEasy3->setIconSet( SmallIcon("help") );
buttonEasy4->setIconSet( SmallIcon("help") );
- buttonEasy1->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
- buttonEasy2->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
- buttonEasy3->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
- buttonEasy4->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+ buttonEasy1->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+ buttonEasy2->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+ buttonEasy3->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
+ buttonEasy4->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
const TQString easy_text( i18n("<qt>Insert a special KRename command which inserts file information into the filename.</qt>") );
diff --git a/krename/mydirplugin.cpp b/krename/mydirplugin.cpp
index 1f396bf..e92a39d 100644
--- a/krename/mydirplugin.cpp
+++ b/krename/mydirplugin.cpp
@@ -77,7 +77,7 @@ void MyDirPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
groupNumber->tqlayout()->setSpacing( 6 );
groupNumber->tqlayout()->setMargin( 11 );
groupNumberLayout = new TQHBoxLayout( groupNumber->tqlayout() );
- groupNumberLayout->tqsetAlignment( TQt::AlignTop );
+ groupNumberLayout->setAlignment( TQt::AlignTop );
TQLabel* la2 = new TQLabel( groupNumber );
la2->setText( i18n( "Files per directory:" ) );
@@ -107,7 +107,7 @@ void MyDirPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
groupOutput->tqlayout()->setSpacing( 6 );
groupOutput->tqlayout()->setMargin( 11 );
groupOutputLayout = new TQHBoxLayout( groupOutput->tqlayout() );
- groupOutputLayout->tqsetAlignment( TQt::AlignTop );
+ groupOutputLayout->setAlignment( TQt::AlignTop );
outputdir = new TQLineEdit( groupOutput );
buttonDir = new TQPushButton( groupOutput );
diff --git a/krename/numberdialog.cpp b/krename/numberdialog.cpp
index 14151b3..114b00e 100644
--- a/krename/numberdialog.cpp
+++ b/krename/numberdialog.cpp
@@ -50,7 +50,7 @@ NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *parent )
group1->tqlayout()->setSpacing( 6 );
group1->tqlayout()->setMargin( 11 );
TQVBoxLayout* group1Layout = new TQVBoxLayout( group1->tqlayout() );
- group1Layout->tqsetAlignment( TQt::AlignTop );
+ group1Layout->setAlignment( TQt::AlignTop );
spinIndex = new KIntNumInput( group1 );
spinIndex->setMaxValue( SPINMAX );
@@ -69,7 +69,7 @@ NumberDialog::NumberDialog(TQValueList<int> & n,TQWidget *parent )
group2->tqlayout()->setSpacing( 6 );
group2->tqlayout()->setMargin( 11 );
TQHBoxLayout* group2Layout = new TQHBoxLayout( group2->tqlayout() );
- group2Layout->tqsetAlignment( TQt::AlignTop );
+ group2Layout->setAlignment( TQt::AlignTop );
listNumbers = new KListBox( group2 );
diff --git a/krename/permission.cpp b/krename/permission.cpp
index 84a1382..83d79b9 100644
--- a/krename/permission.cpp
+++ b/krename/permission.cpp
@@ -93,7 +93,7 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
gl->addWidget (la, 1, 2);
la = new TQLabel( i18n("Exec"), groupPermission );
- TQSize size = la->tqsizeHint();
+ TQSize size = la->sizeHint();
size.setWidth(size.width() + 15);
la->setFixedSize(size);
gl->addWidget (la, 1, 3);
@@ -140,7 +140,7 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
groupOwner->tqlayout()->setSpacing( 6 );
groupOwner->tqlayout()->setMargin( 11 );
groupOwnerLayout = new TQVBoxLayout( groupOwner->tqlayout() );
- groupOwnerLayout->tqsetAlignment( TQt::AlignTop );
+ groupOwnerLayout->setAlignment( TQt::AlignTop );
Layout2 = new TQHBoxLayout( 0, 0, 6 );
Layout3 = new TQHBoxLayout( 0, 0, 6 );
@@ -157,10 +157,10 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
setpwent();
for (i=0; ((user = getpwent()) != 0L) && (i < MAXENTRIES); i++) {
if( uid == 0 )
- username->insertItem(TQString::tqfromLatin1(user->pw_name));
+ username->insertItem(TQString::fromLatin1(user->pw_name));
else
if( user->pw_uid == uid )
- username->insertItem(TQString::tqfromLatin1(user->pw_name));
+ username->insertItem(TQString::fromLatin1(user->pw_name));
}
endpwent();
@@ -171,14 +171,14 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
setgrent();
for (i=0; ((ge = getgrent()) != 0L) && (i < MAXENTRIES); i++) {
if( uid == 0 ) {
- groupname->insertItem(TQString::tqfromLatin1(ge->gr_name));
+ groupname->insertItem(TQString::fromLatin1(ge->gr_name));
} else {
char ** members = ge->gr_mem;
char * member;
while ((member = *members) != 0L) {
if (strUser == member) {
- groupname->insertItem(TQString::tqfromLatin1(ge->gr_name));
+ groupname->insertItem(TQString::fromLatin1(ge->gr_name));
break;
}
@@ -191,7 +191,7 @@ void MyPermPlugin::drawInterface( TQWidget* w, TQVBoxLayout* l )
/* add the users group */
ge = getgrgid (getegid());
if (ge) {
- TQString name = TQString::tqfromLatin1(ge->gr_name);
+ TQString name = TQString::fromLatin1(ge->gr_name);
if (name.isEmpty())
name.setNum(ge->gr_gid);
diff --git a/krename/threadedlister.cpp b/krename/threadedlister.cpp
index 322e268..fab1068 100644
--- a/krename/threadedlister.cpp
+++ b/krename/threadedlister.cpp
@@ -113,7 +113,7 @@ void ThreadedLister::reclisterFinished()
if( m_dirnames )
{
TQString name = m_dirname.fileName();
- if( !m_hidden && name.right( 1 ) != TQString::tqfromLatin1(".") )
+ if( !m_hidden && name.right( 1 ) != TQString::fromLatin1(".") )
m_list->addDirName( m_dirname );
}
@@ -142,7 +142,7 @@ void ThreadedLister::listerFinished()
if( m_dirnames )
{
TQString name = m_dirname.fileName();
- if( !m_hidden && name.right( 1 ) != TQString::tqfromLatin1(".") )
+ if( !m_hidden && name.right( 1 ) != TQString::fromLatin1(".") )
m_list->addDirName( m_dirname );
}