diff --git a/ark/ace.cpp b/ark/ace.cpp
index 4ce0709..6ad5cd0 100644
--- a/ark/ace.cpp
+++ b/ark/ace.cpp
@@ -174,7 +174,7 @@ void AceArch::unarchFileInternal( )
void AceArch::catchMeIfYouCan( KProcess*, char *buffer, int buflen )
{
- TQString myBuf = TQString::tqfromLatin1( buffer, buflen );
+ TQString myBuf = TQString::fromLatin1( buffer, buflen );
kdDebug(1601) << " Wololo!: " << myBuf << endl;
}
diff --git a/ark/addition.ui b/ark/addition.ui
index ac12593..401c146 100644
--- a/ark/addition.ui
+++ b/ark/addition.ui
@@ -66,7 +66,7 @@
Expanding
-
+
20
51
diff --git a/ark/arch.cpp b/ark/arch.cpp
index 5ff9a61..29bdf63 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -367,7 +367,7 @@ bool Arch::processLine( const TQCString &line )
TQString( "%1" )
.tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
: columns[ m_fixMonth ];
- TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+ TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
.tqarg( year )
.tqarg( month )
.tqarg( columns[ m_fixDay ] )
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 20ac169..8834e61 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -411,12 +411,12 @@ void ArkStatusBarExtension::setupStatusBar()
m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" );
m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame );
- m_pStatusLabelTotal->tqsetAlignment( AlignRight );
+ m_pStatusLabelTotal->setAlignment( AlignRight );
m_pStatusLabelTotal->setText( i18n( "Total: 0 files" ) );
m_pStatusLabelSelect = new TQLabel( statusBar(), "StatusLabelSelect" );
m_pStatusLabelSelect->setFrameStyle( TQFrame::NoFrame );
- m_pStatusLabelSelect->tqsetAlignment( AlignLeft );
+ m_pStatusLabelSelect->setAlignment( AlignLeft );
m_pStatusLabelSelect->setText(i18n( "0 files selected" ) );
m_cancelButton = new KPushButton( SmallIcon( "cancel" ), TQString(), statusBar(), "CancelButton" );
@@ -454,7 +454,7 @@ void ArkStatusBarExtension::slotSetBusy( const TQString & text, bool showCancelB
{
m_pBusyText = new TQLabel( statusBar() );
- m_pBusyText->tqsetAlignment( AlignLeft );
+ m_pBusyText->setAlignment( AlignLeft );
m_pBusyText->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
}
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index b2ae335..ce0c18c 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -76,7 +76,7 @@ bool ArkViewer::view( const KURL& filename )
TQLabel *iconLabel = new TQLabel( header );
iconLabel->setPixmap( mimetype->pixmap( KIcon::Desktop ) );
- iconLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+ iconLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
TQVBox *headerRight = new TQVBox( header );
new TQLabel( TQString( "%1" )
@@ -84,7 +84,7 @@ bool ArkViewer::view( const KURL& filename )
);
new TQLabel( mimetype->comment(), headerRight );
- header->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
+ header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
m_part = KParts::ComponentFactory::createPartInstanceFromQuery( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) );
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index a83cb14..5091bb3 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -354,7 +354,7 @@ ArkWidget::convertSlotCreateDone( bool success )
// addFile( const TQString & baseDir, //
// const TQStringList & filesToAdd ) //
//////////////////////////////////////////////////////
- *it = TQString::tqfromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
+ *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
}
bool bOldRecVal = ArkSettings::rarRecurseSubdirs();
connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) );
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index f935eac..862d357 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -60,7 +60,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, con
m_openAsMimeType = _openAsMimeType;
kdDebug(1601) << "CompressedFile constructor" << endl;
m_tempDirectory = new KTempDir( _gui->tmpDir()
- + TQString::tqfromLatin1( "compressed_file_temp" ) );
+ + TQString::fromLatin1( "compressed_file_temp" ) );
m_tempDirectory->setAutoDelete( true );
m_tmpdir = m_tempDirectory->name();
initData();
diff --git a/ark/extraction.ui b/ark/extraction.ui
index b51ebee..1ac60b8 100644
--- a/ark/extraction.ui
+++ b/ark/extraction.ui
@@ -66,7 +66,7 @@
Expanding
-
+
20
20
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index 923f108..905cfcb 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -73,7 +73,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
TQLabel *icon = new TQLabel( header );
icon->setPixmap( DesktopIcon( "ark_extract" ) );
- icon->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+ icon->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
if ( enableSelected )
{
@@ -96,7 +96,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
TQHBox *destDirBox = new TQHBox( vbox );
TQLabel *destFolderLabel = new TQLabel( i18n( "Destination folder: " ), destDirBox );
- destFolderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+ destFolderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
KHistoryCombo *combobox = new KHistoryCombo( true, destDirBox );
combobox->setPixmapProvider( new KURLPixmapProvider );
@@ -111,7 +111,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
combobox->setInsertionPolicy( TQComboBox::AtTop );
m_urlRequester = new KURLRequester( combobox, destDirBox );
- m_urlRequester->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ m_urlRequester->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
m_urlRequester->setMode( KFile::Directory );
if (!defaultExtractionDir.prettyURL().isEmpty() )
diff --git a/ark/general.ui b/ark/general.ui
index 150e1e4..d849cfc 100644
--- a/ark/general.ui
+++ b/ark/general.ui
@@ -53,7 +53,7 @@
Fixed
-
+
15
31
@@ -80,7 +80,7 @@
Expanding
-
+
20
90
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 8541e1a..005aa92 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -177,7 +177,7 @@ MainWindow::file_reload()
void
MainWindow::editToolbars()
{
- saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
+ saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
KEditToolbar dlg( factory(), this );
connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
dlg.exec();
@@ -187,7 +187,7 @@ void
MainWindow::slotNewToolbarConfig()
{
createGUI( m_part );
- applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
+ applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
}
void
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index 0673f6c..a85d127 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -285,7 +285,7 @@ bool SevenZipArch::processLine( const TQCString& _line )
TQString( "%1" )
.tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
: columns[ m_fixMonth ];
- TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+ TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
.tqarg( year )
.tqarg( month )
.tqarg( columns[ m_fixDay ] )
diff --git a/ark/tar.cpp b/ark/tar.cpp
index e91f5ca..0a87d4e 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -106,12 +106,12 @@ TarArch::TarArch( ArkWidget *_gui,
{
compressed = true;
m_tmpDir = new KTempDir( _gui->tmpDir()
- + TQString::tqfromLatin1( "temp_tar" ) );
+ + TQString::fromLatin1( "temp_tar" ) );
m_tmpDir->setAutoDelete( true );
m_tmpDir->qDir()->cd( m_tmpDir->name() );
// build the temp file name
KTempFile *pTempFile = new KTempFile( m_tmpDir->name(),
- TQString::tqfromLatin1(".tar") );
+ TQString::fromLatin1(".tar") );
tmpfile = pTempFile->name();
delete pTempFile;
diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h
index 6dcdbe5..070b483 100644
--- a/ark/tarlistingthread.h
+++ b/ark/tarlistingthread.h
@@ -32,16 +32,16 @@ class KArchive;
class ListingEvent: public TQCustomEvent
{
public:
- enum tqStatus { Normal, Error, ListingFinished };
- ListingEvent( const TQStringList& data, tqStatus st = Normal )
+ enum Status { Normal, Error, ListingFinished };
+ ListingEvent( const TQStringList& data, Status st = Normal )
: TQCustomEvent( 65442 ), m_data( data ), m_status( st ) {}
const TQStringList& columns() const { return m_data; }
- tqStatus status() const { return m_status; }
+ Status status() const { return m_status; }
private:
TQStringList m_data;
- tqStatus m_status;
+ Status m_status;
};
class TarListingThread: public TQThread
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 4f41c90..2b2929e 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -251,16 +251,16 @@ void CharTable::paintCell(TQPainter* p, int row, int col)
// draw background
if (active) {
- p->setBrush(TQBrush(tqcolorGroup().highlight()));
+ p->setBrush(TQBrush(colorGroup().highlight()));
p->setPen(NoPen);
p->drawRect(0, 0, w, h);
- p->setPen(tqcolorGroup().highlightedText());
+ p->setPen(colorGroup().highlightedText());
}
else {
- p->setBrush(TQBrush(tqcolorGroup().base()));
+ p->setBrush(TQBrush(colorGroup().base()));
p->setPen(NoPen);
p->drawRect(0, 0, w, h);
- p->setPen(tqcolorGroup().text());
+ p->setPen(colorGroup().text());
}
// set font
diff --git a/kcalc/colors.ui b/kcalc/colors.ui
index 6aae3bc..af64057 100644
--- a/kcalc/colors.ui
+++ b/kcalc/colors.ui
@@ -62,7 +62,7 @@
Expanding
-
+
110
20
@@ -179,7 +179,7 @@
Expanding
-
+
41
20
@@ -255,7 +255,7 @@
Expanding
-
+
20
0
diff --git a/kcalc/constants.ui b/kcalc/constants.ui
index efe888c..8bebd01 100644
--- a/kcalc/constants.ui
+++ b/kcalc/constants.ui
@@ -59,7 +59,7 @@
Expanding
-
+
70
21
@@ -84,7 +84,7 @@
Expanding
-
+
80
21
@@ -130,7 +130,7 @@
Expanding
-
+
70
21
@@ -155,7 +155,7 @@
Expanding
-
+
80
21
@@ -201,7 +201,7 @@
Expanding
-
+
70
21
@@ -226,7 +226,7 @@
Expanding
-
+
80
21
@@ -272,7 +272,7 @@
Expanding
-
+
70
21
@@ -297,7 +297,7 @@
Expanding
-
+
80
21
@@ -343,7 +343,7 @@
Expanding
-
+
70
21
@@ -368,7 +368,7 @@
Expanding
-
+
80
21
@@ -414,7 +414,7 @@
Expanding
-
+
70
21
@@ -439,7 +439,7 @@
Expanding
-
+
80
21
@@ -468,7 +468,7 @@
Expanding
-
+
20
40
diff --git a/kcalc/general.ui b/kcalc/general.ui
index 3b922b8..bd04b29 100644
--- a/kcalc/general.ui
+++ b/kcalc/general.ui
@@ -73,7 +73,7 @@
Expanding
-
+
21
20
@@ -101,7 +101,7 @@
Expanding
-
+
101
20
@@ -165,7 +165,7 @@
Expanding
-
+
20
31
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 34f4fb3..e6c2ef2 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -106,7 +106,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
// Create Button to select BaseMode
BaseChooseGroup = new TQHButtonGroup(i18n("Base"), central);
connect(BaseChooseGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotBaseSelected(int)));
- BaseChooseGroup->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+ BaseChooseGroup->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
pbBaseChoose[0] = new TQRadioButton(i18n("He&x"), BaseChooseGroup,
@@ -381,7 +381,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
updateGeometry();
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
UpdateDisplay(true);
@@ -457,7 +457,7 @@ actionCollection());
void KCalculator::setupStatusbar(void)
{
- // tqStatus bar contents
+ // Status bar contents
statusBar()->insertFixedItem(" NORM ", 0, true);
statusBar()->setItemAlignment(0, AlignCenter);
@@ -1050,7 +1050,7 @@ void KCalculator::updateGeometry(void)
{
TQWidget *tmp_widget = dynamic_cast(o);
margin = TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
+ pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
tmp_widget->setFixedSize(s.width()+margin, s.height()+margin);
//tmp_widget->setMinimumSize(s.width()+margin, s.height()+margin);
tmp_widget->installEventFilter( this );
@@ -1060,11 +1060,11 @@ void KCalculator::updateGeometry(void)
l = mLargePage->childrenListObject();
- int h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
+ int h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
int h2 = static_cast( (static_cast(h1) + 4.0) / 5.0 );
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l.count(); i++)
@@ -1087,11 +1087,11 @@ void KCalculator::updateGeometry(void)
l = mNumericPage->childrenListObject(); // silence please
- h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
+ h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
h2 = (int)((((float)h1 + 4.0) / 5.0));
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l.count(); i++)
@@ -1950,7 +1950,7 @@ void KCalculator::slotStatshow(bool toggled)
pbStat["ClearData"]->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowStat(toggled);
}
@@ -1985,7 +1985,7 @@ void KCalculator::slotScientificshow(bool toggled)
calc_display->setStatusText(2, TQString());
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowScientific(toggled);
}
@@ -2026,7 +2026,7 @@ void KCalculator::slotLogicshow(bool toggled)
(NumButtonGroup->find(i))->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowLogic(toggled);
}
@@ -2052,7 +2052,7 @@ void KCalculator::slotConstantsShow(bool toggled)
pbConstant[5]->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowConstants(toggled);
}
@@ -2108,7 +2108,7 @@ void KCalculator::updateSettings()
calc_display->changeSettings();
updateGeometry();
- resize(tqminimumSize());
+ resize(minimumSize());
//
// 1999-10-31 Espen Sand: Don't ask me why ;)
diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp
index 277e5bd..dd62821 100644
--- a/kcalc/kcalc_button.cpp
+++ b/kcalc/kcalc_button.cpp
@@ -118,7 +118,7 @@ void KCalcButton::paintLabel(TQPainter *paint)
{
if (_mode[_mode_flags].is_label_richtext) {
TQSimpleRichText _text(_label, font());
- _text.draw(paint, width()/2-_text.width()/2, 0, tqchildrenRegion(), tqcolorGroup());
+ _text.draw(paint, width()/2-_text.width()/2, 0, childrenRegion(), colorGroup());
} else {
KPushButton::drawButtonLabel(paint);
}
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index 83e0924..a875106 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -46,10 +46,10 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name)
selection_timer(new TQTimer)
{
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
- tqsetAlignment(AlignRight | AlignVCenter);
+ setAlignment(AlignRight | AlignVCenter);
setFocus();
setFocusPolicy(TQ_StrongFocus);
- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected()));
@@ -123,7 +123,7 @@ void KCalcDisplay::slotPaste(bool bClipboard)
tmp_str = tmp_str.stripWhiteSpace();
- if (tmp_str.tqstartsWith("0x", false))
+ if (tmp_str.startsWith("0x", false))
tmp_num_base = NB_HEX;
if (tmp_num_base != NB_DECIMAL)
@@ -598,11 +598,11 @@ void KCalcDisplay::drawContents(TQPainter *p)
// Return the TQLabel's normal size hint vertically expanded
// by half the font height to make room for the status texts
-TQSize KCalcDisplay::tqsizeHint() const
+TQSize KCalcDisplay::sizeHint() const
{
TQFont f(font());
f.setPointSize(TQMAX((f.pointSize() / 2), 7));
TQFontMetrics fm(f);
- return TQLabel::tqsizeHint() + TQSize(0, fm.height());
+ return TQLabel::sizeHint() + TQSize(0, fm.height());
}
diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h
index d12ba2f..338e721 100644
--- a/kcalc/kcalcdisplay.h
+++ b/kcalc/kcalcdisplay.h
@@ -110,7 +110,7 @@ public:
TQString text() const;
bool updateDisplay(void);
void setStatusText(uint i, const TQString& text);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
private:
bool _beep;
bool _groupdigits;
diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index 1e2f23d..8741eaf 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -35,7 +35,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Add character selection widget from library tdeui
charSelect = new KCharSelect(mainWidget,"",vFont,vChr,_tableNum);
- charSelect->resize(charSelect->tqsizeHint());
+ charSelect->resize(charSelect->sizeHint());
connect(charSelect,TQT_SIGNAL(highlighted(const TQChar &)),
TQT_SLOT(charChanged(const TQChar &)));
connect(charSelect,TQT_SIGNAL(activated(const TQChar &)),
@@ -46,7 +46,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Build line editor
lined = new TQLineEdit(mainWidget);
- lined->resize(lined->tqsizeHint());
+ lined->resize(lined->sizeHint());
TQFont font = lined->font();
font.setFamily( vFont );
@@ -59,7 +59,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Build some buttons
bHelp = new KPushButton( KStdGuiItem::help(), mainWidget );
connect(bHelp,TQT_SIGNAL(clicked()),this,TQT_SLOT(help()));
- bHelp->setFixedSize( bHelp->tqsizeHint() );
+ bHelp->setFixedSize( bHelp->sizeHint() );
grid->addWidget( bHelp, 2, 0 );
TQSpacerItem *space = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding );
@@ -67,12 +67,12 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
bClear = new KPushButton( KStdGuiItem::clear(), mainWidget );
connect(bClear,TQT_SIGNAL(clicked()),this,TQT_SLOT(clear()));
- bClear->setFixedSize( bClear->tqsizeHint() );
+ bClear->setFixedSize( bClear->sizeHint() );
grid->addWidget( bClear, 2, 2 );
bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ),
"editcopy" ), mainWidget );
- bClip->setFixedSize( bClip->tqsizeHint() );
+ bClip->setFixedSize( bClip->sizeHint() );
connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip()));
grid->addWidget( bClip, 2, 3 );
@@ -104,9 +104,9 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
entryDirection = direction;
if( entryDirection )
- lined->tqsetAlignment( TQt::AlignRight );
+ lined->setAlignment( TQt::AlignRight );
else
- lined->tqsetAlignment( TQt::AlignLeft );
+ lined->setAlignment( TQt::AlignLeft );
setupGUI(Keys|StatusBar|Save|Create);
}
@@ -244,9 +244,9 @@ void KCharSelectDia::toggleEntryDirection()
{
entryDirection ^= 1;
if( entryDirection )
- lined->tqsetAlignment( TQt::AlignRight );
+ lined->setAlignment( TQt::AlignRight );
else
- lined->tqsetAlignment( TQt::AlignLeft );
+ lined->setAlignment( TQt::AlignLeft );
}
//==================================================================
diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui
index c9a4559..e4ed1f0 100644
--- a/kdelirc/kcmlirc/addactionbase.ui
+++ b/kdelirc/kcmlirc/addactionbase.ui
@@ -81,7 +81,7 @@
Expanding
-
+
81
31
@@ -125,7 +125,7 @@
Expanding
-
+
101
31
@@ -144,7 +144,7 @@
Expanding
-
+
311
20
@@ -169,7 +169,7 @@
Expanding
-
+
321
21
@@ -194,7 +194,7 @@
Expanding
-
+
21
20
@@ -245,7 +245,7 @@
Expanding
-
+
110
41
@@ -289,7 +289,7 @@
Expanding
-
+
110
31
@@ -528,7 +528,7 @@
Expanding
-
+
61
21
@@ -604,7 +604,7 @@
Expanding
-
+
21
81
@@ -701,7 +701,7 @@
Expanding
-
+
21
111
@@ -739,7 +739,7 @@
Expanding
-
+
146
21
@@ -785,7 +785,7 @@
Expanding
-
+
21
61
@@ -826,7 +826,7 @@
Expanding
-
+
21
61
@@ -870,7 +870,7 @@
Expanding
-
+
20
61
@@ -908,7 +908,7 @@
Expanding
-
+
21
51
@@ -957,7 +957,7 @@
Expanding
-
+
147
21
@@ -1035,7 +1035,7 @@
Expanding
-
+
670
20
@@ -1171,7 +1171,7 @@
Expanding
-
+
20
170
@@ -1234,7 +1234,7 @@
Expanding
-
+
131
31
@@ -1278,7 +1278,7 @@
Expanding
-
+
131
31
@@ -1308,7 +1308,7 @@
Expanding
-
+
551
20
@@ -1366,7 +1366,7 @@
Expanding
-
+
21
30
diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui
index d94cfc2..acd9f94 100644
--- a/kdelirc/kcmlirc/editactionbase.ui
+++ b/kdelirc/kcmlirc/editactionbase.ui
@@ -295,7 +295,7 @@
Expanding
-
+
20
91
@@ -339,7 +339,7 @@
Expanding
-
+
20
101
@@ -377,7 +377,7 @@
Expanding
-
+
21
101
@@ -415,7 +415,7 @@
Expanding
-
+
20
101
@@ -467,7 +467,7 @@
Expanding
-
+
21
111
@@ -486,7 +486,7 @@
0
-
+
106
0
@@ -503,7 +503,7 @@
Expanding
-
+
20
101
@@ -533,7 +533,7 @@
Expanding
-
+
481
20
@@ -584,7 +584,7 @@
Expanding
-
+
21
30
@@ -654,7 +654,7 @@
Expanding
-
+
491
20
@@ -718,7 +718,7 @@
Expanding
-
+
670
20
@@ -854,7 +854,7 @@
Expanding
-
+
20
150
@@ -902,7 +902,7 @@
Expanding
-
+
20
20
diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui
index 829a35d..2f991ac 100644
--- a/kdelirc/kcmlirc/editmodebase.ui
+++ b/kdelirc/kcmlirc/editmodebase.ui
@@ -78,7 +78,7 @@
Expanding
-
+
110
21
@@ -145,7 +145,7 @@
Expanding
-
+
410
20
@@ -192,7 +192,7 @@
Expanding
-
+
20
90
@@ -231,7 +231,7 @@
Expanding
-
+
231
20
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index 8ec4fff..8d4de53 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -74,8 +74,8 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
(new TQHBoxLayout(this))->setAutoAdd(true);
theKCMLircBase = new KCMLircBase(this);
connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateActions() ));
- connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModestqStatus(TQListViewItem *) ));
- connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionstqStatus(TQListViewItem *) ));
+ connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModesStatus(TQListViewItem *) ));
+ connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) ));
connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() ));
connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) ));
connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)));
@@ -94,7 +94,7 @@ KCMLirc::~KCMLirc()
{
}
-void KCMLirc::updateModestqStatus(TQListViewItem *item)
+void KCMLirc::updateModesStatus(TQListViewItem *item)
{
theKCMLircBase->theModes->setItemsRenameable(item && item->parent());
theKCMLircBase->theAddActions->setEnabled(ProfileServer::profileServer()->profiles().count() && theKCMLircBase->theModes->selectedItem() && RemoteServer::remoteServer()->remotes()[modeMap[theKCMLircBase->theModes->selectedItem()].remote()]);
@@ -104,7 +104,7 @@ void KCMLirc::updateModestqStatus(TQListViewItem *item)
theKCMLircBase->theEditMode->setEnabled(item);
}
-void KCMLirc::updateActionstqStatus(TQListViewItem *item)
+void KCMLirc::updateActionsStatus(TQListViewItem *item)
{
theKCMLircBase->theRemoveAction->setEnabled(item);
theKCMLircBase->theEditAction->setEnabled(item);
@@ -374,7 +374,7 @@ void KCMLirc::updateActions()
theKCMLircBase->theActions->clear();
actionMap.clear();
- if(!theKCMLircBase->theModes->selectedItem()) { updateActionstqStatus(0); return; }
+ if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(0); return; }
Mode m = modeMap[theKCMLircBase->theModes->selectedItem()];
theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions always available") : i18n("Actions available only in mode %1").tqarg(m.name())));
@@ -387,7 +387,7 @@ void KCMLirc::updateActions()
if(theKCMLircBase->theActions->currentItem())
theKCMLircBase->theActions->currentItem()->setSelected(true);
- updateActionstqStatus(theKCMLircBase->theActions->currentItem());
+ updateActionsStatus(theKCMLircBase->theActions->currentItem());
}
void KCMLirc::gotButton(TQString remote, TQString button)
@@ -429,7 +429,7 @@ void KCMLirc::updateModes()
}
if(theKCMLircBase->theModes->currentItem())
theKCMLircBase->theModes->currentItem()->setSelected(true);
- updateModestqStatus(theKCMLircBase->theModes->currentItem());
+ updateModesStatus(theKCMLircBase->theModes->currentItem());
updateActions();
}
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h
index b4ea329..6d65fe8 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/kdelirc/kcmlirc/kcmlirc.h
@@ -46,8 +46,8 @@ private:
public slots:
void updateActions();
- void updateModestqStatus(TQListViewItem *);
- void updateActionstqStatus(TQListViewItem *);
+ void updateModesStatus(TQListViewItem *);
+ void updateActionsStatus(TQListViewItem *);
void updateModes();
void updateExtensions();
void updateInformation();
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui
index 625b3a0..dfd2897 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui
+++ b/kdelirc/kcmlirc/kcmlircbase.ui
@@ -158,7 +158,7 @@
Expanding
-
+
17
20
@@ -316,7 +316,7 @@
Expanding
-
+
240
21
diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui
index 5726eba..571863b 100644
--- a/kdelirc/kcmlirc/newmode.ui
+++ b/kdelirc/kcmlirc/newmode.ui
@@ -93,7 +93,7 @@
Expanding
-
+
61
21
diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui
index 5e15af9..7da2f25 100644
--- a/kdelirc/kcmlirc/selectprofile.ui
+++ b/kdelirc/kcmlirc/selectprofile.ui
@@ -70,7 +70,7 @@
Expanding
-
+
40
20
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index a3d5003..6e6a48d 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
KCmdLineArgs::usage(i18n("No command or host specified."));
// Check if ssh is available
- if (KStandardDirs::findExe(TQString::tqfromLatin1("ssh")).isEmpty())
+ if (KStandardDirs::findExe(TQString::fromLatin1("ssh")).isEmpty())
{
kdError(1511) << "ssh not found\n";
exit(1);
@@ -151,8 +151,8 @@ int main(int argc, char *argv[])
// Read configuration
KConfig *config = KGlobal::config();
- config->setGroup(TQString::tqfromLatin1("Passwords"));
- int timeout = config->readNumEntry(TQString::tqfromLatin1("Timeout"), defTimeout);
+ config->setGroup(TQString::fromLatin1("Passwords"));
+ int timeout = config->readNumEntry(TQString::fromLatin1("Timeout"), defTimeout);
SshProcess proc(host, user);
proc.setStub(stub);
diff --git a/kdessh/sshdlg.cpp b/kdessh/sshdlg.cpp
index 62dcd24..60934b7 100644
--- a/kdessh/sshdlg.cpp
+++ b/kdessh/sshdlg.cpp
@@ -21,10 +21,10 @@ KDEsshDialog::KDEsshDialog(TQCString host, TQCString user, TQCString stub,
m_User = user;
m_Stub = stub;
- setCaption(TQString::tqfromLatin1("%1@%2").tqarg(TQString(m_User)).tqarg(TQString(m_Host)));
+ setCaption(TQString::fromLatin1("%1@%2").tqarg(TQString(m_User)).tqarg(TQString(m_Host)));
// Make the prompt a little more polite :-)
- if (prompt.lower().left(6) == TQString::tqfromLatin1("enter "))
+ if (prompt.lower().left(6) == TQString::fromLatin1("enter "))
prompt.remove(0, 6);
int pos = prompt.find(':');
if (pos != -1)
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 596cbcb..abec1b8 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -243,7 +243,7 @@ void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len )
*/
- TQString tmp = TQString::tqfromLatin1(data, len);
+ TQString tmp = TQString::fromLatin1(data, len);
dfStringErrOut.append(tmp);
}
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index 155e6e2..1520b18 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -104,13 +104,13 @@ int DiskEntry::mount()
{
// FreeBSD's mount(8) is picky: -o _must_ go before
// the device and mountpoint.
- cmdS=TQString::tqfromLatin1("mount -t%t -o%o %d %m");
+ cmdS=TQString::fromLatin1("mount -t%t -o%o %d %m");
}
- cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
- cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
- cmdS.replace(TQString::tqfromLatin1("%t"),fsType());
- cmdS.replace(TQString::tqfromLatin1("%o"),mountOptions());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%t"),fsType());
+ cmdS.replace(TQString::fromLatin1("%o"),mountOptions());
kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -126,8 +126,8 @@ int DiskEntry::umount()
if (cmdS.isEmpty()) // generate default umount cmd
cmdS="umount %d";
- cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
- cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index f963a12..45f0ec7 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -48,8 +48,8 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
setCentralWidget(kdf);
- // kdf->setMinimumSize(kdf->tqsizeHint());
- kdf->resize(kdf->tqsizeHint());
+ // kdf->setMinimumSize(kdf->sizeHint());
+ kdf->resize(kdf->sizeHint());
setupGUI(KMainWindow::Keys | StatusBar | Save | Create);
}
diff --git a/kdf/listview.cpp b/kdf/listview.cpp
index 49021ee..b9274c3 100644
--- a/kdf/listview.cpp
+++ b/kdf/listview.cpp
@@ -20,7 +20,7 @@
//
// 1999-11-28 Espen Sand
// The purpose of this class is:
-// 1) Easily set minimum number of visible items and to adjust the tqsizeHint()
+// 1) Easily set minimum number of visible items and to adjust the sizeHint()
// 2) Provide a pixmap collection
//
@@ -46,20 +46,20 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize )
mVisibleItem = TQMAX( 1, visibleItem );
if( updateSize == true )
{
- TQSize s = tqsizeHint();
- setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
+ TQSize s = sizeHint();
+ setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
lineWidth() * 2, s.height() );
}
}
-TQSize CListView::tqsizeHint( void ) const
+TQSize CListView::sizeHint( void ) const
{
- TQSize s = TQListView::tqsizeHint();
+ TQSize s = TQListView::sizeHint();
int h = fontMetrics().height() + 2*itemMargin();
if( h % 2 > 0 ) { h++; }
- s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
+ s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
return( s );
}
diff --git a/kdf/listview.h b/kdf/listview.h
index 96ae398..873a327 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -34,7 +34,7 @@ class CListView : public KListView
CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
void setVisibleItem( int visibleItem, bool updateSize=true );
- virtual TQSize tqsizeHint( void ) const;
+ virtual TQSize sizeHint( void ) const;
const TQPixmap &icon( const TQString &iconName, bool drawBorder );
private:
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 1819760..0eb86ba 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -102,7 +102,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
mIconButton = new KIconButton(mGroupBox);
mIconButton->setIconType(KIcon::Small, KIcon::Device);
Q_CHECK_PTR(mIconButton);
- mIconButton->setFixedWidth( mIconButton->tqsizeHint().height() );
+ mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
gl->addWidget( mIconButton, 2, 1 );
diff --git a/kedit/color.ui b/kedit/color.ui
index 2310c57..bec67d9 100644
--- a/kedit/color.ui
+++ b/kedit/color.ui
@@ -29,7 +29,7 @@
Expanding
-
+
41
111
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index d5bcba5..88ab3aa 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -84,7 +84,7 @@ TopLevel::TopLevel (TQWidget *, const char *name)
setupEditWidget();
if (!initialGeometrySet())
- resize( TQSize(550, 400).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
@@ -341,7 +341,7 @@ void TopLevel::insertDate(){
int line, column;
TQString string;
- TQDate dt = TQDate::tqcurrentDate();
+ TQDate dt = TQDate::currentDate();
string = KGlobal::locale()->formatDate(dt);
eframe->getCursorPosition(&line,&column);
@@ -896,7 +896,7 @@ void TopLevel::statusbar_slot(){
void TopLevel::print()
{
bool aborted = false;
- TQString headerLeft = i18n("Date: %1").tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true));
+ TQString headerLeft = i18n("Date: %1").tqarg(KGlobal::locale()->formatDate(TQDate::currentDate(),true));
TQString headerMid = i18n("File: %1").tqarg(m_caption);
TQString headerRight;
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 32dfc19..e0f998b 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -65,7 +65,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
i18n("Select Encoding..."), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding");
- mEncoding->setIcon( TQString::tqfromLatin1("charset") );
+ mEncoding->setIcon( TQString::fromLatin1("charset") );
KToolBar *tb = toolBar();
mEncoding->plug( tb, pathComboIndex() - 1 );
@@ -96,7 +96,7 @@ void KTextFileDialog::slotShowEncCombo()
vbox->setSpacing( KDialog::spacingHint() );
encDlg->setMainWidget( vbox );
label = new TQLabel( vbox );
- label->tqsetAlignment( AlignLeft | AlignVCenter );
+ label->setAlignment( AlignLeft | AlignVCenter );
label->setText(i18n("Select encoding for text file: "));
encCombo = new TQComboBox(vbox);
diff --git a/kedit/misc.ui b/kedit/misc.ui
index 76df775..956790d 100644
--- a/kedit/misc.ui
+++ b/kedit/misc.ui
@@ -82,7 +82,7 @@
Expanding
-
+
20
101
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 18851bc..a89d18f 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -288,7 +288,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
frame = new TQLabel( this, "NewsWindow" );
frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
- frame->tqsetAlignment(WordBreak|ExpandTabs);
+ frame->setAlignment(WordBreak|ExpandTabs);
TQWhatsThis::add( frame,
i18n("This is the status window, where error messages are displayed.") );
@@ -539,7 +539,7 @@ void FloppyData::format(){
formatActions = new KFActionQueue(TQT_TQOBJECT(this));
connect(formatActions,TQT_SIGNAL(status(const TQString &,int)),
- this,TQT_SLOT(formattqStatus(const TQString &,int)));
+ this,TQT_SLOT(formatStatus(const TQString &,int)));
connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)),
this,TQT_SLOT(reset()));
@@ -642,7 +642,7 @@ void FloppyData::format(){
formatActions->exec();
}
-void FloppyData::formattqStatus(const TQString &s,int p)
+void FloppyData::formatStatus(const TQString &s,int p)
{
kdDebug(2002) << "FloppyData::formatStatus: " << s << " : " << p << endl;
if (!s.isEmpty())
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index 30b0519..ead6b71 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -75,7 +75,7 @@ public slots:
void format();
void reset();
- void formattqStatus(const TQString &,int);
+ void formatStatus(const TQString &,int);
protected slots:
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 03f6f41..9a972f4 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -358,7 +358,7 @@ void FloppyAction::processStdOut(KProcess *, char *b, int l)
{
Q_UNUSED(b);
Q_UNUSED(l);
- kdDebug(KFAREA) << "stdout:" << TQString::tqfromLatin1(b,l) << endl;
+ kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl;
}
void FloppyAction::processStdErr(KProcess *p, char *b, int l)
@@ -390,7 +390,7 @@ FDFormat::FDFormat(TQObject *p) :
doVerify(true)
{
DEBUGSETUP;
- theProcessName = TQString::tqfromLatin1("fdformat");
+ theProcessName = TQString::fromLatin1("fdformat");
setName("FDFormat");
}
@@ -482,7 +482,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
}
else
{
- s = TQString::tqfromLatin1(b,l);
+ s = TQString::fromLatin1(b,l);
if (s.contains("ioctl(FD_FORM)"))
{
emit status (i18n(
@@ -499,7 +499,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
DEBUGS(s);
}
#elif defined(ANY_LINUX)
- s = TQString::tqfromLatin1(b,l);
+ s = TQString::fromLatin1(b,l);
DEBUGS(s);
TQRegExp regexp( "([0-9]+)" );
if ( s.startsWith( "bad data at cyl" ) || ( s.find( "Problem reading cylinder" ) != -1 ) )
@@ -557,7 +557,7 @@ DDZeroOut::DDZeroOut(TQObject *p) :
FloppyAction(p)
{
kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl;
- theProcessName = TQString::tqfromLatin1("dd");
+ theProcessName = TQString::fromLatin1("dd");
setName("DD");
}
@@ -720,7 +720,7 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system
{
@@ -886,7 +886,7 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!"
{
@@ -977,7 +977,7 @@ void MinixFilesystem::exec()
void MinixFilesystem::processStdOut(KProcess *, char *b, int l)
{
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!"
{
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index e774a8f..5dae22e 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -250,7 +250,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
DEBUGSETUP;
#ifdef DEBUG
- TQString o = TQString::tqfromLatin1(b,l);
+ TQString o = TQString::fromLatin1(b,l);
DEBUGS(TQString(" %1").tqarg(o).latin1());
#endif
@@ -283,7 +283,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
//
emit setProgress(1);
- // TQString myBuf = TQString::tqfromLatin1(b, l);
+ // TQString myBuf = TQString::fromLatin1(b, l);
// DEBUGS(myBuf.latin1());
}
break;
diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui
index da86512..b604046 100644
--- a/kgpg/conf_decryption.ui
+++ b/kgpg/conf_decryption.ui
@@ -40,7 +40,7 @@
Expanding
-
+
21
155
diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui
index 7fa0563..2aabb64 100644
--- a/kgpg/conf_encryption.ui
+++ b/kgpg/conf_encryption.ui
@@ -42,7 +42,7 @@
kcfg_AsciiArmor
-
+
0
0
@@ -102,7 +102,7 @@
Expanding
-
+
20
72
diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index 1109528..416f242 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -103,7 +103,7 @@
Expanding
-
+
190
20
@@ -122,7 +122,7 @@
Expanding
-
+
21
54
diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui
index 8c0a43e..9572402 100644
--- a/kgpg/conf_misc.ui
+++ b/kgpg/conf_misc.ui
@@ -53,7 +53,7 @@
kcfg_UseMouseSelection
-
+
0
0
@@ -71,7 +71,7 @@
kcfg_RemoteFileWarn
-
+
0
0
@@ -107,7 +107,7 @@
Expanding
-
+
91
20
@@ -159,7 +159,7 @@ the original file.
Expanding
-
+
20
71
@@ -220,7 +220,7 @@ the original file.
Expanding
-
+
21
91
diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui
index 74a4a0b..1344d26 100644
--- a/kgpg/conf_ui2.ui
+++ b/kgpg/conf_ui2.ui
@@ -129,7 +129,7 @@
Expanding
-
+
21
210
@@ -146,7 +146,7 @@
Expanding
-
+
140
20
diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp
index 6874813..30a5ca0 100644
--- a/kgpg/detailedconsole.cpp
+++ b/kgpg/detailedconsole.cpp
@@ -42,7 +42,7 @@ KDetailedConsole::KDetailedConsole(TQWidget *parent, const char *name,const TQSt
TQVGroupBox *detailsGroup = new TQVGroupBox( i18n("Details"), page);
(void) new TQLabel(errormessage,detailsGroup);
- //labdetails->setMinimumSize(labdetails->tqsizeHint());
+ //labdetails->setMinimumSize(labdetails->sizeHint());
setDetailsWidget(detailsGroup);
vbox->addWidget(lab1);
diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui
index 438d2b9..fe6d178 100644
--- a/kgpg/groupedit.ui
+++ b/kgpg/groupedit.ui
@@ -127,7 +127,7 @@
Expanding
-
+
71
20
diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui
index 8389aa3..4daae5b 100644
--- a/kgpg/keyexport.ui
+++ b/kgpg/keyexport.ui
@@ -20,7 +20,7 @@
0
-
+
350
0
@@ -54,7 +54,7 @@
Expanding
-
+
20
16
diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp
index 70bbff7..26ecebe 100644
--- a/kgpg/keygener.cpp
+++ b/kgpg/keygener.cpp
@@ -64,7 +64,7 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent
keyexp->insertItem(i18n("Weeks"),2);
keyexp->insertItem(i18n("Months"),3);
keyexp->insertItem(i18n("Years"),4);
- keyexp->setMinimumSize(keyexp->tqsizeHint());
+ keyexp->setMinimumSize(keyexp->sizeHint());
connect(keyexp,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activateexp(int)));
(void) new TQLabel(i18n("Key size:"),bgroup1);
@@ -74,17 +74,17 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent
keysize->insertItem("2048");
keysize->insertItem("4096");
keysize->setCurrentItem("1024");
- keysize->setMinimumSize(keysize->tqsizeHint());
+ keysize->setMinimumSize(keysize->sizeHint());
(void) new TQLabel(i18n("Algorithm:"),bgroup1);
keykind = new KComboBox(bgroup1);
keykind->insertItem("DSA & ElGamal");
keykind->insertItem("RSA");
- keykind->setMinimumSize(keykind->tqsizeHint());
+ keykind->setMinimumSize(keykind->sizeHint());
vbox->addWidget(bgroup1);
page->show();
- page->resize(page->tqmaximumSize());
+ page->resize(page->maximumSize());
setMainWidget(page);
}
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index 93aa61f..2e75a4d 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -85,7 +85,7 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi
connect(prop->kCOwnerTrust,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotChangeTrust(int)));
connect(this,TQT_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQT_SLOT(slotSetPhoto(const TQPixmap&)));
- //prop->setMinimumSize(prop->tqsizeHint());
+ //prop->setMinimumSize(prop->sizeHint());
}
void KgpgKeyInfo::slotDisableKey(bool isOn)
@@ -378,14 +378,14 @@ chdate->show();
void KgpgKeyInfo::slotCheckDate(TQDate date)
{
-chdate->enableButtonOK(date>=TQDate::tqcurrentDate ());
+chdate->enableButtonOK(date>=TQDate::currentDate ());
}
void KgpgKeyInfo::slotChangeDate()
{
KgpgInterface *KeyExpirationProcess=new KgpgInterface();
if (kb->isChecked())
- KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::tqcurrentDate(),true);
+ KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::currentDate(),true);
else
KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,kdt->date(),false);
connect(KeyExpirationProcess,TQT_SIGNAL(expirationFinished(int)),this,TQT_SLOT(slotInfoExpirationChanged(int)));
@@ -401,7 +401,7 @@ chdate->enableButtonOK(true);
else
{
kdt->setEnabled(true);
-chdate->enableButtonOK(kdt->date()>=TQDate::tqcurrentDate ());
+chdate->enableButtonOK(kdt->date()>=TQDate::currentDate ());
}
}
diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui
index 485c182..adfe8c1 100644
--- a/kgpg/keyproperties.ui
+++ b/kgpg/keyproperties.ui
@@ -50,13 +50,13 @@
0
-
+
120
140
-
+
32767
140
diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui
index 40c81ec..4087bde 100644
--- a/kgpg/keyserver.ui
+++ b/kgpg/keyserver.ui
@@ -107,7 +107,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
Expanding
-
+