diff options
| author | Timothy Pearson <[email protected]> | 2011-12-18 18:29:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-18 18:29:23 -0600 |
| commit | 628043be55ddd2f534411d028e4f68c8fe4eaabb (patch) | |
| tree | 29459652112ab6d5dfbf27ac0bbf5b86b7c83bca | |
| parent | 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (diff) | |
| download | tdebase-628043be55ddd2f534411d028e4f68c8fe4eaabb.tar.gz tdebase-628043be55ddd2f534411d028e4f68c8fe4eaabb.zip | |
Rename old tq methods that no longer need a unique name
523 files changed, 2140 insertions, 2140 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index a89e63584..e82ed614e 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -175,7 +175,7 @@ void BackTrace::processBacktrace() --len; } m_strBt.remove( pos, len ); - m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" )); + m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" )); } } } diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index d90fc38d3..ac6f00975 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, TQWidget *w = new TQWidget( this ); ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true ); m_status = new TQLabel( w ); - m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); //m_copyButton = new KPushButton( KStdGuiItem::copy(), w ); - KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) ); + KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) ); m_copyButton = new KPushButton( item, w ); connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); m_copyButton->setEnabled( false ); @@ -109,7 +109,7 @@ void KrashDebugger :: slotSave() } else { - TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" ); + TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); if( defname.contains( '/' )) defname = defname.mid( defname.findRev( '/' ) + 1 ); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); @@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger() bool KrashDebugger::performChecks( TQString* msg ) { bool ret = true; - KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true ); + KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true ); kdedcfg.setGroup( "General" ); if( kdedcfg.readBoolEntry( "DelayedCheck", false )) { diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index e3a525174..c99f9b09c 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -93,12 +93,12 @@ void KrashConfig :: readConfig() // maybe we should check if it's relative? TQString configname = config->readEntry("ConfigName", - TQString::tqfromLatin1("enduser")); + TQString::fromLatin1("enduser")); TQString debuggername = config->readEntry("Debugger", - TQString::tqfromLatin1("gdb")); + TQString::fromLatin1("gdb")); - KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername), + KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername), true, false, "appdata"); debuggers.setGroup("General"); @@ -112,7 +112,7 @@ void KrashConfig :: readConfig() m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); m_kcrashRegExp = debuggers.readEntry("KCrashRegExp"); - KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname), + KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname), true, false, "appdata"); preset.setGroup("ErrorDescription"); @@ -138,7 +138,7 @@ void KrashConfig :: readConfig() TQString str = TQString::number(m_signalnum); // use group unknown if signal not found if (!preset.hasGroup(str)) - str = TQString::tqfromLatin1("unknown"); + str = TQString::fromLatin1("unknown"); preset.setGroup(str); m_signalName = preset.readEntry("Name"); if (b) @@ -149,13 +149,13 @@ void KrashConfig :: readConfig() void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const { TQMap<TQString,TQString> map; - map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName()); - map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("tdeinit") : m_execname; - map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber()); - map[TQString::tqfromLatin1("signame")] = signalName(); - map[TQString::tqfromLatin1("progname")] = programName(); - map[TQString::tqfromLatin1("pid")] = TQString::number(pid()); - map[TQString::tqfromLatin1("tempfile")] = tempFile; + map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName()); + map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("tdeinit") : m_execname; + map[TQString::fromLatin1("signum")] = TQString::number(signalNumber()); + map[TQString::fromLatin1("signame")] = signalName(); + map[TQString::fromLatin1("progname")] = programName(); + map[TQString::fromLatin1("pid")] = TQString::number(pid()); + map[TQString::fromLatin1("tempfile")] = tempFile; if (shell) str = KMacroExpander::expandMacrosShellQuote( str, map ); else diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index 118e56c39..ab804281f 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name) // picture of konqi TQLabel *lab = new TQLabel(page); lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png"))); + TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png"))); lab->setPixmap(pix); - lab->setFixedSize( lab->tqsizeHint() ); + lab->setFixedSize( lab->sizeHint() ); TQLabel * info = new TQLabel(generateText(), page); - info->setMinimumSize(info->tqsizeHint()); + info->setMinimumSize(info->sizeHint()); if (m_krashconf->showBacktrace()) { @@ -196,7 +196,7 @@ void Toplevel :: slotUser3() void Toplevel :: slotBacktraceDone(const TQString &str) { // Do not translate.. This will be included in the _MAIL_. - TQString buf = TQString::tqfromLatin1 + TQString buf = TQString::fromLatin1 ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str; m_bugreport->setText(buf); diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index e5cf13ec8..415cdbb65 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -54,7 +54,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name "applications on your system and adds " "them to the KDE menu system. " "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this); - label->tqsetAlignment( AlignAuto | WordBreak ); + label->setAlignment( AlignAuto | WordBreak ); layout->addWidget( label ); layout->addSpacing( 5 ); diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index 13d883eab..1e7dcb3ef 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded() { if (m_part) return; - if (!tqtopLevelWidget() || !parentWidget()) return; - if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return; + if (!topLevelWidget() || !parentWidget()) return; + if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return; KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index abcf05d15..5986b77c8 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -86,7 +86,7 @@ KateDocManager::~KateDocManager () { m_metaInfos->setGroup(*it); TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def); - if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos) + if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos) m_metaInfos->deleteGroup(*it); } delete def; @@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc) m_metaInfos->setGroup(doc->url().prettyURL()); doc->writeSessionConfig(m_metaInfos); m_metaInfos->writeEntry("MD5", (const char *)md5); - m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime()); + m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime()); m_metaInfos->sync(); } } diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index 4ed9c3d95..c0daf314b 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl; return false; } - KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget()); + KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget()); if (!dmw) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl; return false; @@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leName = new TQLineEdit( w ); lo->addWidget( leName, 1, 2 ); l = new TQLabel( leName, i18n("&Label:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 1, 1 ); if ( tool ) leName->setText( tool->name ); TQWhatsThis::add( leName, i18n( @@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * teCommand = new TQTextEdit( w ); lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 ); l = new TQLabel( teCommand, i18n("S&cript:"), w ); - l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight ); + l->setAlignment( Qt::AlignTop|Qt::AlignRight ); lo->addWidget( l, 2, 1 ); if ( tool ) teCommand->setText( tool->command ); TQWhatsThis::add( teCommand, i18n( @@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leExecutable = new TQLineEdit( w ); lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 ); l = new TQLabel( leExecutable, i18n("&Executable:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 3, 1 ); if ( tool ) leExecutable->setText( tool->tryexec ); TQWhatsThis::add( leExecutable, i18n( @@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leMimetypes = new TQLineEdit( w ); lo->addWidget( leMimetypes, 4, 2 ); l = new TQLabel( leMimetypes, i18n("&Mime types:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 4, 1 ); if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") ); TQWhatsThis::add( leMimetypes, i18n( @@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * cmbSave = new TQComboBox(w); lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 ); l = new TQLabel( cmbSave, i18n("&Save:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 5, 1 ); TQStringList sl; sl << i18n("None") << i18n("Current Document") << i18n("All Documents"); @@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leCmdLine = new TQLineEdit( w ); lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 ); l = new TQLabel( leCmdLine, i18n("&Command line name:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->tqalignment()|Qt::AlignRight ); lo->addWidget( l, 6, 1 ); if ( tool ) leCmdLine->setText( tool->cmdname ); TQWhatsThis::add( leCmdLine, i18n( diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index c29bdd1e1..4ae91fe3a 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -69,7 +69,7 @@ class ToolTip : public TQToolTip KateFileListItem *item = ((KateFileListItem*)i); if ( ! item ) return; - tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) ); + tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) ); } diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 3a01cda28..6e5bef002 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { - setMinimumHeight(m_tb->tqsizeHint().height()); + setMinimumHeight(m_tb->sizeHint().height()); m_tb->resize(width(),height()); } } @@ -123,7 +123,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, tqInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); cmbPath->setAutoDeleteCompletionObject( true ); @@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); @@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u ) newurl.setPath(pathstr); if ( !kateFileSelectorIsReadable ( newurl ) ) - newurl.cd(TQString::tqfromLatin1("..")); + newurl.cd(TQString::fromLatin1("..")); if ( !kateFileSelectorIsReadable (newurl) ) newurl.setPath( TQDir::homeDirPath() ); diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index ebc461618..0542d0c33 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -100,7 +100,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) loInput->setColStretch(1, 20); TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this); - lPattern->setFixedSize(lPattern->tqsizeHint()); + lPattern->setFixedSize(lPattern->sizeHint()); loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loPattern = new TQHBoxLayout( 4 ); @@ -112,22 +112,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion); lPattern->setBuddy(cmbPattern); cmbPattern->setFocus(); - cmbPattern->setMinimumSize(cmbPattern->tqsizeHint()); + cmbPattern->setMinimumSize(cmbPattern->sizeHint()); loPattern->addWidget( cmbPattern ); cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this); - cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width()); + cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width()); cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true)); loPattern->addWidget(cbCasesensitive); cbRegex = new TQCheckBox( i18n("Regular expression"), this ); - cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() ); + cbRegex->setMinimumWidth( cbRegex->sizeHint().width() ); cbRegex->setChecked( config->readBoolEntry( "Regex", true ) ); loPattern->addWidget( cbRegex ); loPattern->setStretchFactor( cmbPattern, 100 ); TQLabel *lTemplate = new TQLabel(i18n("Template:"), this); - lTemplate->setFixedSize(lTemplate->tqsizeHint()); + lTemplate->setFixedSize(lTemplate->sizeHint()); loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loTemplate = new TQHBoxLayout(4); @@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) leTemplate = new KLineEdit(this); lTemplate->setBuddy(leTemplate); leTemplate->setText(strTemplate[0]); - leTemplate->setMinimumSize(leTemplate->tqsizeHint()); + leTemplate->setMinimumSize(leTemplate->sizeHint()); loTemplate->addWidget(leTemplate); KComboBox *cmbTemplate = new KComboBox(false, this); @@ -146,19 +146,19 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) loTemplate->addWidget(cmbTemplate); TQLabel *lFiles = new TQLabel(i18n("Files:"), this); - lFiles->setFixedSize(lFiles->tqsizeHint()); + lFiles->setFixedSize(lFiles->sizeHint()); loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter); cmbFiles = new KComboBox(true, this); lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy())); - cmbFiles->setMinimumSize(cmbFiles->tqsizeHint()); + cmbFiles->setMinimumSize(cmbFiles->sizeHint()); cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion); cmbFiles->setDuplicatesEnabled(false); cmbFiles->insertStringList(lastSearchFiles); loInput->addWidget(cmbFiles, 2, 1); TQLabel *lDir = new TQLabel(i18n("Folder:"), this); - lDir->setFixedSize(lDir->tqsizeHint()); + lDir->setFixedSize(lDir->sizeHint()); loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter); TQBoxLayout *loDir = new TQHBoxLayout(3); @@ -176,7 +176,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) lDir->setBuddy(cmbDir); cbRecursive = new TQCheckBox(i18n("Recursive"), this); - cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width()); + cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width()); cbRecursive->setChecked(config->readBoolEntry("Recursive", true)); loDir->addWidget(cbRecursive); diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 52bf1f243..79a1e19c6 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) } list->hide(); connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) ); - mw->setMinimumSize( lInfo->tqsizeHint() ); + mw->setMinimumSize( lInfo->sizeHint() ); } TQPtrList<Kate::Document> KateMailDialog::selectedDocs() @@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton() lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") ); } - mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) ); - setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) ); + mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) ); + setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) ); resize( width(), minimumHeight() ); } #include "katemailfilesdialog.moc" diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 369eb0b78..4fc9080cb 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) if (sconfig) { sconfig->setGroup (sgroup); - size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); } // if thats fails, try to reuse size @@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) { // first try global app config KateApp::self()->config()->setGroup ("MainWindow"); - size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); if (size.isEmpty()) size = TQSize (kMin (700, desk.width()), kMin(480, desk.height())); diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 9a809c374..1991816af 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw ) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::tqfromLatin1( guiDescription ) + TQString completeDescription = TQString::fromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); @@ -239,7 +239,7 @@ ToolView::~ToolView () m_mainWin->toolViewDeleted (this); } -void ToolView::tqsetVisible (bool vis) +void ToolView::setVisible (bool vis) { if (m_visible == vis) return; @@ -380,7 +380,7 @@ bool Sidebar::showWidget (ToolView *widget) { it.current()->hide(); setTab (it.currentKey(), false); - it.current()->tqsetVisible(false); + it.current()->setVisible(false); } setTab (m_widgetToId[widget], true); @@ -388,7 +388,7 @@ bool Sidebar::showWidget (ToolView *widget) m_ownSplit->show (); widget->show (); - widget->tqsetVisible (true); + widget->setVisible (true); return true; } @@ -420,7 +420,7 @@ bool Sidebar::hideWidget (ToolView *widget) if (!anyVis) m_ownSplit->hide (); - widget->tqsetVisible (false); + widget->setVisible (false); return true; } @@ -618,7 +618,7 @@ void Sidebar::restoreSession (KConfig *config) ToolView *tv = m_toolviews[i]; tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false); - tv->tqsetVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false)); + tv->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false)); if (!anyVis) anyVis = tv->visible(); diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index 3588f4ecc..8096433b7 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -146,7 +146,7 @@ class ToolView : public TQVBox Sidebar *sidebar () { return m_sidebar; } - void tqsetVisible (bool vis); + void setVisible (bool vis); public: bool visible () const; diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index c2caba114..4df741fdf 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -67,9 +67,9 @@ protected: void paintEvent( TQPaintEvent *e ) { TQPainter p( this ); - p.setPen( tqcolorGroup().shadow() ); + p.setPen( colorGroup().shadow() ); p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); - p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() ); + p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() ); p.drawLine( e->rect().left(), 1, e->rect().right(), 1 ); } }; @@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name ) { m_lineColLabel = new TQLabel( this ); addWidget( m_lineColLabel, 0, false ); - m_lineColLabel->tqsetAlignment( Qt::AlignCenter ); + m_lineColLabel->setAlignment( Qt::AlignCenter ); m_lineColLabel->installEventFilter( this ); m_modifiedLabel = new TQLabel( TQString(" "), this ); addWidget( m_modifiedLabel, 0, false ); - m_modifiedLabel->tqsetAlignment( Qt::AlignCenter ); + m_modifiedLabel->setAlignment( Qt::AlignCenter ); m_modifiedLabel->installEventFilter( this ); m_insertModeLabel = new TQLabel( i18n(" INS "), this ); addWidget( m_insertModeLabel, 0, false ); - m_insertModeLabel->tqsetAlignment( Qt::AlignCenter ); + m_insertModeLabel->setAlignment( Qt::AlignCenter ); m_insertModeLabel->installEventFilter( this ); m_selectModeLabel = new TQLabel( i18n(" NORM "), this ); addWidget( m_selectModeLabel, 0, false ); - m_selectModeLabel->tqsetAlignment( Qt::AlignCenter ); + m_selectModeLabel->setAlignment( Qt::AlignCenter ); m_selectModeLabel->installEventFilter( this ); m_fileNameLabel=new KSqueezedTextLabel( this ); addWidget( m_fileNameLabel, 1, true ); m_fileNameLabel->setMinimumSize( 0, 0 ); - m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); - m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); + m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); m_fileNameLabel->installEventFilter( this ); installEventFilter( this ); @@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged() void KateVSStatusBar::showMenu() { - KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() ); + KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() ); TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) ); if (menu) diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index d3a834629..d5fd5f76b 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -277,7 +277,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view ) setActiveView (view); m_viewList.findRef (view); - mainWindow()->toolBar ()->tqsetUpdatesEnabled (false); + mainWindow()->toolBar ()->setUpdatesEnabled (false); if (m_viewManager->guiMergedView) mainWindow()->guiFactory()->removeClient (m_viewManager->guiMergedView ); @@ -287,7 +287,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view ) if (!m_blockViewCreationAndActivation) mainWindow()->guiFactory ()->addClient( view ); - mainWindow()->toolBar ()->tqsetUpdatesEnabled (true); + mainWindow()->toolBar ()->setUpdatesEnabled (true); statusMsg(); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index f47beb87f..571361782 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc) // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) - resize( TQSize(700, 480).expandedTo(tqminimumSizeHint())); + resize( TQSize(700, 480).expandedTo(minimumSizeHint())); // call it as last thing, must be sure everything is already set up ;) setAutoSaveSettings (); diff --git a/kate/utils/dockviewbase.cpp b/kate/utils/dockviewbase.cpp index 6048f9b70..76e5844ed 100644 --- a/kate/utils/dockviewbase.cpp +++ b/kate/utils/dockviewbase.cpp @@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title ) { setSpacing( 4 ); d->header = new TQWidget( this ); - d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); + d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); TQHBoxLayout *lo = new TQHBoxLayout( d->header ); lo->setSpacing( 6 ); lo->insertSpacing( 0, 6 ); diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 206389b20..be6b11204 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() { TQVBoxLayout * vlay = new TQVBoxLayout(lay); featuresLabel = new TQLabel( "", contents ); - featuresLabel->tqsetAlignment( WordBreak|AlignVCenter ); + featuresLabel->setAlignment( WordBreak|AlignVCenter ); vlay->addWidget( featuresLabel ); vlay->addStretch(); diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 64c33682a..9d1eae438 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -311,7 +311,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") ); hbox->addSpacing(12); colorButton = new KColorButton(grp); - colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2); + colorButton->setFixedWidth(colorButton->sizeHint().height()*2); hbox->addWidget(colorButton); hbox->addStretch(); TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); @@ -388,7 +388,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp); - kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyModifiersButton); connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); @@ -536,7 +536,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint()); hbox->addStretch(1); kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp); - kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyAccessXButton); connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui index 041939a7f..403dba661 100644 --- a/kcontrol/accessibility/accessibilityconfigwidget.ui +++ b/kcontrol/accessibility/accessibilityconfigwidget.ui @@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>15</height> @@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>61</height> @@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index ae65419a9..cb0f6f93a 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -499,7 +499,7 @@ void KArtsModule::updateWidgets() if (item >= 0) { audioIO = audioIOList.tqat(item)->name; - bool jack = (audioIO == TQString::tqfromLatin1("jack")); + bool jack = (audioIO == TQString::fromLatin1("jack")); if(jack) { customRate->setChecked(false); @@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans, TQString args; if(fragmentCount) - args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount); + args += TQString::fromLatin1(" -F %1").arg(fragmentCount); if(fragmentSize) - args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize); + args += TQString::fromLatin1(" -S %1").arg(fragmentSize); if (!audioIO.isEmpty()) - args += TQString::tqfromLatin1(" -a %1").arg(audioIO); + args += TQString::fromLatin1(" -a %1").arg(audioIO); if (duplex) - args += TQString::tqfromLatin1(" -d"); + args += TQString::fromLatin1(" -d"); if (netTrans) - args += TQString::tqfromLatin1(" -n"); + args += TQString::fromLatin1(" -n"); if (!deviceName.isEmpty()) - args += TQString::tqfromLatin1(" -D ") + deviceName; + args += TQString::fromLatin1(" -D ") + deviceName; if (rate) - args += TQString::tqfromLatin1(" -r %1").arg(rate); + args += TQString::fromLatin1(" -r %1").arg(rate); if (bits) - args += TQString::tqfromLatin1(" -b %1").arg(bits); + args += TQString::fromLatin1(" -b %1").arg(bits); if (autoSuspend && suspendTime) - args += TQString::tqfromLatin1(" -s %1").arg(suspendTime); + args += TQString::fromLatin1(" -s %1").arg(suspendTime); if (!addOptions.isEmpty()) args += TQChar(' ') + addOptions; - args += TQString::tqfromLatin1(" -m artsmessage"); - args += TQString::tqfromLatin1(" -c drkonqi"); - args += TQString::tqfromLatin1(" -l 3"); - args += TQString::tqfromLatin1(" -f"); + args += TQString::fromLatin1(" -m artsmessage"); + args += TQString::fromLatin1(" -c drkonqi"); + args += TQString::fromLatin1(" -l 3"); + args += TQString::fromLatin1(" -f"); return args; } diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui index f0d42dd8a..06ccd7b92 100644 --- a/kcontrol/arts/generaltab.ui +++ b/kcontrol/arts/generaltab.ui @@ -12,7 +12,7 @@ <height>613</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>450</height> @@ -227,7 +227,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>173</width> <height>20</height> @@ -256,7 +256,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -289,7 +289,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -308,7 +308,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui index 68ed5916f..ac20fdfe2 100644 --- a/kcontrol/arts/hardwaretab.ui +++ b/kcontrol/arts/hardwaretab.ui @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index d15d344a7..0a188a475 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - tqsetAlignment( TQt::WordBreak ); + setAlignment( TQt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::tqminimumSizeHint() const +TQSize KRichTextLabel::minimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::tqsizeHint() const +TQSize KRichTextLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 43bf0afce..18cba5a32 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -45,8 +45,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index e14be2af0..0917bfe0f 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -432,7 +432,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent m_RefreshEdit->setRange(5, 60); m_RefreshEdit->setSteps(5, 10); m_RefreshEdit->setSuffix(i18n(" min")); - m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint()); + m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint()); lbl->setBuddy(m_RefreshEdit); grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft); diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui index 55dbc384e..441b918de 100644 --- a/kcontrol/background/bgadvanced_ui.ui +++ b/kcontrol/background/bgadvanced_ui.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>0</height> @@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> @@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 02669bdd0..e0415f832 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) } // background image settings - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_urlWallpaperButton->setIconSet( iconSet ); m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->tqsetAlignment(Qt::AlignCenter); + screenLabel->setAlignment(Qt::AlignCenter); screenLabel->setNum(int(s + 1)); // BUGLET: we should not allow the identification to be entered again // until the timer fires. TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); - TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); @@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti() { KBackgroundRenderer *r = eRenderer(); - BGMultiWallpaperDialog dlg(r, tqtopLevelWidget()); + BGMultiWallpaperDialog dlg(r, topLevelWidget()); if (dlg.exec() == TQDialog::Accepted) { r->stop(); m_slideShowRandom = r->multiWallpaperMode(); @@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced() KBackgroundRenderer *r = eRenderer(); m_previewUpdates = false; - BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop); + BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop); if (!m_pMonitorArrangement->isEnabled()) { dlg.makeReadOnly(); diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui index c3d1a0344..3960b4009 100644 --- a/kcontrol/background/bgdialog_ui.ui +++ b/kcontrol/background/bgdialog_ui.ui @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -132,7 +132,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -161,7 +161,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -277,7 +277,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>10</height> @@ -539,7 +539,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>10</height> @@ -613,7 +613,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>260</width> <height>20</height> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>16</height> diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index 696edc56c..f78a7b616 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -157,7 +157,7 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm ) BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) : TQLabel(parent, name) { - tqsetAlignment(AlignCenter); + setAlignment(AlignCenter); setScaledContents(true); setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); m_pBGMonitor = new BGMonitor(this); @@ -168,8 +168,8 @@ BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) void BGMonitorLabel::updateMonitorGeometry() { - double scaleX = double(width()) / double(tqsizeHint().width()); - double scaleY = double(height()) / double(tqsizeHint().height()); + double scaleX = double(width()) / double(sizeHint().width()); + double scaleY = double(height()) / double(sizeHint().height()); kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ); @@ -189,7 +189,7 @@ void BGMonitorLabel::resizeEvent( TQResizeEvent * e ) BGMonitor::BGMonitor(TQWidget *parent, const char *name) : TQLabel(parent, name) { - tqsetAlignment(AlignCenter); + setAlignment(AlignCenter); setScaledContents(true); setAcceptDrops(true); } diff --git a/kcontrol/background/bgwallpaper_ui.ui b/kcontrol/background/bgwallpaper_ui.ui index 130157c08..14fca2eb2 100644 --- a/kcontrol/background/bgwallpaper_ui.ui +++ b/kcontrol/background/bgwallpaper_ui.ui @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>100</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index ef3f73ac1..96183b73d 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() ); cal = new KDatePicker( dateBox ); - cal->setMinimumSize(cal->tqsizeHint()); + cal->setMinimumSize(cal->sizeHint()); l1->addWidget( cal ); TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); @@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots1 = new TQLabel(":", timeBox); dots1->setMinimumWidth( 7 ); - dots1->tqsetAlignment( TQLabel::AlignCenter ); + dots1->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots1, 0, 1, 3, 3 ); minute = new HMSTimeWidget( timeBox ); @@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots2 = new TQLabel(":", timeBox); dots2->setMinimumWidth( 7 ); - dots2->tqsetAlignment( TQLabel::AlignCenter ); + dots2->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots2, 0, 1, 5, 5 ); second = new HMSTimeWidget( timeBox ); @@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * ) TQPointArray pts; TQPoint cp = rect().center(); int d = QMIN(width(),height()); - TQColor hands = tqcolorGroup().dark(); - TQColor shadow = tqcolorGroup().text(); + TQColor hands = colorGroup().dark(); + TQColor shadow = colorGroup().text(); paint.setPen( shadow ); paint.setBrush( shadow ); paint.setViewport(4,4,width(),height()); diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 450b140a5..ba1edfaf3 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -338,7 +338,7 @@ void WidgetCanvas::drawSampleWidgets() smplw.resize(width(), height()); //smplw.fill( parentWidget()->back() ); - smplw.fill( parentWidget()->tqcolorGroup().mid() ); + smplw.fill( parentWidget()->colorGroup().mid() ); // Actually start painting in @@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets() popup->setItemEnabled( id, false ); // HACK: Force Layouting - //Sad Eagle: tqsizeHint() forces layouting too, and it's a lot less visible - //popup->tqsizeHint(); // Breaks with Qt 3.3 - popup->resize(popup->tqsizeHint()); + //Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible + //popup->sizeHint(); // Breaks with Qt 3.3 + popup->resize(popup->sizeHint()); pm = TQPixmap::grabWidget( popup ); delete popup; @@ -585,7 +585,7 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - parentWidget()->tqcolorGroup(), TRUE, 0); + parentWidget()->colorGroup(), TRUE, 0); // Stop the painting diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui index 6fb35aba4..1cbd35a5e 100644 --- a/kcontrol/componentchooser/browserconfig_ui.ui +++ b/kcontrol/componentchooser/browserconfig_ui.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 403219de8..6bd1c16cd 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *) kmailCB->setChecked(useKMail); otherCB->setChecked(!useKMail); txtEMailClient->setText(emailClient); - txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height()); + txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height()); chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true")); emit changed(false); @@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient() TQString client = dlg.text(); // get the preferred Terminal Application - KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); - preferredTerminal += TQString::tqfromLatin1(" -e "); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + preferredTerminal += TQString::fromLatin1(" -e "); int len = preferredTerminal.length(); bool b = client.left(len) == preferredTerminal; @@ -393,7 +393,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it))); } - ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width()); + ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width()); ServiceChooser->sort(); connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); ServiceChooser->setSelected(0,true); @@ -410,7 +410,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File); ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available"))); - ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint()); + ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); TQString cfgType=cfg.readEntry("configurationType"); @@ -461,7 +461,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { delete configWidget; configWidget=newConfigWidget; connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); - configContainer->setMinimumSize(configWidget->tqsizeHint()); + configContainer->setMinimumSize(configWidget->sizeHint()); } if (configWidget) diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui index a988335a9..c0978f732 100644 --- a/kcontrol/componentchooser/componentconfig_ui.ui +++ b/kcontrol/componentchooser/componentconfig_ui.ui @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>91</height> diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui index 9a5879b00..25ee7480f 100644 --- a/kcontrol/componentchooser/emailclientconfig_ui.ui +++ b/kcontrol/componentchooser/emailclientconfig_ui.ui @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>16</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>16</height> diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui index aa7a63506..cbb79cb9f 100644 --- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui +++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>87</height> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -120,7 +120,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index f6db43497..c125a7743 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -842,7 +842,7 @@ TQString whatstr; tabs->addTab(tabSSLCOpts, i18n("Validation Options")); #endif - tabs->resize(tabs->tqsizeHint()); + tabs->resize(tabs->sizeHint()); load(); } @@ -1500,7 +1500,7 @@ TQString iss = TQString(); TQPalette cspl; iss = cert->getIssuer(); cspl = validFrom->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1508,7 +1508,7 @@ TQString iss = TQString(); validFrom->setPalette(cspl); cspl = validUntil->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1518,7 +1518,7 @@ TQString iss = TQString(); validFrom->setText(cert->getNotBefore()); validUntil->setText(cert->getNotAfter()); untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires()) - : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC))); + : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; @@ -1738,7 +1738,7 @@ TQString iss; TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); cspl = yValidFrom->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1746,7 +1746,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1778,7 +1778,7 @@ TQString iss; KSSLCertificate *cert = pkcs->getCertificate(); iss = cert->getIssuer(); cspl = yValidFrom->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1786,7 +1786,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index 619cf7d0c..b974fa375 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>451</width> <height>20</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui index 5422f614d..5074b8bab 100644 --- a/kcontrol/css/csscustom.ui +++ b/kcontrol/css/csscustom.ui @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -412,7 +412,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -429,7 +429,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -463,7 +463,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui index a58946576..51bd26ad1 100644 --- a/kcontrol/css/preview.ui +++ b/kcontrol/css/preview.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 2b7e7dde2..9cb7cb67e 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -743,7 +743,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin m_randrsimple = new KRandrSimpleAPI(); TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" )); + systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdisplay/kdisplayconfigrc" )); systemconfig->setFileWriteMode(0644); KAboutData *about = diff --git a/kcontrol/displayconfig/displayconfigbase.ui b/kcontrol/displayconfig/displayconfigbase.ui index 161fb81ff..50d7e9834 100644 --- a/kcontrol/displayconfig/displayconfigbase.ui +++ b/kcontrol/displayconfig/displayconfigbase.ui @@ -65,7 +65,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -403,7 +403,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -420,7 +420,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -597,7 +597,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -649,7 +649,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -749,7 +749,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index a0695d3ed..67ddea42e 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>21</height> @@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -281,7 +281,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>21</height> @@ -300,7 +300,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>110</height> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 4c0689f81..cdb04c5ff 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file - domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" )); + domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" )); domain->setGroup("publishing"); load(); connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); @@ -124,7 +124,7 @@ void KCMDnssd::load() while (avahiStatus.isRunning()) { kapp->processEvents(); } - int exitStatus = avahiStatus.exitqStatus(); + int exitStatus = avahiStatus.exiStatus(); if (exitStatus == 0) { // disabled enableZeroconf->setChecked(false); } else if (exitStatus == 1) { // enabled diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui index f9afe187c..f036dd6be 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui @@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>170</height> diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index 1f9af3152..14626580e 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -41,7 +41,7 @@ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name, : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ), DCOPObject( "LocalDomainURIFilterIface" ), last_time( 0 ), - m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) ) + m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) ) { configure(); } @@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const if( m_hostPortPattern.exactMatch( cmd ) && isLocalDomainHost( cmd ) ) { - cmd.prepend( TQString::tqfromLatin1("http://") ); + cmd.prepend( TQString::fromLatin1("http://") ); setFilteredURI( data, KURL( cmd ) ); setURIType( data, KURIFilterData::NET_PROTOCOL ); @@ -76,7 +76,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const if( !(host == last_host && last_time > time( NULL ) - 5 ) ) { - TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "klocaldomainurifilterhelper" )); + TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" )); if( helper.isEmpty()) return last_result = false; diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 16e23efbb..7e077ecb0 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -43,7 +43,7 @@ #define IPv6_PATTERN "^\\[.*\\]" #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*" -#define QFL1(x) TQString::tqfromLatin1(x) +#define QFL1(x) TQString::fromLatin1(x) /** * IMPORTANT: @@ -164,13 +164,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const if (!isMalformed && (url.protocol().length() == 4) && - (url.protocol() != TQString::tqfromLatin1("http")) && + (url.protocol() != TQString::fromLatin1("http")) && (url.protocol()[0]=='h') && (url.protocol()[1]==url.protocol()[2]) && (url.protocol()[3]=='p')) { // Handle "encrypted" URLs like: h++p://www.kde.org - url.setProtocol( TQString::tqfromLatin1("http")); + url.setProtocol( TQString::fromLatin1("http")); setFilteredURI( data, url); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const } // Detect UNC style (aka windows SMB) URLs - if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) ) + if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) ) { // make sure path is unix style cmd.replace('\\', '/'); - cmd.prepend( TQString::tqfromLatin1( "smb:" ) ); + cmd.prepend( TQString::fromLatin1( "smb:" ) ); setFilteredURI( data, KURL( cmd )); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setRef(ref); u.setQuery(query); - if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it's a file will get // an access denied error later on. @@ -514,7 +514,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setPath(path); u.setRef(ref); - if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it exists and will get // an access denied error later on. diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index daf7961a1..a678e0eb2 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -100,7 +100,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed, 1 ); - m_autoEmbed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); + m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); // The order of those three items is very important. If you change it, fix typeslistitem.cpp ! new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); @@ -120,7 +120,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) secondLayout->addSpacing(10); embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget ); - embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().height() ); + embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() ); connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); secondLayout->addWidget(embedServiceListWidget, 3); diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 41a11ee43..6d8ee9860 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -126,7 +126,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) // Widget shown on startup m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack); - m_emptyWidget->tqsetAlignment(AlignCenter); + m_emptyWidget->setAlignment(AlignCenter); m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ ); diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index 3380f86f9..8ff08d157 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -69,7 +69,7 @@ void TypesListItem::initMeta( const TQString & major ) KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting( major ); - m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; } bool TypesListItem::defaultEmbeddingSetting( const TQString& major ) @@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting(m_major); - unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; if ( m_autoEmbed != oldAutoEmbed ) return true; } @@ -249,7 +249,7 @@ void TypesListItem::sync() { KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); - config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 ); + config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 ); return; } @@ -286,9 +286,9 @@ void TypesListItem::sync() config.writeEntry("Hidden", false); if ( m_autoEmbed == 2 ) - config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false ); + config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false ); else - config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); + config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); m_bNewItem = false; } diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 6b7d166db..124d33d2f 100644 --- a/kcontrol/fonts/kxftconfig.cpp +++ b/kcontrol/fonts/kxftconfig.cpp @@ -52,7 +52,7 @@ TQString KXftConfig::contractHome(TQString path) unsigned int len = home.length(); if(path.length() == len || path[len] == '/') - return path.replace(0, len, TQString::tqfromLatin1("~")); + return path.replace(0, len, TQString::fromLatin1("~")); } } diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 6556b912d..44b69e2ff 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -65,8 +65,8 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); - systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); + config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); KAboutData *about = new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"), diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui index cf66e3b1c..9716563cb 100644 --- a/kcontrol/iccconfig/iccconfigbase.ui +++ b/kcontrol/iccconfig/iccconfigbase.ui @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 4fc8df5fc..80eb4f1ad 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -80,7 +80,7 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name) // Size TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); grid->addWidget(lbl, 0, 0, Qt::AlignLeft); mpSizeBox = new TQComboBox(m_pTab1); connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int))); @@ -105,8 +105,8 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name) top->activate(); - mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" )); - mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); + mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" )); + mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); init(); read(); @@ -125,7 +125,7 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget * TQLabel *lab = new TQLabel(str, parent); lay->addWidget(lab, 1, i, Qt::AlignCenter); mpPreview[i] = new TQLabel(parent); - mpPreview[i]->tqsetAlignment(AlignCenter); + mpPreview[i]->setAlignment(AlignCenter); mpPreview[i]->setMinimumSize(105, 105); lay->addWidget(mpPreview[i], 2, i); TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent); @@ -302,12 +302,12 @@ void KIconConfig::apply() if (mpUsageList->currentText() == i18n("Panel Buttons")) { mpSizeBox->clear(); - mpSizeBox->insertItem(TQString().tqsetNum(16)); - mpSizeBox->insertItem(TQString().tqsetNum(22)); - mpSizeBox->insertItem(TQString().tqsetNum(32)); - mpSizeBox->insertItem(TQString().tqsetNum(48)); - mpSizeBox->insertItem(TQString().tqsetNum(64)); - mpSizeBox->insertItem(TQString().tqsetNum(128)); + mpSizeBox->insertItem(TQString().setNum(16)); + mpSizeBox->insertItem(TQString().setNum(22)); + mpSizeBox->insertItem(TQString().setNum(32)); + mpSizeBox->insertItem(TQString().setNum(48)); + mpSizeBox->insertItem(TQString().setNum(64)); + mpSizeBox->insertItem(TQString().setNum(128)); for (i=0;i<(mpSizeBox->count());i++) { if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) { mpSizeBox->setCurrentItem(i); @@ -316,12 +316,12 @@ void KIconConfig::apply() } else if (mpUsageList->currentText() == i18n("System Tray Icons")) { mpSizeBox->clear(); - mpSizeBox->insertItem(TQString().tqsetNum(16)); - mpSizeBox->insertItem(TQString().tqsetNum(22)); - mpSizeBox->insertItem(TQString().tqsetNum(32)); - mpSizeBox->insertItem(TQString().tqsetNum(48)); - mpSizeBox->insertItem(TQString().tqsetNum(64)); - mpSizeBox->insertItem(TQString().tqsetNum(128)); + mpSizeBox->insertItem(TQString().setNum(16)); + mpSizeBox->insertItem(TQString().setNum(22)); + mpSizeBox->insertItem(TQString().setNum(32)); + mpSizeBox->insertItem(TQString().setNum(48)); + mpSizeBox->insertItem(TQString().setNum(64)); + mpSizeBox->insertItem(TQString().setNum(128)); for (i=0;i<(mpSizeBox->count());i++) { if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) { mpSizeBox->setCurrentItem(i); @@ -335,7 +335,7 @@ void KIconConfig::apply() if (mUsage < KIcon::LastGroup) { for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++) { - mpSizeBox->insertItem(TQString().tqsetNum(*it)); + mpSizeBox->insertItem(TQString().setNum(*it)); dw = abs(mSizes[mUsage] - *it); if (dw < delta) { @@ -688,7 +688,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, top->setRowStretch(1,1); lbl = new TQLabel(i18n("&Effect:"), page); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); top->addWidget(lbl, 0, 0, Qt::AlignLeft); mpEffectBox = new TQListBox(page); mpEffectBox->insertItem(i18n("No Effect")); @@ -713,7 +713,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, grid->setRowStretch(1, 1); mpPreview = new TQLabel(frame); - mpPreview->tqsetAlignment(AlignCenter); + mpPreview->setAlignment(AlignCenter); mpPreview->setMinimumSize(105, 105); grid->addWidget(mpPreview, 1, 0); diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 54f0bdf86..770b2cdf3 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits ) { TQString hexstr; int i; - hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); + hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); for (i=hexstr.length()-1; i>0; --i) if (hexstr[i]==' ') hexstr[i] = '0'; @@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie for (i = 0; i < ndepths; i++) { txt = txt + Value(depths[i]); if (i < ndepths - 1) - txt = txt + TQString::tqfromLatin1(", "); + txt = txt + TQString::fromLatin1(", "); } last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt); @@ -204,7 +204,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie &width, &height); last = new TQListViewItem(item, last, i18n("Largest Cursor"), (width == 65535 && height == 65535) - ? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height)); + ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height)); last = new TQListViewItem(item, last, i18n("Current Input Event Mask"), HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS)); @@ -272,12 +272,12 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) last = new TQListViewItem(next, i18n("Name of the Display"), DisplayString(dpy)); - last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy))); + last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy))); last = new TQListViewItem(next, last, i18n("Vendor Release Number"), Value((int)VendorRelease(dpy))); last = new TQListViewItem(next, last, i18n("Version Number"), - TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) + TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) .arg((int)ProtocolRevision(dpy))); last = item = new TQListViewItem(next, last, i18n("Available Screens")); @@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) int extCount; char **extensions = XListExtensions( dpy, &extCount ); for ( i = 0; i < extCount; i++ ) { - item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) ); + item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) ); } XFreeExtensionList( extensions ); @@ -356,7 +356,7 @@ void KInfoListWidget::load() retrieve-function. If the function wants the widget to show another string, then it change *GetInfo_ErrorString ! */ ErrorString = i18n("No information available about %1.").arg(title) - + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING; + + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING; GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */ sorting_allowed = true; /* the functions may set that */ @@ -425,7 +425,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) ); NoInfoText = new TQLabel(widgetStack); widgetStack->addWidget(NoInfoText, 1); - NoInfoText->tqsetAlignment(AlignCenter | WordBreak); + NoInfoText->setAlignment(AlignCenter | WordBreak); widgetStack->raiseWidget(NoInfoText); load(); } diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index b779eac29..02fd98b1d 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox) // convert to strings vv[0] = KIO::convertSize(big[0]); - vv[1] = TQString::tqfromLatin1("%1 (%2%%)") + vv[1] = TQString::fromLatin1("%1 (%2%%)") .arg(KIO::convertSize(big[1])) .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); // FIXME: these two are large enough to punctuate vv[2] = TQString::number(mnt->f_files); - vv[3] = TQString::tqfromLatin1("%1 (%2%%) ") + vv[3] = TQString::fromLatin1("%1 (%2%%) ") .arg(mnt->f_ffree) .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0); vv[4] = TQString::null; -#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " "); +#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " "); MNTF(ASYNC) MNTF(DEFEXPORTED) MNTF(EXKERB) diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index cd7c9b010..306cdd751 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) break; }; Widget = new TQLabel(title, this); - Widget->tqsetAlignment(AlignLeft); + Widget->setAlignment(AlignLeft); vbox->addWidget(Widget, 1); } @@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) if (i == SWAP_MEM) vbox->addSpacing(SPACING); Widget = new TQLabel(this); - Widget->tqsetAlignment(AlignRight); + Widget->setAlignment(AlignRight); MemSizeLabel[i][j] = Widget; vbox->addWidget(Widget, 1); } @@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) hint = "<qt>" + hint + "</qt>"; Widget = new TQLabel("<b>" + title + "</b>", this); - Widget->tqsetAlignment(AlignCenter); + Widget->setAlignment(AlignCenter); TQToolTip::add(Widget, hint); vbox->addWidget(Widget); vbox->addSpacing(SPACING / 2); @@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) vbox->addSpacing(SPACING / 2); Widget = new TQLabel(this); /* xx MB used. */ - Widget->tqsetAlignment(AlignCenter); + Widget->setAlignment(AlignCenter); TQToolTip::add(Widget, hint); GraphLabel[i] = Widget; vbox->addWidget(Widget); diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp index f04a93d06..061e368e6 100644 --- a/kcontrol/info/opengl.cpp +++ b/kcontrol/info/opengl.cpp @@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1) if (!ext || !ext[0]) return; - TQString qext = TQString::tqfromLatin1(ext); + TQString qext = TQString::fromLatin1(ext); TQListViewItem *l2 = NULL; i = j = 0; diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui index f3e14fc53..5dfcedb46 100644 --- a/kcontrol/input/kmousedlg.ui +++ b/kcontrol/input/kmousedlg.ui @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -112,7 +112,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>115</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -235,7 +235,7 @@ <property name="name"> <cstring>slAutoSelect</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -301,7 +301,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -331,7 +331,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index 17bf227f4..c4b1ec6b0 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -286,7 +286,7 @@ PreviewWidget::~PreviewWidget() void PreviewWidget::setTheme( const TQString &theme ) { - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); int minHeight = previewSize + 20; // Minimum height of the preview widget int maxHeight = height(); // Tallest cursor height @@ -302,7 +302,7 @@ void PreviewWidget::setTheme( const TQString &theme ) current = -1; setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) ); - tqsetUpdatesEnabled( true ); + setUpdatesEnabled( true ); tqrepaint( false ); } @@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * ) { TQPixmap buffer( size() ); TQPainter p( &buffer ); - p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); Picture dest; if ( !qt_has_xft || !qt_use_xrender ) { diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp index 4b6d5fc9b..84135bb66 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -65,7 +65,7 @@ void CalDialog::calibrate() do { - tqApp->tqprocessEvents(2000); + tqApp->processEvents(2000); } while ( ti.isActive() && (result() != TQDialog::Rejected) ); @@ -165,7 +165,7 @@ void CalDialog::waitButton(int axis, bool press, int &lastVal) // loop until the user presses a button on the device or on the dialog do { - tqApp->tqprocessEvents(100); + tqApp->processEvents(100); if ( joydev->getEvent(type, number, value) ) { diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 87b6f4e05..3ffc0e1d7 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -95,7 +95,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &) joyWidget = new JoyWidget(this); - setMinimumSize(joyWidget->tqminimumSize()); + setMinimumSize(joyWidget->minimumSize()); setButtons(KCModule::Default); } diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index 3d9eaf0d4..ff3db429c 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -56,7 +56,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) TQLabel *icon = new TQLabel(messageBox); icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true)); - icon->setFixedSize(icon->tqsizeHint()); + icon->setFixedSize(icon->sizeHint()); message = new TQLabel(messageBox); messageBox->hide(); } diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 614a65e7b..1bfd3d127 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca // set qwhatsthis help TQWhatsThis::add(this, i18n(intro_text)); _viewer = new KHTMLPart( this, "_viewer" ); - _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); + _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index 9acab1129..5c4907a91 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent) , _module(0L) { _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this); - _busyw->tqsetAlignment(AlignCenter); + _busyw->setAlignment(AlignCenter); _busyw->setTextFormat(RichText); _busyw->setGeometry(0,0, width(), height()); addWidget( _busyw ); @@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n" ProxyWidget *widget = loadModule( module ); - KCGlobal::repairAccels( tqtopLevelWidget() ); + KCGlobal::repairAccels( topLevelWidget() ); return ( widget!=0 ); } diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index 90b2179c5..b22ad2565 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup() if (_infocenter) { kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl; - _baseGroup = TQString::tqfromLatin1("Settings/Information/"); + _baseGroup = TQString::fromLatin1("Settings/Information/"); } else { kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl; - _baseGroup = TQString::tqfromLatin1("Settings/"); + _baseGroup = TQString::fromLatin1("Settings/"); } } } diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp index 9b7991298..723895de3 100644 --- a/kcontrol/kcontrol/kcrootonly.cpp +++ b/kcontrol/kcontrol/kcrootonly.cpp @@ -30,9 +30,9 @@ KCRootOnly::KCRootOnly(TQWidget *parent, const char *name) TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>" "Click on the \"Administrator Mode\" button below."), this); layout->addWidget(label); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); label->setTextFormat(RichText); - label->setMinimumSize(label->tqsizeHint()); + label->setMinimumSize(label->sizeHint()); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index a780b608e..7a707df21 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -77,9 +77,9 @@ KControlApp::KControlApp() int fontSize = toplevel->fontInfo().pointSize(); if (fontSize == 0) fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX(); - int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()), + int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) ); - int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()), + int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) ); toplevel->resize(x,y); } @@ -91,8 +91,8 @@ KControlApp::~KControlApp() KConfig *config = KGlobal::config(); config->setGroup("General"); TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); - config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); - config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); + config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); + config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); } delete toplevel; diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 88d2124ae..5ec30ef76 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -147,7 +147,7 @@ void ConfigModule::runAsRoot() _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); TQPalette pal( red ); pal.setColor( TQColorGroup::Background, - _module->parentWidget()->tqcolorGroup().background() ); + _module->parentWidget()->colorGroup().background() ); _embedFrame->setPalette( pal ); _embedFrame->setLineWidth( 2 ); _embedFrame->setMidLineWidth( 2 ); @@ -158,7 +158,7 @@ void ConfigModule::runAsRoot() _module->hide(); _embedFrame->show(); TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack); - _busy->tqsetAlignment(AlignCenter); + _busy->setAlignment(AlignCenter); _busy->setTextFormat(RichText); _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 144cf294f..794a69b91 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -133,9 +133,9 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath) -TQSize ModuleTreeView::tqsizeHint() const +TQSize ModuleTreeView::sizeHint() const { - return TQListView::tqsizeHint().boundedTo( + return TQListView::sizeHint().boundedTo( TQSize( fontMetrics().maxWidth()*35, TQWIDGETSIZE_MAX) ); } diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index ff01cc24a..86bfecab4 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -74,7 +74,7 @@ public: void makeSelected(ConfigModule* module); void makeVisible(ConfigModule *module); void fill(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; signals: void moduleSelected(ConfigModule*); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index dde14168b..a385d859e 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -120,7 +120,7 @@ public: ~ProxyContentWidget(){} // this should be really done by qscrollview in AutoOneFit mode! - TQSize tqsizeHint() const { return tqminimumSizeHint(); } + TQSize sizeHint() const { return minimumSizeHint(); } }; @@ -144,7 +144,7 @@ ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool } client->reparent(contentWidget,0,TQPoint(0,0),true); vbox->addWidget( client ); - vbox->activate(); // make sure we have a proper tqminimumSizeHint + vbox->activate(); // make sure we have a proper minimumSizeHint addChild(contentWidget); } diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index f2c00d230..cd096fa76 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name) // help widget _help = new HelpWidget(_dock); - _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // Restore sizes config->setGroup("General"); diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index a3896b71e..cc2ff97fe 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -149,7 +149,7 @@ void KDEDConfig::load( bool useDefaults ) { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::tqfromLatin1( "kded/*.desktop" ), + TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); TQListViewItem* item = 0L; @@ -187,7 +187,7 @@ void KDEDConfig::save() { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::tqfromLatin1( "kded/*.desktop" ), + TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); KConfig kdedrc("kdedrc", false, false); diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp index 651cd8782..e25c7b265 100644 --- a/kcontrol/kdm/kdm-appear.cpp +++ b/kcontrol/kdm/kdm-appear.cpp @@ -277,7 +277,7 @@ void KDMAppearanceWidget::makeReadOnly() void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) { TQStringList langlist = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) @@ -287,9 +287,9 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) TQString nid = fpath.mid(index + 1); KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); - combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null); } } @@ -343,7 +343,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) bool KDMAppearanceWidget::setLogo(TQString logo) { TQString flogo = logo.isEmpty() ? - locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) : + locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) : logo; TQImage p(flogo); if (p.isNull()) @@ -351,7 +351,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo) if (p.width() > 100 || p.height() > 100) p = p.smoothScale(100, 100, TQ_ScaleMin); logobutton->setPixmap(p); - uint bd = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2; + uint bd = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; logobutton->setFixedSize(p.width() + bd, p.height() + bd); logopath = logo; return true; @@ -361,7 +361,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo) void KDMAppearanceWidget::slotLogoButtonClicked() { KImageIO::registerFormats(); - KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")), + KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")), KImageIO::pattern( KImageIO::Reading ), this, 0, true); dialogue.setOperationMode( KFileDialog::Opening ); diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp index e7f267ce3..155d5b380 100644 --- a/kcontrol/kdm/kdm-conv.cpp +++ b/kcontrol/kdm/kdm-conv.cpp @@ -50,7 +50,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this ); alGroup->setCheckable( true ); - alGroup->tqsetSizePolicy( vpref ); + alGroup->setSizePolicy( vpref ); TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to KDM's graphical login." @@ -92,7 +92,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); - puGroup->tqsetSizePolicy( vpref ); + puGroup->setSizePolicy( vpref ); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp index d349b7da7..b6018c842 100644 --- a/kcontrol/kdm/kdm-users.cpp +++ b/kcontrol/kdm/kdm-users.cpp @@ -94,14 +94,14 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); - leminuid->tqsetSizePolicy( sp_ign_fix ); + leminuid->setSizePolicy( sp_ign_fix ); leminuid->setValidator( valid ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); - lemaxuid->tqsetSizePolicy( sp_ign_fix ); + lemaxuid->setSizePolicy( sp_ign_fix ); lemaxuid->setValidator( valid ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); @@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop - uint sz = tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; + uint sz = tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); connect( userbutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotUserButtonClicked()) ); @@ -457,11 +457,11 @@ void KDMUsersWidget::load() cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true)); TQString ps = config->readEntry( "FaceSource" ); - if (ps == TQString::tqfromLatin1("UserOnly")) + if (ps == TQString::fromLatin1("UserOnly")) rbusronly->setChecked(true); - else if (ps == TQString::tqfromLatin1("PreferUser")) + else if (ps == TQString::fromLatin1("PreferUser")) rbprefusr->setChecked(true); - else if (ps == TQString::tqfromLatin1("PreferAdmin")) + else if (ps == TQString::fromLatin1("PreferAdmin")) rbprefadm->setChecked(true); else rbadmonly->setChecked(true); diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp index 02ec37f9b..74230cfce 100644 --- a/kcontrol/kdm/main.cpp +++ b/kcontrol/kdm/main.cpp @@ -175,10 +175,10 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) struct stat st; if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) { - config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); + config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmdistrc" )); } else { - config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); } TQVBoxLayout *top = new TQVBoxLayout(this); diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index cf564e89f..b4b2e11f6 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -83,13 +83,13 @@ void CommandShortcutsModule::initGUI() label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. " "To edit, add or remove entries from this list use the " "<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>")); - label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &))); connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); - m_tree->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mainLayout->setStretchFactor(m_tree, 10); mainLayout->addWidget(m_tree); TQWhatsThis::add(m_tree, diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 75ec4edcb..7605159a7 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -170,7 +170,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) topLayout->addRowSpacing(3, 15); topLayout->addMultiCellWidget(kc, 5, 5, 0, 1); - setMinimumSize(topLayout->tqsizeHint()); + setMinimumSize(topLayout->sizeHint()); } KKeyModule::~KKeyModule (){ diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index c133d0de7..6bb9a08c2 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -145,7 +145,7 @@ void ShortcutsModule::initGUI() m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); - m_pcbSchemes->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); @@ -190,10 +190,10 @@ void ShortcutsModule::initGUI() m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true ); m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); - m_pkcGeneral->resize (m_pkcGeneral->tqsizeHint() ); + m_pkcGeneral->resize (m_pkcGeneral->sizeHint() ); if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) { m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this ); - m_useRmWinKeys->resize( m_useRmWinKeys->tqsizeHint() ); + m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 53295963e..46d5fdd5c 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -114,7 +114,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsSplitter=new TQSplitter(this); fontsFrame=new TQFrame(itsSplitter), itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart"); - itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); @@ -130,7 +130,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { #endif fontsFrame=new TQFrame(this); - fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifdef HAVE_XFT } #endif @@ -141,7 +141,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false)); fontsFrame->setLineWidth(0); - toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); toolbar->setMovingEnabled(false); TQString previousPath=itsConfig.readEntry(CFG_PATH); @@ -152,12 +152,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDirOp->setMinimumSize(TQSize(96, 64)); setMimeTypes(showBitmap); itsDirOp->dirLister()->setMainWindow(this); - itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); - button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index b1bb35e88..b4766c5c4 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem TQRect rect() const { - TQRect r = listView()->tqitemRect(this); + TQRect r = listView()->itemRect(this); return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height())); } diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index 96abb89db..a27bebf70 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url) TQString fname(url.fileName()); int pos; - if(-1!=(pos=fname.findRev(TQString::tqfromLatin1(constMultipleExtension)))) + if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension)))) fname=fname.left(pos); return fname; @@ -292,7 +292,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con ? KFI_KIO_FONTS_PROTOCOL"/system-folder" : KFI_KIO_FONTS_PROTOCOL"/folder"); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); return true; } else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet! @@ -393,15 +393,15 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); if(!Misc::root()) { url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER); - url+=TQString::tqfromLatin1("/"); + url+=TQString::fromLatin1("/"); } if(multiple) - url+=name+TQString::tqfromLatin1(constMultipleExtension); + url+=name+TQString::fromLatin1(constMultipleExtension); else url+=Misc::getFile(path); addAtom(entry, KIO::UDS_URL, 0, url); @@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo if (markPartial) { - TQString destPart(destOrig+TQString::tqfromLatin1(".part")); + TQString destPart(destOrig+TQString::fromLatin1(".part")); TQCString destPartC(TQFile::encodeName(destPart)); dest = destPart; @@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u) if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) || ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) { error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \ diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp index 4382f5feb..8b5ead1a8 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.cpp +++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp @@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *) } } -TQSize CFontPreview::tqsizeHint() const +TQSize CFontPreview::sizeHint() const { return TQSize(132, 132); } -TQSize CFontPreview::tqminimumSizeHint() const +TQSize CFontPreview::minimumSizeHint() const { return TQSize(32, 32); } diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h index f8f922b62..71916479e 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.h +++ b/kcontrol/kfontinst/viewpart/FontPreview.h @@ -50,8 +50,8 @@ class CFontPreview : public TQWidget virtual ~CFontPreview() {} void paintEvent(TQPaintEvent *); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; void showFont(const KURL &url); void showFont(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index 6e19c4f7d..3c8a47086 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -88,7 +88,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) setInstance(new KInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); - itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame); itsFaceSelector=new KIntNumInput(1, itsToolsFrame); itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button"); diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index d2a87be69..7e02b0da9 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -51,7 +51,7 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) layout->addWidget(m_advancedWidget); layout->addStretch(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); @@ -92,7 +92,7 @@ void advancedDialog::load() int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14); m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize); - TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() ); + TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() ); m_advancedWidget->tintColorB->setColor( color ); int tintValue = c.readNumEntry( "TintValue", 33 ); m_advancedWidget->tintSlider->setValue( tintValue ); diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index c49cf45b2..5053d6bac 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui index 8b0aeb223..bcdfef2f8 100644 --- a/kcontrol/kicker/applettab.ui +++ b/kcontrol/kicker/applettab.ui @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="name"> <cstring>pb_add</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -162,7 +162,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index 20db3beba..6aca01f9c 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>342</width> <height>20</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>10</height> @@ -401,7 +401,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -439,7 +439,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -532,7 +532,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -573,7 +573,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -637,7 +637,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 3684ff599..c78c5d4f9 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>66</width> <height>130</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -428,13 +428,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>50</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>50</height> @@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>289</width> <height>20</height> @@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index fad4f859a..2ded51364 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -261,13 +261,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>26</width> <height>26</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>26</width> <height>26</height> @@ -327,7 +327,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -389,7 +389,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -487,7 +487,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -558,7 +558,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -654,7 +654,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -698,7 +698,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index cd1d27fa9..35a89acfc 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) btnCustomKMenuIcon->setPixmap(kmenu_icon); KConfig *config; - config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::tqfromLatin1("RecentDocuments")); - maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10)); + config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::fromLatin1("RecentDocuments")); + maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10)); m_browserGroupLayout->setColStretch( 1, 1 ); m_pRecentOrderGroupLayout->setColStretch( 1, 1 ); @@ -247,8 +247,8 @@ void MenuTab::save() // Save recent documents KConfig *config; - config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::tqfromLatin1("RecentDocuments")); + config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::fromLatin1("RecentDocuments")); config->writeEntry("MaxEntries", maxrecentdocs->value()); config->sync(); diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index e7ea78bb3..fa145433a 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>342</width> <height>20</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -123,7 +123,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>151</width> <height>115</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>101</height> @@ -357,7 +357,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -426,7 +426,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>40</height> @@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -555,7 +555,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>0</height> @@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index d7202726a..220344f98 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) { TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png")); m_monitorImage->setPixmap(monitor); - m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint()); + m_monitorImage->setFixedSize(m_monitorImage->sizeHint()); m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG"); m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY); @@ -696,14 +696,14 @@ void PositionTab::showIdentify() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->tqsetAlignment(Qt::AlignCenter); + screenLabel->setAlignment(Qt::AlignCenter); screenLabel->setNum(s + 1); // BUGLET: we should not allow the identification to be entered again // until the timer fires. TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); - TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui index 532173407..ce9aed797 100644 --- a/kcontrol/kio/cache_ui.ui +++ b/kcontrol/kio/cache_ui.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>21</height> diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index e48d15432..00a87567e 100644 --- a/kcontrol/kio/fakeuaprovider.cpp +++ b/kcontrol/kio/fakeuaprovider.cpp @@ -27,7 +27,7 @@ #include "fakeuaprovider.h" #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL(x) TQString::tqfromLatin1(x) +#define QFL(x) TQString::fromLatin1(x) FakeUASProvider::FakeUASProvider() { @@ -97,13 +97,13 @@ void FakeUASProvider::parseDescription() TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.contains( TQString::tqfromLatin1("en") ) > 0 ) + if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::tqfromLatin1("en"); + (*it) = TQString::fromLatin1("en"); } } diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui index 00a032a79..e4fb65121 100644 --- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>62</height> diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index ac0b2572f..63f4dd21a 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -392,7 +392,7 @@ void KCookiesPolicies::save() while( at ) { - domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); + domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); at = at->nextSibling(); } diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui index 230ef9b5f..880b41cba 100644 --- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui @@ -161,7 +161,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp index 8d21c7a5b..22accb4e9 100644 --- a/kcontrol/kio/kenvvarproxydlg.cpp +++ b/kcontrol/kio/kenvvarproxydlg.cpp @@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed() setHighLight (mDlg->lbNoProxy, false); // Detect HTTP proxy settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); // Detect HTTPS proxy settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); // Detect FTP proxy settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); // Detect the NO_PROXY settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); + found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); if ( !found ) { diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index b5961db7c..92e8a98e6 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name ) mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) ); TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); - mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy ); + mDlg->pbCopyDown->setSizePolicy( sizePolicy ); init(); } diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui index d053707db..e2edb2d27 100644 --- a/kcontrol/kio/kproxydlg_ui.ui +++ b/kcontrol/kio/kproxydlg_ui.ui @@ -115,7 +115,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -300,7 +300,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui index ecc061a64..43567977e 100644 --- a/kcontrol/kio/manualproxy_ui.ui +++ b/kcontrol/kio/manualproxy_ui.ui @@ -137,7 +137,7 @@ <property name="name"> <cstring>sbHttp</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>114</height> diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 316fd7e80..44862f51e 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -70,7 +70,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); - setFixedSize (tqsizeHint()); + setFixedSize (sizeHint()); m_dlgUI->leDomain->setFocus (); } diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h index a67bfccaa..2bf7a4c99 100644 --- a/kcontrol/kio/policydlg.h +++ b/kcontrol/kio/policydlg.h @@ -52,11 +52,11 @@ public: if (advice.isEmpty()) return KCookieAdvice::Dunno; - if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0) + if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0) + else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0) + else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui index 3065ab229..90e801249 100644 --- a/kcontrol/kio/socksbase.ui +++ b/kcontrol/kio/socksbase.ui @@ -127,7 +127,7 @@ <property name="name"> <cstring>_c_customPath</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -211,7 +211,7 @@ <property name="name"> <cstring>_c_newPath</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui index 7bf590208..2082e3db4 100644 --- a/kcontrol/kio/uagentproviderdlg_ui.ui +++ b/kcontrol/kio/uagentproviderdlg_ui.ui @@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> @@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>29</width> <height>20</height> diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui index 73b9dfd2e..1e5d55c4e 100644 --- a/kcontrol/kio/useragentdlg_ui.ui +++ b/kcontrol/kio/useragentdlg_ui.ui @@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index 9eaad64af..c8a135c24 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>233</width> <height>20</height> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -265,7 +265,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index c68ac6681..af6c12cc4 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); - winPixmap->setFixedSize( winPixmap->tqsizeHint() ); + winPixmap->setFixedSize( winPixmap->sizeHint() ); // ---- @@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * TQHBox *hboxpreview = new TQHBox(vbox); TQWidget* spacer = new TQWidget( hboxpreview ); spacer->setMinimumSize( 20, 0 ); - spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index 12537d56a..63a8de7c4 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>80</height> @@ -287,7 +287,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 437c74197..43ba07eb6 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * */ bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); - m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); @@ -241,9 +241,9 @@ void DesktopBehavior::setMediaListViewEnabled(bool enabled) it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling())) { if (it->mimeType().startsWith("media/builtin-") == false) - it->tqsetVisible(enabled); + it->setVisible(enabled); else - it->tqsetVisible(TRUE); + it->setVisible(TRUE); } } diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui index 5df531f10..5249e8801 100644 --- a/kcontrol/konqhtml/advancedTabOptions.ui +++ b/kcontrol/konqhtml/advancedTabOptions.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 699940b66..c0a72e9e1 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -39,7 +39,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title, layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout* thisLayout = new TQGridLayout(tqlayout()); - thisLayout->tqsetAlignment(Qt::AlignTop); + thisLayout->setAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index d295740dc..eb37c15db 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -136,7 +136,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, layout()->setSpacing(0); layout()->setMargin(0); TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2); - this_layout->tqsetAlignment(Qt::AlignTop); + this_layout->setAlignment(Qt::AlignTop); this_layout->setSpacing(3); this_layout->setMargin(11); diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index 23e4ac881..567d87e00 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -96,7 +96,7 @@ <property name="name"> <cstring>GroupBox1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index a977eb4ea..221b2f9ed 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); + hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); /************************************************************************** ********************* Domain-specific Settings *************************** *************************************************************************/ TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); - domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index c6b5c04cb..ed4d47d80 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/konsole/schemadialog.ui b/kcontrol/konsole/schemadialog.ui index d99678904..99d560809 100644 --- a/kcontrol/konsole/schemadialog.ui +++ b/kcontrol/konsole/schemadialog.ui @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -498,13 +498,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>120</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>180</width> <height>120</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index 066c9c69a..19a647cbd 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -184,13 +184,13 @@ <property name="name"> <cstring>previewIcon</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>100</height> @@ -212,7 +212,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>100</height> @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index c8bd71408..dbbc2b9d0 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version) TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); if (list.count() == 0) { - list.append(TQString::tqfromLatin1(sysGtkrc(version))); + list.append(TQString::fromLatin1(sysGtkrc(version))); list.append(TQDir::homeDirPath()+userGtkrc(version)); } list.remove(gtkkde); @@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" "# \"Apply colors to non-KDE applications\"\n" "#\n" - "#\n").arg(TQDateTime::tqcurrentDateTime().toString()); + "#\n").arg(TQDateTime::currentDateTime().toString()); t << "style \"default\"" << endl; t << "{" << endl; @@ -590,7 +590,7 @@ void runRdb( uint flags ) // Qt-only apps without adversely affecting ourselves. // Cheat and use the current timestamp, since we just saved to qtrc. - TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime(); + TQDateTime settingsstamp = TQDateTime::currentDateTime(); static Atom qt_settings_timestamp = 0; if (!qt_settings_timestamp) { diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 9fa86c2c0..3e60ea4f6 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>170</width> <height>20</height> @@ -211,13 +211,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -251,13 +251,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -291,13 +291,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -331,13 +331,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -371,13 +371,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -411,13 +411,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 5a3dc8b50..65a4dd74e 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, this, TQT_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); - m_labLang->tqsetAlignment( AlignTop ); + m_labLang->setAlignment( AlignTop ); m_languages = new TQListBox(this); connect(m_languages, TQT_SIGNAL(selectionChanged()), @@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList() it != first.end(); ++it ) { - TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; @@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList() // add all languages to the list TQStringList alllang = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop"), + TQString::fromLatin1("*/entry.desktop"), false, true); TQStringList langlist = prilang; if (langlist.count() > 0) @@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList() if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = TQString::tqfromLatin1("other"); + submenu = TQString::fromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted @@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - TQString sub = TQString::tqfromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list m_comboCountry->clear(); TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + TQString::tqfromLatin1("*.desktop"), + sub + TQString::fromLatin1("*.desktop"), false, true ); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList() m_locale->translate("without name")); TQString map( locate( "locale", - TQString::tqfromLatin1( "l10n/%1.png" ) + TQString::fromLatin1( "l10n/%1.png" ) .arg(tag) ) ); TQIconSet icon; if ( !map.isNull() ) @@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList() // add all languages to the list TQStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true); + ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) @@ -381,7 +381,7 @@ void KLocaleConfig::loadCountryList() int menu_index = submenu.isEmpty() ? -1 : -2; TQString flag( locate( "locale", - TQString::tqfromLatin1( "l10n/%1/flag.png" ) + TQString::fromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); @@ -399,7 +399,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, KGlobal::_locale = m_locale; // read the name - TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -419,7 +419,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", TQString::tqfromLatin1(""), true, true); + config->writeEntry("Language", TQString::fromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate() TQStringList KLocaleConfig::languageList() const { TQString fileName = locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index 69c92abc7..d97010b97 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample() void KLocaleSample::slotUpdateTime() { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)); m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true)); @@ -98,11 +98,11 @@ void KLocaleSample::slotUpdateTime() void KLocaleSample::slotLocaleChanged() { m_numberSample->setText(m_locale->formatNumber(1234567.89) + - TQString::tqfromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatNumber(-1234567.89)); m_moneySample->setText(m_locale->formatMoney(123456789.00) + - TQString::tqfromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatMoney(-123456789.00)); slotUpdateTime(); diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 16987cc90..35530be23 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -131,7 +131,7 @@ void KLocaleConfigMoney::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); @@ -139,24 +139,24 @@ void KLocaleConfigMoney::save() int i; bool b; - str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$")); + str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$")); config->deleteEntry("CurrencySymbol", false, true); if (str != m_locale->currencySymbol()) config->writeEntry("CurrencySymbol", m_locale->currencySymbol(), true, true); - str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1(".")); + str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1(".")); config->deleteEntry("MonetaryDecimalSymbol", false, true); if (str != m_locale->monetaryDecimalSymbol()) config->writeEntry("MonetaryDecimalSymbol", m_locale->monetaryDecimalSymbol(), true, true); - str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(",")); - str.replace(TQString::tqfromLatin1("$0"), TQString()); + str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(",")); + str.replace(TQString::fromLatin1("$0"), TQString()); config->deleteEntry("MonetaryThousandsSeparator", false, true); if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", - TQString::tqfromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .tqarg(m_locale->monetaryThousandsSeparator()), true, true); diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 31f06fd98..6a03129e4 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -89,26 +89,26 @@ void KLocaleConfigNumber::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; str = ent.readEntry("DecimalSymbol", - TQString::tqfromLatin1(".")); + TQString::fromLatin1(".")); config->deleteEntry("DecimalSymbol", false, true); if (str != m_locale->decimalSymbol()) config->writeEntry("DecimalSymbol", m_locale->decimalSymbol(), true, true); str = ent.readEntry("ThousandsSeparator", - TQString::tqfromLatin1(",")); + TQString::fromLatin1(",")); config->deleteEntry("ThousandsSeparator", false, true); - str.replace(TQString::tqfromLatin1("$0"), TQString()); + str.replace(TQString::fromLatin1("$0"), TQString()); if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", - TQString::tqfromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .tqarg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); @@ -116,7 +116,7 @@ void KLocaleConfigNumber::save() if (str != m_locale->positiveSign()) config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); - str = ent.readEntry("NegativeSign", TQString::tqfromLatin1("-")); + str = ent.readEntry("NegativeSign", TQString::fromLatin1("-")); config->deleteEntry("NegativeSign", false, true); if (str != m_locale->negativeSign()) config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 33b039c6e..1cf6b949b 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -80,7 +80,7 @@ void KLocaleConfigOther::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 7832d90d6..57e5d7f56 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -253,28 +253,28 @@ void KLocaleConfigTime::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; - str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian")); + str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian")); config->deleteEntry("CalendarSystem", false, true); if (str != m_locale->calendarType()) config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); - str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S")); + str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S")); config->deleteEntry("TimeFormat", false, true); if (str != m_locale->timeFormat()) config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); - str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y")); + str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y")); config->deleteEntry("DateFormat", false, true); if (str != m_locale->dateFormat()) config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); - str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d")); + str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d")); config->deleteEntry("DateFormatShort", false, true); if (str != m_locale->dateFormatShort()) config->writeEntry("DateFormatShort", @@ -371,7 +371,7 @@ calendarType); kdDebug(173) << storeToUser(timeMap(), m_locale->timeFormat()) << endl; kdDebug(173) << userToStore(timeMap(), - TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl; + TQString::fromLatin1("HH:MM:SS AMPM test")) << endl; } @@ -416,7 +416,7 @@ void KLocaleConfigTime::slotTranslate() { TQString str; - TQString sep = TQString::tqfromLatin1("\n"); + TQString sep = TQString::fromLatin1("\n"); TQString old; diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index e53b52ed5..0da498e10 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -62,7 +62,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, m_nullConfig = new KConfig(TQString::null, false, false); m_globalConfig = new KConfig(TQString::null, false, true); - m_locale = new KLocale(TQString::tqfromLatin1("kcmlocale"), m_nullConfig); + m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l->setAutoAdd(TRUE); @@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults ) { m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->reparseConfiguration(); - *m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig); + *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig); emit localeChanged(); emit languageChanged(); @@ -180,7 +180,7 @@ void KLocaleApplication::save() "language of all programs, you will have to " "logout first."), m_locale->translate("Applying Language Settings"), - TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); + TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale KGlobal::_locale = lsave; diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index fb97278c7..5bc340f7b 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -298,21 +298,21 @@ TQString flags_tos (unsigned int flags) if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/kcontrol/performance/konqueror_ui.ui b/kcontrol/performance/konqueror_ui.ui index d93cfec71..ee58c2422 100644 --- a/kcontrol/performance/konqueror_ui.ui +++ b/kcontrol/performance/konqueror_ui.ui @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui index c0cbe7701..384ad2f86 100644 --- a/kcontrol/performance/system_ui.ui +++ b/kcontrol/performance/system_ui.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index 003cf235f..b6182c61f 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -79,13 +79,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>50</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>200</height> @@ -114,13 +114,13 @@ <property name="name"> <cstring>selectAllButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -134,13 +134,13 @@ <property name="name"> <cstring>selectNoneButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -179,7 +179,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index 0529eb91d..a284df69e 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -60,7 +60,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = tqsizeHint(); + TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 615d9a2f5..584237975 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -62,11 +62,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a tqsizeHint... - virtual TQSize tqsizeHint () const { - int w = tqminimumSizeHint().width(); + // TQListView has a weird idea of a sizeHint... + virtual TQSize sizeHint () const { + int w = minimumSizeHint().width(); int h = header()->height(); - h += viewport()->tqsizeHint().height(); + h += viewport()->sizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index 8e996e607..f9ded1088 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -54,7 +54,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) { setPixmap(KSystemTray::loadSizedIcon("randr", width())); - tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index 8b56a9fe0..8289e9443 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); - label.setMinimumSize(label.tqsizeHint()); - logFileName.setMinimumSize(250,logFileName.tqsizeHint().height()); + label.setMinimumSize(label.sizeHint()); + logFileName.setMinimumSize(250,logFileName.sizeHint().height()); viewHistory.setMinimumSize(425,200); - showConnOpen.setMinimumSize(showConnOpen.tqsizeHint()); - showConnClose.setMinimumSize(showConnClose.tqsizeHint()); - showFileOpen.setMinimumSize(showFileOpen.tqsizeHint()); - showFileClose.setMinimumSize(showFileClose.tqsizeHint()); - updateButton.setFixedSize(updateButton.tqsizeHint()); + showConnOpen.setMinimumSize(showConnOpen.sizeHint()); + showConnClose.setMinimumSize(showConnClose.sizeHint()); + showFileOpen.setMinimumSize(showFileOpen.sizeHint()); + showFileClose.setMinimumSize(showFileClose.sizeHint()); + updateButton.setFixedSize(updateButton.sizeHint()); } void LogView::loadSettings() diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index ee9a8ab20..431e0f51a 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam hostLe->setText("*"); viewStatistics->setMinimumSize(375,200); - connectionsL->setMinimumSize(connectionsL->tqsizeHint()); - filesL->setMinimumSize(filesL->tqsizeHint()); - eventL->setMinimumSize(eventL->tqsizeHint()); - eventCb->setMinimumSize(eventCb->tqsizeHint()); - hostL->setMinimumSize(hostL->tqsizeHint()); - hostLe->setMinimumSize(120,hostLe->tqsizeHint().height()); - serviceL->setMinimumSize(serviceL->tqsizeHint()); - serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height()); - calcButton->setMinimumSize(calcButton->tqsizeHint()); - clearButton->setMinimumSize(clearButton->tqsizeHint()); - expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint()); - expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint()); + connectionsL->setMinimumSize(connectionsL->sizeHint()); + filesL->setMinimumSize(filesL->sizeHint()); + eventL->setMinimumSize(eventL->sizeHint()); + eventCb->setMinimumSize(eventCb->sizeHint()); + hostL->setMinimumSize(hostL->sizeHint()); + hostLe->setMinimumSize(120,hostLe->sizeHint().height()); + serviceL->setMinimumSize(serviceL->sizeHint()); + serviceLe->setMinimumSize(120,serviceLe->sizeHint().height()); + calcButton->setMinimumSize(calcButton->sizeHint()); + clearButton->setMinimumSize(clearButton->sizeHint()); + expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint()); + expandedUserCb->setMinimumSize(expandedUserCb->sizeHint()); TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui index 6f03509b9..09def2a6f 100644 --- a/kcontrol/screensaver/advanceddialogimpl.ui +++ b/kcontrol/screensaver/advanceddialogimpl.ui @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -365,7 +365,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -382,7 +382,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 9f0463c7d..50dacf843 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -138,7 +138,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverListView = new TQListView( mSaverGroup ); mSaverListView->setMinimumHeight( 120 ); - mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->addColumn(""); mSaverListView->header()->hide(); mSelected = -1; @@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitLockEdit->setSuffix(i18n(" sec")); mWaitLockEdit->setValue(mLockTimeout/1000); mWaitLockEdit->setEnabled(mEnabled && mLock); - if ( mWaitLockEdit->tqsizeHint().width() < - mWaitEdit->tqsizeHint().width() ) { - mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); - mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); + if ( mWaitLockEdit->sizeHint().width() < + mWaitEdit->sizeHint().width() ) { + mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); } else { - mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); - mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); + mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); } connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); @@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis new TQVBoxLayout(topLayout, KDialog::spacingHint()); mMonitorLabel = new TQLabel( this ); - mMonitorLabel->tqsetAlignment( AlignCenter ); + mMonitorLabel->setAlignment( AlignCenter ); mMonitorLabel->setPixmap( TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); rightColumnLayout->addWidget(mMonitorLabel, 0); @@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis advancedLayout->addWidget( new TQWidget( this ) ); TQPushButton* advancedBt = new TQPushButton( i18n( "Advanced &Options" ), this, "advancedBtn" ); - advancedBt->tqsetSizePolicy( TQSizePolicy( + advancedBt->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); connect( advancedBt, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); @@ -739,7 +739,7 @@ void KScreenSaver::slotSetup() // void KScreenSaver::slotAdvanced() { - KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); + KScreenSaverAdvancedDialog dlg( topLevelWidget() ); if ( dlg.exec() ) { mChanged = true; emit changed(true); diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index 9b3823df1..9b9638a6c 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index a17da184f..64b72d445 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index e10f3a813..171fec090 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index ecfd6fea9..a35a8cdc5 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -161,7 +161,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() ); - gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop ); + gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); @@ -169,7 +169,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); - pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); + pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); pbConfigStyle->setEnabled( FALSE ); hbLayout->addWidget( pbConfigStyle ); @@ -296,16 +296,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) box1->setSpacing( KDialog::spacingHint() ); box1->setMargin( 0 ); TQLabel* lbl = new TQLabel( i18n("0%"), box1 ); - lbl->tqsetAlignment( AlignLeft ); + lbl->setAlignment( AlignLeft ); lbl = new TQLabel( i18n("50%"), box1 ); - lbl->tqsetAlignment( AlignHCenter ); + lbl->setAlignment( AlignHCenter ); lbl = new TQLabel( i18n("100%"), box1 ); - lbl->tqsetAlignment( AlignRight ); + lbl->setAlignment( AlignRight ); lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); - lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft ); + lblMenuEffectType->setAlignment( AlignBottom | AlignLeft ); lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); - lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft ); + lblMenuOpacity->setAlignment( AlignBottom | AlignLeft ); menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 ); @@ -844,7 +844,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force) setStyleRecursive( stylePreview, style ); // this flickers, but reliably draws the widgets correctly. - stylePreview->resize( stylePreview->tqsizeHint() ); + stylePreview->resize( stylePreview->sizeHint() ); delete appliedStyle; appliedStyle = style; diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 51d5aad5f..84e951523 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -68,7 +68,7 @@ void MenuPreview::createPixmaps() if (pixBlended) pixBlended->resize( w, h ); - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); TQColor c1 = cg.background(); TQColor c2 = cg.mid(); @@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps() KImageEffect::blend(src, dst, menuOpacity); pixBlended->convertFromImage( dst ); } else if (mode == Tint) { - TQColor clr = tqcolorGroup().button(); + TQColor clr = colorGroup().button(); TQImage dst = pixBackground->convertToImage(); KImageEffect::blend(clr, dst, menuOpacity); pixBlended->convertFromImage( dst ); @@ -137,7 +137,7 @@ void MenuPreview::setPreviewMode( PreviewMode pvm ) void MenuPreview::paintEvent( TQPaintEvent* /* pe */ ) { // Paint the frame and blended pixmap - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); int x2 = width()-1; int y2 = height()-1; diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui index d438c0ad8..ed6d2e43a 100644 --- a/kcontrol/style/stylepreview.ui +++ b/kcontrol/style/stylepreview.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -177,7 +177,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -196,13 +196,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>32767</height> @@ -224,13 +224,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index 6802dd226..4dab10765 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -209,7 +209,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -234,7 +234,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -300,7 +300,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -319,7 +319,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -434,7 +434,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 440a87edc..e4cc3e078 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent) _bus = di.udi_bus; _device = di.udi_addr; - _product = TQString::tqfromLatin1(di.udi_product); + _product = TQString::fromLatin1(di.udi_product); if ( _device == 1 ) _product += " " + TQString::number( _bus ); - _manufacturer = TQString::tqfromLatin1(di.udi_vendor); + _manufacturer = TQString::fromLatin1(di.udi_vendor); _prodID = di.udi_productNo; _vendorID = di.udi_vendorNo; _class = di.udi_class; diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui index eb18e710a..21fda0f82 100644 --- a/kcontrol/view1394/view1394widget.ui +++ b/kcontrol/view1394/view1394widget.ui @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index cedbd42fd..245730cd9 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -223,10 +223,10 @@ TQWidget *KCMXinerama::indicator(int dpy) { si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); si->setFrameShadow(TQFrame::Plain); - si->tqsetAlignment(Qt::AlignCenter); + si->setAlignment(Qt::AlignCenter); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); - TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint()); + TQRect targetGeometry(TQPoint(0,0), si->sizeHint()); targetGeometry.moveCenter(screenCenter); si->setGeometry(targetGeometry); si->show(); diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui index d01495fdc..f3dc8392f 100644 --- a/kcontrol/xinerama/xineramawidget.ui +++ b/kcontrol/xinerama/xineramawidget.ui @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>431</width> <height>21</height> diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui index 7491da6cb..cfef4f95c 100644 --- a/kdcop/kdcopview.ui +++ b/kdcop/kdcopview.ui @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 212376a0a..01ebb0502 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem { setExpandable(true); setText(0, TQString::fromUtf8(app_)); - setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "exec" ), KIcon::Small )); + setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small )); /* Get the icon: we use the icon from a mainwindow in that class. diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp index 43d6699dd..bdf267dd1 100644 --- a/kdebugdialog/kabstractdebugdialog.cpp +++ b/kdebugdialog/kabstractdebugdialog.cpp @@ -52,11 +52,11 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout ) pCancelButton = new KPushButton( KStdGuiItem::cancel(), this ); hbox->addWidget( pCancelButton ); - int w1 = pHelpButton->tqsizeHint().width(); - int w2 = pOKButton->tqsizeHint().width(); - int w3 = pCancelButton->tqsizeHint().width(); + int w1 = pHelpButton->sizeHint().width(); + int w2 = pOKButton->sizeHint().width(); + int w3 = pCancelButton->sizeHint().width(); int w4 = QMAX( w1, QMAX( w2, w3 ) ); - int w5 = pApplyButton->tqsizeHint().width(); + int w5 = pApplyButton->sizeHint().width(); w4 = QMAX(w4, w5); pHelpButton->setFixedWidth( w4 ); diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp index e626fcb12..91523de6f 100644 --- a/kdebugdialog/kdebugdialog.cpp +++ b/kdebugdialog/kdebugdialog.cpp @@ -54,7 +54,7 @@ KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char // Build combo of debug areas pDebugAreas = new TQComboBox( false, this ); - pDebugAreas->setFixedHeight( pDebugAreas->tqsizeHint().height() ); + pDebugAreas->setFixedHeight( pDebugAreas->sizeHint().height() ); pDebugAreas->insertStringList( areaList ); topLayout->addWidget( pDebugAreas ); diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/klistdebugdialog.cpp index a1b75ee83..7ddb2b559 100644 --- a/kdebugdialog/klistdebugdialog.cpp +++ b/kdebugdialog/klistdebugdialog.cpp @@ -182,7 +182,7 @@ void KListDebugDialog::activateArea( TQCString area, bool activate ) for ( ; it.current() ; ++it ) { if ( area == (*it)->name() // debug area code = cb's name - || (*it)->text().find( TQString::tqfromLatin1(area) ) != -1 ) // area name included in cb text + || (*it)->text().find( TQString::fromLatin1(area) ) != -1 ) // area name included in cb text { (*it)->setChecked( activate ); return; diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index 8a6a520bb..11a4547b3 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -150,11 +150,11 @@ void KCMUserAccount::load() KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; TQString fs = KCFGUserAccount::faceSource(); - if (fs == TQString::tqfromLatin1("UserOnly")) + if (fs == TQString::fromLatin1("UserOnly")) _facePerm = userOnly; - else if (fs == TQString::tqfromLatin1("PreferUser")) + else if (fs == TQString::fromLatin1("PreferUser")) _facePerm = userFirst; - else if (fs == TQString::tqfromLatin1("PreferAdmin")) + else if (fs == TQString::fromLatin1("PreferAdmin")) _facePerm = adminFirst; else _facePerm = adminOnly; // Admin Only diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui index bb5a57b94..f712f087d 100644 --- a/kdepasswd/kcm/main_widget.ui +++ b/kdepasswd/kcm/main_widget.ui @@ -32,13 +32,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>74</width> <height>74</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>74</width> <height>74</height> @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index edbaa339e..dae68e9eb 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -296,7 +296,7 @@ void KDIconView::initConfig( bool init ) m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst(); m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in - if (KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"))) + if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"))) m_enableMedia=KDesktopSettings::mediaEnabled(); else m_enableMedia=false; @@ -960,20 +960,20 @@ bool KDIconView::isDesktopFile( KFileItem * _item ) const return false; // return true if desktop file - return ( (_item->mimetype() == TQString::tqfromLatin1("application/x-desktop")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mydocuments")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mycomputer")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mynetworkplaces")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-printers")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-trash")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-webbrowser")) ); + return ( (_item->mimetype() == TQString::fromLatin1("application/x-desktop")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-mydocuments")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-mycomputer")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-mynetworkplaces")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-printers")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-trash")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-webbrowser")) ); } TQString KDIconView::stripDesktopExtension( const TQString & text ) { - if (text.right(7) == TQString::tqfromLatin1(".kdelnk")) + if (text.right(7) == TQString::fromLatin1(".kdelnk")) return text.left(text.length() - 7); - else if (text.right(8) == TQString::tqfromLatin1(".desktop")) + else if (text.right(8) == TQString::fromLatin1(".desktop")) return text.left(text.length() - 8); return text; } @@ -1047,7 +1047,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries ) bool firstRun = (count() == 0); // no icons yet, this seems to be the initial loading // delay updates until all new items have been created - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); TQRect area = iconArea(); setIconArea( TQRect( 0, 0, -1, -1 ) ); @@ -1150,7 +1150,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries ) if ( m_autoAlign ) lineupIcons(); - tqsetUpdatesEnabled( true ); + setUpdatesEnabled( true ); } // ----------------------------------------------------------------------------- diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp index 7d0f201ab..9c2bd5f8a 100644 --- a/kdesktop/kfileividesktop.cpp +++ b/kdesktop/kfileividesktop.cpp @@ -73,15 +73,15 @@ void KFileIVIDesktop::calcRect( const TQString& _text ) int spread = shadowThickness(); TQRect itemTextRect = textRect(); - TQRect tqitemRect = rect(); + TQRect itemRect = rect(); itemTextRect.setBottom( itemTextRect.bottom() + spread ); itemTextRect.setRight( itemTextRect.right() + spread ); - tqitemRect.setBottom( tqitemRect.bottom() + spread ); - tqitemRect.setRight( tqitemRect.right() + spread ); + itemRect.setBottom( itemRect.bottom() + spread ); + itemRect.setRight( itemRect.right() + spread ); setTextRect( itemTextRect ); - setItemRect( tqitemRect ); + setItemRect( itemRect ); } void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg) diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 0292e0e07..f7f545611 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -636,8 +636,8 @@ void KRootWm::slotWindowList() { windowListMenu->init(); disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice - // windowListMenu->rect() is not valid before showing, use tqsizeHint() - windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->tqsizeHint()).center()); + // windowListMenu->rect() is not valid before showing, use sizeHint() + windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center()); windowListMenu->selectActiveWindow(); // make the popup more useful connect( windowListMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotWindowListAboutToShow() ) ); @@ -656,7 +656,7 @@ void KRootWm::slotSwitchUser() { slotPopulateSessions(); disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice - sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->tqsizeHint()).center()); + sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center()); connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotPopulateSessions() ) ); } diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index 7a9cc9e66..22b449c1a 100644 --- a/kdesktop/lock/autologout.cc +++ b/kdesktop/lock/autologout.cc @@ -55,7 +55,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame); mStatusLabel = new TQLabel("<b> </b>", frame); - mStatusLabel->tqsetAlignment(TQLabel::AlignCenter); + mStatusLabel->setAlignment(TQLabel::AlignCenter); TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame); mProgressRemaining = new TQProgressBar(frame); diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index ff4553b8e..f5f35b969 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -86,7 +86,7 @@ InfoDlg::InfoDlg(LockProcess *parent) KUser user; mStatusLabel = new TQLabel( "<b> </b>", frame ); - mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); + mStatusLabel->setAlignment( TQLabel::AlignCenter ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 9ff990820..0aa43e2bb 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -140,7 +140,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) } mStatusLabel = new TQLabel( "<b> </b>", frame ); - mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); + mStatusLabel->setAlignment( TQLabel::AlignCenter ); mLayoutButton = new TQPushButton( frame ); mLayoutButton->setFlat( true ); @@ -268,7 +268,7 @@ void PasswordDlg::setLayoutText( const TQString &txt ) { mLayoutButton->setText( txt ); TQSize sz = mLayoutButton->fontMetrics().size( 0, txt ); - int mrg = mLayoutButton->tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2; + int mrg = mLayoutButton->tqstyle().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg ); } @@ -577,7 +577,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) TQLabel *label2 = new TQLabel( text, winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 ); @@ -788,9 +788,9 @@ void PasswordDlg::slotSwitchUser() ns++; } int fw = lv->frameWidth() * 2; - TQSize hds( lv->header()->tqsizeHint() ); + TQSize hds( lv->header()->sizeHint() ); lv->setMinimumWidth( fw + hds.width() + - (ns > 10 ? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) ); + (ns > 10 ? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) ); lv->setFixedHeight( fw + hds.height() + itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) ); lv->header()->adjustHeaderSize(); diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 0a45bbb76..2c46a91ec 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -243,7 +243,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) TQStringList dmopt = TQStringList::split(TQChar(','), - TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" ))); + TQString::fromLatin1( ::getenv( "XDM_MANAGED" ))); for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it) if ((*it).startsWith("method=")) mMethod = (*it).mid(7); @@ -1194,7 +1194,7 @@ void LockProcess::stopSaver() TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt) { LockProcess *that = (LockProcess *)ctx; - TQString fkey = TQString::tqfromLatin1( key ) + '='; + TQString fkey = TQString::fromLatin1( key ) + '='; for (TQStringList::ConstIterator it = that->mPluginOptions.begin(); it != that->mPluginOptions.end(); ++it) if ((*it).startsWith( fkey )) @@ -1931,7 +1931,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt ) TQLabel *label2 = new TQLabel( txt, winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) ); TQVBoxLayout *vbox = new TQVBoxLayout( &box ); diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index ec9b88b04..e672d5411 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -86,8 +86,8 @@ QueryDlg::QueryDlg(LockProcess *parent) KUser user; mStatusLabel = new TQLabel( "<b> </b>", frame ); - //mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); - mStatusLabel->tqsetAlignment( TQLabel::AlignLeft ); + //mStatusLabel->setAlignment( TQLabel::AlignCenter ); + mStatusLabel->setAlignment( TQLabel::AlignLeft ); KSeparator *sep = new KSeparator( KSeparator::HLine, frame ); diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index ff1c4470f..f600e6a21 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/kdesktop/lock/sakdlg.cc @@ -87,7 +87,7 @@ SAKDlg::SAKDlg(LockProcess *parent) KUser user; mStatusLabel = new TQLabel( "<b> </b>", frame ); - mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter ); + mStatusLabel->setAlignment( TQLabel::AlignVCenter ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 51a8959ce..078477f28 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -87,7 +87,7 @@ Minicli::Minicli( TQWidget *parent, const char *name) mainLayout->addWidget(m_dlg); m_dlg->lbRunIcon->setPixmap(DesktopIcon("kmenu")); - m_dlg->lbComment->tqsetAlignment( TQt::WordBreak ); + m_dlg->lbComment->setAlignment( TQt::WordBreak ); m_dlg->cbCommand->setDuplicatesEnabled( false ); m_dlg->cbCommand->setTrapReturnKey( true ); @@ -182,7 +182,7 @@ void Minicli::setCommand(const TQString& command) } } -TQSize Minicli::tqsizeHint() const +TQSize Minicli::sizeHint() const { int maxWidth = tqApp->desktop()->screenGeometry((TQWidget*)this).width(); if (maxWidth < 603) @@ -784,7 +784,7 @@ void Minicli::slotAdvanced() // Set the focus back to the widget that had it to begin with, i.e. // do not put the focus on the "Options" button. - m_FocusWidget = tqfocusWidget(); + m_FocusWidget = focusWidget(); if( m_FocusWidget ) m_FocusWidget->setFocus(); @@ -846,7 +846,7 @@ void Minicli::parseLine( bool final ) void Minicli::setIcon () { if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" ) - m_iconName = TQString::tqfromLatin1("kmenu"); + m_iconName = TQString::fromLatin1("kmenu"); TQPixmap icon = DesktopIcon( m_iconName ); @@ -891,9 +891,9 @@ void Minicli::updateAuthLabel() m_prevChecked = m_dlg->cbRunAsOther->isChecked(); m_prevCached = true; } - if (m_dlg->leUsername->text() != TQString::tqfromLatin1("root")) + if (m_dlg->leUsername->text() != TQString::fromLatin1("root")) m_dlg->lePassword->setText(TQString::null); - m_dlg->leUsername->setText(TQString::tqfromLatin1("root")); + m_dlg->leUsername->setText(TQString::fromLatin1("root")); m_dlg->cbRunAsOther->setChecked(true); m_dlg->cbRunAsOther->setEnabled(false); m_dlg->leUsername->setEnabled(false); @@ -938,7 +938,7 @@ void Minicli::slotTerminal(bool enable) if (enable) { m_prevIconName = m_iconName; - m_iconName = TQString::tqfromLatin1( "konsole" ); + m_iconName = TQString::fromLatin1( "konsole" ); setIcon(); } else if (!m_prevIconName.isEmpty()) diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h index bfc141124..35e216028 100644 --- a/kdesktop/minicli.h +++ b/kdesktop/minicli.h @@ -57,7 +57,7 @@ public: void clearHistory(); virtual void show(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void saveConfig(); diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui index 1de313bd1..7fde778ab 100644 --- a/kdesktop/minicli_ui.ui +++ b/kdesktop/minicli_ui.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>57</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -331,7 +331,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> @@ -460,7 +460,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -543,7 +543,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>388</width> <height>0</height> diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index b37c768f7..52dbdc811 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -241,9 +241,9 @@ static int directCommand(KCmdLineArgs *args) TQString text = TQString::fromLocal8Bit(args->getOption( option )); int pos; - while ((pos = text.find( TQString::tqfromLatin1("\\n") )) >= 0) + while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0) { - text.replace(pos, 2, TQString::tqfromLatin1("\n")); + text.replace(pos, 2, TQString::fromLatin1("\n")); } if ( type == KMessageBox::WarningContinueCancel ) { @@ -597,43 +597,43 @@ static int directCommand(KCmdLineArgs *args) contextStr = TQString::fromLocal8Bit(args->arg(0)); } KIcon::Group group = KIcon::NoGroup; - if ( groupStr == TQString::tqfromLatin1( "Desktop" ) ) + if ( groupStr == TQString::fromLatin1( "Desktop" ) ) group = KIcon::Desktop; - else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) ) + else if ( groupStr == TQString::fromLatin1( "Toolbar" ) ) group = KIcon::Toolbar; - else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) ) + else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) ) group = KIcon::MainToolbar; - else if ( groupStr == TQString::tqfromLatin1( "Small" ) ) + else if ( groupStr == TQString::fromLatin1( "Small" ) ) group = KIcon::Small; - else if ( groupStr == TQString::tqfromLatin1( "Panel" ) ) + else if ( groupStr == TQString::fromLatin1( "Panel" ) ) group = KIcon::Panel; - else if ( groupStr == TQString::tqfromLatin1( "User" ) ) + else if ( groupStr == TQString::fromLatin1( "User" ) ) group = KIcon::User; KIcon::Context context = KIcon::Any; // From kicontheme.cpp - if ( contextStr == TQString::tqfromLatin1( "Devices" ) ) + if ( contextStr == TQString::fromLatin1( "Devices" ) ) context = KIcon::Device; - else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) ) + else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) ) context = KIcon::MimeType; - else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) ) + else if ( contextStr == TQString::fromLatin1( "FileSystems" ) ) context = KIcon::FileSystem; - else if ( contextStr == TQString::tqfromLatin1( "Applications" ) ) + else if ( contextStr == TQString::fromLatin1( "Applications" ) ) context = KIcon::Application; - else if ( contextStr == TQString::tqfromLatin1( "Actions" ) ) + else if ( contextStr == TQString::fromLatin1( "Actions" ) ) context = KIcon::Action; - else if ( contextStr == TQString::tqfromLatin1( "Animations" ) ) + else if ( contextStr == TQString::fromLatin1( "Animations" ) ) context = KIcon::Animation; - else if ( contextStr == TQString::tqfromLatin1( "Categories" ) ) + else if ( contextStr == TQString::fromLatin1( "Categories" ) ) context = KIcon::Category; - else if ( contextStr == TQString::tqfromLatin1( "Emblems" ) ) + else if ( contextStr == TQString::fromLatin1( "Emblems" ) ) context = KIcon::Emblem; - else if ( contextStr == TQString::tqfromLatin1( "Emotes" ) ) + else if ( contextStr == TQString::fromLatin1( "Emotes" ) ) context = KIcon::Emote; - else if ( contextStr == TQString::tqfromLatin1( "International" ) ) + else if ( contextStr == TQString::fromLatin1( "International" ) ) context = KIcon::International; - else if ( contextStr == TQString::tqfromLatin1( "Places" ) ) + else if ( contextStr == TQString::fromLatin1( "Places" ) ) context = KIcon::Place; - else if ( contextStr == TQString::tqfromLatin1( "Status" ) ) + else if ( contextStr == TQString::fromLatin1( "Status" ) ) context = KIcon::StatusIcon; KIconDialog dlg(0, "icon dialog"); diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp index 23fe18f53..d7abfb694 100644 --- a/kdialog/klistboxdialog.cpp +++ b/kdialog/klistboxdialog.cpp @@ -32,7 +32,7 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent) TQVBox *page = makeVBoxMainWidget(); label = new TQLabel(text, page); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); table = new TQListBox(page); table->setFocus(); diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index 322cf0a0d..d663d1bc3 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -218,7 +218,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& table.setCurrentItem(0); // This is to circumvent a Qt bug for (unsigned int i=0; i+2<args.count(); i += 3) { - table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") ); + table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") ); } handleXGeometry(&box); @@ -233,7 +233,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& } else { for (unsigned int i=0; i<table.count(); i++) if (table.isSelected(i)) - rs += TQString::tqfromLatin1("\"") + tags[i] + TQString::tqfromLatin1("\" "); + rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" "); result.append(rs); } } @@ -260,7 +260,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString& table.insertStringList(entries); for (unsigned int i=0; i+2<args.count(); i += 3) { - table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") ); + table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") ); } handleXGeometry(&box); diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp index c76f041e2..9f8f5064d 100644 --- a/kdm/kfrontend/kchooser.cpp +++ b/kdm/kfrontend/kchooser.cpp @@ -59,7 +59,7 @@ ChooserDlg::ChooserDlg() TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 ); TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this ); - title->tqsetAlignment( AlignCenter ); + title->setAlignment( AlignCenter ); vbox->addWidget( title ); host_view = new TQListView( this, "hosts" ); @@ -145,14 +145,14 @@ void ChooserDlg::pingHosts() void ChooserDlg::accept() { - if (tqfocusWidget() == iline) { + if (focusWidget() == iline) { if (!iline->text().isEmpty()) { GSendInt( G_Ch_DirectChoice ); GSendStr( iline->text().latin1() ); iline->clear(); } return; - } else /*if (tqfocusWidget() == host_view)*/ { + } else /*if (focusWidget() == host_view)*/ { TQListViewItem *item = host_view->currentItem(); if (item) { GSendInt( G_Ready ); @@ -170,7 +170,7 @@ TQString ChooserDlg::recvStr() { char *arr = GRecvStr(); if (arr) { - TQString str = TQString::tqfromLatin1( arr ); + TQString str = TQString::fromLatin1( arr ); free( arr ); return str; } else diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp index 42459ad60..637d6dd90 100644 --- a/kdm/kfrontend/kdmadmindialog.cpp +++ b/kdm/kfrontend/kdmadmindialog.cpp @@ -75,10 +75,10 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) box->addWidget( new KSeparator( KSeparator::HLine, this ) ); okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->tqsetSizePolicy( fp ); + okButton->setSizePolicy( fp ); okButton->setDefault( true ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->tqsetSizePolicy( fp ); + cancelButton->setSizePolicy( fp ); hlay = new TQHBoxLayout( box ); hlay->addStretch( 1 ); @@ -103,7 +103,7 @@ void KDMAdmin::slotActivatePlugMenu() { TQPopupMenu *cmnu = verify->getPlugMenu(); - TQSize sh( cmnu->tqsizeHint() / 2 ); + TQSize sh( cmnu->sizeHint() / 2 ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 87e6a32ba..3160f0459 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -50,7 +50,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) mBorder = false;//config->readNumEntry( "border", FALSE ); //config->setGroup( "Font" ); - mFont.setFamily( TQString::tqfromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); + mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ ); mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ ); mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ ); diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp index 0916eb881..c12345323 100644 --- a/kdm/kfrontend/kdmconfig.cpp +++ b/kdm/kfrontend/kdmconfig.cpp @@ -72,7 +72,7 @@ Str2Font( const TQString &aValue ) TQFont aRetFont; TQString chStr; - TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue ); + TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue ); if (sl.count() == 1) { /* X11 font spec */ @@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc ) sess->vt ? TQString("vt%1").arg( sess->vt ) : #endif - TQString::tqfromLatin1( *sess->from ? sess->from : sess->display ); + TQString::fromLatin1( *sess->from ? sess->from : sess->display ); } else { user = !sess->user ? @@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc ) sess->vt ? TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) : #endif - TQString::tqfromLatin1( sess->display ); + TQString::fromLatin1( sess->display ); } } diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index 70fee982e..a3ec5cbce 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -117,7 +117,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) hlay->addStretch( 1 ); if (mayOk) { okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->tqsetSizePolicy( fp ); + okButton->setSizePolicy( fp ); okButton->setDefault( true ); hlay->addWidget( okButton ); hlay->addStretch( 1 ); @@ -126,13 +126,13 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) if (maySched) { KPushButton *schedButton = new KPushButton( KGuiItem( i18n("&Schedule...") ), this ); - schedButton->tqsetSizePolicy( fp ); + schedButton->setSizePolicy( fp ); hlay->addWidget( schedButton ); hlay->addStretch( 1 ); connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); } cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->tqsetSizePolicy( fp ); + cancelButton->setSizePolicy( fp ); if (!mayOk) cancelButton->setDefault( true ); hlay->addWidget( cancelButton ); @@ -149,7 +149,7 @@ KDMShutdownBase::slotActivatePlugMenu() TQPopupMenu *cmnu = verify->getPlugMenu(); if (!cmnu) return; - TQSize sh( cmnu->tqsizeHint() / 2 ); + TQSize sh( cmnu->sizeHint() / 2 ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } } @@ -276,7 +276,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) freeStrArr( tlist ); targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget ); TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh ); - int spc = kapp->tqstyle().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + int spc = kapp->tqstyle().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + howGroup->insideSpacing(); hb->addSpacing( spc ); hb->addWidget( targets ); @@ -284,7 +284,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) } GSet( 0 ); - howGroup->tqsetSizePolicy( fp ); + howGroup->setSizePolicy( fp ); schedGroup = new TQGroupBox( i18n("Scheduling"), this ); hlay->addWidget( schedGroup, 0, AlignTop ); @@ -310,7 +310,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) grid->addWidget( le_timeout, 2, 1 ); grid->addMultiCellWidget( cb_force, 3,3, 0,1 ); - schedGroup->tqsetSizePolicy( fp ); + schedGroup->setSizePolicy( fp ); le_start->setText( "0" ); if (_defSdMode == SHUT_SCHEDULE) @@ -484,7 +484,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) lfrm->setFrameStyle( TQFrame::NoFrame ); else lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - lfrm->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) ); + lfrm->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) ); // we need to set the minimum size for the logout box, since it // gets too small if there all options are not available lfrm->setMinimumSize(300,120); @@ -494,7 +494,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) // first line of buttons hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox->setAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( lfrm ); @@ -538,7 +538,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) // cancel buttonbox TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox2->tqsetAlignment( Qt::AlignRight ); + hbuttonbox2->setAlignment( Qt::AlignRight ); // Back to kdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index 285c3878e..f662ae1c2 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -169,10 +169,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t TQLabel *label2 = new TQLabel( text, this ); TQRect d = KGlobalSettings::desktopGeometry(this); if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5) - label2->tqsetAlignment(TQt::WordBreak | TQt::AlignAuto ); + label2->setAlignment(TQt::WordBreak | TQt::AlignAuto ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), this ); button->setDefault( true ); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp index 9300b9220..f4ed918c6 100644 --- a/kdm/kfrontend/kgdialog.cpp +++ b/kdm/kfrontend/kgdialog.cpp @@ -134,7 +134,7 @@ void KGDialog::slotActivateMenu( int id ) { TQPopupMenu *cmnu = optMenu->findItem( id )->popup(); - TQSize sh( cmnu->tqsizeHint() / 2 ); + TQSize sh( cmnu->sizeHint() / 2 ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index ab7fd302b..d1d2ea32d 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -96,7 +96,7 @@ class UserListView : public KListView { : KListView( parent, name ) , themed(_them), cachedSizeHint( -1, 0 ) { - tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); + setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); header()->hide(); addColumn( TQString::null ); setColumnAlignment( 0, AlignVCenter ); @@ -122,10 +122,10 @@ class UserListView : public KListView { return sum; } public: - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { if (themed) - return KListView::tqsizeHint(); + return KListView::sizeHint(); if (!cachedSizeHint.isValid()) { constPolish(); @@ -136,7 +136,7 @@ public: maxw = thisw; } cachedSizeHint.setWidth( - tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + + tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) + frameWidth() * 2 + maxw ); } return cachedSizeHint; @@ -157,7 +157,7 @@ public: kdDebug() << "paintEmpty " << rect << endl; TQRect devRect = p->xForm( rect ); kdDebug() << "paintEmpty2 " << devRect << endl; - p->tqdrawPixmap(0, 0, *pm, devRect.left(), devRect.top() ); + p->drawPixmap(0, 0, *pm, devRect.left(), devRect.top() ); } TQPixmap background; @@ -890,14 +890,14 @@ KStdGreeter::KStdGreeter() i18n("This display requires no X authorization.\n" "This means that anybody can connect to it,\n" "open windows on it or intercept your input.") ); - complainLabel->tqsetAlignment( AlignCenter ); + complainLabel->setAlignment( AlignCenter ); complainLabel->setFont( _failFont ); complainLabel->setPaletteForegroundColor( Qt::red ); inner_box->addWidget( complainLabel ); } if (!_greetString.isEmpty()) { TQLabel *welcomeLabel = new TQLabel( _greetString, this ); - welcomeLabel->tqsetAlignment( AlignCenter ); + welcomeLabel->setAlignment( AlignCenter ); welcomeLabel->setFont( _greetFont ); inner_box->addWidget( welcomeLabel ); } diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index b7f57a5bd..05bd18962 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/kdm/kfrontend/kgverify.cpp @@ -856,7 +856,7 @@ KGVerify::getConf( void *, const char *key, const TQVariant &dflt ) if (!qstrcmp( key, "EchoMode" )) return TQVariant( _echoMode ); else { - TQString fkey = TQString::tqfromLatin1( key ) + '='; + TQString fkey = TQString::fromLatin1( key ) + '='; for (TQStringList::ConstIterator it = _pluginOptions.begin(); it != _pluginOptions.end(); ++it) if ((*it).startsWith( fkey )) @@ -930,7 +930,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent, , failedLabelState( 0 ) { grid = new TQGridLayout; - grid->tqsetAlignment( AlignCenter ); + grid->setAlignment( AlignCenter ); failedLabel = new TQLabel( parent ); failedLabel->setFont( _failFont ); @@ -959,7 +959,7 @@ KGStdVerify::slotPluginSelected( int id ) return; if (id != curPlugin) { plugMenu->setItemChecked( curPlugin, false ); - parent->tqsetUpdatesEnabled( false ); + parent->setUpdatesEnabled( false ); grid->removeItem( greet->getLayoutItem() ); Debug( "delete %s\n", pName.data() ); delete greet; @@ -967,7 +967,7 @@ KGStdVerify::slotPluginSelected( int id ) handler->verifyPluginChanged( id ); if (running) start(); - parent->tqsetUpdatesEnabled( true ); + parent->setUpdatesEnabled( true ); } } @@ -1087,10 +1087,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user, { TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->tqsetSizePolicy( fp ); + okButton->setSizePolicy( fp ); okButton->setDefault( true ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->tqsetSizePolicy( fp ); + cancelButton->setSizePolicy( fp ); verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx ); verify->selectPlugin( curPlugin ); diff --git a/kdm/kfrontend/sakdlg.cc b/kdm/kfrontend/sakdlg.cc index 5fbb27346..145efe1d6 100644 --- a/kdm/kfrontend/sakdlg.cc +++ b/kdm/kfrontend/sakdlg.cc @@ -108,7 +108,7 @@ SAKDlg::SAKDlg(TQWidget *parent) KUser user; mStatusLabel = new TQLabel( "<b> </b>", frame ); - mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter ); + mStatusLabel->setAlignment( TQLabel::AlignVCenter ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index eb5283cd9..9b066f750 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -443,12 +443,12 @@ KdmItem::statusChanged() // BEGIN protected inheritable TQSize -KdmItem::tqsizeHint() +KdmItem::sizeHint() { if (myWidget) return myWidget->size(); if (myLayoutItem) - return myLayoutItem->tqsizeHint(); + return myLayoutItem->sizeHint(); int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1, h = pos.hType == DTpixel ? kAbs( pos.height ) : -1; return TQSize( w, h ); @@ -457,7 +457,7 @@ KdmItem::tqsizeHint() TQRect KdmItem::placementHint( const TQRect &parentRect ) { - TQSize hintedSize = tqsizeHint(); + TQSize hintedSize = sizeHint(); TQSize boxHint; int x = parentRect.left(), @@ -474,7 +474,7 @@ KdmItem::placementHint( const TQRect &parentRect ) else { if (!boxManager) return parentRect; - boxHint = boxManager->tqsizeHint(); + boxHint = boxManager->sizeHint(); } kdDebug() << timestamp() << " boxHint " << boxHint << endl; } diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index ca6bd3435..c76222914 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -120,7 +120,7 @@ public: void mouseEvent( int x, int y, bool pressed = false, bool released = false ); /** - * Similar to tqsizeHint(..), this returns the area of the item + * Similar to sizeHint(..), this returns the area of the item * given the @p parentGeometry. The default implementation * takes into account geometric constraints and layoutings. * @param parentGeometry the geometry of the caller item or a @@ -181,7 +181,7 @@ protected: * @return (-1,-1) if no size can be determined (so it should * default to parent's size). */ - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); /** * Low level graphical function to paint the item. diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index c019851e1..b110adf78 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -138,7 +138,7 @@ KdmLabel::setText( const TQString &txt ) } TQSize -KdmLabel::tqsizeHint() +KdmLabel::sizeHint() { // choose the correct label class struct LabelStruct::LabelClass *l = &label.normal; @@ -268,7 +268,7 @@ KdmLabel::lookupText( const TQString &t ) m['s'] = KThemedGreeter::timedUser; // xgettext:no-c-format KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") ); - m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false, false ); + m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false ); return KMacroExpander::expandMacros( text, m ); } diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h index 33ce1cc00..1ec2f88ec 100644 --- a/kdm/kfrontend/themer/kdmlabel.h +++ b/kdm/kfrontend/themer/kdmlabel.h @@ -42,7 +42,7 @@ public: protected: // reimplemented; returns the minimum size of rendered text - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); // draw the label virtual void drawContents( TQPainter *p, const TQRect &r ); diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp index 83a4ea377..093d450fc 100644 --- a/kdm/kfrontend/themer/kdmlayout.cpp +++ b/kdm/kfrontend/themer/kdmlayout.cpp @@ -74,7 +74,7 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) // Check if box size was computed. If not compute it // TODO check if this prevents updating changing items // if (!hintedSize.isValid()) -// tqsizeHint(); +// sizeHint(); // kdDebug() << this << " hintedSize " << hintedSize << endl; @@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) if ((*it)->isExplicitlyHidden()) continue; - TQRect temp = childrenRect, tqitemRect; + TQRect temp = childrenRect, itemRect; if (box.isVertical) { temp.setHeight( 0 ); - tqitemRect = (*it)->placementHint( temp ); - temp.setHeight( tqitemRect.height() ); - childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing ); + itemRect = (*it)->placementHint( temp ); + temp.setHeight( itemRect.height() ); + childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing ); } else { temp.setWidth( 0 ); - tqitemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl; - temp.setWidth( tqitemRect.width() ); - childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing ); + itemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl; + temp.setWidth( itemRect.width() ); + childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing ); kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl; } - tqitemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl; - (*it)->setGeometry( tqitemRect, force ); + itemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl; + (*it)->setGeometry( itemRect, force ); } } } //FIXME truly experimental (is so close to greeter_geometry.c) TQSize -KdmLayoutBox::tqsizeHint() +KdmLayoutBox::sizeHint() { // Sum up area taken by children int w = 0, h = 0; diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h index 69b515d67..4c73e9a1b 100644 --- a/kdm/kfrontend/themer/kdmlayout.h +++ b/kdm/kfrontend/themer/kdmlayout.h @@ -80,7 +80,7 @@ public: // Computes the size hint of the box, telling which is the // smallest size inside which boxed items will fit - TQSize tqsizeHint(); + TQSize sizeHint(); private: struct { diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp index 6bb1fc57d..c11ae8426 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -107,7 +107,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name ) } TQSize -KdmPixmap::tqsizeHint() +KdmPixmap::sizeHint() { // choose the correct pixmap class PixmapStruct::PixmapClass * pClass = &pixmap.normal; @@ -118,7 +118,7 @@ KdmPixmap::tqsizeHint() // use the pixmap size as the size hint if (!pClass->pixmap.isNull()) return pClass->pixmap.size(); - return KdmItem::tqsizeHint(); + return KdmItem::sizeHint(); } void diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h index d49394bc9..a12c9fea4 100644 --- a/kdm/kfrontend/themer/kdmpixmap.h +++ b/kdm/kfrontend/themer/kdmpixmap.h @@ -42,7 +42,7 @@ public: protected: // reimplemented; returns the size of loaded pixmap - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); // draw the pixmap virtual void drawContents( TQPainter *p, const TQRect &r ); diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h index e6e5efdb4..f9a0b1b6f 100644 --- a/kdm/kfrontend/themer/kdmthemer.h +++ b/kdm/kfrontend/themer/kdmthemer.h @@ -61,9 +61,9 @@ public: bool isOK() { return rootItem != 0; } /* - * Gives a tqsizeHint to the widget (parent size) + * Gives a sizeHint to the widget (parent size) */ - //TQSize tqsizeHint() const{ return parentWidget()->size(); } + //TQSize sizeHint() const{ return parentWidget()->size(); } /* * Takes a shot of the current widget diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index 8f3758344..5ac494f86 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -33,7 +33,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) popupFrame = new KPopupFrame(this, "popupFrame"); popupFrame->installEventFilter(this); datePicker = new KDatePicker(popupFrame, date, "datePicker"); - datePicker->setMinimumSize(datePicker->tqsizeHint()); + datePicker->setMinimumSize(datePicker->sizeHint()); datePicker->installEventFilter(this); popupFrame->setMainWidget(datePicker); setDate(date); @@ -57,9 +57,9 @@ TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd) return *qd = KGlobal::locale()->readDate(str); } -TQDate & KDateCombo::getDate(TQDate *tqcurrentDate) +TQDate & KDateCombo::getDate(TQDate *currentDate) { - return string2Date(currentText(), tqcurrentDate); + return string2Date(currentText(), currentDate); } bool KDateCombo::setDate(const TQDate & newDate) diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h index d8da787b8..ab714a3ba 100644 --- a/kfind/kdatecombo.h +++ b/kfind/kdatecombo.h @@ -26,7 +26,7 @@ public: KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0); ~KDateCombo(); - TQDate & getDate(TQDate *tqcurrentDate); + TQDate & getDate(TQDate *currentDate); bool setDate(const TQDate & newDate); private: diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index f10490315..8908b26c8 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -70,7 +70,7 @@ Kfind::Kfind(TQWidget *parent, const char *name) mTopLayout->addWidget(mButtonBox); mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox ); - mButtonBox->setSpacing( (tabWidget->tqsizeHint().height()-4*mSearch->tqsizeHint().height()) / 4); + mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4); connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) ); mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox ); connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) ); diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 0cce510f2..92082019f 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -44,7 +44,7 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, kdDebug() << "KFindPart::KFindPart " << this << endl; m_kfindWidget = new Kfind( parentWidget, widgetName ); - m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height()); + m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height()); const KFileItem *item = ((KonqDirPart*)parent)->currentItem(); kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl; TQDir d; diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 1dbe6b58a..6f7977e41 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -60,11 +60,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[0] = new TQWidget( this, "page1" ); nameBox = new KComboBox(TRUE, pages[0], "combo1"); - nameBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named"); TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") ); dirBox = new KComboBox(TRUE, pages[0], "combo2"); - dirBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named"); subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]); caseSensCb = new TQCheckBox(i18n("Case s&ensitive search"), pages[0]); @@ -187,7 +187,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) sizeUnitBox ->setCurrentItem(1); int tmp = sizeEdit->fontMetrics().width(" 000000000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); m_usernameBox->setDuplicatesEnabled(FALSE); m_groupBox->setDuplicatesEnabled(FALSE); @@ -245,7 +245,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[2] = new TQWidget( this, "page3" ); typeBox =new KComboBox(FALSE, pages[2], "typeBox"); - typeBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type"); textEdit=new KLineEdit(pages[2], "textEdit" ); TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text"); @@ -315,7 +315,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) // Layout tmp = sizeEdit->fontMetrics().width(" 00000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4, KDialog::marginHint(), @@ -854,13 +854,13 @@ static void save_pattern(TQComboBox *obj, conf->writePathEntry(entry, sl); } -TQSize KfindTabWidget::tqsizeHint() const +TQSize KfindTabWidget::sizeHint() const { // #44662: avoid a huge default size when the comboboxes have very large items // Like in minicli, we changed the combobox size policy so that they can resize down, // and then we simply provide a reasonable size hint for the whole window, depending // on the screen width. - TQSize sz = TQTabWidget::tqsizeHint(); + TQSize sz = TQTabWidget::sizeHint(); KfindTabWidget* me = const_cast<KfindTabWidget*>( this ); const int screenWidth = tqApp->desktop()->screenGeometry(me).width(); if ( sz.width() > screenWidth / 2 ) diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h index dfea860da..c080c44d4 100644 --- a/kfind/kftabdlg.h +++ b/kfind/kftabdlg.h @@ -49,7 +49,7 @@ public: void setURL( const KURL & url ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void setFocus(); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index c5c375c22..56218d4fb 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -222,7 +222,7 @@ void KfindWindow::saveResults() stream.setEncoding( TQTextStream::Locale ); if ( mimeType->name() == "text/html") { - stream << TQString::tqfromLatin1("<HTML><HEAD>\n" + stream << TQString::fromLatin1("<HTML><HEAD>\n" "<!DOCTYPE %1>\n" "<TITLE>%2</TITLE></HEAD>\n" "<BODY><H1>%3</H1>" @@ -236,13 +236,13 @@ void KfindWindow::saveResults() { TQString path=((KfFileLVI*)item)->fileitem.url().url(); TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL(); - stream << TQString::tqfromLatin1("<DT><A HREF=\"") << path - << TQString::tqfromLatin1("\">") << pretty - << TQString::tqfromLatin1("</A>\n"); + stream << TQString::fromLatin1("<DT><A HREF=\"") << path + << TQString::fromLatin1("\">") << pretty + << TQString::fromLatin1("</A>\n"); item = item->nextSibling(); } - stream << TQString::tqfromLatin1("</DL><P></BODY></HTML>\n"); + stream << TQString::fromLatin1("</DL><P></BODY></HTML>\n"); } else { item = firstChild(); @@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init) { setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15); TQString sampleDate = - KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15); setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15); setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15); diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp index 3880ce2bc..2ff496074 100644 --- a/khelpcenter/docmetainfo.cpp +++ b/khelpcenter/docmetainfo.cpp @@ -108,7 +108,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode ) if ( langcode == "en" ) return i18n("English"); TQString cfgfile = locate( "locale", - TQString::tqfromLatin1( "%1/entry.desktop" ).arg( langcode ) ); + TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) ); kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl; diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index 46a9ce65b..dc596372e 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -49,7 +49,7 @@ class SectionItem : public KListViewItem { KListViewItem::setOpen(open); - setPixmap( 0, SmallIcon( TQString::tqfromLatin1( open ? "contents" : "contents2" ) ) ); + setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) ); } }; @@ -92,7 +92,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent ) m_cacheFile = locateLocal( "cache", "help/glossary.xml" ); - m_sourceFile = View::View::langLookup( TQString::tqfromLatin1( "khelpcenter/glossary/index.docbook" ) ); + m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) ); m_config = kapp->config(); m_config->setGroup( "Glossary" ); @@ -150,10 +150,10 @@ void Glossary::rebuildGlossaryCache() connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ), this, TQT_SLOT( meinprocExited( KProcess * ) ) ); - *meinproc << locate( "exe", TQString::tqfromLatin1( "meinproc" ) ); - *meinproc << TQString::tqfromLatin1( "--output" ) << m_cacheFile; - *meinproc << TQString::tqfromLatin1( "--stylesheet" ) - << locate( "data", TQString::tqfromLatin1( "khelpcenter/glossary.xslt" ) ); + *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) ); + *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile; + *meinproc << TQString::fromLatin1( "--stylesheet" ) + << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) ); *meinproc << m_sourceFile; meinproc->start( KProcess::NotifyOnExit ); @@ -189,21 +189,21 @@ void Glossary::buildGlossaryTree() if ( !doc.setContent( &cacheFile ) ) return; - TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::tqfromLatin1( "section" ) ); + TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::fromLatin1( "section" ) ); for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) { TQDomElement sectionElement = sectionNodes.item( i ).toElement(); - TQString title = sectionElement.attribute( TQString::tqfromLatin1( "title" ) ); + TQString title = sectionElement.attribute( TQString::fromLatin1( "title" ) ); SectionItem *topicSection = new SectionItem( m_byTopicItem, title ); - TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::tqfromLatin1( "entry" ) ); + TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::fromLatin1( "entry" ) ); for ( unsigned int j = 0; j < entryNodes.count(); j++ ) { TQDomElement entryElement = entryNodes.item( j ).toElement(); - TQString entryId = entryElement.attribute( TQString::tqfromLatin1( "id" ) ); + TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) ); if ( entryId.isNull() ) continue; - TQDomElement termElement = childElement( entryElement, TQString::tqfromLatin1( "term" ) ); + TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) ); TQString term = termElement.text().simplifyWhiteSpace(); EntryItem *entry = new EntryItem(topicSection, term, entryId ); @@ -221,19 +221,19 @@ void Glossary::buildGlossaryTree() new EntryItem( alphabSection, term, entryId ); - TQDomElement definitionElement = childElement( entryElement, TQString::tqfromLatin1( "definition" ) ); + TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) ); TQString definition = definitionElement.text().simplifyWhiteSpace(); GlossaryEntryXRef::List seeAlso; - TQDomElement referencesElement = childElement( entryElement, TQString::tqfromLatin1( "references" ) ); - TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::tqfromLatin1( "reference" ) ); + TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) ); + TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) ); if ( referenceNodes.count() > 0 ) for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) { TQDomElement referenceElement = referenceNodes.item( k ).toElement(); - TQString term = referenceElement.attribute( TQString::tqfromLatin1( "term" ) ); - TQString id = referenceElement.attribute( TQString::tqfromLatin1( "id" ) ); + TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) ); + TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) ); seeAlso += GlossaryEntryXRef( term, id ); } @@ -279,10 +279,10 @@ TQString Glossary::entryToHtml( const GlossaryEntry &entry ) GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin(); GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end(); for (; it != end; ++it) { - seeAlso += TQString::tqfromLatin1("<a href=\"glossentry:"); + seeAlso += TQString::fromLatin1("<a href=\"glossentry:"); seeAlso += (*it).id(); - seeAlso += TQString::tqfromLatin1("\">") + (*it).term(); - seeAlso += TQString::tqfromLatin1("</a>, "); + seeAlso += TQString::fromLatin1("\">") + (*it).term(); + seeAlso += TQString::fromLatin1("</a>, "); } seeAlso = seeAlso.left(seeAlso.length() - 2); } diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index 62a434dd2..e8065cd8e 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -257,7 +257,7 @@ void History::fillForwardMenu() void History::fillGoMenu() { KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu || m_goMenuIndex == -1 ) return; @@ -290,7 +290,7 @@ void History::fillGoMenu() void History::goMenuActivated( int id ) { KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu ) return; diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 64a301be7..9dfc5e350 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -50,15 +50,15 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " "ht://dig HTML search engine. " "You can get ht://dig at the"), gb); - l->tqsetAlignment(TQLabel::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(TQLabel::WordBreak); + l->setMinimumSize(l->sizeHint()); grid->addMultiCellWidget(l, 1, 1, 0, 1); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); KURLLabel *url = new KURLLabel(gb); url->setURL("http://www.htdig.org"); url->setText(i18n("ht://dig home page")); - url->tqsetAlignment(TQLabel::AlignHCenter); + url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(urlClicked(const TQString&))); @@ -157,7 +157,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name) runButton = new TQPushButton(i18n("Generate Index..."), this); TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) ); - runButton->setFixedSize(runButton->tqsizeHint()); + runButton->setFixedSize(runButton->sizeHint()); vbox->addWidget(runButton, AlignRight); connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex())); @@ -179,14 +179,14 @@ void KHTMLSearchConfig::loadLanguages() // add all languages to the list TQStringList langs = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); langs.sort(); for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name")); TQString path = *it; int index = path.findRev('/'); diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp index 6f4b01c42..308109d12 100644 --- a/khelpcenter/htmlsearch/klangcombo.cpp +++ b/khelpcenter/htmlsearch/klangcombo.cpp @@ -39,14 +39,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name) void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index) { - TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")"); - TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png"))); + TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")"); + TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png"))); insertItem(TQIconSet(flag), output, path, submenu, index); } void KLanguageCombo::changeLanguage(const TQString& name, int i) { if (i < 0 || i >= count()) return; - TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")"); + TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")"); changeItem(output, i); } diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index cf259fa46..7d367f1be 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -192,7 +192,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) TQRect clip(2, 2, width() - 4, height() - 4); #if 0 if ( hasFocus() && style().guiStyle() != MotifStyle ) - p.setPen( tqcolorGroup().highlightedText() ); + p.setPen( colorGroup().highlightedText() ); #endif p.drawText(clip, AlignCenter | SingleLine, popup->text( current )); diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index 8581b25c8..ea6dff669 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/khelpcenter/htmlsearchconfig.cpp @@ -51,15 +51,15 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " "ht://dig HTML search engine. " "You can get ht://dig at the"), gb); - l->tqsetAlignment(TQLabel::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(TQLabel::WordBreak); + l->setMinimumSize(l->sizeHint()); grid->addMultiCellWidget(l, 1, 1, 0, 1); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); KURLLabel *url = new KURLLabel(gb); url->setURL("http://www.htdig.org"); url->setText(i18n("ht://dig home page")); - url->tqsetAlignment(TQLabel::AlignHCenter); + url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(urlClicked(const TQString&))); diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index 28e9e5523..1c7e54391 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -101,7 +101,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent ) topLayout->setSpacing( spacingHint() ); mLabel = new TQLabel( this ); - mLabel->tqsetAlignment( AlignHCenter ); + mLabel->setAlignment( AlignHCenter ); topLayout->addWidget( mLabel ); mProgressBar = new TQProgressBar( this ); diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index e70065bfc..30f81015f 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -325,7 +325,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) mDoc->browserExtension()->setURLArgs( args ); - if ( proto == TQString::tqfromLatin1("glossentry") ) { + if ( proto == TQString::fromLatin1("glossentry") ) { TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() ); slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) ); mNavigator->slotSelectGlossEntry( decodedEntryId ); diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 07def94b2..9ec2a31c4 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -262,8 +262,8 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem void Navigator::insertAppletDocs( NavigatorItem *topItem ) { - TQDir appletDir( locate( "data", TQString::tqfromLatin1( "kicker/applets/" ) ) ); - appletDir.setNameFilter( TQString::tqfromLatin1( "*.desktop" ) ); + TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) ); + appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) ); TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable ); TQStringList::ConstIterator it = files.begin(); diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index cdc7d92d9..e357abe2a 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -188,9 +188,9 @@ void TOC::fillTree() TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" ); for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) { TQDomElement chapElem = chapters.item( chapterCount ).toElement(); - TQDomElement chapTitleElem = childElement( chapElem, TQString::tqfromLatin1( "title" ) ); + TQDomElement chapTitleElem = childElement( chapElem, TQString::fromLatin1( "title" ) ); TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace(); - TQDomElement chapRefElem = childElement( chapElem, TQString::tqfromLatin1( "anchor" ) ); + TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) ); TQString chapRef = chapRefElem.text().stripWhiteSpace(); chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef ); @@ -199,9 +199,9 @@ void TOC::fillTree() TQDomNodeList sections = chapElem.elementsByTagName( "section" ); for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) { TQDomElement sectElem = sections.item( sectCount ).toElement(); - TQDomElement sectTitleElem = childElement( sectElem, TQString::tqfromLatin1( "title" ) ); + TQDomElement sectTitleElem = childElement( sectElem, TQString::fromLatin1( "title" ) ); TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace(); - TQDomElement sectRefElem = childElement( sectElem, TQString::tqfromLatin1( "anchor" ) ); + TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) ); TQString sectRef = sectRefElem.text().stripWhiteSpace(); sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef ); diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index d0d144382..c05d73945 100644 --- a/khotkeys/kcontrol/gesturedrawer.cpp +++ b/khotkeys/kcontrol/gesturedrawer.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureDrawer::GestureDrawer(TQWidget *parent, const char *name) : TQFrame(parent, name), _data(TQString::null) { - setBackgroundColor( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMinimumSize(30, 30); } diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index b199ab64a..ee3af6809 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -31,7 +31,7 @@ class GestureDrawer : public TQFrame void setData(const TQString &data); - virtual TQSize tqsizeHint() const { return TQSize(30, 30); } + virtual TQSize sizeHint() const { return TQSize(30, 30); } protected: void paintEvent(TQPaintEvent *ev); diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index b4bba18d9..6e4395a5b 100644 --- a/khotkeys/kcontrol/gesturerecorder.cpp +++ b/khotkeys/kcontrol/gesturerecorder.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureRecorder::GestureRecorder(TQWidget *parent, const char *name) : TQFrame(parent, name), _mouseButtonDown(false) { - setBackgroundColor( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setLineWidth(2); setMidLineWidth(0); diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index ef59a4a99..af2fb8cdc 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, "button below.\n\nDraw here:"); TQLabel *label = new TQLabel(message, this, "label"); - label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _recorder = new GestureRecorder(this, "recorder"); diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 54b3125a0..84b0458b9 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows ) void Module::import() { - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(), + TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(), i18n( "Select File with Actions to Be Imported" )); if( file.isEmpty()) return; KSimpleConfig cfg( file, true ); if( !settings.import( cfg, true )) { - KMessageBox::error( tqtopLevelWidget(), + KMessageBox::error( topLevelWidget(), i18n( "Import of the specified file failed. Most probably the file is not a valid " "file with actions." )); return; diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index ec0671e40..3532cc13f 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P module, TQT_SLOT( changed())); connect( delete_action_button, TQT_SIGNAL( clicked()), module, TQT_SLOT( changed())); - setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why + setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why } void Main_buttons_widget::enable_delete( bool enable_P ) diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 12cd12452..2533b58a0 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data() void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P ) { - if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget())) return; // KHotKeys::Module::changed() module->changed(); diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index c25f7e0ef..ce982399e 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index fdb849ea5..feeae535d 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index bf7c5321a..95c175a98 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index 24192fed3..4817d8662 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 5fc15b458..068806a02 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -121,7 +121,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -257,7 +257,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -349,7 +349,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -410,7 +410,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -454,7 +454,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui index 698392402..17b881de9 100644 --- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index 53868495c..e082fd6c8 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index 4bc827575..6af0aefc6 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index ee5968743..c30ff6293 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index 1a4eed270..6029f0522 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>241</width> <height>21</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>90</height> diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index 8cdc03d05..d15dab5df 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -390,7 +390,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index fa103e6b1..fec07e22f 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -31,7 +31,7 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice."); _label = new TQLabel(_message, this, "label"); - _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index ea0135ceb..024caaefe 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>310</width> <height>20</height> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 74e6a6c99..48617a1a0 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -123,7 +123,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings")); + addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } void KConfigDialogSingle::updateSettings() @@ -242,7 +242,7 @@ void PlainClock::updateClock() void PlainClock::loadSettings() { setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame); - tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine); + setAlignment(AlignVCenter | AlignHCenter | SingleLine); setFont(_prefs->plainFont()); } @@ -353,9 +353,9 @@ void DigitalClock::updateClock() if (_force || newStr != _timeStr) { _timeStr = newStr; - tqsetUpdatesEnabled( FALSE ); + setUpdatesEnabled( FALSE ); display(_timeStr); - tqsetUpdatesEnabled( TRUE ); + setUpdatesEnabled( TRUE ); update(); } @@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*) // but other colors would break the lcd-lock anyway void DigitalClock::drawContents( TQPainter * p) { - tqsetUpdatesEnabled( FALSE ); + setUpdatesEnabled( FALSE ); TQPalette pal = palette(); if (_prefs->digitalLCDStyle()) pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); @@ -430,7 +430,7 @@ void DigitalClock::drawContents( TQPainter * p) pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); setPalette( pal ); p->translate( -2, -2 ); - tqsetUpdatesEnabled( TRUE ); + setUpdatesEnabled( TRUE ); TQLCDNumber::drawContents( p ); p->translate( +1, +1 ); } @@ -908,12 +908,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, setBackgroundOrigin(AncestorOrigin); _dayOfWeek = new TQLabel(this); - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _dayOfWeek->setBackgroundOrigin(AncestorOrigin); _dayOfWeek->installEventFilter(this); // catch mouse clicks _date = new TQLabel(this); - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks @@ -980,18 +980,18 @@ int ClockApplet::widthForHeight(int h) const bool mustShowDate = showDate || (zone->zoneIndex() != 0); if (mustShowDate) { - _date->tqsetAlignment(AlignVCenter | AlignHCenter); + _date->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDateHeight = _date->tqsizeHint().height(); + shareDateHeight = _date->sizeHint().height(); } } if (showDayOfWeek) { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height(); + shareDayOfWeekHeight = _dayOfWeek->sizeHint().height(); } } @@ -1007,8 +1007,8 @@ int ClockApplet::widthForHeight(int h) const } else { - int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0; - int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0; + int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0; + int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0; if (dateToSide) { @@ -1064,13 +1064,13 @@ int ClockApplet::widthForHeight(int h) const _clock->widget()->move(0, 0); if (showDayOfWeek) { - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height()); _dayOfWeek->move(0, _clock->widget()->height()); } if (mustShowDate) { - _date->setFixedSize(w, _date->tqsizeHint().height()); + _date->setFixedSize(w, _date->sizeHint().height()); _date->move(0, _clock->widget()->height() + shareDayOfWeekHeight); } } @@ -1094,16 +1094,16 @@ int ClockApplet::heightForWidth(int w) const // add 4 pixels in height for each of date+dayOfWeek, if visible if (showDayOfWeek) { - if (_dayOfWeek->tqminimumSizeHint().width() > w) + if (_dayOfWeek->minimumSizeHint().width() > w) { - _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | WordBreak); } else { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height()); _dayOfWeek->move(0, clockHeight); clockHeight += _dayOfWeek->height(); @@ -1116,7 +1116,7 @@ int ClockApplet::heightForWidth(int w) const // display on panel that is too narrow and then they made it wider const_cast<ClockApplet*>(this)->updateDateLabel(false); - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { TQString dateStr = _date->text(); // if we're too wide to fit, replace the first non-digit from the end with a space @@ -1127,13 +1127,13 @@ int ClockApplet::heightForWidth(int w) const } } - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { - _date->tqsetAlignment(AlignVCenter | WordBreak); + _date->setAlignment(AlignVCenter | WordBreak); } else { - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } _date->setFixedSize(w, _date->heightForWidth(w)); _date->move(0, clockHeight); @@ -1541,7 +1541,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -1615,7 +1615,7 @@ TQTime ClockApplet::clockGetTime() TQDate ClockApplet::clockGetDate() { - return TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date()); + return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date()); } void ClockApplet::showZone(int z) @@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset))); + tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset))); } else { diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index fc2b66cac..1450e6f4f 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index ebe6af9fc..6906808c7 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 6cf1d30f0..560ddcc7f 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -306,7 +306,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>343</width> <height>20</height> @@ -421,7 +421,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index e551864b1..2aaffe781 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>332</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -192,7 +192,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index 0c19e5326..248614811 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -163,7 +163,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background)); + TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h index 37d04ef9e..1c153d85c 100644 --- a/kicker/applets/launcher/quickbuttongroup.h +++ b/kicker/applets/launcher/quickbuttongroup.h @@ -24,15 +24,15 @@ public: void setDragging(bool drag); void setEnableDrag(bool enable); void deleteContents(); - void tqsetUpdatesEnabled(bool enable); + void setUpdatesEnabled(bool enable); }; QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) { return findProperty(desc, std::mem_fun(&QuickButton::url));} -inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable) +inline void QuickButtonGroup::setUpdatesEnabled(bool enable) { for (QuickButtonGroup::iterator i=begin();i!=end();++i) { - (*i)->tqsetUpdatesEnabled(enable); + (*i)->setUpdatesEnabled(enable); if (enable) { (*i)->update();} } } diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 7ead9eced..db49642cc 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -770,8 +770,8 @@ void QuickLauncher::refreshContents() unsigned index; TQPoint pos; - tqsetUpdatesEnabled(false); - m_buttons->tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); + m_buttons->setUpdatesEnabled(false); for (index = 0; index < m_buttons->size(); index++) { pos = m_manager->pos(index); @@ -791,9 +791,9 @@ void QuickLauncher::refreshContents() m_dragButtons->setDragging(true); } m_buttons->show(); - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); update(); - m_buttons->tqsetUpdatesEnabled(true); + m_buttons->setUpdatesEnabled(true); updateGeometry(); emit updateLayout(); updateStickyHighlightLayer(); diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index 882c8286b..82aa51c87 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -94,8 +94,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name if (!kapp->authorize("logout")) logoutButton->hide(); - lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -113,7 +113,7 @@ Lockout::~Lockout() // direction and wasting a lot of space. void Lockout::checkLayout( int height ) const { - TQSize s = tqminimumSizeHint(); + TQSize s = minimumSizeHint(); TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && @@ -131,13 +131,13 @@ void Lockout::checkLayout( int height ) const int Lockout::widthForHeight( int height ) const { checkLayout( height ); - return tqsizeHint().width(); + return sizeHint().width(); } int Lockout::heightForWidth( int width ) const { checkLayout( width ); - return tqsizeHint().height(); + return sizeHint().height(); } void Lockout::lock() @@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e) void Lockout::propagateMouseEvent(TQMouseEvent* e) { if ( !isTopLevel() ) { - TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ), + TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( tqtopLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index f0a86946f..0798c84b3 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -264,7 +264,7 @@ void Applet::positionChange( Position ) // Kicker's frame). void Applet::updateTopEdgeOffset() { - TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); + TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); if( p.y() <= 2 ) // 2 = work also when running in appletproxy topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); else diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index e494d538d..18166c9d8 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // transparent windows get an 1 pixel frame... if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else if (down) { - bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight())); + bp->setPen(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } else { - bp->setPen(tqcolorGroup().dark()); + bp->setPen(colorGroup().dark()); } bp->drawRect(0, 0, w, h); @@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (on) { - background = tqcolorGroup().brush(TQColorGroup::Midlight); + background = colorGroup().brush(TQColorGroup::Midlight); } else if (down) { - background = TQBrush(KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight())); + background = TQBrush(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } else { - background = tqcolorGroup().brush(TQColorGroup::Mid); + background = colorGroup().brush(TQColorGroup::Mid); } bp->fillRect(0, 0, w, h, background); @@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (twin->activeWindow() == info->win()) { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); - qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); + TQBrush brush = colorGroup().brush(TQColorGroup::Highlight); + qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush); } else { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button); + TQBrush brush = colorGroup().brush(TQColorGroup::Button); if (on) { @@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } bp->fillRect(r, brush); - qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0); + qDrawShadeRect(bp, r, colorGroup(), true, 1, 0); } if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15) @@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // makes it look a bit more finished. if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else { - bp->setPen(tqcolorGroup().mid()); + bp->setPen(colorGroup().mid()); } bp->drawRect(0, 0, w, h); @@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (transparent || liveBkgnd) { - bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText()); + bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText()); m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size()); } else @@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } if (m_inside) - KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); } void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) @@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) TQPixmap windowImage(ww, wh); TQPainter bp(&windowImage, this); - bp.setPen(tqcolorGroup().foreground()); + bp.setPen(colorGroup().foreground()); bp.drawRect(0, 0, ww, wh); - bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background()); + bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background()); Task::List tasklist; tasklist.append(m_currentWindow); diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 8f441a397..fb7ac107b 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -121,14 +121,14 @@ void RunApplet::resizeEvent(TQResizeEvent*) _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->tqsizeHint().height() + _label->height()) + if(height() >= _input->sizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->tqsizeHint().height() - 2; - int labelHeight = _label->tqsizeHint().height(); + int inputVOffset = height() - _input->sizeHint().height() - 2; + int labelHeight = _label->sizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->tqsizeHint().height()); + width(), _input->sizeHint().height()); _label->show(); } else @@ -138,7 +138,7 @@ void RunApplet::resizeEvent(TQResizeEvent*) // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->tqsizeHint().height(); + int newHeight = _input->sizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -184,7 +184,7 @@ void RunApplet::setButtonText() int RunApplet::widthForHeight(int ) const { - return _label->tqsizeHint().width(); + return _label->sizeHint().width(); } int RunApplet::heightForWidth(int ) const diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index 1d3ef95bf..bd2673efa 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 570db2f92..fcc55234a 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -427,12 +427,12 @@ void SystemTrayApplet::showExpandButton(bool show) if (orientation() == Qt::Vertical) { m_expandButton->setFixedSize(width() - 4, - m_expandButton->tqsizeHint() + m_expandButton->sizeHint() .height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint() + m_expandButton->setFixedSize(m_expandButton->sizeHint() .width(), height() - 4); } @@ -869,7 +869,7 @@ int SystemTrayApplet::widthForHeight(int h) const me->setFixedHeight(h); } - return tqsizeHint().width(); + return sizeHint().width(); } int SystemTrayApplet::heightForWidth(int w) const @@ -888,7 +888,7 @@ int SystemTrayApplet::heightForWidth(int w) const me->setFixedWidth(w); } - return tqsizeHint().height(); + return sizeHint().height(); } void SystemTrayApplet::moveEvent( TQMoveEvent* ) @@ -906,7 +906,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* ) void SystemTrayApplet::layoutTray() { - tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); int iconCount = m_shownWins.count(); @@ -927,11 +927,11 @@ void SystemTrayApplet::layoutTray() { if (orientation() == Qt::Vertical) { - m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height()); + m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint().width(), height() - 4); + m_expandButton->setFixedSize(m_expandButton->sizeHint().width(), height() - 4); } } @@ -1102,7 +1102,7 @@ void SystemTrayApplet::layoutTray() } } - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); updateGeometry(); setBackground(); @@ -1138,7 +1138,7 @@ TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent ) void TrayEmbed::getIconSize(int defaultIconSize) { - TQSize minSize = tqminimumSizeHint(); + TQSize minSize = minimumSizeHint(); int width = minSize.width(); int height = minSize.height(); diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index ebeec601f..55e5d113f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(200, h)).width(); + return container->sizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(w, 200)).height(); + return container->sizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index da20a2a61..2cb35e4fc 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -60,7 +60,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, twin_module = new KWinModule(TQT_TQOBJECT(this)); connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); } @@ -77,7 +77,7 @@ DockBarExtension::~DockBarExtension() if (dragging_container) delete dragging_container; } -TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const +TQSize DockBarExtension::sizeHint(Position p, TQSize) const { if (p == Left || p == Right) return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count()); diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 4a5dff41f..0952d259e 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -40,7 +40,7 @@ public: virtual ~DockBarExtension(); - TQSize tqsizeHint(Position, TQSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Right; } protected slots: diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 3d63c8c4e..6ebb6b05c 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( tqcolorGroup().mid() ), + tintColour_( colorGroup().mid() ), useMask_( true ), res(0) { @@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( tqcolorGroup().mid() ), + tintColour_( colorGroup().mid() ), useMask_( true ), res(0) { @@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach ) emit detachedChanged( detached ); } -TQSize KasBar::tqsizeHint( Orientation o, TQSize sz ) +TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { if ( o == Qt::Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -414,7 +414,7 @@ void KasBar::updateLayout() if ( !isUpdatesEnabled() ) return; bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); // This is for testing a rectangular layout // boxesPerLine_ = (uint) ceil(sqrt( items.count() )); @@ -443,9 +443,9 @@ void KasBar::updateLayout() resize( sz ); } - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); - TQWidget *top = tqtopLevelWidget(); + TQWidget *top = topLevelWidget(); TQRegion mask; KasItem *i; diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 201fcc882..c9a3ddd52 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -152,7 +152,7 @@ public: bool isDrag() const { return inDrag; } - TQSize tqsizeHint( Qt::Orientation, TQSize max ); + TQSize sizeHint( Qt::Orientation, TQSize max ); // // Look and feel options diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index c63d6e277..cedc49a67 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -153,7 +153,7 @@ TQSize KasBarExtension::detachedSize() } -TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { Orientation o = Qt::Horizontal; @@ -167,7 +167,7 @@ TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const return TQSize( 0, kasbar->itemExtent()/2 ); } - return kasbar->tqsizeHint( o, maxSize ); + return kasbar->sizeHint( o, maxSize ); } void KasBarExtension::positionChange( Position /* position */) diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index e5e3142df..7fbb4fbc6 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -76,7 +76,7 @@ public: virtual ~KasBarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 959734c22..51dac687d 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd = new LCD( parent ); lcd->hide(); - lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); lcd->setFrameStyle( TQFrame::NoFrame ); lcd->setSegmentStyle( TQLCDNumber::Flat ); @@ -89,7 +89,7 @@ void KasClockItem::paint( TQPainter *p ) p->save(); p->translate( 3, 15 ); - lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() ); + lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() ); lcd->draw( p ); p->restore(); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index d8bd83b54..a1b3f55fc 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p ) if ( !frame ) return; - qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2); + qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); TQPen pen; diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 66cecf9ac..7fd0875d0 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -218,7 +218,7 @@ protected: TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } /** Gets the color group from the parent. */ - const TQColorGroup &tqcolorGroup() const { return kas->tqcolorGroup(); } + const TQColorGroup &colorGroup() const { return kas->colorGroup(); } /** Factory method that creates a popup widget for the item. */ virtual KasPopup *createPopup(); diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 459bd6639..6fa1f9b2a 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -95,7 +95,7 @@ void KasLoadItem::paint( TQPainter *p ) KasItem::paint( p ); - TQColor light = kasbar()->tqcolorGroup().highlight(); + TQColor light = kasbar()->colorGroup().highlight(); TQColor dark = light.dark(); KPixmap pix; @@ -103,7 +103,7 @@ void KasLoadItem::paint( TQPainter *p ) KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient ); p->drawPixmap( 2, extent()-2-h, pix ); - p->setPen( kasbar()->tqcolorGroup().mid() ); + p->setPen( kasbar()->colorGroup().mid() ); for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) { int ypos = (int) floor((extent()-2) - (dh*maxValue*pos)); p->drawLine( 2, ypos, extent()-3, ypos ); diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 3450b1549..78b25e8c0 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -308,7 +308,7 @@ KPixmap KasResources::activeBg() if ( actBg.isNull() ) { actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( actBg, - kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(), + kasbar->colorGroup().light(), kasbar->colorGroup().mid(), KPixmapEffect::DiagonalGradient ); } @@ -320,7 +320,7 @@ KPixmap KasResources::inactiveBg() if ( inactBg.isNull() ) { inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( inactBg, - kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(), + kasbar->colorGroup().mid(), kasbar->colorGroup().dark(), KPixmapEffect::DiagonalGradient ); } diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 28be059ae..851b7d915 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -315,7 +315,7 @@ void KasTasker::moveToMain( KasGroupItem *gi, Task::Ptr t ) void KasTasker::moveToMain( KasGroupItem *gi ) { bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); int i = indexOf( gi ); @@ -327,7 +327,7 @@ void KasTasker::moveToMain( KasGroupItem *gi ) gi->hidePopup(); remove( gi ); - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); updateLayout(); } @@ -346,7 +346,7 @@ void KasTasker::removeStartup( Startup::Ptr s ) void KasTasker::refreshAll() { bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); clear(); @@ -365,7 +365,7 @@ void KasTasker::refreshAll() addTask( t.data() ); } - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); updateLayout(); } @@ -572,7 +572,7 @@ void KasTasker::readConfig( KConfig *conf ) } bool updates = isUpdatesEnabled(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); // @@ -653,7 +653,7 @@ void KasTasker::readConfig( KConfig *conf ) // fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true ); // enablePopup = conf->readBoolEntry( "EnablePopup", true ); - tqsetUpdatesEnabled( updates ); + setUpdatesEnabled( updates ); emit configChanged(); } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index cc10b6410..20374addd 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -173,14 +173,14 @@ void KasTaskItem::updateTask(bool geometryChangeOnly) } bool updates = kasbar()->isUpdatesEnabled(); - kasbar()->tqsetUpdatesEnabled( false ); + kasbar()->setUpdatesEnabled( false ); setProgress( kasbar()->showProgress() ? 0 : -1 ); setText( task_->visibleIconicName() ); setModified( task_->isModified() ); setActive( task_->isActive() ); - kasbar()->tqsetUpdatesEnabled( updates ); + kasbar()->setUpdatesEnabled( updates ); update(); } @@ -422,7 +422,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool taskprops->addColumn( i18n("Value") ); // Create List Items - TQMetaObject *mo = target->tqmetaObject(); + TQMetaObject *mo = target->metaObject(); for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { const TQMetaProperty *p = mo->property(i, recursive); @@ -456,7 +456,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) { TQVBox *vb2 = new TQVBox( parent ); - vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSpacing( KDialog::spacingHint() ); vb2->setMargin( KDialog::marginHint() ); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 9a59e1603..25c096a65 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) } KPixmapEffect::gradient( titleBg, - Qt::black, tqcolorGroup().mid(), + Qt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 3e29403f4..6ae140a23 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -94,7 +94,7 @@ void SidebarExtension::needLayoutUpdate(bool exp) { m_currentWidth=24; m_resizeHandle->hide(); } - tqtopLevelWidget()->setFixedWidth(m_currentWidth); + topLevelWidget()->setFixedWidth(m_currentWidth); emit updateLayout(); } @@ -117,7 +117,7 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { return true; } else if (e->type()==TQEvent::MouseButtonRelease) { m_resizing=false; - m_expandedSize=tqtopLevelWidget()->width(); + m_expandedSize=topLevelWidget()->width(); needLayoutUpdate(true); return true; } else if (e->type()==TQEvent::MouseMove) { @@ -126,14 +126,14 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { if (p==Left) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff); + topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff); m_x=((TQMouseEvent*)e)->globalX(); } } else if (p==Right) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff); - tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y()); + topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff); + topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y()); m_x=((TQMouseEvent*)e)->globalX(); } } @@ -148,7 +148,7 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const { return KPanelExtension::Left; } -TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const +TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const { return TQSize(m_currentWidth,maxSize.height()); } diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 9f28854b9..4d0d1646b 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -36,7 +36,7 @@ public: virtual ~SidebarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const; virtual void positionChange( Position position ); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 56e6ea3ce..24e37b505 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -123,17 +123,17 @@ void TaskBarExtension::preferences() m_container->preferences(); } -TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const +TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const { if (p == Left || p == Right) maxSize.setWidth(sizeInPixels()); else maxSize.setHeight(sizeInPixels()); -// kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl; +// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl; // kdDebug(1210) << " width: " << size.width() << endl; // kdDebug(1210) << "height: " << size.height() << endl; - return m_container->tqsizeHint(p, maxSize); + return m_container->sizeHint(p, maxSize); } void TaskBarExtension::configure() diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 92c065beb..2848e80c7 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -49,7 +49,7 @@ public: int actions = 0, TQWidget *parent = 0, const char *name = 0 ); ~TaskBarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Bottom; } protected: diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 4a8c9a7af..2e2cb5a2d 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -103,7 +103,7 @@ void BrowserButton::dropEvent( TQDropEvent *ev ) { KURL path ( topMenu->path() ); _menuTimer->stop(); - KFileItem item( path, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index 71bcaa2e5..9f23741e5 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -77,7 +77,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev ) void DesktopButton::dropEvent( TQDropEvent *ev ) { KURL dPath ( KGlobalSettings::desktopPath() ); - KFileItem item( dPath, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 382779648..6b03269eb 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) int AppletHandle::heightForWidth( int /* w */ ) const { - int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -282,7 +282,7 @@ void AppletHandle::checkHandleHover() bool AppletHandle::onMenuButton(const TQPoint& point) const { - return m_menuButton && (tqchildAt(mapFromGlobal(point)) == m_menuButton); + return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); } void AppletHandle::toggleMenuButtonOff() @@ -308,9 +308,9 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) setBackgroundOrigin( AncestorOrigin ); } -TQSize AppletHandleDrag::tqminimumSizeHint() const +TQSize AppletHandleDrag::minimumSizeHint() const { - int wh = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int wh = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); if (m_parent->orientation() == Qt::Horizontal) { @@ -368,7 +368,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQRect r = rect(); tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, - tqcolorGroup(), flags); + colorGroup(), flags); } else { @@ -382,9 +382,9 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -TQSize AppletHandleButton::tqminimumSizeHint() const +TQSize AppletHandleButton::minimumSizeHint() const { - int height = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int height = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; if (m_parent->orientation() == Qt::Horizontal) diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index a49319dc6..34e8e3576 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -92,9 +92,9 @@ class AppletHandleDrag : public TQWidget public: AppletHandleDrag(AppletHandle* parent); - TQSize tqminimumSizeHint() const; - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } TQSizePolicy sizePolicy() const; protected: @@ -113,9 +113,9 @@ class AppletHandleButton : public SimpleArrowButton public: AppletHandleButton(AppletHandle *parent); - TQSize tqminimumSizeHint() const; - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } TQSizePolicy sizePolicy() const; private: diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index a6cfc11ab..47a07a5f5 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _valid = true; _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection())); - _applet->tqsetAlignment((KPanelApplet::Alignment)tqalignment()); + _applet->setAlignment((KPanelApplet::Alignment)tqalignment()); _actions = _applet->actions(); _type = _applet->type(); @@ -275,14 +275,14 @@ void AppletContainer::slotRemoved(KConfig* config) void AppletContainer::activateWindow() { - KWin::forceActiveWindow(tqtopLevelWidget()->winId()); + KWin::forceActiveWindow(topLevelWidget()->winId()); } void AppletContainer::focusRequested(bool focus) { if (focus) { - KWin::forceActiveWindow(tqtopLevelWidget()->winId()); + KWin::forceActiveWindow(topLevelWidget()->winId()); } emit maintainFocus(focus); @@ -361,7 +361,7 @@ void AppletContainer::alignmentChange(KPanelExtension::Alignment a) return; } - _applet->tqsetAlignment( (KPanelApplet::Alignment)a ); + _applet->setAlignment( (KPanelApplet::Alignment)a ); } int AppletContainer::widthForHeight(int h) const diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index 2607e3608..0b1ff30f7 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -110,7 +110,7 @@ void BaseContainer::slotRemoved(KConfig* config) config->sync(); } -void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a) +void BaseContainer::setAlignment(KPanelExtension::Alignment a) { if (_tqalignment == a) { diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index f9c449b1f..0c4a79539 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -97,7 +97,7 @@ public slots: virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; } virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; } - void tqsetAlignment(KPanelExtension::Alignment a); + void setAlignment(KPanelExtension::Alignment a); signals: void removeme(BaseContainer*); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 51a9904d7..c56672949 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -224,7 +224,7 @@ ExtensionContainer::~ExtensionContainer() { } -TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize &maxSize) const +TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const { int width = 0; int height = 0; @@ -284,7 +284,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize if (m_extension) { - size = m_extension->tqsizeHint(p, maxSize - size) + size; + size = m_extension->sizeHint(p, maxSize - size) + size; } return size.boundedTo(maxSize); @@ -510,7 +510,7 @@ void ExtensionContainer::moveMe() // on other parameters this can lead to Bad Things(tm) // // we need to find a way to do this that doesn't result in - // tqsizeHint's getting called on the extension =/ + // sizeHint's getting called on the extension =/ // // or else we need to change the semantics for applets so that // they don't get their "you're changing position" signals through @@ -578,7 +578,7 @@ void ExtensionContainer::enableMouseOverEffects() KickerTip::enableTipping(true); TQPoint globalPos = TQCursor::pos(); TQPoint localPos = mapFromGlobal(globalPos); - TQWidget* child = tqchildAt(localPos); + TQWidget* child = childAt(localPos); if (child) { @@ -1408,11 +1408,11 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e) // KPanelExtension::Left/Right don't seem to draw the separators at all! if (position() == KPanelExtension::Left) { rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Horizontal ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Right) { rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Horizontal ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Horizontal ); } else if (position() == KPanelExtension::Top) { // Nastiness to both vertically flip the PE_Separator @@ -1420,14 +1420,14 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e) TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - TQColorGroup darkcg = tqcolorGroup(); - darkcg.setColor(TQColorGroup::Light, tqcolorGroup().dark()); + TQColorGroup darkcg = colorGroup(); + darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); p.drawPixmap(0,height()-2,inv_pm); } else { rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); - tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, tqcolorGroup(), TQStyle::Style_Default ); + tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &p, rect, colorGroup(), TQStyle::Style_Default ); } } } @@ -1444,7 +1444,7 @@ void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a) return; } - m_extension->tqsetAlignment(a); + m_extension->setAlignment(a); } void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) @@ -1551,7 +1551,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, if (a != m_settings.alignment()) { m_settings.setAlignment(a); - tqsetAlignment(a); + setAlignment(a); } if (XineramaScreen != xineramaScreen()) @@ -1777,7 +1777,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.bottomRight().y() << ")" << endl;*/ - TQSize hint = tqsizeHint(p, workArea.size()).boundedTo(workArea.size()); + TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); int width = 0; int height = 0; diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 3c7894db6..c6347ba08 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -66,7 +66,7 @@ public: TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const; + virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } @@ -101,7 +101,7 @@ public: bool reserveStrut() const; KPanelExtension::Alignment tqalignment() const; - void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } + void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } TQRect currentGeometry() const; TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index 00d781b98..20f6720d7 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -1430,7 +1430,7 @@ void ContainerArea::setBackground() if (KickerSettings::transparent() && (KickerSettings::menubarPanelTransparent() || - !ExtensionManager::the()->isMenuBar(tqtopLevelWidget()))) + !ExtensionManager::the()->isMenuBar(topLevelWidget()))) { if (!_rootPixmap) { @@ -1639,7 +1639,7 @@ void ContainerArea::moveDragIndicator(int pos) void ContainerArea::updateBackground( const TQPixmap& pm ) { - TQBrush bgBrush(tqcolorGroup().background(), pm); + TQBrush bgBrush(colorGroup().background(), pm); TQPalette pal = kapp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); @@ -1728,13 +1728,13 @@ void ContainerArea::setPosition(KPanelExtension::Position p) //tqrepaint(); } -void ContainerArea::tqsetAlignment(KPanelExtension::Alignment a) +void ContainerArea::setAlignment(KPanelExtension::Alignment a) { for (BaseContainer::ConstIterator it = m_containers.begin(); it != m_containers.end(); ++it) { - (*it)->tqsetAlignment(a); + (*it)->setAlignment(a); } } @@ -1958,8 +1958,8 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().base() ); + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + TQStyle::Style_Default, colorGroup().base() ); } void DragIndicator::mousePressEvent(TQMouseEvent*) diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index 3dc494798..8b473124e 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -101,7 +101,7 @@ public slots: void removeContainers(BaseContainer::List containers); void takeContainer(BaseContainer* a); void setPosition(KPanelExtension::Position p); - void tqsetAlignment(KPanelExtension::Alignment a); + void setAlignment(KPanelExtension::Alignment a); void slotSaveContainerConfig(); void tqrepaint(); void showAddAppletDialog(); diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index e33a78518..dc325597b 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -81,7 +81,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const } else { - return item->tqsizeHint().height(); + return item->sizeHint().height(); } } @@ -94,7 +94,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const } else { - return item->tqsizeHint().width(); + return item->sizeHint().width(); } } @@ -415,7 +415,7 @@ TQWidget* ContainerAreaLayout::widgetAt(int index) const return m_items[index]->item->widget(); } -TQSize ContainerAreaLayout::tqsizeHint() const +TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); @@ -429,7 +429,7 @@ TQSize ContainerAreaLayout::tqsizeHint() const } } -TQSize ContainerAreaLayout::tqminimumSize() const +TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 41a104929..4edeb8be2 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -83,8 +83,8 @@ class ContainerAreaLayout : public TQLayout void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); TQStringList listItems() const; TQWidget* widgetAt(int index) const; - TQSize tqsizeHint() const; - TQSize tqminimumSize() const; + TQSize sizeHint() const; + TQSize minimumSize() const; TQLayoutIterator iterator(); void setGeometry(const TQRect& rect); diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index d3ec91e2c..00b0eeae3 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar() KMenuBar tmpmenu; tmpmenu.insertItem("KDE Rocks!"); m_menubarPanel->setSize(KPanelExtension::SizeCustom, - tmpmenu.tqsizeHint().height()); + tmpmenu.sizeHint().height()); m_menubarPanel->writeConfig(); emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui index 8a86f366d..f76942c94 100644 --- a/kicker/kicker/core/kmenubase.ui +++ b/kicker/kicker/core/kmenubase.ui @@ -55,13 +55,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>52</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>52</height> @@ -129,13 +129,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>20</height> @@ -241,7 +241,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>90</width> <height>24</height> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>14</width> <height>20</height> diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index e6b7e3d60..af24e50da 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -156,8 +156,8 @@ void MenuManager::kmenuAccelActivated() r = desktop->geometry(); else r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); - // kMenu->rect() is not valid before showing, use tqsizeHint() - p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->tqsizeHint()).center(); + // kMenu->rect() is not valid before showing, use sizeHint() + p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center(); m_kmenu->popup(p); // when the cursor is in the area where the menu pops up, @@ -170,8 +170,8 @@ void MenuManager::kmenuAccelActivated() { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't - // shown before, so we resize it here according to its tqsizeHint(). - const TQSize size = m_kmenu->tqsizeHint(); + // shown before, so we resize it here according to its sizeHint(). + const TQSize size = m_kmenu->sizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu->widget()); diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index d11c14c28..73fa0c2b0 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -100,7 +100,7 @@ void PanelExtension::populateContainerArea() { _containerArea->show(); - if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget())) + if (ExtensionManager::the()->isMainPanel(topLevelWidget())) { setObjId("Panel"); _containerArea->initialize(true); @@ -139,7 +139,7 @@ void PanelExtension::positionChange(Position p) _containerArea->setPosition(p); } -TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const +TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const { TQSize size; diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index 61e6c229c..c7882291f 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -80,7 +80,7 @@ k_dcop: void configure(); // KDE4: remove, moved to Kikcker public: - TQSize tqsizeHint(Position, TQSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kicker/kicker/plugins/beaglesearch.cpp b/kicker/kicker/plugins/beaglesearch.cpp index f75f719ab..9f86c8fbd 100644 --- a/kicker/kicker/plugins/beaglesearch.cpp +++ b/kicker/kicker/plugins/beaglesearch.cpp @@ -347,7 +347,7 @@ BeagleUtil::timestringToBeagleTimestamp(TQString timestring) //kdDebug () << "datetime string:" << timestring << endl; // FIXME: error check timestring format if (timestring.isNull () || timestring.stripWhiteSpace () == "" || timestring.length() != 8 ) - return beagle_timestamp_new_from_unix_time (TQDateTime::tqcurrentDateTime ().toTime_t ()); + return beagle_timestamp_new_from_unix_time (TQDateTime::currentDateTime ().toTime_t ()); //TQDateTime dt = TQDateTime::fromString (timestring, Qt::ISODate); struct tm tm_time; time_t timet_time; diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 163a4ae9d..133df0016 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView() { m_appletBox->layout()->activate(); w = v->visibleWidth(); - h = m_appletBox->tqlayout()->tqminimumSize().height(); + h = m_appletBox->tqlayout()->minimumSize().height(); v->resizeContents(w, QMAX(h, v->visibleHeight())); if (w == m_appletBox->width() && h == m_appletBox->height()) break; @@ -456,7 +456,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) if (appletContainer) { ExtensionContainer* ec = - dynamic_cast<ExtensionContainer*>(m_containerArea->tqtopLevelWidget()); + dynamic_cast<ExtensionContainer*>(m_containerArea->topLevelWidget()); if (ec) { diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 7f4f90676..294be2463 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -157,7 +157,7 @@ void AddAppletVisualFeedback::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(Qt::black); - bufferPainter.setBrush(tqcolorGroup().background()); + bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -175,14 +175,14 @@ void AddAppletVisualFeedback::displayInternal() int textY = (height - textRect.height()) / 2; // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); } } diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui index dc6faab50..7ddb827b4 100644 --- a/kicker/kicker/ui/appletitem.ui +++ b/kicker/kicker/ui/appletitem.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -105,7 +105,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>64</height> diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index 4ba0f38e8..f5a32651b 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -110,7 +110,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>284</width> <height>20</height> diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index ee62791e9..4998fc5cf 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -429,7 +429,7 @@ void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) { KURL u( path() ); - KFileItem item( u, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, u, ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index d39fb5942..6b1dd15ef 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -78,8 +78,8 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio this, TQT_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline - resize(tqsizeHint().width() > 300 ? tqsizeHint().width() : 300, - tqsizeHint().height()); + resize(sizeHint().width() > 300 ? sizeHint().width() : 300, + sizeHint().height()); } void PanelExeDialog::slotOk() diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index fb5cfd422..34b3b310f 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -57,7 +57,7 @@ void BackFrame::drawContents( TQPainter *p ) { TQColor gray( 230, 230, 230 ); if ( mouse_inside ) - p->fillRect( 3, 3, width() - 6, height() - 6, tqcolorGroup().color( TQColorGroup::Highlight ) ); + p->fillRect( 3, 3, width() - 6, height() - 6, colorGroup().color( TQColorGroup::Highlight ) ); else p->fillRect( 3, 3, width() - 6, height() - 6, gray ); p->setPen( gray.dark(110) ); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 58bde0457..77e1dc22c 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -51,22 +51,22 @@ void HideButton::drawButton(TQPainter *p) { if (m_arrow == Qt::LeftArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } else if (m_arrow == Qt::RightArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, 0, 0, height()); } else if (m_arrow == Qt::UpArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } else if (m_arrow == Qt::DownArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, 0, width(), 0); } diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index f9ab06006..dbe1ee29a 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -166,7 +166,7 @@ void KMenuItem::setup() void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) { ItemView *listview = static_cast<ItemView*>( listView() ); - int bottom = listView()->tqitemRect( this ).bottom(); + int bottom = listView()->itemRect( this ).bottom(); int diff = bottom - listView()->viewport()->height(); KPixmap pm; @@ -608,7 +608,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos ) if ( item->toolTip().isNull() ) return; - TQRect r = view->tqitemRect( item ); + TQRect r = view->itemRect( item ); int headerPos = view->header()->sectionPos( 0 ); r.setLeft( headerPos ); r.setRight( headerPos + view->header()->sectionSize( 0 ) ); @@ -915,7 +915,7 @@ void ItemView::contentsMousePressEvent ( TQMouseEvent * e ) KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) ); if ( si ) { - if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) ) + if ( si->hitsLink( vp - itemRect(si).topLeft() ) ) emit startURL( si->linkUrl() ); } } @@ -928,7 +928,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) bool link_cursor = false; KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( i ); if ( si ) - link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() ); + link_cursor = si->hitsLink( vp - itemRect(si).topLeft() ); if (i && !i->isSelectable() && !link_cursor) { unsetCursor(); @@ -965,7 +965,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e ) { KListView::resizeEvent( e ); // if ( m_lastOne ) -// int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height(); +// int diff = itemRect( m_lastOne ).bottom() - viewport()->height(); } void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) @@ -1052,7 +1052,7 @@ TQDragObject * ItemView::dragObject() else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) { TQString uri = kitem->path(); - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1103,7 +1103,7 @@ const char * KMenuItemDrag::format(int i) const return 0; } -TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const +TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const { if (TQString("application/kmenuitem") == mimeType) return a; @@ -1138,7 +1138,7 @@ bool ItemView::acceptDrag (TQDropEvent* event) const bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) { - TQByteArray a = e->tqencodedData("application/kmenuitem"); + TQByteArray a = e->encodedData("application/kmenuitem"); if (a.isEmpty()) { TQStringList l; @@ -1211,7 +1211,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index 2a6b7e68b..c8b95ee42 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -248,7 +248,7 @@ class KMenuItemDrag : public TQDragObject ~KMenuItemDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, KMenuItemInfo& item); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 6953143c9..d43e3b17a 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -211,7 +211,7 @@ void PanelKMenu::paletteChanged() if (!loadSidePixmap()) { sidePixmap = sideTilePixmap = TQPixmap(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } } @@ -584,7 +584,7 @@ void PanelKMenu::showMenu() TQRect PanelKMenu::sideImageRect() { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), height() - 2*frameWidth() ), this ); } @@ -595,21 +595,21 @@ void PanelKMenu::resizeEvent(TQResizeEvent * e) PanelServiceMenu::resizeEvent(e); - setFrameRect( TQStyle::tqvisualRect( TQRect( sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0, width() - sidePixmap.width(), height() ), this ) ); } //Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. void PanelKMenu::resize(int width, int height) { - width = kMax(width, tqmaximumSize().width()); + width = kMax(width, maximumSize().width()); PanelServiceMenu::resize(width, height); } -TQSize PanelKMenu::tqsizeHint() const +TQSize PanelKMenu::sizeHint() const { - TQSize s = PanelServiceMenu::tqsizeHint(); -// kdDebug(1210) << "PanelKMenu::tqsizeHint()" << endl; + TQSize s = PanelServiceMenu::sizeHint(); +// kdDebug(1210) << "PanelKMenu::sizeHint()" << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl; return s; } @@ -626,7 +626,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index f7ad2ee77..53a29d809 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -59,7 +59,7 @@ public: int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setMinimumSize(const TQSize &); virtual void setMaximumSize(const TQSize &); virtual void setMinimumSize(int, int); diff --git a/kicker/kicker/ui/k_mnu_stub.cpp b/kicker/kicker/ui/k_mnu_stub.cpp index 16e755d48..b02d2bcbf 100644 --- a/kicker/kicker/ui/k_mnu_stub.cpp +++ b/kicker/kicker/ui/k_mnu_stub.cpp @@ -97,11 +97,11 @@ void KMenuStub::resize(int w, int h) return m_w.panelkmenu->resize(w, h); } -TQSize KMenuStub::tqsizeHint() const +TQSize KMenuStub::sizeHint() const { if(m_type == t_KMenu) - return m_w.kmenu->tqsizeHint(); - return m_w.panelkmenu->tqsizeHint(); + return m_w.kmenu->sizeHint(); + return m_w.panelkmenu->sizeHint(); } bool KMenuStub::highlightMenuItem( const TQString &menuId ) diff --git a/kicker/kicker/ui/k_mnu_stub.h b/kicker/kicker/ui/k_mnu_stub.h index 17fe92b7c..362d132b2 100644 --- a/kicker/kicker/ui/k_mnu_stub.h +++ b/kicker/kicker/ui/k_mnu_stub.h @@ -53,7 +53,7 @@ public: void popup(const TQPoint &pos, int indexAtPoint = -1); void selectFirstItem(); void resize(int, int); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool highlightMenuItem( const TQString &menuId ); void clearRecentMenuItems(); void initialize(); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index e27f47d88..facc0975e 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -302,7 +302,7 @@ KMenu::KMenu() m_searchInternet->setPixmap(0,icon); setTabOrder(m_kcommand, m_searchResultsWidget); - m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty(); + m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty(); m_isShowing = false; if (!m_kerryInstalled) { @@ -421,7 +421,7 @@ void KMenu::setupUi() { m_stacker = new TQWidgetStack( this, "m_stacker" ); m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); - m_stacker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); + m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); // m_stacker->setFocusPolicy( TQ_StrongFocus ); m_stacker->setLineWidth( 0 ); @@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) m_sloppySourceClicked = true; if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { - int timeout= tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); + int timeout= tqstyle().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); if (m_sloppySourceClicked) timeout = 3000; m_sloppyTimer.start(timeout); @@ -1699,14 +1699,14 @@ void KMenu::setOrientation(MenuOrientation orientation) TQWidget *footer = m_footer->mainWidget(); TQPixmap pix( 64, footer->height() ); TQPainter p( &pix ); - p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) ); + p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) ); p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0, 64, 3, KNewButton::self()->borderColor() ); p.end(); footer->setPaletteBackgroundPixmap( pix ); } - resizeEvent(new TQResizeEvent(tqsizeHint(), tqsizeHint())); + resizeEvent(new TQResizeEvent(sizeHint(), sizeHint())); } void KMenu::showMenu() @@ -1762,7 +1762,7 @@ void KMenu::paintEvent(TQPaintEvent * e) const BackgroundMode bgmode = backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - p.setBrush( tqcolorGroup().brush( crole ) ); + p.setBrush( colorGroup().brush( crole ) ); p.drawRect( 0, 0, width(), height() ); int ypos = m_search->mainWidget()->geometry().bottom(); @@ -1923,7 +1923,7 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_tqcurrentDate = TQDate::currentDate().toString(Qt::ISODate); + m_currentDate = TQDate::currentDate().toString(Qt::ISODate); bool initialize = (m_seenPrograms.count() == 0); @@ -1978,7 +1978,7 @@ void KMenu::createNewProgramList(TQString relPath) if (!found) { m_seenProgramsChanged=true; m_seenPrograms+=shortStorageId; - m_seenPrograms+=m_tqcurrentDate; + m_seenPrograms+=m_currentDate; if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } @@ -2744,7 +2744,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupPath.path = kitem->path(); m_popupPath.icon = kitem->icon(); - if (m_popupPath.path.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } @@ -2936,7 +2936,7 @@ void KMenu::slotContextMenu(int selected) case EditMenu: accept(); proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); break; @@ -3074,24 +3074,24 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // put the search widget at the top of the menu and give it its desired // height m_search->mainWidget()->setGeometry( 0, ypos, width(), - m_search->tqminimumSize().height() ); - left_height -= m_search->tqminimumSize().height(); - ypos += m_search->tqminimumSize().height(); + m_search->minimumSize().height() ); + left_height -= m_search->minimumSize().height(); + ypos += m_search->minimumSize().height(); // place the footer widget at the bottom of the menu and give it its desired // height - m_footer->mainWidget()->setGeometry( 0, height() - m_footer->tqminimumSize().height(), - width(), m_footer->tqminimumSize().height() ); - left_height -= m_footer->tqminimumSize().height(); + m_footer->mainWidget()->setGeometry( 0, height() - m_footer->minimumSize().height(), + width(), m_footer->minimumSize().height() ); + left_height -= m_footer->minimumSize().height(); // place the button box above the footer widget, horizontal placement // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), - height() - m_footer->tqminimumSize().height() - - m_tabBar->tqsizeHint().height(), + height() - m_footer->minimumSize().height() - + m_tabBar->sizeHint().height(), width() - button_box_left.width(), - m_tabBar->tqsizeHint().height() ); - left_height -= m_tabBar->tqsizeHint().height(); + m_tabBar->sizeHint().height() ); + left_height -= m_tabBar->sizeHint().height(); // place the main (stacker) widget below the search widget, // in the remaining vertical space @@ -3105,28 +3105,28 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // place the 'footer' widget at the top of the menu and give it // its desired height m_footer->mainWidget()->setGeometry( 0, - ypos /*height() - m_footer->tqminimumSize().height()*/, + ypos /*height() - m_footer->minimumSize().height()*/, width(), - m_footer->tqminimumSize().height() ); - ypos += m_footer->tqminimumSize().height(); - left_height -= m_footer->tqminimumSize().height(); + m_footer->minimumSize().height() ); + ypos += m_footer->minimumSize().height(); + left_height -= m_footer->minimumSize().height(); // place the button box next at the top of the menu. // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), ypos, width() - button_box_left.width(), - m_tabBar->tqsizeHint().height()); + m_tabBar->sizeHint().height()); - ypos += m_tabBar->tqsizeHint().height(); - left_height -= m_tabBar->tqsizeHint().height(); + ypos += m_tabBar->sizeHint().height(); + left_height -= m_tabBar->sizeHint().height(); // put the search widget above the footer widget // height m_search->mainWidget()->setGeometry( 0, - height() - m_search->tqminimumSize().height(), + height() - m_search->minimumSize().height(), width(), - m_search->tqminimumSize().height() + m_search->minimumSize().height() ); - left_height -= m_search->tqminimumSize().height(); + left_height -= m_search->minimumSize().height(); // place the main (stacker) widget below the button box, // in the remaining vertical space @@ -3167,14 +3167,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e ) if ( hasMouseTracking() && m_isresizing ) { m_stacker->setMinimumSize( TQSize(0, 0) ); m_stacker->setMaximumSize( TQSize(32000, 32000) ); - int newWidth = QMAX( e->x() - x(), tqminimumSizeHint().width() ); + int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() ); if ( m_orientation == BottomUp ) { - int newHeight = QMAX( height() - e->y(), tqminimumSizeHint().height() + 10 ); + int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 ); int newY = y() + height() - newHeight; setGeometry( x(), newY, newWidth, newHeight); } else { - setGeometry( x(), y(), newWidth, QMAX( e->y(), tqminimumSizeHint().height() + 10 )); + setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 )); } } } @@ -3331,7 +3331,7 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service) RecentlyLaunchedApps::the().m_bNeedToUpdate = true; } -TQSize KMenu::tqsizeHint() const +TQSize KMenu::sizeHint() const { #warning FIXME // this should be only for the inner area so layout changes do not break it @@ -3339,28 +3339,28 @@ TQSize KMenu::tqsizeHint() const const int height = kMin(KickerSettings::kMenuHeight(), TQApplication::desktop()->screen()->height()-50); TQSize wanted(width, height); - kdDebug() << "show " << tqminimumSizeHint() << " " << m_stacker->tqminimumSizeHint() << " " - << m_searchFrame->tqminimumSizeHint() << " " << wanted << endl; + kdDebug() << "show " << minimumSizeHint() << " " << m_stacker->minimumSizeHint() << " " + << m_searchFrame->minimumSizeHint() << " " << wanted << endl; bool isDefault = wanted.isNull(); - wanted = wanted.expandedTo(tqminimumSizeHint()); + wanted = wanted.expandedTo(minimumSizeHint()); if ( isDefault ) - wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->tqminimumSizeHint().height() ) ); + wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->minimumSizeHint().height() ) ); return wanted; } -TQSize KMenu::tqminimumSizeHint() const +TQSize KMenu::minimumSizeHint() const { TQSize minsize; - minsize.setWidth( minsize.width() + m_tabBar->tqsizeHint().width() ); + minsize.setWidth( minsize.width() + m_tabBar->sizeHint().width() ); minsize.setWidth( QMAX( minsize.width(), - m_search->tqminimumSize().width() ) ); + m_search->minimumSize().width() ) ); minsize.setWidth( QMAX( minsize.width(), - m_search->tqminimumSize().width() ) ); + m_search->minimumSize().width() ) ); minsize.setHeight( minsize.height() + - m_search->tqminimumSize().height() + - m_footer->tqminimumSize().height() + + m_search->minimumSize().height() + + m_footer->minimumSize().height() + 180 ); // 180 is a very rough guess for 32 icon size return minsize; } @@ -3558,7 +3558,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) else { TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index 73549cfa0..ef45ef815 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -104,8 +104,8 @@ public: enum MaskEffect { Plain, Dissolve }; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; void searchOver(); void initCategoryTitlesUpdate(); @@ -319,7 +319,7 @@ private: TQStringList m_programsInMenu; TQStringList m_newInstalledPrograms, m_seenPrograms; bool m_seenProgramsChanged; - TQString m_tqcurrentDate; + TQString m_currentDate; MenuOrientation m_orientation; bool m_toolTipsEnabled; diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index 6a41a719b..bf90263e0 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -58,8 +58,8 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const //selection flags if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), - tqcolorGroup(), flags, TQStyleOption(t) ); + tqstyle().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), + colorGroup(), flags, TQStyleOption(t) ); paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); } @@ -70,7 +70,7 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha TQRect r = br; bool selected = m_tabsActivated && (currentTab() == t->identifier()); - int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); p->setFont( font() ); TQFontMetrics fm = p->fontMetrics(); @@ -116,14 +116,14 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha // flags |= TQStyle::Style_Sunken; if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt, - t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(), + tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, rt, + t->isEnabled() ? colorGroup(): tqpalette().disabled(), flags, TQStyleOption(t) ); } -TQSize KickoffTabBar::tqsizeHint() const +TQSize KickoffTabBar::sizeHint() const { - TQSize s = TQTabBar::tqsizeHint(); + TQSize s = TQTabBar::sizeHint(); return s; } @@ -135,9 +135,9 @@ void KickoffTabBar::layoutTabs() TQFontMetrics fm = fontMetrics(); int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; - int hframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); - int overlap = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); + int hframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int overlap = tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQSize s; for (int t = 0; t < count(); ++t) diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 55f94c3dd..2330ffe39 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -32,7 +32,7 @@ public: KickoffTabBar(TQWidget* parent, const char* name); void deactivateTabs(bool b); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: virtual void paint(TQPainter*, TQTab*, bool) const; diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui index 0b49763a1..113fc905b 100644 --- a/kicker/kicker/ui/kmenuitembase.ui +++ b/kicker/kicker/ui/kmenuitembase.ui @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -120,7 +120,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>64</height> diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui index a3f04e6a8..187dd7cb5 100644 --- a/kicker/kicker/ui/nonKDEButtonSettings.ui +++ b/kicker/kicker/ui/nonKDEButtonSettings.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -140,13 +140,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>58</width> <height>58</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>58</width> <height>58</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index c9e545417..1e15179f7 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -69,11 +69,11 @@ public: m_font.setBold(true); } - TQSize tqsizeHint() + TQSize sizeHint() { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index ee0414644..982586c2f 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -695,7 +695,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditItem: proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); break; @@ -739,7 +739,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditMenu: proc = new KProcess(TQT_TQOBJECT(this)); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); break; diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 3265c428c..6f6f3a7fb 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -161,7 +161,7 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); + KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; delete kickerconfig; @@ -236,13 +236,13 @@ TQPoint popupPosition(KPanelApplet::Direction d, { case KPanelApplet::Left: case KPanelApplet::Right: - r.setLeft( source->tqtopLevelWidget()->x() ); - r.setWidth( source->tqtopLevelWidget()->width() ); + r.setLeft( source->topLevelWidget()->x() ); + r.setWidth( source->topLevelWidget()->width() ); break; case KPanelApplet::Up: case KPanelApplet::Down: - r.setTop( source->tqtopLevelWidget()->y() ); - r.setHeight( source->tqtopLevelWidget()->height() ); + r.setTop( source->topLevelWidget()->y() ); + r.setHeight( source->topLevelWidget()->height() ); break; } } diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index e1975a693..97df6918d 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -392,8 +392,8 @@ void KickerTip::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(tqcolorGroup().foreground()); - bufferPainter.setBrush(tqcolorGroup().background()); + bufferPainter.setPen(colorGroup().foreground()); + bufferPainter.setBrush(colorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); @@ -409,13 +409,13 @@ void KickerTip::displayInternal() if (KickerSettings::mouseOversShowText()) { // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, textX, textY, rect(), cg); } } diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 8d2e6acdb..5c3e960cd 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", TQString::tqfromLatin1("kicker/menuext/%1").arg(desktopFile))); + KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-KDE-AuthorizeAction"); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 4d60068a8..6d628a7e9 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -559,7 +559,7 @@ void PanelButton::drawButton(TQPainter *p) else if (isDown() || isOn()) { // Draw tqshapes to indicate the down state. - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken); + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -569,8 +569,8 @@ void PanelButton::drawButton(TQPainter *p) int x1, y1, x2, y2; TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().button()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + TQStyle::Style_Default, colorGroup().button()); } } @@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); + tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -595,10 +595,10 @@ void PanelButton::drawDeepButton(TQPainter *p) TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2); if (isDown() || isOn()) { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Down); + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Down); } else { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, tqcolorGroup(), TQStyle::Style_Raised); + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, p, btn_rect, colorGroup(), TQStyle::Style_Raised); } drawButtonLabel(p,0,FALSE); @@ -608,8 +608,8 @@ void PanelButton::drawDeepButton(TQPainter *p) int x1, y1, x2, y2; TQT_TQRECT_OBJECT(rect()).coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().button()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + TQStyle::Style_Default, colorGroup().button()); } } @@ -718,7 +718,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) if (m_drawArrow && (m_highlight || active) && drawArrow) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; - int arrowSize = tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator); + int arrowSize = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) @@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow) { flags |= TQStyle::Style_Down; } - tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags); } } diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp index 28721d3f7..1fb6b9ce6 100644 --- a/kicker/libkicker/paneldrag.cpp +++ b/kicker/libkicker/paneldrag.cpp @@ -46,7 +46,7 @@ PanelDrag::~PanelDrag() bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container) { - TQByteArray a = e->tqencodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { @@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return false; } - TQByteArray a = e->tqencodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { return false; @@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return true; } -TQByteArray PanelDrag::tqencodedData(const char * mimeType) const +TQByteArray PanelDrag::encodedData(const char * mimeType) const { if (TQString("application/basecontainerptr") == mimeType && a.size() == PANELDRAG_BUFSIZE) @@ -136,7 +136,7 @@ const char * AppletInfoDrag::format(int i) const return 0; } -TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const +TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const { if (TQString("application/appletinfo") == mimeType) { @@ -158,7 +158,7 @@ bool AppletInfoDrag::canDecode(const TQMimeSource * e) bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container) { - TQByteArray a = e->tqencodedData("application/appletinfo"); + TQByteArray a = e->encodedData("application/appletinfo"); if (a.isEmpty()) { diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index 7388f4dbc..6684c32c6 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -39,7 +39,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject ~PanelDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, BaseContainer** container); @@ -55,7 +55,7 @@ class KDE_EXPORT AppletInfoDrag : public TQDragObject ~AppletInfoDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, AppletInfo& container); diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index 1dc592bbd..ddb990d8d 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -103,8 +103,8 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::LeftArrow); _rdSB->setArrowType(Qt::RightArrow); - _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); TQToolTip::add(_rdSB, i18n("Scroll right")); setMinimumSize(24, 0); @@ -117,8 +117,8 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::UpArrow); _rdSB->setArrowType(Qt::DownArrow); - _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); - _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQToolTip::add(_luSB, i18n("Scroll up")); TQToolTip::add(_rdSB, i18n("Scroll down")); setMinimumSize(0, 24); diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index 2f09d76f1..7ae68d096 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -39,7 +39,7 @@ public: Panner( TQWidget* parent, const char* name = 0 ); ~Panner(); - TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); } + TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } Qt::Orientation orientation() const { return _orient; } virtual void setOrientation(Qt::Orientation orientation); diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 4aa0b9ff3..bc85c4521 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -71,22 +71,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::tqsizeHint() const +TQSize SimpleButton::sizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqsizeHint(); + return TQButton::sizeHint(); else return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); } -TQSize SimpleButton::tqminimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqminimumSizeHint(); + return TQButton::minimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p ) if (m_highlight || isDown() || isOn()) { int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonTool, p, r, colorGroup(), flags); } } @@ -229,7 +229,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons _inside = false; } -TQSize SimpleArrowButton::tqsizeHint() const +TQSize SimpleArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -263,7 +263,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); + tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags); if (m_forceStandardCursor) { SimpleButton::drawButton(p); diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index 8e4c13896..bbfcbd79d 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public TQButton SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -68,7 +68,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); virtual ~SimpleArrowButton() {}; - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index f2689bc1f..f12a58063 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -109,7 +109,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); - m_runEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); runLayout->addWidget(m_runEdit, 10); runLayout->addSpacing(KDialog::spacingHint()); @@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().tqdrawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -736,13 +736,13 @@ void TOM::setMaximumSize(int w, int h) TQRect TOM::sideImageRect() { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), height() - 2*frameWidth() ), this ); } void TOM::resizeEvent(TQResizeEvent * e) { - setFrameRect( TQStyle::tqvisualRect( TQRect( m_sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0, width() - m_sidePixmap.width(), height() ), this ) ); } @@ -757,7 +757,7 @@ void TOM::paintEvent(TQPaintEvent * e) tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 0f18914f3..e556dd2a3 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -372,14 +372,14 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "tqsetAlignment(int)" ) + else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int tqalignment; dataStream >> tqalignment; if(_applet) { - _applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment ); + _applet->setAlignment( (KPanelApplet::Alignment)tqalignment ); } return true; } diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index d4b4d67d6..8fc230352 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID) bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - if ( fun == "tqsizeHint(int,TQSize)" ) + if ( fun == "sizeHint(int,TQSize)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int pos; @@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, if(!_extension) reply << maxSize; else - reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); + reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize); return true; } @@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "tqsetAlignment(int)" ) + else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int tqalignment; dataStream >> tqalignment; if(_extension) { - _extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); + _extension->setAlignment( (KPanelExtension::Alignment)tqalignment ); } return true; } diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 4da304daf..2dcddc22d 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -66,7 +66,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) blocklayout = true; // init - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) @@ -160,7 +160,7 @@ KTextShadowEngine *TaskBar::textShadowEngine() } -TQSize TaskBar::tqsizeHint() const +TQSize TaskBar::sizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -171,7 +171,7 @@ TQSize TaskBar::tqsizeHint() const return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -TQSize TaskBar::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -898,9 +898,9 @@ void TaskBar::propagateMouseEvent( TQMouseEvent* e ) { if ( !isTopLevel() ) { - TQMouseEvent me( e->type(), mapTo( tqtopLevelWidget(), e->pos() ), + TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( tqtopLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 40b02b6ea..9f56565e3 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -47,8 +47,8 @@ public: TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - TQSize tqsizeHint() const; - TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize sizeHint() const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); void setArrowType( TQt::ArrowType at ); diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 404c27e24..938487dfc 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -135,7 +135,7 @@ void TaskBarContainer::configure() windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->tqsizeHint()); + windowListButton->setMinimumSize(windowListButton->sizeHint()); layout->insertWidget(0, windowListButton); windowListButton->show(); } @@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->tqsizeHint()); + windowListButton->setMinimumSize(windowListButton->sizeHint()); } } @@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu() pos.setX( pos.x() + width() ); break; case KPanelApplet::Left: - pos.setX( pos.x() - windowListMenu->tqsizeHint().width() ); + pos.setX( pos.x() - windowListMenu->sizeHint().width() ); break; case KPanelApplet::Down: pos.setY( pos.y() + height() ); break; case KPanelApplet::Up: - pos.setY( pos.y() - windowListMenu->tqsizeHint().height() ); + pos.setY( pos.y() - windowListMenu->sizeHint().height() ); default: break; } @@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton() connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); } -TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { - TQSize size = taskBar->tqsizeHint( p, maxSize ); + TQSize size = taskBar->sizeHint( p, maxSize ); if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) { return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); } diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index e0e4f0dce..87a55c2b9 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -48,7 +48,7 @@ public: void popupDirectionChange( KPanelApplet::Direction ); void preferences(); //FIXME: don't use Position, use Orientation - TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setBackground(); k_dcop: diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 7d0e4d3cd..115e61610 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -315,7 +315,7 @@ void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -583,8 +583,8 @@ void TaskContainer::drawButton(TQPainter *p) bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool reverse = TQApplication::reverseLayout(); TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); - TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), - tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); + TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), + tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) @@ -653,7 +653,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw modified overlay if (!modPixmap.isNull()) { - TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos, + TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -670,7 +670,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw text if (!text.isEmpty()) { - TQRect tr = TQStyle::tqvisualRect(TQRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; @@ -787,7 +787,7 @@ void TaskContainer::drawButton(TQPainter *p) } int flags = TQStyle::Style_Enabled; - TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2, + TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { @@ -799,7 +799,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); if (aboutToActivate) { @@ -1161,17 +1161,17 @@ void TaskContainer::popupMenu(int action) pos.setX(pos.x() + width()); break; case LeftArrow: - pos.setX(pos.x() - m_menu->tqsizeHint().width()); + pos.setX(pos.x() - m_menu->sizeHint().width()); break; case DownArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); - pos.setY(pos.y() - m_menu->tqsizeHint().height()); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); + pos.setY(pos.y() - m_menu->sizeHint().height()); break; default: break; diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index af7f6e854..bd8ef360c 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg, p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -TQSize TaskMenuItem::tqsizeHint() +TQSize TaskMenuItem::sizeHint() { TQFont font = TQFont(); if (m_isActive) diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 973cf666f..7eedc115b 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -38,7 +38,7 @@ public: ~TaskMenuItem(); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - TQSize tqsizeHint(); + TQSize sizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index f6cff4248..5fca31774 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e) Task::List TaskDrag::decode( const TQMimeSource* e ) { - TQByteArray data(e->tqencodedData("taskbar/task")); + TQByteArray data(e->encodedData("taskbar/task")); Task::List tasks; if (data.size()) diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc index 5ae1a8867..8392dd160 100644 --- a/kioslave/filter/filter.cc +++ b/kioslave/filter/filter.cc @@ -56,7 +56,7 @@ int kdemain( int argc, char ** argv) FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app ) : KIO::SlaveBase( protocol, pool, app ) { - TQString mimetype = TQString::tqfromLatin1("application/x-") + TQString::tqfromLatin1(protocol); + TQString mimetype = TQString::fromLatin1("application/x-") + TQString::fromLatin1(protocol); filter = KFilterBase::findFilterByMimeType( mimetype ); Q_ASSERT(filter); } @@ -157,7 +157,7 @@ void FilterProtocol::get( const KURL & ) void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ ) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("put")); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put")); } void FilterProtocol::setSubURL(const KURL &url) diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index 2f0210dbd..95c91dc2c 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -1436,7 +1436,7 @@ void fishProtocol::run() { if (rc > 0) { int noff = received(buf,rc+offset); if (noff > 0) memmove(buf,buf+offset+rc-noff,noff); - //myDebug( << "left " << noff << " bytes: " << TQString::tqfromLatin1(buf,offset) << endl); + //myDebug( << "left " << noff << " bytes: " << TQString::fromLatin1(buf,offset) << endl); offset = noff; } else { if (errno == EINTR) diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index 742d788bf..a64340b8f 100644 --- a/kioslave/ldap/kio_ldap.cpp +++ b/kioslave/ldap/kio_ldap.cpp @@ -166,8 +166,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls, { TQString oid; bool critical; TQByteArray value; int i = 0; - while ( hasMetaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "server ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << @@ -176,8 +176,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls, i++; } i = 0; - while ( hasMetaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "client ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << @@ -519,7 +519,7 @@ void LDAPProtocol::fillAuthInfo( AuthInfo &info ) info.url.setPort( mPort ); info.url.setUser( mUser ); info.caption = i18n("LDAP Login"); - info.comment = TQString::tqfromLatin1( mProtocol ) + "://" + mHost + ":" + + info.comment = TQString::fromLatin1( mProtocol ) + "://" + mHost + ":" + TQString::number( mPort ); info.commentLabel = i18n("site:"); info.username = mAuthSASL ? mUser : mBindName; diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp index 245af6fcf..e64d22d65 100644 --- a/kioslave/mac/kio_mac.cpp +++ b/kioslave/mac/kio_mac.cpp @@ -455,12 +455,12 @@ int MacProtocol::makeTime(TQString mday, TQString mon, TQString third) { // otherwise it only prints the year TQRegExp hourMin("(..):(..)"); if (hourMin.exactMatch(third)) { - TQDate tqcurrentDate(TQDate::currentDate()); + TQDate currentDate(TQDate::currentDate()); - if (month > tqcurrentDate.month()) { - year = tqcurrentDate.year() - 1; + if (month > currentDate.month()) { + year = currentDate.year() - 1; } else { - year = tqcurrentDate.year(); + year = currentDate.year(); } TQString h(hourMin.cap(1)); TQString m(hourMin.cap(2)); diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index 7cec22c27..c94c9b2c6 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -404,7 +404,7 @@ void MANProtocol::output(const char *insert) { m_outputBuffer.close(); data(m_outputBuffer.buffer()); - m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); + m_outputBuffer.setBuffer(TQByteArray()); m_outputBuffer.open(IO_WriteOnly); } } @@ -505,7 +505,7 @@ void MANProtocol::get(const KURL& url ) m_outputBuffer.close(); data(m_outputBuffer.buffer()); - m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); + m_outputBuffer.setBuffer(TQByteArray()); // tell we are done data(TQByteArray()); } diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui index d5d42a066..8a088f7cf 100644 --- a/kioslave/media/kcmodule/managermoduleview.ui +++ b/kioslave/media/kcmodule/managermoduleview.ui @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>360</height> diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui index 50f93bc40..ad508c03d 100644 --- a/kioslave/media/kcmodule/notifiermoduleview.ui +++ b/kioslave/media/kcmodule/notifiermoduleview.ui @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>101</height> diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui index 6ae357699..a6c3063f6 100644 --- a/kioslave/media/kcmodule/serviceview.ui +++ b/kioslave/media/kcmodule/serviceview.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>640</width> <height>480</height> @@ -80,13 +80,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>40</height> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index 58e2992e0..a4571fa46 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi) void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification) { kdDebug(1219) << "HALBackend::setProperties" << endl; - if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) + if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) { const Medium *cmedium = m_mediaList.findById(mediumUdi); if ( cmedium ) diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp index 9913f033d..7ba172601 100644 --- a/kioslave/media/medianotifier/notificationdialog.cpp +++ b/kioslave/media/medianotifier/notificationdialog.cpp @@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett updateActionsListBox(); - resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize(400,400).expandedTo( minimumSizeHint() ) ); m_actionWatcher = new KDirWatch(); diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui index 032ea1f10..f7bd744be 100644 --- a/kioslave/media/medianotifier/notificationdialogview.ui +++ b/kioslave/media/medianotifier/notificationdialogview.ui @@ -42,13 +42,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>64</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>64</width> <height>64</height> diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui index dfb8c17d0..1de859542 100644 --- a/kioslave/media/mounthelper/decryptdialog.ui +++ b/kioslave/media/mounthelper/decryptdialog.ui @@ -55,13 +55,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>41</height> diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui index 3c98e1eb7..51ead3a25 100644 --- a/kioslave/media/propsdlgplugin/propertiespagegui.ui +++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui @@ -352,7 +352,7 @@ Display the short name as is; store a long name when the short name is not all u <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp index d4a595c16..6e6d5b312 100644 --- a/kioslave/nfs/kio_nfs.cpp +++ b/kioslave/nfs/kio_nfs.cpp @@ -807,7 +807,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& struct passwd *user = getpwuid( uid ); if ( user ) { - m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); + m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) ); atom.m_str = user->pw_name; } else @@ -825,7 +825,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& struct group *grp = getgrgid( gid ); if ( grp ) { - m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); + m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); atom.m_str = grp->gr_name; } else diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index 8782fb80b..300f5fe32 100644 --- a/kioslave/pop3/pop3.cc +++ b/kioslave/pop3/pop3.cc @@ -242,8 +242,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len, QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4))); } - TQString command = TQString::tqfromLatin1(cmd); - TQString serverMsg = TQString::tqfromLatin1(buf).mid(5).stripWhiteSpace(); + TQString command = TQString::fromLatin1(cmd); + TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace(); if (command.left(4) == "PASS") { command = i18n("PASS <your password>"); @@ -353,7 +353,7 @@ int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai ) { char buf[512]; - TQString apop_string = TQString::tqfromLatin1("APOP "); + TQString apop_string = TQString::fromLatin1("APOP "); if (m_sUser.isEmpty() || m_sPass.isEmpty()) { // Prompt for usernames if (!openPassDlg(ai)) { @@ -461,7 +461,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) { #ifdef HAVE_LIBSASL2 char buf[512]; - TQString sasl_buffer = TQString::tqfromLatin1("AUTH"); + TQString sasl_buffer = TQString::fromLatin1("AUTH"); int result; sasl_conn_t *conn = NULL; @@ -525,13 +525,13 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) TQByteArray challenge, tmp; - TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mechusing ); + TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing ); challenge.setRawData( out, outlen ); KCodecs::base64Encode( challenge, tmp ); challenge.resetRawData( out, outlen ); if ( !tmp.isEmpty() ) { firstCommand += " "; - firstCommand += TQString::tqfromLatin1( tmp.data(), tmp.size() ); + firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() ); } challenge.resize( 2049 ); @@ -624,7 +624,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai ) m_sOldUser = m_sUser; m_sOldPass = m_sPass; - TQString one_string = TQString::tqfromLatin1("USER "); + TQString one_string = TQString::fromLatin1("USER "); one_string.append( m_sUser ); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -638,7 +638,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai ) return false; } - one_string = TQString::tqfromLatin1("PASS "); + one_string = TQString::fromLatin1("PASS "); one_string.append(m_sPass); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -1176,7 +1176,7 @@ void POP3Protocol::listDir(const KURL &) uds_url.setUser(m_sUser); uds_url.setPass(m_sPass); uds_url.setHost(m_sServer); - uds_url.setPath(TQString::tqfromLatin1("/download/%1").arg(i + 1)); + uds_url.setPath(TQString::fromLatin1("/download/%1").arg(i + 1)); atom.m_str = uds_url.url(); atom.m_long = 0; entry.append(atom); diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp index e923fe69e..2ccab59b7 100644 --- a/kioslave/sftp/ksshprocess.cpp +++ b/kioslave/sftp/ksshprocess.cpp @@ -206,7 +206,7 @@ void KSshProcess::removeSignalHandlers() { KSshProcess::KSshProcess() : mVersion(UNKNOWN_VER), mConnected(false), mRunning(false), mConnectState(0) { - mSshPath = KStandardDirs::findExe(TQString::tqfromLatin1("ssh")); + mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh")); kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << mSshPath << "]" << endl; @@ -292,7 +292,7 @@ TQString KSshProcess::versionStr() { return TQString::null; } - return TQString::tqfromLatin1(versionStrs[mVersion]); + return TQString::fromLatin1(versionStrs[mVersion]); } */ @@ -776,7 +776,7 @@ bool KSshProcess::connect() { i18n("Error encountered while talking to ssh."); mConnectState = STATE_FATAL; } - else if( line.find(TQString::tqfromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { + else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { mConnectState = STATE_TRY_PASSWD; } else if( line.find(passphrasePrompt[mVersion]) != -1 ) { diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp index d8ac6d60d..b79f95fc1 100644 --- a/kioslave/smb/kio_smb_browse.cpp +++ b/kioslave/smb/kio_smb_browse.cpp @@ -409,7 +409,7 @@ void SMBSlave::listDir( const KURL& kurl ) udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::tqfromLatin1("application/x-smb-server"); + atom.m_str = TQString::fromLatin1("application/x-smb-server"); udsentry.append(atom); } @@ -429,7 +429,7 @@ void SMBSlave::listDir( const KURL& kurl ) udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::tqfromLatin1("application/x-smb-workgroup"); + atom.m_str = TQString::fromLatin1("application/x-smb-workgroup"); udsentry.append(atom); atom.m_uds = KIO::UDS_URL; diff --git a/kioslave/smtp/capabilities.h b/kioslave/smtp/capabilities.h index 919633d64..9f9464104 100644 --- a/kioslave/smtp/capabilities.h +++ b/kioslave/smtp/capabilities.h @@ -57,7 +57,7 @@ namespace KioSMTP { return mCapabilities.find( cap.upper() ) != mCapabilities.end(); } bool have( const TQCString & cap ) const { return have( TQString( cap.data() ) ); } - bool have( const char * cap ) const { return have( TQString::tqfromLatin1( cap ) ); } + bool have( const char * cap ) const { return have( TQString::fromLatin1( cap ) ); } TQString asMetaDataString() const; diff --git a/kioslave/smtp/command.cc b/kioslave/smtp/command.cc index 41c9cf78a..2771baf82 100644 --- a/kioslave/smtp/command.cc +++ b/kioslave/smtp/command.cc @@ -321,14 +321,14 @@ static sasl_callback_t callbacks[] = { cmd = mUngetSASLResponse; mUngetSASLResponse = 0; } else if ( mFirstTime ) { - TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mMechusing ); + TQString firstCommand = "AUTH " + TQString::fromLatin1( mMechusing ); tmp.setRawData( mOut, mOutlen ); KCodecs::base64Encode( tmp, challenge ); tmp.resetRawData( mOut, mOutlen ); if ( !challenge.isEmpty() ) { firstCommand += " "; - firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() ); + firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() ); } cmd = firstCommand.latin1(); diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc index 2079666a0..6339f1ee3 100644 --- a/kioslave/tar/tar.cc +++ b/kioslave/tar/tar.cc @@ -125,7 +125,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro path.truncate( len - 1 ); } else - path = TQString::tqfromLatin1("/"); + path = TQString::fromLatin1("/"); kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl; break; } @@ -248,9 +248,9 @@ void ArchiveProtocol::listDir( const KURL & url ) if ( path.isEmpty() ) { - KURL redir( url.protocol() + TQString::tqfromLatin1( ":/") ); + KURL redir( url.protocol() + TQString::fromLatin1( ":/") ); kdDebug( 7109 ) << "url.path()==" << url.path() << endl; - redir.setPath( url.path() + TQString::tqfromLatin1("/") ); + redir.setPath( url.path() + TQString::fromLatin1("/") ); kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -360,7 +360,7 @@ void ArchiveProtocol::stat( const KURL & url ) const KArchiveEntry* archiveEntry; if ( path.isEmpty() ) { - path = TQString::tqfromLatin1( "/" ); + path = TQString::fromLatin1( "/" ); archiveEntry = root; } else { path = TQString::fromLocal8Bit(remoteEncoding()->encode(path)); diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index 4d4330ea9..344f31f74 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -78,10 +78,10 @@ TrashProtocol::TrashProtocol( const TQCString& protocol, const TQCString &pool, { struct passwd *user = getpwuid( getuid() ); if ( user ) - m_userName = TQString::tqfromLatin1(user->pw_name); + m_userName = TQString::fromLatin1(user->pw_name); struct group *grp = getgrgid( getgid() ); if ( grp ) - m_groupName = TQString::tqfromLatin1(grp->gr_name); + m_groupName = TQString::fromLatin1(grp->gr_name); } TrashProtocol::~TrashProtocol() diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp index 8718dfe5f..696d6d305 100644 --- a/kioslave/trash/trashimpl.cpp +++ b/kioslave/trash/trashimpl.cpp @@ -262,7 +262,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1(); info += "\n"; info += "DeletionDate="; - info += TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ).latin1(); + info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1(); info += "\n"; size_t sz = info.size() - 1; // avoid trailing 0 from QCString @@ -429,7 +429,7 @@ bool TrashImpl::directRename( const TQString& src, const TQString& dest ) kdDebug() << k_funcinfo << src << " -> " << dest << endl; if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) { if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename") ); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") ); } else { if (( errno == EACCES ) || (errno == EPERM)) { error( KIO::ERR_ACCESS_DENIED, dest ); diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 24b5b6a34..97eee6eec 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -91,7 +91,7 @@ void KlipperApplet::preferences() void KlipperApplet::help() { - kapp->invokeHelp(TQString::null, TQString::tqfromLatin1("klipper")); + kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper")); } void KlipperApplet::about() diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index ea1fb0974..7428a4ed3 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -66,7 +66,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = tqsizeHint(); + TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); @@ -299,13 +299,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() )); TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box); - label->tqsetAlignment( WordBreak | AlignLeft | AlignVCenter ); + label->setAlignment( WordBreak | AlignLeft | AlignVCenter ); box->setStretchFactor( label, 5 ); box = new TQHBox( this ); TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box ); - advanced->setFixedSize( advanced->tqsizeHint() ); + advanced->setFixedSize( advanced->sizeHint() ); connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() )); (void) new TQWidget( box ); // spacer @@ -410,8 +410,8 @@ void ActionWidget::slotAdvanced() AdvancedWidget *widget = new AdvancedWidget( box ); widget->setWMClasses( m_wmClasses ); - dlg.resize( dlg.tqsizeHint().width(), - dlg.tqsizeHint().height() +40); // or we get an ugly scrollbar :( + dlg.resize( dlg.sizeHint().width(), + dlg.sizeHint().height() +40); // or we get an ugly scrollbar :( if ( dlg.exec() == TQDialog::Accepted ) { m_wmClasses = widget->wmClasses(); diff --git a/klipper/configdialog.h b/klipper/configdialog.h index 219f5f6cf..514f40bc7 100644 --- a/klipper/configdialog.h +++ b/klipper/configdialog.h @@ -237,11 +237,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a tqsizeHint... - virtual TQSize tqsizeHint () const { - int w = tqminimumSizeHint().width(); + // TQListView has a weird idea of a sizeHint... + virtual TQSize sizeHint () const { + int w = minimumSizeHint().width(); int h = header()->height(); - h += viewport()->tqsizeHint().height(); + h += viewport()->sizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp index 3dfc37f17..86c19f07a 100644 --- a/klipper/historyitem.cpp +++ b/klipper/historyitem.cpp @@ -52,7 +52,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource ) TQMap<TQString,TQString> metaData; if( KURLDrag::decode( &aSource, urls, metaData )) { // this is from KonqDrag (libkonq) - TQByteArray a = aSource.tqencodedData( "application/x-kde-cutselection" ); + TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" ); bool cut = !a.isEmpty() && (a.tqat(0) == '1'); // true if 1 return new HistoryURLItem( urls, metaData, cut ); } diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index cff763ff6..838888bb9 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -133,7 +133,7 @@ int PopupProxy::insertFromSpill( int index ) { // discarding any that doesn't match the current filter. // stop when the total number of items equal m_itemsPerMenu; int count = 0; - int remainingHeight = m_menu_height - proxy_for_menu->tqsizeHint().height(); + int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().height(); // Force at least one item to be inserted. remainingHeight = QMAX( remainingHeight, 0 ); for ( const HistoryItem* item = spillPointer.current(); diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 81c7bd326..4b1afb572 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -327,7 +327,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu ) { Q_ASSERT( menu != 0L ); - TQSize size = menu->tqsizeHint(); // geometry is not valid until it's shown + TQSize size = menu->sizeHint(); // geometry is not valid until it's shown if (bPopupAtMouse) { TQPoint g = TQCursor::pos(); if ( size.height() < g.y() ) @@ -1013,13 +1013,13 @@ TQString KlipperWidget::getClipboardHistoryItem(int i) // bool KlipperWidget::ignoreClipboardChanges() const { - TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); - if ( tqfocusWidget ) + TQWidget *focusWidget = tqApp->focusWidget(); + if ( focusWidget ) { - if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) || - (tqfocusWidget->parentWidget() && - tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && - tqfocusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) ) + if ( focusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) || + (focusWidget->parentWidget() && + focusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && + focusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) ) { return true; } diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h index 40d288b9a..b5212890b 100644 --- a/klipper/urlgrabber.h +++ b/klipper/urlgrabber.h @@ -132,7 +132,7 @@ public: inline bool matches( const TQString& string ) { int res = myRegExp.search( string ) ; if ( res != -1 ) { - myCapturedTexts = myRegExp.tqcapturedTexts(); + myCapturedTexts = myRegExp.capturedTexts(); return true; } return false; diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index 57230186b..1ab175c17 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -468,8 +468,8 @@ void BasicTab::slotCapturedShortcut(const KShortcut& cut) if (signalsBlocked()) return; - if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, tqtopLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( cut, true, tqtopLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( cut, true, topLevelWidget())) return; if ( KHotKeys::present() ) diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 87cc8c695..0f518f065 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -121,7 +121,7 @@ void KMenuEdit::slotChangeView() #endif // disabling the updates prevents unnecessary redraws - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); guiFactory()->removeClient( this ); delete m_actionDelete; diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index ebe23bea7..73e0b8382 100644 --- a/knetattach/knetattach.ui +++ b/knetattach/knetattach.ui @@ -96,7 +96,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -327,7 +327,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>560</width> <height>16</height> diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index 2f87bae8e..ce945d832 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cc @@ -251,18 +251,18 @@ bool KonquerorIface::processCanBeReused( int screen ) TQStringList allowed_parts = KonqSettings::safeParts(); bool all_parts_allowed = false; - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "SAFE" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" )) { allowed_parts.clear(); // is duplicated in client/kfmclient.cc - allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) - << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) - << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) - << TQString::tqfromLatin1( "konq_infolistview.desktop" ) - << TQString::tqfromLatin1( "konq_treeview.desktop" ) - << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); } - else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) + else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) { allowed_parts.clear(); all_parts_allowed = true; diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 03dfad93b..5ed4c3984 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -77,9 +77,9 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file ) res = t.read(); // otherwise all embedded objects are referenced as about:/... - TQString basehref = TQString::tqfromLatin1("<BASE HREF=\"file:") + + TQString basehref = TQString::fromLatin1("<BASE HREF=\"file:") + file.left( file.findRev( '/' )) + - TQString::tqfromLatin1("/\">\n"); + TQString::fromLatin1("/\">\n"); TQRegExp reg("<head>"); reg.setCaseSensitive(FALSE); res.replace(reg, "<head>\n\t" + basehref); @@ -507,32 +507,32 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con return; } - if ( url == TQString::tqfromLatin1("launch.html") ) + if ( url == TQString::fromLatin1("launch.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::launch(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("intro.html") ) + else if ( url == TQString::fromLatin1("intro.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::intro(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("specs.html") ) + else if ( url == TQString::fromLatin1("specs.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::specs(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("tips.html") ) + else if ( url == TQString::fromLatin1("tips.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::tips(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("config:/disable_overview") ) + else if ( url == TQString::fromLatin1("config:/disable_overview") ) { if ( KMessageBox::questionYesNo( widget(), i18n("Do you want to disable showing " diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index fdc95b961..90939ccb7 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -178,33 +178,33 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) */ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile ) { - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); TQStringList allowed_parts; // is duplicated in ../KonquerorIface.cc - allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) - << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) - << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) - << TQString::tqfromLatin1( "konq_infolistview.desktop" ) - << TQString::tqfromLatin1( "konq_treeview.desktop" ) - << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); if( cfg.hasKey( "SafeParts" ) - && cfg.readEntry( "SafeParts" ) != TQString::tqfromLatin1( "SAFE" )) + && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" )) allowed_parts = cfg.readListEntry( "SafeParts" ); - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) return false; // all parts allowed if( url.isEmpty()) { if( profile.isEmpty()) return true; - TQString profilepath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profile ); + TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile ); if( profilepath.isEmpty()) return true; KConfig cfg( profilepath, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); - TQMap< TQString, TQString > entries = cfg.entryMap( TQString::tqfromLatin1( "Profile" )); - TQRegExp urlregexp( TQString::tqfromLatin1( "^View[0-9]*_URL$" )); + TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" )); + TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" )); TQStringList urls; for( TQMap< TQString, TQString >::ConstIterator it = entries.begin(); it != entries.end(); @@ -218,16 +218,16 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& if( urls.count() != 1 ) return true; url = urls.first(); - mimetype = TQString::tqfromLatin1( "" ); + mimetype = TQString::fromLatin1( "" ); } if( mimetype.isEmpty()) mimetype = KMimeType::findByURL( KURL( url ) )->name(); - KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::tqfromLatin1( "KParts/ReadOnlyPart" ), + KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), TQString::null, TQString::null ); KService::Ptr serv; if( offers.count() > 0 ) serv = offers.first(); - return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") ); + return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::fromLatin1(".desktop") ); } static int currentScreen() @@ -248,7 +248,7 @@ static int currentScreen() // when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile ! static TQCString getPreloadedKonqy() { - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 ) return ""; @@ -301,8 +301,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co // check if user wants to use external browser // ###### this option seems to have no GUI and to be redundant with BrowserApplication now. // ###### KDE4: remove - KConfig config( TQString::tqfromLatin1("kfmclientrc")); - config.setGroup( TQString::tqfromLatin1("Settings")); + KConfig config( TQString::fromLatin1("kfmclientrc")); + config.setGroup( TQString::fromLatin1("Settings")); TQString strBrowser = config.readPathEntry("ExternalBrowser"); if (!strBrowser.isEmpty()) { @@ -314,7 +314,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co return true; } - if (url.protocol().startsWith(TQString::tqfromLatin1("http"))) + if (url.protocol().startsWith(TQString::fromLatin1("http"))) { config.setGroup("General"); if (!config.readEntry("BrowserApplication").isEmpty()) @@ -330,7 +330,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co } } - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "FMSettings" ); if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) ) { @@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co { TQString error; /* Well, we can't pass a mimetype through startServiceByDesktopPath ! - if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), url.url(), &error ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; @@ -391,8 +391,8 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url, if( appId.isEmpty()) { TQString error; - if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), - TQString::tqfromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), + TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; return false; @@ -401,7 +401,7 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url, // so when we arrive here, konq is up and running already, and appId contains the identification } - TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); if ( profile.isEmpty() ) { fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() ); @@ -479,7 +479,7 @@ bool clientApp::doIt() } if ( argc == 3 ) { - return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::tqfromLatin1(args->arg(2)) ); + return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) ); } } else if ( command == "openProfile" ) @@ -529,7 +529,7 @@ bool clientApp::doIt() { KURL::List urls; urls.append( args->url(1) ); - const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::tqfromLatin1( "Application" ), TQString::null, TQString::null ); + const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); if (offers.isEmpty()) return 1; KService::Ptr serv = offers.first(); return KRun::run( *serv, urls ); diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 7947c82ac..c8c601e03 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -359,7 +359,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); - m_dirLister->setMainWindow(m_pIconView->tqtopLevelWidget()); + m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), this, TQT_SLOT( slotStarted() ) ); @@ -872,7 +872,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url ) // the completed() signal, so handle that case. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { - m_pIconView->viewport()->tqsetUpdatesEnabled( true ); + m_pIconView->viewport()->setUpdatesEnabled( true ); m_pIconView->viewport()->tqrepaint(); } if ( m_pEnsureVisible ){ @@ -892,7 +892,7 @@ void KonqKfmIconView::slotCompleted() // not been called), a viewport tqrepaint is forced. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { - m_pIconView->viewport()->tqsetUpdatesEnabled( true ); + m_pIconView->viewport()->setUpdatesEnabled( true ); m_pIconView->viewport()->tqrepaint(); } @@ -952,7 +952,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) // We need to disable graphics updates on the iconview when // inserting items, or else a blank paint operation will be // performed on the top-left corner for each inserted item! - m_pIconView->tqsetUpdatesEnabled( false ); + m_pIconView->setUpdatesEnabled( false ); for (KFileItemListIterator it(entries); it.current(); ++it) { //kdDebug(1202) << "KonqKfmIconView::slotNewItem(...)" << _fileitem->url().url() << endl; @@ -1006,11 +1006,11 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries ) m_itemDict.insert( *it, item ); } // After filtering out updates-on-insertions we can re-enable updates - m_pIconView->tqsetUpdatesEnabled( true ); + m_pIconView->setUpdatesEnabled( true ); // Locking the viewport has filtered out blanking and now, since we // have some items to draw, we can restore updating. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) - m_pIconView->viewport()->tqsetUpdatesEnabled( true ); + m_pIconView->viewport()->setUpdatesEnabled( true ); KonqDirPart::newItems( entries ); } @@ -1150,7 +1150,7 @@ void KonqKfmIconView::slotClear() // meaningless paint operations (such as a clear() just before drawing // fresh contents) we disable updating the viewport until we'll // receive some data or a timeout timer expires. - m_pIconView->viewport()->tqsetUpdatesEnabled( false ); + m_pIconView->viewport()->setUpdatesEnabled( false ); if ( !m_pTimeoutRefreshTimer ) { m_pTimeoutRefreshTimer = new TQTimer( this ); @@ -1247,9 +1247,9 @@ void KonqKfmIconView::slotRefreshViewport() kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl; TQWidget * vp = m_pIconView->viewport(); bool prevState = vp->isUpdatesEnabled(); - vp->tqsetUpdatesEnabled( true ); + vp->setUpdatesEnabled( true ); vp->tqrepaint(); - vp->tqsetUpdatesEnabled( prevState ); + vp->setUpdatesEnabled( prevState ); } bool KonqKfmIconView::doOpenURL( const KURL & url ) diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index c7c5f83a6..f0855fec0 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource( bool modified = false; const char *format = 0; for (int i = 0; format = data->format(i), format; i++) { - // qt docs don't say if tqencodedData(blah) where + // qt docs don't say if encodedData(blah) where // blah is not a stored mimetype should return null // or not. so, we search. sucky... if (strcmp(format, "GALEON_BOOKMARK") == 0) { modified = true; TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel"); - mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK")); + mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK")); data = mydrag; break; } else if( strcmp(format, "application/x-xbel" )==0) { diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 2abf26401..5b238302f 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { bool gotArg = (args->count() == 1); TQString filename = gotArg - ? TQString::tqfromLatin1(args->arg(0)) - : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + ? TQString::fromLatin1(args->arg(0)) + : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); if (!isGui) { CurrentMgr::self()->createManager(filename); diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index 148a8b5ca..26cc4c3d6 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -184,7 +184,7 @@ TQString CurrentMgr::makeTimeStr(int b) { TQDateTime dt; dt.setTime_t(b); - return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31) + return (dt.daysTo(TQDateTime::currentDateTime()) > 31) ? KGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false) : KGlobal::locale()->formatDateTime(dt, false); } @@ -233,11 +233,11 @@ KEBApp::KEBApp( vsplitter->setOrientation(Qt::Vertical); vsplitter->setSizes(TQValueList<int>() << h << 380 - << m_bkinfo->tqsizeHint().height() ); + << m_bkinfo->sizeHint().height() ); setCentralWidget(vsplitter); - resize(ListView::self()->widget()->tqsizeHint().width(), - vsplitter->tqsizeHint().height()); + resize(ListView::self()->widget()->sizeHint().width(), + vsplitter->sizeHint().height()); createActions(); if (m_browser) diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 3d1a1003f..cd1a41260 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -99,7 +99,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) m_pageSecurity( KonqMainWindow::NotCrypted ) { setInsertionPolicy( NoInsertion ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); Q_ASSERT( s_config ); @@ -272,14 +272,14 @@ void KonqCombo::updateItem( const TQPixmap& pix, const TQString& t, int index, c listBox()->changeItem( item, index ); /* - tqsetUpdatesEnabled( false ); - lineEdit()->tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); + lineEdit()->setUpdatesEnabled( false ); removeItem( index ); insertItem( pix, t, index ); - tqsetUpdatesEnabled( true ); - lineEdit()->tqsetUpdatesEnabled( true ); + setUpdatesEnabled( true ); + lineEdit()->setUpdatesEnabled( true ); update(); */ } @@ -301,12 +301,12 @@ void KonqCombo::updatePixmaps() { saveState(); - tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); KonqPixmapProvider *prov = KonqPixmapProvider::self(); for ( int i = 1; i < count(); i++ ) { updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) ); } - tqsetUpdatesEnabled( true ); + setUpdatesEnabled( true ); tqrepaint(); restoreState(); @@ -521,15 +521,15 @@ void KonqCombo::slotRemoved( const TQString& item ) void KonqCombo::removeURL( const TQString& url ) { - tqsetUpdatesEnabled( false ); - lineEdit()->tqsetUpdatesEnabled( false ); + setUpdatesEnabled( false ); + lineEdit()->setUpdatesEnabled( false ); removeFromHistory( url ); applyPermanent(); setTemporary( currentText() ); - tqsetUpdatesEnabled( true ); - lineEdit()->tqsetUpdatesEnabled( true ); + setUpdatesEnabled( true ); + lineEdit()->setUpdatesEnabled( true ); update(); } @@ -540,7 +540,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) { // check if the pixmap was clicked int x = e->pos().x(); - int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if ( x > x0 + 2 && x < lineEdit()->x() ) { m_dragStart = e->pos(); @@ -551,7 +551,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { // check if the lock icon was clicked int x = e->pos().x(); - int x0 = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); + int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); if ( x < x0 ) emit showPageSecurity(); @@ -605,7 +605,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) TQLineEdit *edit = lineEdit(); TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + re = TQStyle::visualRect(re, this); if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) { TQColor color(245, 246, 190); @@ -723,8 +723,8 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) pmWidth = pm->width() + 5; } - int entryWidth = listBox()->width() - listBox()->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) - - 2 * listBox()->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + int entryWidth = listBox()->width() - listBox()->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) - + 2 * listBox()->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ); int titleWidth = ( entryWidth / 3 ) - 1; int urlWidth = entryWidth - titleWidth - pmWidth - 2; @@ -884,7 +884,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items ) triggerUpdate( false ); } - if ( isVisible() && size().height() != tqsizeHint().height() ) + if ( isVisible() && size().height() != sizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index e918f1ac3..9f5d8fc94 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -42,7 +42,7 @@ KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args : m_factory( factory ), m_args( args ), m_createBrowser( createBrowser ) { if ( m_createBrowser ) - m_args << TQString::tqfromLatin1( "Browser/View" ); + m_args << TQString::fromLatin1( "Browser/View" ); } KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName, diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index d8c80b234..0da7cd29a 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -68,20 +68,20 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) setSizeGripEnabled( false ); m_led = new TQLabel( this ); - m_led->tqsetAlignment( Qt::AlignCenter ); - m_led->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_led->setAlignment( Qt::AlignCenter ); + m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); addWidget( m_led, 0, false ); // led (active view indicator) m_led->hide(); m_pStatusLabel = new KSqueezedTextLabel( this ); m_pStatusLabel->setMinimumSize( 0, 0 ); - m_pStatusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_pStatusLabel->installEventFilter(this); addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus); - m_pLinkedViewCheckBox->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); TQWhatsThis::add( m_pLinkedViewCheckBox, i18n("Checking this box on at least two views sets those views as 'linked'. " "Then, when you change directories in one view, the other views " @@ -301,7 +301,7 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); - m_pStatusBar->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; @@ -327,16 +327,16 @@ void KonqFrame::listViews( ChildViewList *viewList ) void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { if (saveURLs) - config->writePathEntry( TQString::tqfromLatin1( "URL" ).prepend( prefix ), + config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ), childView()->url().url() ); - config->writeEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); - config->writeEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); - config->writeEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); - config->writeEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); - config->writeEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); - config->writeEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); - //config->writeEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); - if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); + config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); + config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); + config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); + config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); + config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); + //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); KonqConfigEvent ev( config, prefix+"_", true/*save*/); TQApplication::sendEvent( childView()->part(), &ev ); @@ -521,40 +521,40 @@ void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bo int idSecond = id + (int)pow( 2.0, depth ); //write children sizes - config->writeEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); + config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); //write children TQStringList strlst; if( firstChild() ) - strlst.append( TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); + strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); if( secondChild() ) - strlst.append( TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); + strlst.append( TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); - config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); //write orientation TQString o; if( orientation() == Qt::Horizontal ) - o = TQString::tqfromLatin1("Horizontal"); + o = TQString::fromLatin1("Horizontal"); else if( orientation() == Qt::Vertical ) - o = TQString::tqfromLatin1("Vertical"); - config->writeEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ), o ); + o = TQString::fromLatin1("Vertical"); + config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o ); //write docContainer - if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); - if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); - else config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); + if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); + else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); //write child configs if( firstChild() ) { - TQString newPrefix = TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); + TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); newPrefix.append( '_' ); firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 ); } if( secondChild() ) { - TQString newPrefix = TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); + TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); newPrefix.append( '_' ); secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 ); } diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index c9556f824..b7e756971 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -230,7 +230,7 @@ TQPtrList<KAction> ToggleViewGUIClient::actions() const void ToggleViewGUIClient::slotToggleView( bool toggle ) { - TQString serviceName = TQString::tqfromLatin1( TQT_TQOBJECT_CONST(sender())->name() ); + TQString serviceName = TQString::fromLatin1( TQT_TQOBJECT_CONST(sender())->name() ); bool horizontal = m_mapOrientation[ serviceName ]; @@ -240,7 +240,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) { KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, - TQString::tqfromLatin1( "Browser/View" ), + TQString::fromLatin1( "Browser/View" ), serviceName, !horizontal /* vertical = make it first */); diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 17888e8c8..3f3e47bc3 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -76,7 +76,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) while ( KonqMainWindow::canBeRestored( n ) ) { TQString className = KMainWindow::classNameOfToplevel( n ); - if( className == TQString::tqfromLatin1( "KonqMainWindow" )) + if( className == TQString::fromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else kdWarning() << "Unknown class " << className << " in session saved data!" << endl; @@ -104,7 +104,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) TQString profile = TQString::fromLocal8Bit(args->getOption("profile")); TQString profilePath = profile; if (profile[0] != '/') - profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); + profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); TQString url; TQStringList filesToSelect; if (args->count() == 1) @@ -150,7 +150,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { // By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager. TQString profile = "webbrowsing"; - TQString profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); + TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); if ( !profilePath.isEmpty() ) { KonqMisc::createBrowserWindowFromProfile( profilePath, profile ); } else { diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index f08fc10db..ae3cc25a8 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -235,7 +235,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) - plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); else { delete m_toggleViewGUIClient; @@ -342,8 +342,8 @@ KonqMainWindow::~KonqMainWindow() TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { - static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id ); @@ -393,8 +393,8 @@ void KonqMainWindow::initBookmarkBar() void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { - static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) { @@ -966,10 +966,10 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs if ( !frameName.isEmpty() ) { - static TQString _top = TQString::tqfromLatin1( "_top" ); - static TQString _self = TQString::tqfromLatin1( "_self" ); - static TQString _parent = TQString::tqfromLatin1( "_parent" ); - static TQString _blank = TQString::tqfromLatin1( "_blank" ); + static TQString _top = TQString::fromLatin1( "_top" ); + static TQString _self = TQString::fromLatin1( "_self" ); + static TQString _parent = TQString::fromLatin1( "_parent" ); + static TQString _blank = TQString::fromLatin1( "_blank" ); if ( frameName.lower() == _blank ) { @@ -1234,7 +1234,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs mainWindow->viewManager()->setActivePart( part, true ); } - TQString profileName = TQString::tqfromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); + TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); KSimpleConfig cfg( locate( "data", profileName ), true ); cfg.setGroup( "Profile" ); @@ -1284,7 +1284,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( !windowArgs.resizable ) // ### this doesn't seem to work :-( - mainWindow->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mainWindow->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); // Trying to show the window initially behind the current window is a bit tricky, // as this involves the window manager, which may see things differently. @@ -1336,12 +1336,12 @@ void KonqMainWindow::slotNewWindow() if ( profile.isEmpty() ) { if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) ) - profile = TQString::tqfromLatin1("webbrowsing"); + profile = TQString::fromLatin1("webbrowsing"); else - profile = TQString::tqfromLatin1("filemanagement"); + profile = TQString::fromLatin1("filemanagement"); } KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ), + locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ), profile ); } @@ -1528,7 +1528,7 @@ void KonqMainWindow::slotToolFind() else url.setPath( TQDir::homeDirPath() ); KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::tqfromLatin1("konqueror/profiles/filemanagement") ), + locate( "data", TQString::fromLatin1("konqueror/profiles/filemanagement") ), "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) @@ -1652,7 +1652,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // current viewmode TQPtrListIterator<KAction> it( m_toolBarViewModeActions ); for (; it.current(); ++it ) - if ( TQString::tqfromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) + if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) { assert( it.current()->inherits( "KonqViewModeAction" ) ); @@ -1815,7 +1815,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView ) if ( !reloadView || reloadView->url().isEmpty() ) return; - if ( reloadView->part() && (reloadView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = reloadView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2032,7 +2032,7 @@ void KonqMainWindow::slotConfigureToolbars() void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked { if ( m_toggleViewGUIClient ) - plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); if ( m_currentView && m_currentView->appServiceOffers().count() > 0 ) plugActionList( "openwith", m_openWithActions ); @@ -2048,7 +2048,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail ) if ( avail && m_currentView && m_currentView->part() ) { // Avoid qWarning from TQObject::property if it doesn't exist - if ( m_currentView->part()->tqmetaObject()->findProperty( "supportsUndo" ) != -1 ) + if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 ) { TQVariant prop = m_currentView->part()->property( "supportsUndo" ); if ( prop.isValid() && prop.toBool() ) @@ -2665,7 +2665,7 @@ void KonqMainWindow::slotDuplicateTabPopup() void KonqMainWindow::slotBreakOffTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2682,7 +2682,7 @@ void KonqMainWindow::slotBreakOffTabPopup() { KonqView* originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2787,7 +2787,7 @@ void KonqMainWindow::openMultiURL( KURL::List url ) void KonqMainWindow::slotRemoveView() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2803,7 +2803,7 @@ void KonqMainWindow::slotRemoveView() void KonqMainWindow::slotRemoveTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, @@ -2819,7 +2819,7 @@ void KonqMainWindow::slotRemoveTabPopup() { KonqView *originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2856,7 +2856,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -2889,7 +2889,7 @@ void KonqMainWindow::slotReloadAllTabs() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -3454,7 +3454,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) ext = m_currentView->browserExtension(); TQStrList slotNames; if (ext) - slotNames = ext->tqmetaObject()->slotNames(); + slotNames = ext->metaObject()->slotNames(); //for ( char * s = slotNames.first() ; s ; s = slotNames.next() ) //{ @@ -4327,7 +4327,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->tqmetaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { @@ -4361,7 +4361,7 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->tqmetaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { @@ -4888,7 +4888,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa m_currentView = m_oldView; } // Special case: RMB + renaming in sidebar; setFocus would abort editing. - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) ) m_oldView->part()->widget()->setFocus(); } @@ -5111,7 +5111,7 @@ void KonqMainWindow::updateViewModeActions() itname = (*it)->name(); TQString icon = (*it)->icon(); - if ( icon != TQString::tqfromLatin1( "unknown" ) ) + if ( icon != TQString::fromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) action = new KRadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() ); else @@ -5282,7 +5282,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) if ( tabContainer->count() > 1 ) { KConfig *config = KGlobal::config(); - KConfigGroupSaver cs( config, TQString::tqfromLatin1("Notification Messages") ); + KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); if ( !config->hasKey( "MultipleTabConfirm" ) ) { @@ -5320,7 +5320,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); @@ -5338,7 +5338,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) // m_pViewManager->showTab( originalView ); } else if ( m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 5c65e872f..5802d47c9 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -106,7 +106,7 @@ KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLAr KMimeType::findByURL(url)->name() == "text/html") ? "webbrowsing" : "filemanagement"; - TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); return createBrowserWindowFromProfile(profile, profileName, url, args, forbidUseHTML, filesToSelect, tempFile, openURL ); @@ -225,7 +225,7 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text , m_mw(mw) { setBackgroundMode( TQt::PaletteButton ); - tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | + setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter | TQt::ShowPrefix ); setAcceptDrops(true); adjustSize(); diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index eca415ba5..2a3547068 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -104,7 +104,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); - m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); + m_pListView->setMinimumSize( m_pListView->sizeHint() ); m_cbSaveURLs = new TQCheckBox( i18n("Save &URLs in profile"), box ); m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() ); @@ -121,7 +121,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); - resize( tqsizeHint() ); + resize( sizeHint() ); } KonqProfileDlg::~KonqProfileDlg() diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 3fb199d88..457f6ed21 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -196,16 +196,16 @@ void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool sa TQString newPrefix; for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) { - newPrefix = TQString::tqfromLatin1( it->frameType() ) + "T" + TQString::number(i); + newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i); strlst.append( newPrefix ); newPrefix.append( '_' ); it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i ); i++; } - config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); - config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), + config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), currentPageIndex() ); } diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 4f02022d4..4278d5522 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -528,8 +528,8 @@ void KonqView::slotStarted( KIO::Job * job ) // Manage passwords properly... if (m_pMainWindow) { - kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->tqtopLevelWidget()->winId() << endl; - job->setWindow (m_pMainWindow->tqtopLevelWidget ()); + kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->topLevelWidget()->winId() << endl; + job->setWindow (m_pMainWindow->topLevelWidget ()); } connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); @@ -1077,7 +1077,7 @@ bool KonqView::callExtensionMethod( const char *methodName ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 1 ]; @@ -1092,7 +1092,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; @@ -1109,7 +1109,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; @@ -1126,7 +1126,7 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; TQUObject o[ 2 ]; diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 423929f39..58848efec 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -132,7 +132,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, //printSizeInfo( splitFrame, parentContainer, "before split"); #endif - parentContainer->widget()->tqsetUpdatesEnabled( false ); + parentContainer->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = splitFrame->widget()->pos(); @@ -184,7 +184,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation, //newView->frame()->show(); newContainer->show(); - parentContainer->widget()->tqsetUpdatesEnabled( true ); + parentContainer->widget()->setUpdatesEnabled( true ); if (m_pDocContainer == splitFrame) m_pDocContainer = newContainer; @@ -226,7 +226,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, KonqFrameBase* mainFrame = m_pMainWindow->childFrame(); - mainFrame->widget()->tqsetUpdatesEnabled( false ); + mainFrame->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = mainFrame->widget()->pos(); @@ -249,7 +249,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation, newContainer->show(); - mainFrame->widget()->tqsetUpdatesEnabled( true ); + mainFrame->widget()->setUpdatesEnabled( true ); if( childView ) childView->openURL( url, locationBarURL ); @@ -279,7 +279,7 @@ void KonqViewManager::convertDocContainer() splitterSizes = static_cast<KonqFrameContainer*>(parentContainer)->sizes(); } - parentContainer->widget()->tqsetUpdatesEnabled( false ); + parentContainer->widget()->setUpdatesEnabled( false ); //kdDebug(1202) << "Move out child" << endl; TQPoint pos = m_pDocContainer->widget()->pos(); @@ -302,7 +302,7 @@ void KonqViewManager::convertDocContainer() newContainer->show(); - parentContainer->widget()->tqsetUpdatesEnabled( true ); + parentContainer->widget()->setUpdatesEnabled( true ); m_pDocContainer = newContainer; } @@ -423,7 +423,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); @@ -493,10 +493,10 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); - config.writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + config.writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false ); @@ -784,7 +784,7 @@ void KonqViewManager::removeView( KonqView *view ) if (m_pDocContainer == parentContainer) m_pDocContainer = otherFrame; - grandParentContainer->widget()->tqsetUpdatesEnabled( false ); + grandParentContainer->widget()->setUpdatesEnabled( false ); static_cast<KonqFrameContainer*>(parentContainer)->setAboutToBeDeleted(); //kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl; @@ -826,7 +826,7 @@ void KonqViewManager::removeView( KonqView *view ) grandParentContainer->setActiveChild( otherFrame ); grandParentContainer->activateChild(); - grandParentContainer->widget()->tqsetUpdatesEnabled( true ); + grandParentContainer->widget()->setUpdatesEnabled( true ); } else if (parentContainer->frameType()=="Tabs") { kdDebug(1202) << "parentContainer " << parentContainer << " is a KonqFrameTabs" << endl; @@ -1077,7 +1077,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize ) { - TQString path = locateLocal( "data", TQString::tqfromLatin1( "konqueror/profiles/" ) + + TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) + fileName, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1096,7 +1096,7 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi { //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; if( m_pMainWindow->childFrame() != 0L ) { - TQString prefix = TQString::tqfromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString::number(0); cfg.writeEntry( "RootItem", prefix ); prefix.append( '_' ); @@ -1156,7 +1156,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, for ( it.toFirst(); it != 0L; ++it ) { KonqView *view = it.current()->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { showTab( view ); @@ -1175,7 +1175,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, else { KonqView *view = m_pMainWindow->currentView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( 0, @@ -1465,8 +1465,8 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, serviceType = "text/html"; serviceName = "html"; } else { - serviceType = cfg.readEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); - serviceName = cfg.readEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ) ); + serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); + serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) ); } //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; @@ -1480,17 +1480,17 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, return; //ugh.. } - bool passiveMode = cfg.readBoolEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), false ); + bool passiveMode = cfg.readBoolEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), false ); //kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl; KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage ); - if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), false ) ); - childView->setToggleView( cfg.readBoolEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), false ) ); - if( !cfg.readBoolEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) + if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) ); + childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) ); + if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) childView->frame()->statusbar()->hide(); - if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = childView->frame(); if (!m_pDocContainer) @@ -1536,7 +1536,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, childView->frame()->show(); - TQString key = TQString::tqfromLatin1( "URL" ).prepend( prefix ); + TQString key = TQString::fromLatin1( "URL" ).prepend( prefix ); if ( openURL ) { KURL url; @@ -1546,11 +1546,11 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, { TQString u = cfg.readPathEntry( key ); if ( u.isEmpty() ) - u = TQString::tqfromLatin1("about:blank"); + u = TQString::fromLatin1("about:blank"); url = u; } else if(key == "empty_URL") - url = TQString::tqfromLatin1("about:blank"); + url = TQString::fromLatin1("about:blank"); else url = defaultURL; @@ -1567,13 +1567,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, //else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl; } // Do this after opening the URL, so that it's actually possible to open it :) - childView->setLockedLocation( cfg.readBoolEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); + childView->setLockedLocation( cfg.readBoolEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); } else if( name.startsWith("Container") ) { //kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl; //load container config - TQString ostr = cfg.readEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ) ); + TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) ); //kdDebug(1202) << "Orientation: " << ostr << endl; Qt::Orientation o; if( ostr == "Vertical" ) @@ -1586,12 +1586,12 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, } TQValueList<int> sizes = - cfg.readIntListEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix )); + cfg.readIntListEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix )); - int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); TQStrList childList; - if( cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) + if( cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) { kdWarning() << "Profile Loading Error: Less than two children in " << name << endl; // fallback to defaults @@ -1608,7 +1608,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, parent->insertChildFrame( newContainer, tabindex ); - if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = newContainer; loadItem( cfg, newContainer, childList.tqat(0), defaultURL, openURL ); @@ -1634,9 +1634,9 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; - int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); - TQStringList childList = cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ) ); + TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) ); for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it ) { loadItem( cfg, newContainer, *it, defaultURL, openURL ); diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 6adf36feb..ff829c4c0 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -181,8 +181,8 @@ void KonqInfoListViewWidget::rebuildView() if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } } @@ -215,8 +215,8 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index b47e43ede..57da1803b 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -421,7 +421,7 @@ KonqBaseListViewItem::~KonqBaseListViewItem() TQRect KonqBaseListViewItem::rect() const { - TQRect r = m_pListViewWidget->tqitemRect(this); + TQRect r = m_pListViewWidget->itemRect(this); return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 97bddf559..26e10aaa6 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * { kdDebug(1202) << "+KonqBaseListViewWidget" << endl; - m_dirLister->setMainWindow(tqtopLevelWidget()); + m_dirLister->setMainWindow(topLevelWidget()); m_bTopLevelComplete = true; @@ -489,7 +489,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() ); m_pBrowserView->emitMouseOver( item->item() ); - vp.setY( tqitemRect( item ).y() ); + vp.setY( itemRect( item ).y() ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); @@ -553,7 +553,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p ) pt = contentsToViewport( pt ); tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p, TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), - tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() ); + colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } @@ -591,9 +591,9 @@ void KonqBaseListViewWidget::slotAutoScroll() { TQRect rect; if ( allColumnsShowFocus() ) - rect = tqitemRect( cur ); + rect = itemRect( cur ); else { - rect = tqitemRect( cur ); + rect = itemRect( cur ); rect.setWidth( executeArea( cur ) ); } @@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } } else @@ -631,7 +631,7 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) @@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } } else @@ -667,7 +667,7 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) @@ -985,7 +985,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) if (_item->pixmap(0) != 0) { // Rect of the TQListViewItem's pixmap area. - TQRect rect = _item->listView()->tqitemRect(_item); + TQRect rect = _item->listView()->itemRect(_item); // calculate nesting depth int nestingDepth = 0; @@ -1111,7 +1111,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url ) args.yOffset = contentsY(); m_pBrowserView->extension()->setURLArgs( args ); - if ( currentItem() && tqitemRect( currentItem() ).isValid() ) + if ( currentItem() && itemRect( currentItem() ).isValid() ) m_itemToGoTo = currentItem()->text(0); m_pBrowserView->m_filesToSelect.clear(); @@ -1192,8 +1192,8 @@ void KonqBaseListViewWidget::setComplete() if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } @@ -1237,8 +1237,8 @@ void KonqBaseListViewWidget::slotClear() m_pBrowserView->resetCount(); m_pBrowserView->lstPendingMimeIconItems().clear(); - viewport()->tqsetUpdatesEnabled( false ); - tqsetUpdatesEnabled( false ); + viewport()->setUpdatesEnabled( false ); + setUpdatesEnabled( false ); clear(); } @@ -1268,8 +1268,8 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); @@ -1314,8 +1314,8 @@ void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem ) // OK, but this code also gets activated when deleting a hidden file... (dfaure) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc index 3076aa7ac..32de25351 100644 --- a/konqueror/listview/konq_textviewwidget.cc +++ b/konqueror/listview/konq_textviewwidget.cc @@ -101,8 +101,8 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } slotUpdateBackground(); @@ -146,8 +146,8 @@ void KonqTextViewWidget::setComplete() if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } } diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc index 624e74eaf..4d04f2fa4 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cc @@ -121,8 +121,8 @@ void KonqTreeViewWidget::slotCompleted( const KURL & _url ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } } @@ -268,8 +268,8 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries ) if ( !viewport()->isUpdatesEnabled() ) { - viewport()->tqsetUpdatesEnabled( true ); - tqsetUpdatesEnabled( true ); + viewport()->setUpdatesEnabled( true ); + setUpdatesEnabled( true ); triggerUpdate(); } diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index 014ee769b..35b2352e1 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cc @@ -109,8 +109,8 @@ void KonqyPreloader::updateCount() { if( !check_always_preloaded_timer.isActive()) { - if( kapp->tdeinitExec( TQString::tqfromLatin1( "konqueror" ), - TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) + if( kapp->tdeinitExec( TQString::fromLatin1( "konqueror" ), + TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) { kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; check_always_preloaded_timer.start( 5000, true ); diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 45287eb67..edaacf1dd 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -41,7 +41,7 @@ #include "kremoteencodingplugin.h" -#define DATA_KEY TQString::tqfromLatin1("Charset") +#define DATA_KEY TQString::fromLatin1("Charset") KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, const char *name, diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index e41d1c99a..eefa57337 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -43,10 +43,10 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox); closeButton->setDefault(true); - label->resize(label->tqsizeHint()); - m_shell->resize(m_shell->tqsizeHint()); - closeButton->setFixedSize(closeButton->tqsizeHint()); - cancelButton->setFixedSize(cancelButton->tqsizeHint()); + label->resize(label->sizeHint()); + m_shell->resize(m_shell->sizeHint()); + closeButton->setFixedSize(closeButton->sizeHint()); + cancelButton->setFixedSize(cancelButton->sizeHint()); box->addWidget(label,0); box->addWidget(m_shell,1); diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 271150338..29f8de794 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -30,7 +30,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, setInstance( KonqSidebarFactory::instance() ); m_extension = 0; // this should be your custom internal widget - m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->tqtopLevelWidget()->property("currentProfile").toString() ); + m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), this, TQT_SIGNAL(started(KIO::Job*))); diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index e97c42c3f..6f178543a 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -252,7 +252,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_buttons.setAutoDelete(true); m_hasStoredUrl = false; m_latestViewed = -1; - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); TQSplitter *splitterWidget = splitter(); if (splitterWidget) { @@ -262,7 +262,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons } m_area = new KDockArea(this); - m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_mainDockWidget = m_area->createDockWidget("free", 0); m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget)); m_area->setMainDockWidget(m_mainDockWidget); @@ -675,7 +675,7 @@ void Sidebar_Widget::stdAction(const char *handlestd) kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl; - int id = mod->module->tqmetaObject()->findSlot( handlestd ); + int id = mod->module->metaObject()->findSlot( handlestd ); if ( id == -1 ) return; kdDebug() << "Action slot was found, it will be called now" << endl; @@ -1049,7 +1049,7 @@ void Sidebar_Widget::collapseExpandSidebar() if (m_visibleViews.count()==0) { m_somethingVisible = false; - parentWidget()->setMaximumWidth(tqminimumSizeHint().width()); + parentWidget()->setMaximumWidth(minimumSizeHint().width()); updateGeometry(); emit panelHasBeenExpanded(false); } else { @@ -1060,11 +1060,11 @@ void Sidebar_Widget::collapseExpandSidebar() } } -TQSize Sidebar_Widget::tqsizeHint() const +TQSize Sidebar_Widget::sizeHint() const { if (m_somethingVisible) return TQSize(m_savedWidth,200); - return tqminimumSizeHint(); + return minimumSizeHint(); } void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) @@ -1195,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { - if (mod->tqmetaObject()->findSignal("started(KIO::Job*)") != -1) { + if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) { connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); } - if (mod->tqmetaObject()->findSignal("completed()") != -1) { + if (mod->metaObject()->findSignal("completed()") != -1) { connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); } - if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->tqmetaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const " TQPOINT_OBJECT_NAME_STRING " &,const KURL&,const " TQSTRING_OBJECT_NAME_STRING "&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->tqmetaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const " TQPOINT_OBJECT_NAME_STRING "&,const KFileItemList&)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } - if (mod->tqmetaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->tqmetaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { + if (mod->metaObject()->findSignal("submitFormRequest(const char*,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQBYTEARRAY_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&,const " TQSTRING_OBJECT_NAME_STRING "&)") != -1) { connect(mod, TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } - if (mod->tqmetaObject()->findSignal("enableAction(const char*,bool)") != -1) { + if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), this,TQT_SLOT(enableAction(const char *, bool))); } - if (mod->tqmetaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index dd7182a35..75975f35e 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -107,7 +107,7 @@ public: void stdAction(const char *handlestd); //virtual KParts::ReadOnlyPart *getPart(); KParts::BrowserExtension *getExtension(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void addWebSideBar(const KURL& url, const TQString& name); diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index d1b5cc16e..c55e71d7b 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab() else return; - DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name()); if (bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); @@ -490,7 +490,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo item->setOpen(false); } else if ( bk.isSeparator() ) - item->tqsetVisible( false ); + item->setVisible( false ); else item->setExpandable( false ); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 989ef2a70..0ceb93d13 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -163,7 +163,7 @@ void KonqSidebarDirTreeItem::itemSelected() bInTrash = true; TQMimeSource *data = TQApplication::tqclipboard()->data(); - bool paste = ( data->tqencodedData( data->format() ).size() != 0 ); + bool paste = ( data->encodedData( data->format() ).size() != 0 ); tree()->enableActions( true, true, paste, true && !bInTrash, true, true ); } diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui index a90c1c49e..225920387 100644 --- a/konqueror/sidebar/trees/history_module/history_dlg.ui +++ b/konqueror/sidebar/trees/history_module/history_dlg.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>16</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>418</width> <height>0</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>30</height> diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 02e77c526..ad2d2a7e2 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -129,7 +129,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, int column, int width, int tqalignment ) { TQDateTime dt; - TQDateTime current = TQDateTime::tqcurrentDateTime(); + TQDateTime current = TQDateTime::currentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan )); diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index a29a2fe0c..a7fd943ca 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KConfig *kc = KGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); @@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems() KonqHistoryEntry *entry; KonqHistoryList entries( KonqHistoryManager::kself()->entries() ); KonqHistoryIterator it( entries ); - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); // the group item and the item of the serverroot '/' get a fav-icon // if available. All others get the protocol icon. @@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry ) if ( !m_initialized ) return; - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url ); KonqSidebarHistoryItem *item = group->findChild( entry ); if ( !item ) diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index 20ca214d4..6871415a0 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global) m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 ); m_valueOlderThan = config->readNumEntry("Value olderThan", 2 ); - TQString minutes = TQString::tqfromLatin1("minutes"); - TQString days = TQString::tqfromLatin1("days"); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); TQString metric = config->readEntry("Metric youngerThan", days ); m_metricYoungerThan = (metric == days) ? DAYS : MINUTES; metric = config->readEntry("Metric olderThan", days ); @@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings() config->writeEntry("Value youngerThan", m_valueYoungerThan ); config->writeEntry("Value olderThan", m_valueOlderThan ); - TQString minutes = TQString::tqfromLatin1("minutes"); - TQString days = TQString::tqfromLatin1("days"); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ? days : minutes ); config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ? diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 99c22e148..7755286bc 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path // Version 5 includes the audiocd browser // Version 6 includes the printmanager and lan browser const int currentVersion = 6; - TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber"); + TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber"); KSimpleConfig versionCfg( path + "/.directory" ); int versionNumber = versionCfg.readNumEntry( key, 1 ); kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; @@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation() for (; it != end; ++it ) { uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); it.key()->setPixmap( 0, SmallIcon( icon)); iconNumber++; @@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste, bool KonqSidebarTree::tabSupport() { // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror) - DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); DCOPReply reply = ref.call("functions()"); if (reply.isValid()) { QCStringList funcs; @@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow() void KonqSidebarTree::slotOpenTab() { if (!m_currentTopLevelItem) return; - DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() ); } @@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point ) if ( item ) { TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->tqitemRect( item ), text ); + tip ( m_view->itemRect( item ), text ); } } diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 38862fb18..31d4f5f82 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -814,7 +814,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) int y,x,len; const TQPixmap* pm = backgroundPixmap(); TQPainter paint; - tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); paint.begin( this ); TQPoint tL = contentsRect().topLeft(); @@ -926,7 +926,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) } drawFrame( &paint ); paint.end(); - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = false; } free(dirtyMask); @@ -954,7 +954,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget); l->addWidget(mResizeLabel, 1, AlignCenter); mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); - mResizeWidget->setMinimumHeight(mResizeLabel->tqsizeHint().height()+20); + mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); mResizeTimer = new TQTimer(this); connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); } @@ -993,7 +993,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) { const TQPixmap* pm = backgroundPixmap(); TQPainter paint; - tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); paint.begin( this ); paint.setBackgroundMode( Qt::TransparentMode ); @@ -1051,7 +1051,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe ) erase( er ); paint.end(); - tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); } void TEWidget::print(TQPainter &paint, bool friendly, bool exact) @@ -1185,9 +1185,9 @@ void TEWidget::propagateSize() if (isFixedSize) { setSize(columns, lines); - TQFrame::setFixedSize(tqsizeHint()); + TQFrame::setFixedSize(sizeHint()); parentWidget()->adjustSize(); - parentWidget()->setFixedSize(parentWidget()->tqsizeHint()); + parentWidget()->setFixedSize(parentWidget()->sizeHint()); return; } if (image) @@ -1880,7 +1880,7 @@ void TEWidget::doScroll(int lines) bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) { if ( (e->type() == TQEvent::Accel || - e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this ) + e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this ) { TQT_TQKEYEVENT( e )->ignore(); return false; @@ -2104,7 +2104,7 @@ void TEWidget::clearImage() void TEWidget::calcGeometry() { - scrollbar->resize(TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent), + scrollbar->resize(TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent), contentsRect().height()); switch(scrollLoc) { @@ -2177,7 +2177,7 @@ void TEWidget::setFixedSize(int cols, int lins) TQFrame::setFixedSize(m_size); } -TQSize TEWidget::tqsizeHint() const +TQSize TEWidget::sizeHint() const { return m_size; } @@ -2242,7 +2242,7 @@ void TEWidget::dropEvent(TQDropEvent* event) TQString tmp; if (url.isLocalFile()) { tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others - } else if ( url.protocol() == TQString::tqfromLatin1( "mailto" ) ) { + } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) { justPaste = true; break; } else { diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index afb1ff3a8..197ec860c 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -98,7 +98,7 @@ public: void updateImageSize(); void setSize(int cols, int lins); void setFixedSize(int cols, int lins); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setWordCharacters(TQString wc); TQString wordCharacters() { return word_characters; } diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index b3aa76e9f..18d453a58 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -362,7 +362,7 @@ void KeyTrans::readConfig() ; TQBuffer* newbuf; newbuf = new TQBuffer(); - newbuf->tqsetBufferFromCopy(txt); + newbuf->setBuffer(txt); buf=TQT_TQIODEVICE(newbuf); } else diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 7c9395da5..5c3620b16 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -1289,7 +1289,7 @@ void Konsole::setColLin(int columns, int lines) te->setSize(columns, lines); adjustSize(); if (b_fixedSize) - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); notifySize(columns, lines); // set menu items } } @@ -1437,7 +1437,7 @@ void Konsole::slotSaveSessionsProfile() TQString::null, &ok, this ); if ( ok ) { TQString path = locateLocal( "data", - TQString::tqfromLatin1( "konsole/profiles/" ) + prof, + TQString::fromLatin1( "konsole/profiles/" ) + prof, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1927,7 +1927,7 @@ void Konsole::slotToggleMenubar() { if (b_fixedSize) { adjustSize(); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); @@ -2007,7 +2007,7 @@ void Konsole::slotSelectTabbar() { if (b_fixedSize) { adjustSize(); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } } @@ -3498,7 +3498,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) co->writeEntry("Name", socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); co->writeEntry("Comment", txt); - co->writePathEntry("Exec", TQString::tqfromLatin1("SCREENDIR=%1 screen -r %2") + co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2") .arg(path).arg(socket)); TQString icon = "konsole"; cmd_serial++; diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index b5463f8fb..d7f871f8d 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -1137,7 +1137,7 @@ void konsolePart::showShellInDir( const TQString& dir ) { TQString text = dir; KRun::shellQuote(text); - text = TQString::tqfromLatin1("cd ") + text + '\n'; + text = TQString::fromLatin1("cd ") + text + '\n'; te->emitText( text ); }; } diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index 1f40e8c14..cb21f6aff 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -271,7 +271,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) TQString term = ""; if(args->isSet("tn")) { - term=TQString::tqfromLatin1(args->getOption("tn")); + term=TQString::fromLatin1(args->getOption("tn")); } login_shell = args->isSet("ls"); @@ -591,7 +591,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) //// Temporary code, waiting for Qt to do this properly // Delete all toplevel widgets that have WDestructiveClose - TQWidgetList *list = TQApplication::tqtopLevelWidgets(); + TQWidgetList *list = TQApplication::topLevelWidgets(); // remove all toplevel widgets that have a parent (i.e. they // got WTopLevel explicitly), they'll be deleted by the parent list->first(); diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index b3bae8eff..f18b7cfc5 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname) ,lastRead(new TQDateTime()) { //start with a valid time, aleXXX - *lastRead = TQDateTime::tqcurrentDateTime(); + *lastRead = TQDateTime::currentDateTime(); TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname); if (fPath.isEmpty() || !TQFile::exists(fPath)) { @@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile() char line[100]; - *lastRead = TQDateTime::tqcurrentDateTime(); + *lastRead = TQDateTime::currentDateTime(); while (fscanf(sysin,"%80[^\n]\n",line) > 0) { @@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas() // now. // // - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); r = updateAllSchemaTimes(now); diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index cc4293326..53990af2f 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -133,11 +133,11 @@ void TESession::ptyError() { // FIXME: sh->error() is always empty if ( sh->error().isEmpty() ) - KMessageBox::error( te->tqtopLevelWidget(), + KMessageBox::error( te->topLevelWidget(), i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."), i18n("A Fatal Error Has Occurred") ); else - KMessageBox::error(te->tqtopLevelWidget(), sh->error()); + KMessageBox::error(te->topLevelWidget(), sh->error()); emit done(this); } @@ -645,7 +645,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - zmodemProgress = new ZModemDialog(te->tqtopLevelWidget(), false, + zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, i18n("ZModem Progress")); connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), @@ -767,7 +767,7 @@ QCStringList TESession::functionsDynamic() void TESession::onRcvBlock( const char* buf, int len ) { em->onRcvBlock( buf, len ); - emit receivedData( TQString::tqfromLatin1( buf, len ) ); + emit receivedData( TQString::fromLatin1( buf, len ) ); } void TESession::print( TQPainter &paint, bool friendly, bool exact ) diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index c03fd044f..f155d7050 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -295,7 +295,7 @@ TQPixmap *Desktop::paintNewWindow(const KWin::WindowInfo *info) p.begin(pixmap); p.setFont(font()); - p.fillRect( r, tqcolorGroup().brush(TQColorGroup::Dark)); + p.fillRect( r, colorGroup().brush(TQColorGroup::Dark)); paintWindow(p, info, false); p.end(); @@ -425,7 +425,7 @@ void Desktop::paintEvent( TQPaintEvent * ) p.begin(&pixmap); // p.setFont(font()); -// p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Dark)); +// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark)); // p.setPen(Qt::black); // p.drawRect(rect()); @@ -450,7 +450,7 @@ void Desktop::paintEvent( TQPaintEvent * ) else pixmap.fill(Qt::gray); } else - p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Mid)); + p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid)); // set in/active pen if (isCurrent()) @@ -523,8 +523,8 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool TQBrush brush; - if ( isActive ) brush=tqcolorGroup().brush( TQColorGroup::Highlight ); - else brush=tqcolorGroup().brush( TQColorGroup::Button ); + if ( isActive ) brush=colorGroup().brush( TQColorGroup::Highlight ); + else brush=colorGroup().brush( TQColorGroup::Button ); if ( m_transparentMode==AllWindows || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) ) @@ -532,12 +532,12 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool if ( isActive ) { - qDrawShadeRect( &p, r, tqcolorGroup(), false, 1, 0, &brush ); + qDrawShadeRect( &p, r, colorGroup(), false, 1, 0, &brush ); } else { p.fillRect( r, brush ); - qDrawShadeRect( &p, r, tqcolorGroup(), true, 1, 0 ); + qDrawShadeRect( &p, r, colorGroup(), true, 1, 0 ); } } @@ -669,7 +669,7 @@ void Desktop::backgroundLoaded(bool b) } else kdDebug() << "Error getting the background\n"; } -TQSize Desktop::tqsizeHint() const +TQSize Desktop::sizeHint() const { return TQSize(67,50); } diff --git a/kpager/desktop.h b/kpager/desktop.h index 56429342c..9fc9942ae 100644 --- a/kpager/desktop.h +++ b/kpager/desktop.h @@ -74,7 +74,7 @@ public: static void removeCachedPixmap(int nWin) { m_windowPixmaps.remove(nWin); }; - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * active is a bool that specifies if the frame is the active diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 57a960bb7..077500710 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -76,7 +76,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) if (w > 0 && h > 0) resize(w,h); else - resize(m_pPager->tqsizeHint()); + resize(m_pPager->sizeHint()); // resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90)); int xpos=cfg->readNumEntry("xPos",-1); @@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) // rect.pos.y+rect.size.height-m_pPager->height()); // antonio:The above lines don't work. I should look at them when I have // more time - move(kapp->desktop()->width()-m_pPager->tqsizeHint().width()-5,kapp->desktop()->height()-m_pPager->tqsizeHint().height()-25); + move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25); } // Set the wm flags to this window @@ -652,12 +652,12 @@ void KPager::slotGrabWindows() m_desktops[m_currentDesktop-1]->tqrepaint(); } -TQSize KPager::tqsizeHint() const +TQSize KPager::sizeHint() const { int n=m_desktops.count(); int w=-1,h=-1; - TQSize size=m_desktops[0]->tqsizeHint(); + TQSize size=m_desktops[0]->sizeHint(); int wDsk=size.width(); int hDsk=size.height(); switch (m_layoutType) diff --git a/kpager/kpager.h b/kpager/kpager.h index e88c2904f..aa194b4df 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -76,7 +76,7 @@ public: KWin::WindowInfo* info( WId win ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; enum LayoutTypes { Classical=0, Horizontal, Vertical }; diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index 113928a8b..71e58ce39 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -76,7 +76,7 @@ KCountryPage::~KCountryPage(){ void KCountryPage::loadCountryList(KLanguageButton *combo) { - TQString sub = TQString::tqfromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list combo->clear(); @@ -86,8 +86,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString tag = *it; int index; @@ -113,8 +113,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString submenu = '-' + entry.readEntry("Region"); TQString tag = *it; @@ -123,7 +123,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { index = tag.findRev('/'); tag = tag.mid(index+1); - TQPixmap flag( locate( "locale", TQString::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) ); + TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) ); TQIconSet icon( flag ); combo->insertItem( icon, name, tag, submenu ); } @@ -138,7 +138,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) { for ( it = langlist.begin(); it != langlist.end(); ++it ) { if ((*it).isNull()) { combo->insertSeparator(); - submenu = TQString::tqfromLatin1("all"); + submenu = TQString::fromLatin1("all"); combo->insertSubmenu(i18n("All"), submenu, TQString::null); continue; } @@ -151,9 +151,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan kdDebug() << "KCountryPage::save()" << endl; KConfigBase *config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Locale")); - config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true); - config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true); + config->setGroup(TQString::fromLatin1("Locale")); + config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true); + config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true); config->sync(); // only make the system reload the language, if the selected one deferes from the old saved one. @@ -167,7 +167,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan kapp->dcopClient()->attach(); // ksycoca needs to be rebuilt KProcess proc; - proc << TQString::tqfromLatin1("kbuildsycoca"); + proc << TQString::fromLatin1("kbuildsycoca"); proc.start(KProcess::DontCare); kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language @@ -182,10 +182,10 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan void KCountryPage::setLangForCountry(const TQString &country) { KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); - ent.setGroup(TQString::tqfromLatin1("KCM Locale")); - langs = ent.readListEntry(TQString::tqfromLatin1("Languages")); + ent.setGroup(TQString::fromLatin1("KCM Locale")); + langs = ent.readListEntry(TQString::fromLatin1("Languages")); - TQString lang = TQString::tqfromLatin1("en_US"); + TQString lang = TQString::fromLatin1("en_US"); // use the first INSTALLED langauge in the list, or default to C for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { if (cb_language->contains(*it)) { diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui index 168c0d014..cdad6cd7f 100644 --- a/kpersonalizer/kcountrypagedlg.ui +++ b/kpersonalizer/kcountrypagedlg.ui @@ -36,7 +36,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -120,7 +120,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui index c988c1607..82386d836 100644 --- a/kpersonalizer/keyecandypagedlg.ui +++ b/kpersonalizer/keyecandypagedlg.ui @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -222,7 +222,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index 4e3537206..a23f98322 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -38,7 +38,7 @@ KFindLanguage::KFindLanguage() { m_country = config->readEntry("Country", "C"); if (m_country == "C") { - m_country = TQString::tqfromLatin1(getenv("LANG")); + m_country = TQString::fromLatin1(getenv("LANG")); if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY m_country = "no"; if(m_country.contains("_")) @@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() { } // get the users primary Languages - KSimpleConfig ent(locate("locale", TQString::tqfromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); + KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); ent.setGroup("KCM Locale"); TQStringList langs = ent.readListEntry("Languages"); if (langs.isEmpty()) @@ -96,7 +96,7 @@ KFindLanguage::KFindLanguage() { if (m_oldlang.isEmpty()) { compare = langs.first(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) { - if (*it == TQString::tqfromLatin1(getenv("LANG")).mid(3, 2).lower()) + if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower()) compare = *it; } } diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui index 7e8a8a63c..acbb2713f 100644 --- a/kpersonalizer/kospagedlg.ui +++ b/kpersonalizer/kospagedlg.ui @@ -33,7 +33,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -136,7 +136,7 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>22</width> <height>10</height> @@ -153,7 +153,7 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>22</width> <height>16</height> diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index 71349d2e9..e28848cc0 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -232,11 +232,11 @@ void KPersonalizer::setBeforeSession(){ /** there seems to be a bug in TQWizard, that makes this evil hack necessary */ void KPersonalizer::setPosition() { - TQSize hint = countrypage->tqsizeHint(); - TQSize os_size = ospage->tqsizeHint(); - TQSize candy_size = eyecandy->tqsizeHint(); - TQSize style_size = stylepage->tqsizeHint(); - TQSize refine_size = refinepage->tqsizeHint(); + TQSize hint = countrypage->sizeHint(); + TQSize os_size = ospage->sizeHint(); + TQSize candy_size = eyecandy->sizeHint(); + TQSize style_size = stylepage->sizeHint(); + TQSize refine_size = refinepage->sizeHint(); // get the width of the broadest child-widget if ( hint.width() < os_size.width() ) diff --git a/kpersonalizer/krefinepagedlg.ui b/kpersonalizer/krefinepagedlg.ui index a13e3364b..0a2c563c4 100644 --- a/kpersonalizer/krefinepagedlg.ui +++ b/kpersonalizer/krefinepagedlg.ui @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>16</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index e125796a9..88b10edf8 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) { for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) { if (groups[i] == 0L) break; - KGlobal::config()->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons"); + KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); } KGlobal::config()->sync(); @@ -428,12 +428,12 @@ void KStylePage::getAvailability() { else if (*it == "Light, 3rd revision") kde_light_exist = true; } // and disable the ListItems, if they are not. - if ( !(kde_plastik_exist || kde_light_exist) ) kde->tqsetVisible(false); - if ( !(kde_hc_exist || kde_def_exist) ) classic->tqsetVisible(false); - if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->tqsetVisible(false); - if (!cde_exist) cde->tqsetVisible(false); - if (!win_exist) win->tqsetVisible(false); - if (!platinum_exist) platinum->tqsetVisible(false); + if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false); + if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false); + if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false); + if (!cde_exist) cde->setVisible(false); + if (!win_exist) win->setVisible(false); + if (!platinum_exist) platinum->setVisible(false); // test, wich KWin-styles are available twin_keramik_exist = twin_system_exist = twin_plastik_exist @@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() { // go ahead setStyleRecursive( stylePreview, palette, style ); // this flickers, but reliably draws the widgets corretly. - stylePreview->resize( stylePreview->tqsizeHint() ); + stylePreview->resize( stylePreview->sizeHint() ); delete appliedStyle; appliedStyle = style; diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui index 58890bb36..cc3837bbd 100644 --- a/kpersonalizer/kstylepagedlg.ui +++ b/kpersonalizer/kstylepagedlg.ui @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 5462eae5a..16d766871 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -52,7 +52,7 @@ int main(int argc, char **argv) KConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); + konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); else konfig = new KConfig(file, false, false); diff --git a/kscreensaver/blankscrn.cpp b/kscreensaver/blankscrn.cpp index 114bff145..1f57726b2 100644 --- a/kscreensaver/blankscrn.cpp +++ b/kscreensaver/blankscrn.cpp @@ -69,7 +69,7 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) grid->setRowStretch( 2, 10 ); grid->setRowStretch( 3, 20 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } // read settings from config file diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index 42b92f936..35693b724 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -271,7 +271,7 @@ KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); grid->addWidget(manipulateScreen, 1, 0); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); KConfig config("krandom.kssrc"); config.setGroup("Settings"); diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp index b1927890a..2f6708963 100644 --- a/ksmserver/client.cpp +++ b/ksmserver/client.cpp @@ -146,7 +146,7 @@ TQString KSMClient::program() const SmProp* p = property( SmProgram ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::tqfromLatin1( (const char*) p->vals[0].value ); + return TQString::fromLatin1( (const char*) p->vals[0].value ); } TQStringList KSMClient::restartCommand() const @@ -156,7 +156,7 @@ TQStringList KSMClient::restartCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); + result +=TQString::fromLatin1( (const char*) p->vals[i].value ); return result; } @@ -167,7 +167,7 @@ TQStringList KSMClient::discardCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); + result +=TQString::fromLatin1( (const char*) p->vals[i].value ); return result; } @@ -184,7 +184,7 @@ TQString KSMClient::userId() const SmProp* p = property( SmUserID ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::tqfromLatin1( (const char*) p->vals[0].value ); + return TQString::fromLatin1( (const char*) p->vals[0].value ); } diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index ad190185e..ec0ace402 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -315,7 +315,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop) if (!data) return result; for (int i=0; i<(int)nitems; i++) { - result << TQString::tqfromLatin1( (const char*)data + i ); + result << TQString::fromLatin1( (const char*)data + i ); while(data[i]) i++; } XFree(data); @@ -363,7 +363,7 @@ TQString KSMServer::windowWmClientMachine(WId w) } } } - return TQString::tqfromLatin1(result); + return TQString::fromLatin1(result); } WId KSMServer::windowWmClientLeader(WId w) diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 8e2270068..c98a1eb69 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] ) qmsg.sprintf(msg.data(), path.data()); qmsg = msg_pre+qmsg+msg_post; TQMessageBox::critical(0, "KDE Installation Problem!", - TQString::tqfromLatin1(qmsg.data())); + TQString::fromLatin1(qmsg.data())); exit(255); } } @@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) only_local = false; #endif - KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local); + KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local); kapp->dcopClient()->setDefaultObject( server->objId() ); IceSetIOErrorHandler( IoErrorHandler ); diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 3df6870b7..b4c8b7064 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -650,7 +650,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, TQFrame* frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - frame->setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); + frame->setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); // we need to set the minimum size for the logout box, since it // gets too small if there isn't all options available frame->setMinimumWidth(400); @@ -691,7 +691,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // first line of buttons hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() ); - hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox->setAlignment( Qt::AlignHCenter ); // End session FlatButton* btnLogout = new FlatButton( frame ); btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false ); @@ -711,12 +711,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, hbox->addWidget( lfrm, AlignCenter ); buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() ); - buttonlay->tqsetAlignment( Qt::AlignHCenter ); + buttonlay->setAlignment( Qt::AlignHCenter ); TQLabel* icon = new TQLabel( lfrm ); icon->setPixmap( UserIcon( "shutdownkonq" ) ); - lfrm->setFixedSize( icon->tqsizeHint()); - icon->setFixedSize( icon->tqsizeHint()); + lfrm->setFixedSize( icon->sizeHint()); + icon->setFixedSize( icon->sizeHint()); buttonlay->addStretch( 1 ); // End session @@ -832,7 +832,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // bottom buttons TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox2->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox2->setAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( frame ); @@ -882,7 +882,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->tqsetAlignment( Qt::AlignRight ); + hbuttonbox3->setAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -969,7 +969,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->tqsetAlignment( Qt::AlignRight ); + hbuttonbox3->setAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -1100,7 +1100,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd maysd, sdtype ); // Show dialog (will save the background in showEvent) - TQSize sh = l->tqsizeHint(); + TQSize sh = l->sizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); l->move(rect.x() + (rect.width() - sh.width())/2, @@ -1230,7 +1230,7 @@ bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const { kapp->enableStyles(); KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay ); - TQSize sh = msg.tqsizeHint(); + TQSize sh = msg.sizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); msg.move(rect.x() + (rect.width() - sh.width())/2, diff --git a/ksmserver/timed.ui b/ksmserver/timed.ui index 14337f6cd..0a1d3b8bf 100644 --- a/ksmserver/timed.ui +++ b/ksmserver/timed.ui @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -229,7 +229,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -258,7 +258,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -286,7 +286,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -319,7 +319,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 1b7a3afba..860844ffe 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -99,7 +99,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( leftbox, 1 ); mThemesList = new ThemeListBox(this); - mThemesList->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int))); connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&))); leftbox->addWidget(mThemesList); @@ -120,16 +120,16 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( rightbox, 3 ); mPreview = new TQLabel(this); - mPreview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); mPreview->setMinimumSize(TQSize(320,240)); - mPreview->tqsetAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); rightbox->addWidget(mPreview); rightbox->setStretchFactor( mPreview, 3 ); mText = new TQTextEdit(this); - mText->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); - mText->setMinimumSize(mText->tqsizeHint()); + mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + mText->setMinimumSize(mText->sizeHint()); mText->setReadOnly(true); rightbox->addWidget(mText); rightbox->setStretchFactor( mText, 1 ); diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 5e918cef3..77274da99 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -164,7 +164,7 @@ void ThemeDefault::_initUi() mProgressBar->setPaletteBackgroundPixmap( blimage ); bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) ); - bottom_label->setFixedHeight( mLabel->tqsizeHint().height()+4 ); + bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 ); // 3 pixels of whitespace between the label and the progressbar. mLabel->resize( bottom_label->width(), bottom_label->height() ); @@ -274,7 +274,7 @@ TQPixmap ThemeDefault::updateBarPixmap( int state ) p.drawPixmap(0, 0, *mInactivePixmap, 0, 0, tmp.width()-offs ); else #endif - p.tqdrawPixmap(offs, 0, *mInactivePixmap, offs, 0); + p.drawPixmap(offs, 0, *mInactivePixmap, offs, 0); return tmp ; } diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 175863f74..5c7118441 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -199,11 +199,11 @@ void ThemeRedmond::_initUi() kdmconfig->setGroup("X-*-Greeter"); TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; TQString fs = kdmconfig->readEntry( "FaceSource" ); - if (fs == TQString::tqfromLatin1("UserOnly")) + if (fs == TQString::fromLatin1("UserOnly")) faceSource = fUserOnly; - else if (fs == TQString::tqfromLatin1("PreferUser")) + else if (fs == TQString::fromLatin1("PreferUser")) faceSource = fUserFirst; - else if (fs == TQString::tqfromLatin1("PreferAdmin")) + else if (fs == TQString::fromLatin1("PreferAdmin")) faceSource = fAdminFirst; else faceSource = fAdminOnly; // Admin Only diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp index e552e9909..782753c82 100644 --- a/ksplashml/themeengine/unified/themeunified.cpp +++ b/ksplashml/themeengine/unified/themeunified.cpp @@ -80,7 +80,7 @@ void ThemeUnified::_initUi() const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() ); // Center the dialog - TQSize sh = tqsizeHint(); + TQSize sh = sizeHint(); TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos()); move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2); } diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc index 5aef8a26f..5160dbddb 100644 --- a/ksysguard/gui/KSGAppletSettings.cc +++ b/ksysguard/gui/KSGAppletSettings.cc @@ -65,7 +65,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name ) topLayout->addWidget( mInterval, 2, 1 ); label->setBuddy( mInterval ); - resize( TQSize( 250, 130 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) ); KAcceleratorManager::manage( page ); } diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc index 1980c3762..cf0c1ee0a 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc @@ -52,7 +52,7 @@ BarGraph::BarGraph( TQWidget *parent, const char *name ) // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); } @@ -111,7 +111,7 @@ void BarGraph::paintEvent( TQPaintEvent* ) /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( tqcolorGroup().light() ) ); + p.setPen( TQColor( colorGroup().light() ) ); p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index 7163f9b99..3d513ace3 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc @@ -53,7 +53,7 @@ DancingBars::DancingBars( TQWidget *parent, const char *name, const TQString &ti else mPlotter = new BarGraph( frame() ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ @@ -231,12 +231,12 @@ void DancingBars::resizeEvent( TQResizeEvent* ) frame()->setGeometry( 0, 0, width(), height() ); } -TQSize DancingBars::tqsizeHint() +TQSize DancingBars::sizeHint() { if ( noFrame() ) - return ( mPlotter->tqsizeHint() ); + return ( mPlotter->sizeHint() ); else - return ( frame()->tqsizeHint() ); + return ( frame()->sizeHint() ); } void DancingBars::answerReceived( int id, const TQString &answer ) diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h index 35feaa07f..3ccc03f86 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h @@ -54,7 +54,7 @@ class DancingBars : public KSGRD::SensorDisplay void updateSamples( const TQMemArray<double> &samples ); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); virtual void answerReceived( int id, const TQString &answer ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 09a6e7a94..89c12a30c 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc @@ -52,7 +52,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name, mPlotter->setTitle( title ); mPlotter->setThinFrame(!isApplet); //if we aren't an applet, draw a thin white frame on the left and bottom, for a 3d effect - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ @@ -281,12 +281,12 @@ void FancyPlotter::resizeEvent( TQResizeEvent* ) frame()->setGeometry( 0, 0, width(), height() ); } -TQSize FancyPlotter::tqsizeHint() +TQSize FancyPlotter::sizeHint() { if ( noFrame() ) - return mPlotter->tqsizeHint(); + return mPlotter->sizeHint(); else - return frame()->tqsizeHint(); + return frame()->sizeHint(); } void FancyPlotter::answerReceived( int id, const TQString &answer ) diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h index 00d88223a..2f0e36c60 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h @@ -66,7 +66,7 @@ class FancyPlotter : public KSGRD::SensorDisplay bool removeSensor( uint pos ); - virtual TQSize tqsizeHint(void); + virtual TQSize sizeHint(void); virtual void answerReceived( int id, const TQString &answer ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index 91b908553..8de923d60 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -90,7 +90,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) boxLayout->addWidget( label, 1, 0 ); mMinValue = new KLineEdit( groupBox ); - mMinValue->tqsetAlignment( AlignRight ); + mMinValue->setAlignment( AlignRight ); mMinValue->setEnabled( false ); TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMinValue, 1, 1 ); @@ -100,7 +100,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) boxLayout->addWidget( label, 1, 3 ); mMaxValue = new KLineEdit( groupBox ); - mMaxValue->tqsetAlignment( AlignRight ); + mMaxValue->setAlignment( AlignRight ); mMaxValue->setEnabled( false ); TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMaxValue, 1, 4 ); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index e9fc17c24..c4daee1b6 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -105,7 +105,7 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending PrivateListView::PrivateListView(TQWidget *parent, const char *name) : TQListView(parent, name) { - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); @@ -116,8 +116,8 @@ PrivateListView::PrivateListView(TQWidget *parent, const char *name) void PrivateListView::update(const TQString& answer) { - tqsetUpdatesEnabled(false); - viewport()->tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); + viewport()->setUpdatesEnabled(false); int vpos = verticalScrollBar()->value(); int hpos = horizontalScrollBar()->value(); @@ -143,8 +143,8 @@ void PrivateListView::update(const TQString& answer) verticalScrollBar()->setValue(vpos); horizontalScrollBar()->setValue(hpos); - viewport()->tqsetUpdatesEnabled(true); - tqsetUpdatesEnabled(true); + viewport()->setUpdatesEnabled(true); + setUpdatesEnabled(true); triggerUpdate(); } @@ -290,12 +290,12 @@ ListView::restoreSettings(TQDomElement& element) { addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title")); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); - tqcolorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); - tqcolorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); + colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); + colorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); SensorDisplay::restoreSettings(element); @@ -311,10 +311,10 @@ ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) element.setAttribute("sensorName", sensors().tqat(0)->name()); element.setAttribute("sensorType", sensors().tqat(0)->type()); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link)); - saveColor(element, "textColor", tqcolorGroup.color(TQColorGroup::Text)); - saveColor(element, "backgroundColor", tqcolorGroup.color(TQColorGroup::Base)); + TQColorGroup colorGroup = monitor->colorGroup(); + saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link)); + saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text)); + saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base)); SensorDisplay::saveSettings(doc, element); @@ -331,10 +331,10 @@ ListView::configureSettings() Q_CHECK_PTR(lvs); connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - lvs->setGridColor(tqcolorGroup.color(TQColorGroup::Link)); - lvs->setTextColor(tqcolorGroup.color(TQColorGroup::Text)); - lvs->setBackgroundColor(tqcolorGroup.color(TQColorGroup::Base)); + TQColorGroup colorGroup = monitor->colorGroup(); + lvs->setGridColor(colorGroup.color(TQColorGroup::Link)); + lvs->setTextColor(colorGroup.color(TQColorGroup::Text)); + lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base)); lvs->setTitle(title()); if (lvs->exec()) @@ -347,11 +347,11 @@ ListView::configureSettings() void ListView::applySettings() { - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); - tqcolorGroup.setColor(TQColorGroup::Text, lvs->textColor()); - tqcolorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); + colorGroup.setColor(TQColorGroup::Text, lvs->textColor()); + colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); setTitle(lvs->title()); @@ -361,11 +361,11 @@ ListView::applySettings() void ListView::applyStyle() { - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); - tqcolorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); - tqcolorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); + colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); + colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); setModified(true); } diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h index 3a79a20b3..d26852230 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.h +++ b/ksysguard/gui/SensorDisplayLib/ListView.h @@ -58,7 +58,7 @@ public: PrivateListViewItem(PrivateListView *parent = 0); void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) { - TQColorGroup cgroup = _parent->tqcolorGroup(); + TQColorGroup cgroup = _parent->colorGroup(); TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); p->setPen(cgroup.color(TQColorGroup::Link)); p->drawLine(0, height() - 1, width - 1, height() - 1); diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index 314690513..9089b3b7a 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -79,7 +79,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T void LogFile::configureSettings(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); lfs = new LogFileSettings(this); Q_CHECK_PTR(lfs); @@ -147,7 +147,7 @@ void LogFile::settingsRuleListSelected(int index) void LogFile::applySettings(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color()); cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color()); @@ -166,7 +166,7 @@ void LogFile::applySettings(void) void LogFile::applyStyle() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -179,7 +179,7 @@ bool LogFile::restoreSettings(TQDomElement& element) { TQFont font; - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -212,8 +212,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) element.setAttribute("font", monitor->font().toString()); - saveColor(element, "textColor", monitor->tqcolorGroup().text()); - saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); + saveColor(element, "textColor", monitor->colorGroup().text()); + saveColor(element, "backgroundColor", monitor->colorGroup().base()); for (TQStringList::Iterator it = filterRules.begin(); it != filterRules.end(); it++) diff --git a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui index a1cc1572c..c346dfbe3 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui +++ b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc index 7050decde..9a81582e0 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc @@ -53,7 +53,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name, Q_CHECK_PTR(lcd); lcd->setSegmentStyle(TQLCDNumber::Filled); setDigitColor(KSGRD::Style->backgroundColor()); - lcd->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, false)); setBackgroundColor(KSGRD::Style->backgroundColor()); diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 40209feac..16abc45c1 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -121,7 +121,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -162,7 +162,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -377,8 +377,8 @@ <property type="Bool">enabled</property> <property type="Rect">geometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 6068e85e5..6c99f9d1d 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -98,11 +98,11 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T cbFilter->insertItem(i18n("System Processes"), 1); cbFilter->insertItem(i18n("User Processes"), 2); cbFilter->insertItem(i18n("Own Processes"), 3); - cbFilter->setMinimumSize(cbFilter->tqsizeHint()); + cbFilter->setMinimumSize(cbFilter->sizeHint()); // Create the check box to switch between tree view and list view. xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView"); Q_CHECK_PTR(xbTreeView); - xbTreeView->setMinimumSize(xbTreeView->tqsizeHint()); + xbTreeView->setMinimumSize(xbTreeView->sizeHint()); connect(xbTreeView, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setTreeView(bool))); @@ -116,13 +116,13 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), this, "bRefresh" ); Q_CHECK_PTR(bRefresh); - bRefresh->setMinimumSize(bRefresh->tqsizeHint()); + bRefresh->setMinimumSize(bRefresh->sizeHint()); connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); // Create the 'Kill' button. bKill = new KPushButton(i18n("&Kill"), this, "bKill"); Q_CHECK_PTR(bKill); - bKill->setMinimumSize(bKill->tqsizeHint()); + bKill->setMinimumSize(bKill->sizeHint()); connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); /* Disable the kill button until we know that the daemon supports the * kill command. */ @@ -147,7 +147,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T setPlotterWidget(pList); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); fixTabOrder(); } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 003050e8f..0fc037bca 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -297,8 +297,8 @@ ProcessList::update(const TQString& list) /* Disable painting to avoid flickering effects, * especially when in tree view mode. * Ditto for the scrollbar. */ - tqsetUpdatesEnabled(false); - viewport()->tqsetUpdatesEnabled(false); + setUpdatesEnabled(false); + viewport()->setUpdatesEnabled(false); pl.clear(); @@ -349,8 +349,8 @@ ProcessList::update(const TQString& list) horizontalScrollBar()->setValue(hpos); // Re-enable painting, and force an update. - tqsetUpdatesEnabled(true); - viewport()->tqsetUpdatesEnabled(true); + setUpdatesEnabled(true); + viewport()->setUpdatesEnabled(true); triggerUpdate(); diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc index f5d13ed5c..dfd535883 100644 --- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc +++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc @@ -43,7 +43,7 @@ ReniceDlg::ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, "the number is the higher the priority.\n\n" "Please enter the desired nice level:").arg(pid); message = new TQLabel(msg, page); - message->setMinimumSize(message->tqsizeHint()); + message->setMinimumSize(message->sizeHint()); vLay->addWidget(message); /* diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index 7acd11501..c4ff6a649 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -66,7 +66,7 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name, if(!nf) { mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame"); mFrame->setFlat(true); - mFrame->tqsetAlignment(Qt::AlignHCenter); + mFrame->setAlignment(Qt::AlignHCenter); mFrame->setInsideMargin(2); setTitle( title ); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc index 383e7b53c..0e30136bf 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc @@ -50,7 +50,7 @@ LogSensor::LogSensor(TQListView *parent) pixmap_waiting = UserIcon( "waiting" ); lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->tqcolorGroup().text()); + lvi->setTextColor(monitor->colorGroup().text()); monitor->insertItem(lvi); } @@ -72,7 +72,7 @@ void LogSensor::stopLogging(void) { lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->tqcolorGroup().text()); + lvi->setTextColor(monitor->colorGroup().text()); lvi->tqrepaint(); timerOff(); } @@ -104,7 +104,7 @@ LogSensor::answerReceived(int id, const TQString& answer) { timerOff(); lowerLimitActive = false; - lvi->setTextColor(monitor->tqcolorGroup().foreground()); + lvi->setTextColor(monitor->colorGroup().foreground()); lvi->tqrepaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName)); timerOn(); @@ -112,13 +112,13 @@ LogSensor::answerReceived(int id, const TQString& answer) { timerOff(); upperLimitActive = false; - lvi->setTextColor(monitor->tqcolorGroup().foreground()); + lvi->setTextColor(monitor->colorGroup().foreground()); lvi->tqrepaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } - TQDate date = TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().date()); - TQTime time = TQT_TQTIME_OBJECT(TQDateTime::tqcurrentDateTime().time()); + TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date()); + TQTime time = TQT_TQTIME_OBJECT(TQDateTime::currentDateTime().time()); stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value); } @@ -139,7 +139,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t monitor->addColumn(i18n("Host Name")); monitor->addColumn(i18n("Log File")); - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor()); @@ -232,7 +232,7 @@ SensorLogger::editSensor(LogSensor* sensor) void SensorLogger::configureSettings() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); Q_CHECK_PTR(sls); @@ -254,7 +254,7 @@ SensorLogger::configureSettings() void SensorLogger::applySettings() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); setTitle(sls->title()); @@ -269,7 +269,7 @@ SensorLogger::applySettings() void SensorLogger::applyStyle(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -282,7 +282,7 @@ SensorLogger::applyStyle(void) bool SensorLogger::restoreSettings(TQDomElement& element) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -319,9 +319,9 @@ SensorLogger::restoreSettings(TQDomElement& element) bool SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - saveColor(element, "textColor", monitor->tqcolorGroup().text()); - saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); - saveColor(element, "alarmColor", monitor->tqcolorGroup().foreground()); + saveColor(element, "textColor", monitor->colorGroup().text()); + saveColor(element, "backgroundColor", monitor->colorGroup().base()); + saveColor(element, "alarmColor", monitor->colorGroup().foreground()); for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next()) { diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui index 78d99b953..144335654 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -127,7 +127,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index dbf4e7fc2..04e9e6541 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc @@ -50,7 +50,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name ) // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); mShowVerticalLines = true; @@ -401,7 +401,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) pm.fill( mBackgroundColor ); /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( tqcolorGroup().light() ) ); + p.setPen( TQColor( colorGroup().light() ) ); if(mShowThinFrame) { p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index ac0793a9a..377cc4783 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -457,7 +457,7 @@ void WorkSheet::dropEvent( TQDropEvent *e ) } } -TQSize WorkSheet::tqsizeHint() const +TQSize WorkSheet::sizeHint() const { return TQSize( 200,150 ); } @@ -531,7 +531,7 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new mDisplayList[ row ][ column ]->show(); } - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); setModified( true ); } diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h index 61ae0c46e..37bafbda3 100644 --- a/ksysguard/gui/WorkSheet.h +++ b/ksysguard/gui/WorkSheet.h @@ -90,7 +90,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard void titleChanged( TQWidget *sheet ); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void dragEnterEvent( TQDragEnterEvent* ); void dropEvent( TQDropEvent* ); void customEvent( TQCustomEvent* ); diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index aaa0c77b2..682f77558 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -50,7 +50,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) group->tqlayout()->setSpacing( spacingHint() ); TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->setAlignment( Qt::AlignTop ); mSheetTitle = new KLineEdit( group ); groupLayout->addWidget( mSheetTitle, 0, 0 ); @@ -62,7 +62,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) group->tqlayout()->setSpacing( spacingHint() ); groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->setAlignment( Qt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); groupLayout->addWidget( label, 0, 0 ); @@ -103,7 +103,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) mSheetTitle->setFocus(); - resize( TQSize( 250, 230 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) ); } WorkSheetSettings::~WorkSheetSettings() diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index 0f87323d4..95c45716e 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -61,7 +61,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) i18n( "Connection Type" ), page ); TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4, spacingHint() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->setAlignment( Qt::AlignTop ); mUseSsh = new TQRadioButton( i18n( "ssh" ), group ); mUseSsh->setEnabled( true ); diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 3ec2be165..9eb71db4f 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -25,7 +25,7 @@ KSysTrayCmd::KSysTrayCmd() isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), win(0), client(0), twinmodule(0), top(0), left(0) { - tqsetAlignment( AlignCenter ); + setAlignment( AlignCenter ); twinmodule = new KWinModule( TQT_TQOBJECT(this) ); refresh(); } diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui index bc1225bfb..f0b2f8041 100644 --- a/kxkb/kcmlayoutwidget.ui +++ b/kxkb/kcmlayoutwidget.ui @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>600</width> <height>510</height> @@ -34,7 +34,7 @@ <property name="name"> <cstring>tabWidget</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>600</width> <height>500</height> @@ -303,7 +303,7 @@ <property name="name"> <cstring>listLayoutsSrc</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>260</width> <height>0</height> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -410,7 +410,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -442,7 +442,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 35f528318..3a8dcd817 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -545,7 +545,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin TQLabel * label = new TQLabel( textFileName, fileNameBox ); m_leFileName = new KLineEdit( fileNameBox, 0L ); - m_leFileName->setMinimumWidth(m_leFileName->tqsizeHint().width() * 3); + m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3); label->setBuddy(m_leFileName); // please "scheck" style m_leFileName->setText( defaultName ); m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect @@ -559,7 +559,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" ); m_urlRequester->setMode( KFile::File | KFile::Directory ); - m_urlRequester->setMinimumWidth( m_urlRequester->tqsizeHint().width() * 3 ); + m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 ); connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotURLTextChanged(const TQString&)) ); label->setBuddy(m_urlRequester); // please "scheck" style diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc index b025f3d4d..042cafb99 100644 --- a/libkonq/konq_bgnddlg.cc +++ b/libkonq/konq_bgnddlg.cc @@ -51,7 +51,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() ); m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->setAlignment( Qt::AlignTop ); mainLayout->addWidget( m_buttonGroup ); connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ), @@ -61,7 +61,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup ); groupLayout->addWidget( m_radioColor, 0, 0 ); m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup ); - m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred, + m_buttonColor->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); groupLayout->addWidget( m_buttonColor, 0, 1 ); @@ -90,14 +90,14 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, TQLabel* lbl = new TQLabel( i18n("Preview"), page ); hlay->addWidget( lbl ); TQFrame* frame = new TQFrame( page ); - frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); frame->setFrameShape( TQFrame::HLine ); frame->setFrameShadow( TQFrame::Sunken ); hlay->addWidget( frame ); // preview frame m_preview = new TQFrame( page ); - m_preview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_preview->setMinimumSize( 370, 180 ); m_preview->setFrameShape( TQFrame::Panel ); m_preview->setFrameShadow( TQFrame::Raised ); diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc index 4b97456f6..1e5271123 100644 --- a/libkonq/konq_drag.cc +++ b/libkonq/konq_drag.cc @@ -47,12 +47,12 @@ const char* KonqIconDrag::format( int i ) const else return 0; } -TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const +TQByteArray KonqIconDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "application/x-qiconlist" ) - a = TQIconDrag::tqencodedData( mime ); + a = TQIconDrag::encodedData( mime ); else if ( mimetype == "text/uri-list" ) { TQCString s = urls.join( "\r\n" ).latin1(); if( urls.count() > 0 ) @@ -145,7 +145,7 @@ const char* KonqIconDrag2::format( int i ) const return KonqIconDrag::format( i ); } -TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const +TQByteArray KonqIconDrag2::encodedData( const char* mime ) const { TQCString mimetype( mime ); if ( mimetype == "application/x-kde-urilist" ) @@ -164,7 +164,7 @@ TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const a[c] = 0; return a; } - return KonqIconDrag::tqencodedData( mime ); + return KonqIconDrag::encodedData( mime ); } // @@ -223,7 +223,7 @@ const char* KonqDrag::format( int i ) const else return 0; } -TQByteArray KonqDrag::tqencodedData( const char* mime ) const +TQByteArray KonqDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); @@ -243,7 +243,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const } else if ( mimetype == "application/x-kde-urilist" ) { - return TQUriDrag::tqencodedData( "text/uri-list" ); + return TQUriDrag::encodedData( "text/uri-list" ); } else if ( mimetype == "application/x-kde-cutselection" ) { @@ -271,7 +271,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e ) { - TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" ); + TQByteArray a = e->encodedData( "application/x-kde-cutselection" ); if ( a.isEmpty() ) return false; else diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h index 65a156021..c30bbe49b 100644 --- a/libkonq/konq_drag.h +++ b/libkonq/konq_drag.h @@ -44,7 +44,7 @@ public: virtual ~KonqIconDrag() {} const char* format( int i ) const; - TQByteArray tqencodedData( const char* mime ) const; + TQByteArray encodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url ); @@ -72,7 +72,7 @@ public: virtual ~KonqIconDrag2() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url, const KURL &mostLocalURL ); @@ -107,7 +107,7 @@ public: virtual ~KonqDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; void setMoveSelection( bool move ) { m_bCutSelection = move; } diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc index c7ef40c56..03f7d64bf 100644 --- a/libkonq/konq_filetip.cc +++ b/libkonq/konq_filetip.cc @@ -49,7 +49,7 @@ KonqFileTip::KonqFileTip( TQScrollView* parent ) { m_iconLabel = new TQLabel(this); m_textLabel = new TQLabel(this); - m_textLabel->tqsetAlignment(TQt::AlignAuto | TQt::AlignTop); + m_textLabel->setAlignment(TQt::AlignAuto | TQt::AlignTop); TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0); layout->addWidget(m_iconLabel, 0, 0); @@ -189,7 +189,7 @@ void KonqFileTip::drawContents( TQPainter *p ) } if ( m_corners[m_corner].isNull()) - m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); + m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); TQPixmap &pix = m_corners[m_corner]; diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc index 9ac069cc5..451b61ecf 100644 --- a/libkonq/konq_historymgr.cc +++ b/libkonq/konq_historymgr.cc @@ -48,7 +48,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) m_history.setAutoDelete( true ); m_filename = locateLocal( "data", - TQString::tqfromLatin1("konqueror/konq_history" )); + TQString::fromLatin1("konqueror/konq_history" )); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -295,7 +295,7 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url, // konqueror's window caption). if ( !pending && u != title ) entry.title = title; - entry.firstVisited = TQDateTime::tqcurrentDateTime(); + entry.firstVisited = TQDateTime::currentDateTime(); entry.lastVisited = entry.firstVisited; // always remove from pending if available, otherwise the else branch leaks @@ -342,7 +342,7 @@ void KonqHistoryManager::insert( const TQString& url ) // Local URL -> add to history KonqHistoryEntry entry; entry.url = u; - entry.firstVisited = TQDateTime::tqcurrentDateTime(); + entry.firstVisited = TQDateTime::currentDateTime(); entry.lastVisited = entry.firstVisited; emitAddToHistory( entry ); } @@ -589,7 +589,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString ) // compatibility fallback, try to load the old completion history bool KonqHistoryManager::loadFallback() { - TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history")); + TQString file = locateLocal( "config", TQString::fromLatin1("konq_history")); if ( file.isEmpty() ) return false; @@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item) entry->url = u; entry->numberOfTimesVisited = weight; // to make it not expire immediately... - entry->lastVisited = TQDateTime::tqcurrentDateTime(); + entry->lastVisited = TQDateTime::currentDateTime(); } return entry; diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index d881b6012..a4414db52 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF m_LineupMode = LineupBoth; // emit our signals slotSelectionChanged(); - m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" ); + m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" ); KonqUndoManager::incRef(); } @@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) if (!hasPixmap && backgroundMode() != NoBackground) d->m_movie->setBackgroundColor( viewport()->backgroundColor() ); d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) ); - d->m_movie->connectqStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) ); + d->m_movie->connecStatus( TQT_TQOBJECT(this), TQT_SLOT( slotMovieStatus(int) ) ); d->movieFileName = d->pActiveItem->mouseOverAnimation(); d->pActiveItem->setAnimated( true ); } @@ -349,7 +349,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) d->pSoundPlayer->mimeTypes().contains( item->item()->mimetype()) && KGlobalSettings::showFilePreview(item->item()->url()) - && tqtopLevelWidget() == kapp->activeWindow()) + && topLevelWidget() == kapp->activeWindow()) { d->pSoundItem = item; d->bSoundItemClicked = false; @@ -653,7 +653,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint // event that will be triggered in that case. bool prevUpdatesState = viewport()->isUpdatesEnabled(); - viewport()->tqsetUpdatesEnabled( false ); + viewport()->setUpdatesEnabled( false ); // Do this even if size didn't change, since this is used by refreshMimeTypes... for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { @@ -673,7 +673,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie } // Restore viewport update to previous state - viewport()->tqsetUpdatesEnabled( prevUpdatesState ); + viewport()->setUpdatesEnabled( prevUpdatesState ); if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() || !stopImagePreviewFor.isEmpty() ) && autoArrange() ) @@ -995,7 +995,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e ) { if ( e->provides( "text/uri-list" ) ) { - TQByteArray payload = e->tqencodedData( "text/uri-list" ); + TQByteArray payload = e->encodedData( "text/uri-list" ); if ( !payload.size() ) kdError() << "Empty data !" << endl; // Cache the URLs, since we need them every time we move over a file @@ -1221,7 +1221,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) // The following call is SO expensive (the ::widgetAt call eats up to 80% // of the mouse move cpucycles!), so it's mandatory to place that function // under strict checks, such as d->pSoundPlayer->isPlaying() - if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() ) + if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() ) { if (d->pSoundPlayer) d->pSoundPlayer->stop(); diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index fb803a9a9..0e0416f70 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -76,7 +76,7 @@ KonqOperations::~KonqOperations() void KonqOperations::editMimeType( const TQString & mimeType ) { - TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); + TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType), keditfiletype, keditfiletype /*unused*/); } diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index a7608c7f8..b878b0ae5 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -355,7 +355,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) m_pluginList.setAutoDelete( true ); m_ownActions.setHighlightingEnabled( true ); - attrName = TQString::tqfromLatin1( "name" ); + attrName = TQString::fromLatin1( "name" ); prepareXMLGUIStuff(); m_builder = new KonqPopupMenuGUIBuilder( this ); @@ -1157,7 +1157,7 @@ void KonqPopupMenu::addPlugins() //search for a plugin with the right protocol KTrader::OfferList plugin_offers; unsigned int pluginCount = 0; - plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::tqfromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); + plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); if ( plugin_offers.isEmpty() ) return; // no plugins installed do not bother about it @@ -1176,7 +1176,7 @@ void KonqPopupMenu::addPlugins() if ( !plugin ) continue; // This make the kuick plugin insert its stuff above "Properties" - TQString pluginClientName = TQString::tqfromLatin1( "Plugin%1" ).arg( pluginCount ); + TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount ); addMerge( pluginClientName ); plugin->domDocument().documentElement().setAttribute( "name", pluginClientName ); m_pluginList.append( plugin ); diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc index b860183c6..303fe044f 100644 --- a/libkonq/konq_propsview.cc +++ b/libkonq/konq_propsview.cc @@ -474,7 +474,7 @@ void KonqPropsView::setBgColor( const TQColor & color ) const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const { if ( !m_bgColor.isValid() ) - return widget->tqcolorGroup().base(); + return widget->colorGroup().base(); else return m_bgColor; } @@ -501,7 +501,7 @@ void KonqPropsView::setTextColor( const TQColor & color ) const TQColor & KonqPropsView::textColor( TQWidget * widget ) const { if ( !m_textColor.isValid() ) - return widget->tqcolorGroup().text(); + return widget->colorGroup().text(); else return m_textColor; } diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index c17f58a68..c69b97966 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -133,7 +133,7 @@ protected: TQString currentGroup() const { return isDefaultProperties() ? - TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties"); + TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties"); } private: diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc index b9cf41503..d48c7af10 100644 --- a/libkonq/konq_settings.cc +++ b/libkonq/konq_settings.cc @@ -146,10 +146,10 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl; if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" ) return true; //always embed mimetype inode/*, Browser/* and Konqueror/* - TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::tqfromLatin1("embed-")+serviceTypeGroup ); + TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup ); if ( it != m_embedMap.end() ) { kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl; - return it.data() == TQString::tqfromLatin1("true"); + return it.data() == TQString::fromLatin1("true"); } // 3 - if no config found, use default. // Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp ! diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h index a45878562..9774d92e9 100644 --- a/libkonq/konqbookmarkmanager.h +++ b/libkonq/konqbookmarkmanager.h @@ -11,7 +11,7 @@ public: static KBookmarkManager * self() { if ( !s_bookmarkManager ) { - TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); } return s_bookmarkManager; diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 354cb1cf5..350da1098 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -307,7 +307,7 @@ bool PluginPart::openURL(const KURL &url) _widget = inst; } else { TQLabel *label = new TQLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas ); - label->tqsetAlignment( AlignCenter | WordBreak ); + label->setAlignment( AlignCenter | WordBreak ); _widget = label; } diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index ce2e238bc..b48d2a8b6 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -251,14 +251,14 @@ int tryCheck(int write_fd, const TQString &absFile) NPError err = func_GetValue( 0, NPPVpluginNameString, (void*)&buf ); if ( err==NPERR_NO_ERROR ) - name = TQString::tqfromLatin1( buf ); + name = TQString::fromLatin1( buf ); kdDebug() << "name = " << name << endl; // get name NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString, (void*)&buf ); if ( nperr==NPERR_NO_ERROR ) - description = TQString::tqfromLatin1( buf ); + description = TQString::fromLatin1( buf ); kdDebug() << "description = " << description << endl; } else diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp index c9c535957..1d85f674a 100644 --- a/nsplugins/viewer/kxt.cpp +++ b/nsplugins/viewer/kxt.cpp @@ -567,7 +567,7 @@ bool KXtWidget::isActiveWindow() const TQWidget *w = find( (WId)win ); if ( w ) { // We know that window - return w->tqtopLevelWidget() == tqtopLevelWidget(); + return w->topLevelWidget() == topLevelWidget(); } else { // Window still may be a parent (if top-level is foreign window) Window root, parent; diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 0f56f055f..146604c22 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -252,8 +252,8 @@ NPError g_NPN_GetURL(NPP instance, const char *url, const char *target) NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); if (inst) { - inst->requestURL( TQString::tqfromLatin1(url), TQString::null, - TQString::tqfromLatin1(target), 0 ); + inst->requestURL( TQString::fromLatin1(url), TQString::null, + TQString::fromLatin1(target), 0 ); } return NPERR_NO_ERROR; @@ -267,8 +267,8 @@ NPError g_NPN_GetURLNotify(NPP instance, const char *url, const char *target, NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); if (inst) { kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl; - inst->requestURL( TQString::tqfromLatin1(url), TQString::null, - TQString::tqfromLatin1(target), notifyData, true ); + inst->requestURL( TQString::fromLatin1(url), TQString::null, + TQString::fromLatin1(target), notifyData, true ); } return NPERR_NO_ERROR; @@ -318,7 +318,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -360,9 +360,9 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); - if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { - inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), - TQString::tqfromLatin1(target), notifyData, args, true ); + if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { + inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), + TQString::fromLatin1(target), notifyData, args, true ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -415,7 +415,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -457,9 +457,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); - if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { - inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), - TQString::tqfromLatin1(target), 0L, args, false ); + if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { + inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), + TQString::fromLatin1(target), 0L, args, false ); } else { // Unsupported / insecure return NPERR_INVALID_URL; diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index effa3dea3..e0862271c 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0) void showmsgconsole(const TQString& msg, int type = 0) { - TQString errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); + TQString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); kdDebug() << errmsg << msg << endl; } diff --git a/tdeprint/slave/kio_print.cpp b/tdeprint/slave/kio_print.cpp index 71c8779ef..12ecb8f60 100644 --- a/tdeprint/slave/kio_print.cpp +++ b/tdeprint/slave/kio_print.cpp @@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("printer.template"), content)) + if (!loadTemplate(TQString::fromLatin1("printer.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template")); return; @@ -676,7 +676,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("class.template"), content)) + if (!loadTemplate(TQString::fromLatin1("class.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template")); return; @@ -686,7 +686,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) TQStringList members(printer->members()); for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) { - memberContent.append(TQString::tqfromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it)); + memberContent.append(TQString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it)); } memberContent.append("</ul>\n"); @@ -719,7 +719,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("pseudo.template"), content)) + if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) { - TQFile f(locate("data", TQString::tqfromLatin1("tdeprint/template/")+filename)); + TQFile f(locate("data", TQString::fromLatin1("tdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) { TQTextStream t(&f); @@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) } TQString content; - if (!loadTemplate(TQString::tqfromLatin1("jobs.template"), content)) + if (!loadTemplate(TQString::fromLatin1("jobs.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -891,7 +891,7 @@ void KIO_Print::showDriver(KMPrinter *prt) mimeType("text/html"); TQString content; - if (!loadTemplate(TQString::tqfromLatin1("driver.template"), content)) + if (!loadTemplate(TQString::fromLatin1("driver.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 171077eea..075b435d2 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -291,7 +291,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa if (v.isEmpty()) v = getenv("FAXSERVER"); if (v.isEmpty()) - v = TQString::tqfromLatin1("localhost"); + v = TQString::fromLatin1("localhost"); v = processTag( match, v ); } else if (isTag( match, "%page" )) @@ -491,7 +491,7 @@ void FaxCtrl::filter() m_tempfiles.append(tmp); m_process->clearArguments(); *m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters")) - << TQString::tqfromLatin1("--mime=%1").arg(mimeType) + << TQString::fromLatin1("--mime=%1").arg(mimeType) << "-p" << pageSize() << KProcess::quote(m_files[0]) << KProcess::quote(tmp); if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) @@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog() KPrinter printer; printer.setDocName( i18n( "Fax log" ) ); printer.setDocFileName( "faxlog" ); - if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) ) + if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) ) { TQPainter painter( &printer ); TQPaintDeviceMetrics metric( &printer ); @@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog() richText.setWidth( &painter, body.width() ); do { - richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() ); + richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() ); view.moveBy( 0, body.height() ); painter.translate( 0, -body.height() ); if ( view.top() >= richText.height() ) diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 24ad58a0e..047b4cb3c 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -429,14 +429,14 @@ void KdeprintFax::updateState() if ( !m_cover->isEnabled() ) m_cover->setChecked(false); m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked()); - //m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background)); + //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background)); if (!m_comment->isEnabled()) { m_comment->setText(""); - m_comment->setPaper( tqcolorGroup().background() ); + m_comment->setPaper( colorGroup().background() ); } else - m_comment->setPaper( tqcolorGroup().base() ); + m_comment->setPaper( colorGroup().base() ); /* m_enterprise->setEnabled(cmd.find("%enterprise") != -1); if (!m_enterprise->isEnabled()) diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp index 719df105a..2b9d5e5bb 100644 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp +++ b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp @@ -56,7 +56,7 @@ static TQCString findLibrary() static long parentToWinId( const TQWidget* w ) { if( w != NULL ) - return w->tqtopLevelWidget()->winId(); + return w->topLevelWidget()->winId(); // try to find some usable parent if( tqApp->activeWindow() && w != tqApp->activeWindow()) return tqApp->activeWindow()->winId(); diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index c5786146a..28ebc9c76 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -419,7 +419,7 @@ void B2Client::init() titleLayout->addSpacing(3); - TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()). + TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()). color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) { @@ -635,7 +635,7 @@ void B2Client::paintEvent(TQPaintEvent* e) int bb = mustDrawHandle() ? 4 : 0; int bDepth = thickness + bb; - TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive()); + TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive()); TQBrush fillBrush(options()->color(frameColorGroup, isActive())); // outer frame rect @@ -859,7 +859,7 @@ void B2Client::activeChange() widget()->tqrepaint(false); titlebar->tqrepaint(false); - TQColor c = options()->tqcolorGroup( + TQColor c = options()->colorGroup( KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) @@ -881,7 +881,7 @@ void B2Client::shadeChange() } } -TQSize B2Client::tqminimumSize() const +TQSize B2Client::minimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -960,8 +960,8 @@ void B2Client::unobscureTitlebar() static void redraw_pixmaps() { int i; - TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); - TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false); // close drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false); @@ -1222,7 +1222,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, } -TQSize B2Button::tqsizeHint() const +TQSize B2Button::sizeHint() const { return TQSize(buttonSize, buttonSize); } @@ -1363,7 +1363,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) // titlebar fill const TQColorGroup cg = - options()->tqcolorGroup(KDecoration::ColorTitleBar, state); + options()->colorGroup(KDecoration::ColorTitleBar, state); TQBrush brush(cg.background()); if (gradient) brush.setPixmap(*gradient); qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1, diff --git a/twin/clients/b2/b2client.h b/twin/clients/b2/b2client.h index d1062348e..30220b175 100644 --- a/twin/clients/b2/b2client.h +++ b/twin/clients/b2/b2client.h @@ -38,7 +38,7 @@ public: void setToggle(){setToggleType(Toggle);} void setActive(bool on){setOn(on);} void setUseMiniIcon(){useMiniIcon = true;} - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; protected: virtual void drawButton(TQPainter *p); @@ -119,7 +119,7 @@ protected: Position mousePosition( const TQPoint& p ) const; void resize(const TQSize&); void borders(int &, int &, int &, int &) const; - TQSize tqminimumSize() const; + TQSize minimumSize() const; bool eventFilter(TQObject *, TQEvent *); private slots: void menuButtonPressed(); diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp index f3b8fa2ba..987e80ee2 100644 --- a/twin/clients/default/kdedefault.cpp +++ b/twin/clients/default/kdedefault.cpp @@ -328,7 +328,7 @@ void KDEDefaultHandler::createPixmaps() TQPainter p; // Active pins - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); p.begin( pinUpPix ); @@ -346,7 +346,7 @@ void KDEDefaultHandler::createPixmaps() pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Inactive pins - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); p.begin( ipinUpPix ); @@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps() irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight); // Draw the button state pixmaps - g = options()->tqcolorGroup( ColorTitleBar, true ); + g = options()->colorGroup( ColorTitleBar, true ); drawButtonBackground( leftBtnUpPix[true], g, false ); drawButtonBackground( leftBtnDownPix[true], g, true ); drawButtonBackground( leftBtnUpPix[false], g, false ); drawButtonBackground( leftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); drawButtonBackground( rightBtnUpPix[true], g, false ); drawButtonBackground( rightBtnDownPix[true], g, true ); drawButtonBackground( rightBtnUpPix[false], g, false ); drawButtonBackground( rightBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorTitleBar, false ); + g = options()->colorGroup( ColorTitleBar, false ); drawButtonBackground( ileftBtnUpPix[true], g, false ); drawButtonBackground( ileftBtnDownPix[true], g, true ); drawButtonBackground( ileftBtnUpPix[false], g, false ); drawButtonBackground( ileftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); drawButtonBackground( irightBtnUpPix[true], g, false ); drawButtonBackground( irightBtnDownPix[true], g, true ); drawButtonBackground( irightBtnUpPix[false], g, false ); @@ -909,7 +909,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawRect(x,y,w,h); // Draw part of the frame that is the titlebar color - g = options()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(ColorTitleBar, isActive()); p.setPen(g.light()); p.drawLine(x+1, y+1, rightOffset-1, y+1); p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4); @@ -929,7 +929,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2); // Fill out the border edges - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(rightOffset, y+1, x2-1, y+1); p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1); diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp index d1cbd78fd..a635c4ee2 100644 --- a/twin/clients/keramik/embedtool.cpp +++ b/twin/clients/keramik/embedtool.cpp @@ -60,7 +60,7 @@ private: KeramikEmbedder::KeramikEmbedder() { - TQDateTime date( TQDateTime::tqcurrentDateTime() ); + TQDateTime date( TQDateTime::currentDateTime() ); TQString datestring( date.toString() ); file = new TQFile( "tiles.h" ); diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index e514e3a20..ce137cd20 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -832,14 +832,14 @@ void KeramikButton::drawButton( TQPainter *p ) if ( isDown() ) { // Pressed - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); } else if ( hover ) // Mouse over - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) ); else // Normal - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) ); // Draw the button deco on the bevel @@ -1280,7 +1280,7 @@ void KeramikClient::updateCaptionBuffer() ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); - TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, + TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); //p.setPen( Qt::red ); // debug @@ -1289,7 +1289,7 @@ void KeramikClient::updateCaptionBuffer() // Application icon if ( clientHandler->showAppIcons() ) { - TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(), + TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(), 1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr ); TQRect r( icon->rect() ); r.moveCenter( iconRect.center() ); @@ -1349,7 +1349,7 @@ void KeramikClient::calculateCaptionRect() cw += 16 + 4; // icon width + space cw = QMIN( cw, titlebar->geometry().width() ); - captionRect = TQStyle::tqvisualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), + captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), cw, clientHandler->titleBarHeight(largeCaption) ), titlebar->geometry() ); } @@ -1794,9 +1794,9 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons } -TQSize KeramikClient::tqminimumSize() const +TQSize KeramikClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } diff --git a/twin/clients/keramik/keramik.h b/twin/clients/keramik/keramik.h index 8e4a98518..59f9960c5 100644 --- a/twin/clients/keramik/keramik.h +++ b/twin/clients/keramik/keramik.h @@ -148,7 +148,7 @@ namespace Keramik { virtual Position mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual void activeChange(); virtual void captionChange(); diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index 5d5e462f7..1a1316dc1 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p) int offset = (isDown() && ((pixmap()->width() >= width()) || (pixmap()->height() >= height()))) ? 1 : 0; style().drawItem(p, TQRect( offset, offset, width(), height() ), - AlignCenter, tqcolorGroup(), + AlignCenter, colorGroup(), true, pixmap(), TQString::null); } } @@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.begin(&buffer); if(titleSunken){ - qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), + qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), true, 1, 0); r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); } @@ -384,7 +384,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.drawTiledPixmap(r, *fill); } else{ - p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()). + p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()). brush(TQColorGroup::Button)); } p.setFont(options()->font(isActive())); @@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) } drawTitle(p); - TQColor c = widget()->tqcolorGroup().background(); + TQColor c = widget()->colorGroup().background(); // KWM evidently had a 1 pixel border around the client window. We // emulate it here, but should be removed at some point in order to @@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize KWMThemeClient::tqminimumSize() const +TQSize KWMThemeClient::minimumSize() const { - return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); } void KWMThemeClient::resize( const TQSize& s ) diff --git a/twin/clients/kwmtheme/kwmthemeclient.h b/twin/clients/kwmtheme/kwmthemeclient.h index e51bfe6d1..58db3d14f 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.h +++ b/twin/clients/kwmtheme/kwmthemeclient.h @@ -30,7 +30,7 @@ public: ~KWMThemeClient(){;} void init(); void resize( const TQSize& s ); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; protected: void doShape(); diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp index db37feae6..3b0a1c7ef 100644 --- a/twin/clients/laptop/laptopclient.cpp +++ b/twin/clients/laptop/laptopclient.cpp @@ -157,7 +157,7 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons (active/inactive, sunken/unsunken, 2 sizes each) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1 = new KPixmap; btnPix1->resize(btnWidth1, titleHeight); @@ -184,7 +184,7 @@ static void create_pixmaps() KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120), KPixmapEffect::DiagonalGradient); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), KPixmapEffect::DiagonalGradient); @@ -200,20 +200,20 @@ static void create_pixmaps() btnDownPix1->fill(c.rgb()); btnPix2->fill(c.rgb()); btnDownPix2->fill(c.rgb()); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); iBtnPix2->fill(c.rgb()); iBtnDownPix2->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); c = g.background(); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnPix2, g, false); drawButtonFrame(btnDownPix2, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); @@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p) } } else{ - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); int w = width(); int h = height(); p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button()); @@ -469,7 +469,7 @@ void LaptopClient::captionChange() void LaptopClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); p.setPen(Qt::black); @@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setFont(options()->font(false, isToolWindow() )); TQFontMetrics fm(options()->font(false)); - g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); + g = options()->colorGroup(KDecoration::ColorTitleBar, false); if(iUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -564,7 +564,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setPen(options()->color(KDecoration::ColorFont, false)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); @@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( ) p.setFont(options()->font(true, isToolWindow() )); TQFontMetrics fm(options()->font(true)); - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true); if(aUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( ) p.setPen(options()->color(KDecoration::ColorFont, true)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 136ff3492..a1e417cc7 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -59,11 +59,11 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par bool rtl = kapp->reverseLayout(); label1 = new TQLabel(i18n("Small"), hbox); - label1->tqsetAlignment(rtl ? AlignRight : AlignLeft); + label1->setAlignment(rtl ? AlignRight : AlignLeft); label2 = new TQLabel(i18n("Medium"), hbox); - label2->tqsetAlignment(AlignHCenter); + label2->setAlignment(AlignHCenter); label3 = new TQLabel(i18n("Large"), hbox); - label3->tqsetAlignment(rtl ? AlignLeft : AlignRight); + label3->setAlignment(rtl ? AlignLeft : AlignRight); vbox->addWidget(handleBox); vbox->addStretch(1); diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp index b6e7cda01..cbe17099e 100644 --- a/twin/clients/modernsystem/modernsys.cpp +++ b/twin/clients/modernsystem/modernsys.cpp @@ -171,13 +171,13 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons - TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true)); + TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true)); buttonPix = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPix); buttonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPixDown, true); - btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false); iButtonPix = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPix); iButtonPixDown = new TQPixmap(14, 15); @@ -515,7 +515,7 @@ void ModernSys::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient); else p.fillRect(0, 0, width(), title_height+2, - options()->tqcolorGroup(ColorTitleBar, true). + options()->colorGroup(ColorTitleBar, true). brush(TQColorGroup::Button)); TQRect t = titleRect(); // titlebar->geometry(); @@ -554,7 +554,7 @@ void ModernSys::updateCaption() void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->tqcolorGroup(ColorFrame, isActive()), false); + options()->colorGroup(ColorFrame, isActive()), false); } @@ -570,9 +570,9 @@ void ModernSys::paintEvent( TQPaintEvent* ) TQPainter p( widget() ); TQRect t = titleRect(); // titlebar->geometry(); - TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ? - widget()->tqcolorGroup().brush(TQColorGroup::Background) : - options()->tqcolorGroup(ColorFrame, isActive()). + TQBrush fillBrush(widget()->colorGroup().tqbrush(TQColorGroup::Background).pixmap() ? + widget()->colorGroup().brush(TQColorGroup::Background) : + options()->colorGroup(ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush); @@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) int h = height() - hw; // titlebar - TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive()); + TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive()); if(isActive()){ p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2); } @@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(0, title_height+2, w-2, title_height+2); // frame - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(1, title_height+3, 1, h-2); p.setPen(g.dark()); diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp index 9faf73df0..76d643904 100644 --- a/twin/clients/plastik/plastik.cpp +++ b/twin/clients/plastik/plastik.cpp @@ -290,7 +290,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo } else { pm = new TQPixmap(1, titleBarTileHeight); painter.begin(pm); - painter.tqdrawPixmap(0, 0, gradient, 0,2); + painter.drawPixmap(0, 0, gradient, 0,2); if (m_coloredBorder) { painter.setPen(getColor(TitleGradient3, active).dark(110) ); } else { diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp index d0b8974cf..7530adc84 100644 --- a/twin/clients/quartz/quartz.cpp +++ b/twin/clients/quartz/quartz.cpp @@ -291,18 +291,18 @@ void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const TQColor &c1, cons void QuartzHandler::createPixmaps() { // Obtain titlebar blend colours, and create the block stuff on pixmaps. - TQColorGroup g2 = options()->tqcolorGroup(ColorTitleBlend, true); + TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true); TQColor c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, true ); + g2 = options()->colorGroup(ColorTitleBar, true ); TQColor c = g2.background().light(130); titleBlocks = new KPixmap(); titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( titleBlocks, *titleBlocks, c, c2 ); - g2 = options()->tqcolorGroup(ColorTitleBlend, false); + g2 = options()->colorGroup(ColorTitleBlend, false); c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, false ); + g2 = options()->colorGroup(ColorTitleBar, false ); c = g2.background().light(130); ititleBlocks = new KPixmap(); @@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps() TQColorGroup g; TQPainter p; - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, true ); + g2 = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); @@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps() // Inactive pins - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, false ); + g2 = options()->colorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); @@ -675,9 +675,9 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the title color if( coloredFrame ) - g = options()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(ColorTitleBar, isActive()); else - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); // Draw outer highlights and lowlights p.setPen( g.light().light(120) ); diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp index 9fd625dde..e4127adaa 100644 --- a/twin/clients/redmond/redmond.cpp +++ b/twin/clients/redmond/redmond.cpp @@ -149,7 +149,7 @@ static void create_pixmaps () defaultMenuPix = new TQPixmap(kdelogo); // buttons (active/inactive, sunken/unsunken) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1->resize(normalTitleHeight, normalTitleHeight-2); btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2); @@ -172,7 +172,7 @@ static void create_pixmaps () KPixmapEffect::gradient(*miniBtnDownPix1, c.dark(130), c.light(130), KPixmapEffect::VerticalGradient); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130), KPixmapEffect::VerticalGradient); @@ -188,7 +188,7 @@ static void create_pixmaps () miniBtnPix1->fill(c.rgb()); miniBtnDownPix1->fill(c.rgb()); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); @@ -196,13 +196,13 @@ static void create_pixmaps () iMiniBtnDownPix1->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(miniBtnPix1, g, false); drawButtonFrame(miniBtnDownPix1, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iMiniBtnPix1, g, false); @@ -491,7 +491,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the frame color // ============================================== - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); p.setPen( g.background() ); p.drawLine( x, y, x2-1, y ); p.drawLine( x, y, x, y2-1 ); diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index 02fd5b1d3..2e26a7c41 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -93,7 +93,7 @@ void Decoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize Decoration::tqminimumSize() const +TQSize Decoration::minimumSize() const { return TQSize( 100, 50 ); } diff --git a/twin/clients/test/test.h b/twin/clients/test/test.h index e1d3d51a6..bfe36fa7c 100644 --- a/twin/clients/test/test.h +++ b/twin/clients/test/test.h @@ -22,7 +22,7 @@ class Decoration virtual MousePosition mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void activeChange() {}; virtual void captionChange() {}; virtual void maximizeChange() {}; diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp index 793b406af..0f3b9c70b 100644 --- a/twin/clients/web/Web.cpp +++ b/twin/clients/web/Web.cpp @@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe) TQPainter p(widget()); p.setPen(Qt::black); - p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background()); + p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp index bf1f54af4..3c96cac2d 100644 --- a/twin/clients/web/WebButton.cpp +++ b/twin/clients/web/WebButton.cpp @@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p) TQPen highlightPen; if (isDown() ) - highlightPen = TQPen(tqcolorGroup().light()); + highlightPen = TQPen(colorGroup().light()); else { if (mouseOver_) - highlightPen = TQPen(tqcolorGroup().highlight()); + highlightPen = TQPen(colorGroup().highlight()); else highlightPen = TQPen(NoPen); } - p->fillRect(rect(), tqcolorGroup().background()); + p->fillRect(rect(), colorGroup().background()); Position position_; if (0 == mapToParent(rect().topLeft() ).x() ) diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 2e0b205c7..70ad90991 100644 --- a/twin/geometry.cpp +++ b/twin/geometry.cpp @@ -1120,7 +1120,7 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra TQSize max_size = maxSize(); if( decoration != NULL ) { - TQSize decominsize = decoration->tqminimumSize(); + TQSize decominsize = decoration->minimumSize(); TQSize border_size( border_left + border_right, border_top + border_bottom ); if( border_size.width() > decominsize.width()) // just in case decominsize.setWidth( border_size.width()); diff --git a/twin/geometrytip.cpp b/twin/geometrytip.cpp index 83598d47c..e196135ab 100644 --- a/twin/geometrytip.cpp +++ b/twin/geometrytip.cpp @@ -20,7 +20,7 @@ GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): setIndent(0); setLineWidth(1); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); - tqsetAlignment( AlignCenter | AlignTop ); + setAlignment( AlignCenter | AlignTop ); sizeHints = xSizeHints; if( save_under ) { diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 2c450aed1..3f9a509b3 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -123,7 +123,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color) ButtonSource::ButtonSource(TQWidget *parent, const char* name) : KListView(parent, name) { - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setResizeMode(TQListView::AllColumns); setDragEnabled(true); @@ -140,19 +140,19 @@ ButtonSource::~ButtonSource() { } -TQSize ButtonSource::tqsizeHint() const +TQSize ButtonSource::sizeHint() const { - // make the tqsizeHint height a bit smaller than the one of TQListView... + // make the sizeHint height a bit smaller than the one of TQListView... if ( cachedSizeHint().isValid() ) return cachedSizeHint(); constPolish(); - TQSize s( header()->tqsizeHint() ); + TQSize s( header()->sizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); + s.setWidth( s.width() + tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... @@ -167,7 +167,7 @@ void ButtonSource::hideAllButtons() { TQListViewItemIterator it(this); while (it.current() ) { - it.current()->tqsetVisible(false); + it.current()->setVisible(false); ++it; } } @@ -176,7 +176,7 @@ void ButtonSource::showAllButtons() { TQListViewItemIterator it(this); while (it.current() ) { - it.current()->tqsetVisible(true); + it.current()->setVisible(true); ++it; } } @@ -187,7 +187,7 @@ void ButtonSource::showButton( TQChar btn ) while (it.current() ) { ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() ); if (item && item->button().type == btn) { - it.current()->tqsetVisible(true); + it.current()->setVisible(true); return; } ++it; @@ -200,7 +200,7 @@ void ButtonSource::hideButton( TQChar btn ) while (it.current() ) { ButtonSourceItem *item = dynamic_cast<ButtonSourceItem*>(it.current() ); if (item && item->button().type == btn && !item->button().duplicate) { - it.current()->tqsetVisible(false); + it.current()->setVisible(false); return; } ++it; @@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject() if (i) { ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag"); - bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() )); + bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() )); return bd; } @@ -487,7 +487,7 @@ void ButtonDropSite::mousePressEvent( TQMouseEvent* e ) m_selected = buttonAt(e->pos() ); if (m_selected) { ButtonDrag *bd = new ButtonDrag(m_selected->button(), this); - bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) ); + bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) ); bd->dragMove(); } } @@ -581,9 +581,9 @@ bool ButtonDropSite::removeSelectedButton() void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset) { for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { - TQRect tqitemRect = (*it)->rect; - if (tqitemRect.isValid() ) { - (*it)->draw(p, tqcolorGroup(), tqitemRect); + TQRect itemRect = (*it)->rect; + if (itemRect.isValid() ) { + (*it)->draw(p, colorGroup(), itemRect); } offset += (*it)->width(); } @@ -675,11 +675,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) m_factory(0) { TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); TQLabel* label = new TQLabel( this ); m_dropSite = new ButtonDropSite( this ); - label->tqsetAlignment( int( TQLabel::WordBreak ) ); + label->setAlignment( int( TQLabel::WordBreak ) ); label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items " "between the available item list and the titlebar preview. Similarly, " "drag items within the titlebar preview to re-position them.") ); diff --git a/twin/kcmtwin/twindecoration/buttons.h b/twin/kcmtwin/twindecoration/buttons.h index 088d3414d..e1dbbc812 100644 --- a/twin/kcmtwin/twindecoration/buttons.h +++ b/twin/kcmtwin/twindecoration/buttons.h @@ -117,7 +117,7 @@ class ButtonSource : public KListView ButtonSource(TQWidget *parent = 0, const char* name = 0); virtual ~ButtonSource(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void hideAllButtons(); void showAllButtons(); diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp index ee8c59c75..f5148b57c 100644 --- a/twin/kcmtwin/twindecoration/preview.cpp +++ b/twin/kcmtwin/twindecoration/preview.cpp @@ -49,7 +49,7 @@ KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name ) "Most probably there\n" "was a problem loading the plugin." ), this ); - no_preview->tqsetAlignment( AlignCenter ); + no_preview->setAlignment( AlignCenter ); setMinimumSize( 100, 100 ); no_preview->resize( size()); @@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews() // Resize the active window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Active]->tqminimumSize() ); + .expandedTo( deco[Active]->minimumSize() ); geometry = TQRect( TQPoint( 0, titleBarHeight ), size ); - deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); + deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); // Resize the inactive window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Inactive]->tqminimumSize() ); + .expandedTo( deco[Inactive]->minimumSize() ); geometry = TQRect( TQPoint( xoffset, 0 ), size ); - deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( geometry, this ) ); + deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active ) diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 4ef509e5a..1dd86a833 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -154,8 +154,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c preview = new KDecorationPreview( this ); previewLayout->addWidget(preview); - preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); // Page 3 (Window Shadows) TQHBox *inactiveShadowColourHBox, *shadowColourHBox; diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 30692d87f..873331ce6 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -163,7 +163,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf combo->insertItem(i18n("Lower")); combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); - combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayout->addWidget(combo); coTiDbl = combo; @@ -188,7 +188,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf comboW->insertItem(i18n("Move to Previous/Next Desktop")); comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); - comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); hlayoutW->addWidget(comboW); coTiAct4 = comboW; @@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf label = new TQLabel(i18n("Active"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an active window.") ); @@ -292,7 +292,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); label = new TQLabel(i18n("Inactive"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an inactive window.") ); @@ -356,14 +356,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf TQLabel * label = new TQLabel(strMouseButton[b], box); TQWhatsThis::add( label, txtButton[b] ); - label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); coMax[b] = new ToolTipComboBox(box, tbl_Max); for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]); connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed())); TQWhatsThis::add( coMax[b], txtButton[b] ); - coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 80185a427..1b0b2773c 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); -// fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(), -// clickRaiseOn->tqsizeHint().width()) + 15); +// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), +// clickRaiseOn->sizeHint().width()) + 15); TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically" " come to the front when the mouse pointer has been over it for some time.") ); @@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget * //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); - minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft); + minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); - minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight); + minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight); rLay->addWidget(minimizeAnimFastLabel,1,2); wtstr = i18n("Here you can set the speed of the animation shown when windows are" @@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); diff --git a/twin/kcmtwin/twinrules/detectwidgetbase.ui b/twin/kcmtwin/twinrules/detectwidgetbase.ui index af4ca9670..b13e7948a 100644 --- a/twin/kcmtwin/twinrules/detectwidgetbase.ui +++ b/twin/kcmtwin/twinrules/detectwidgetbase.ui @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui index af704c0a2..702816263 100644 --- a/twin/kcmtwin/twinrules/editshortcutbase.ui +++ b/twin/kcmtwin/twinrules/editshortcutbase.ui @@ -66,7 +66,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -91,7 +91,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -116,7 +116,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui index 5fc5fd6ed..8ab21412b 100644 --- a/twin/kcmtwin/twinrules/ruleslistbase.ui +++ b/twin/kcmtwin/twinrules/ruleslistbase.ui @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>294</height> diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index cfe96458e..8680018d7 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -661,7 +661,7 @@ bool RulesWidget::finalCheck() all_types = false; if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types ) { - if( KMessageBox::warningContinueCancel( tqtopLevelWidget(), + if( KMessageBox::warningContinueCancel( topLevelWidget(), i18n( "You have specified the window class as unimportant.\n" "This means the settings will possibly apply to windows from all applications. " "If you really want to create a generic setting, it is recommended you at least " @@ -680,7 +680,7 @@ void RulesWidget::prepareWindowSpecific( WId window ) void RulesWidget::shortcutEditClicked() { - EditShortcutDialog dlg( tqtopLevelWidget()); + EditShortcutDialog dlg( topLevelWidget()); dlg.setShortcut( shortcut->text()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut()); @@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name ) void EditShortcut::editShortcut() { - ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget()); + ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui index 5a5640ca2..c83bbef92 100644 --- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui +++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>212</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>212</width> <height>20</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>20</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -296,7 +296,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>269</width> <height>20</height> @@ -470,7 +470,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -501,7 +501,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -543,7 +543,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -616,7 +616,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -647,7 +647,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -1181,7 +1181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -1347,7 +1347,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>171</width> <height>20</height> @@ -1364,7 +1364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1381,7 +1381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1398,7 +1398,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1415,7 +1415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1432,7 +1432,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1449,7 +1449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1466,7 +1466,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1796,7 +1796,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -1847,7 +1847,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>181</width> <height>20</height> @@ -2278,7 +2278,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp index 716b829cc..dc01e4178 100644 --- a/twin/killer/killer.cpp +++ b/twin/killer/killer.cpp @@ -55,7 +55,7 @@ int main( int argc, char* argv[] ) bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); TQString caption = TQString::fromUtf8( args->getOption( "windowname" )); - TQString appname = TQString::tqfromLatin1( args->getOption( "applicationname" )); + TQString appname = TQString::fromLatin1( args->getOption( "applicationname" )); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool time_ok = false; diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index 4a667c7b4..c6f9abbbc 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -522,7 +522,7 @@ void KCommonDecoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize KCommonDecoration::tqminimumSize() const +TQSize KCommonDecoration::minimumSize() const { const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft)) +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight)) @@ -946,7 +946,7 @@ void KCommonDecorationButton::setSize(const TQSize &s) } } -TQSize KCommonDecorationButton::tqsizeHint() const +TQSize KCommonDecorationButton::sizeHint() const { return m_size; } diff --git a/twin/lib/kcommondecoration.h b/twin/lib/kcommondecoration.h index 93427b248..a9161b762 100644 --- a/twin/lib/kcommondecoration.h +++ b/twin/lib/kcommondecoration.h @@ -234,7 +234,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void show(); virtual void resize(const TQSize& s); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void maximizeChange(); virtual void desktopChange(); virtual void shadeChange(); @@ -348,7 +348,7 @@ class KWIN_EXPORT KCommonDecorationButton : public TQButton */ ButtonState lastMousePress() const { return m_lastMouse; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void setToggleButton(bool toggle); diff --git a/twin/lib/kdecoration.cpp b/twin/lib/kdecoration.cpp index ee8eb866d..837036ea5 100644 --- a/twin/lib/kdecoration.cpp +++ b/twin/lib/kdecoration.cpp @@ -388,7 +388,7 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const return(active ? d->activeFont : d->inactiveFont); } -const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const +const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const { int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) diff --git a/twin/lib/kdecoration.h b/twin/lib/kdecoration.h index 30da5bc5c..17045025c 100644 --- a/twin/lib/kdecoration.h +++ b/twin/lib/kdecoration.h @@ -205,7 +205,7 @@ public: * @param type The requested color type. * @param active Whether to return the color for active or inactive windows. */ - const TQColorGroup& tqcolorGroup(ColorType type, bool active=true) const; + const TQColorGroup& colorGroup(ColorType type, bool active=true) const; /** * Returns the active or inactive decoration font. * The changed flags for this setting is SettingFont. @@ -594,7 +594,7 @@ class KWIN_EXPORT KDecoration * Note that the returned size shouldn't be too large, because it will be * used to keep the decorated window at least as large. */ - virtual TQSize tqminimumSize() const = 0; + virtual TQSize minimumSize() const = 0; /** * This function is called whenever the window either becomes or stops being active. * Use isActive() to find out the current state. diff --git a/twin/manage.cpp b/twin/manage.cpp index 85ba9adc9..48a32dad7 100644 --- a/twin/manage.cpp +++ b/twin/manage.cpp @@ -264,7 +264,7 @@ bool Client::manage( Window w, bool isMapped ) usePosition = true; if( !rules()->checkIgnoreGeometry( !usePosition )) { - bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::tqfromLatin1(resourceClass()))); + bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass()))); if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) || (xSizeHint.flags & USPosition) ) diff --git a/twin/options.cpp b/twin/options.cpp index 4f51bc1cd..07f4d88fd 100644 --- a/twin/options.cpp +++ b/twin/options.cpp @@ -383,7 +383,7 @@ int Options::electricBorderDelay() bool Options::checkIgnoreFocusStealing( const Client* c ) { - return ignoreFocusStealingClasses.contains(TQString::tqfromLatin1(c->resourceClass())); + return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass())); } Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta ) diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index f2367b933..455e6aa7d 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -76,7 +76,7 @@ void PopupInfo::paintEvent( TQPaintEvent* ) { TQPainter p( this ); tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default ); + colorGroup(), TQStyle::Style_Default ); paintContents(); } @@ -90,7 +90,7 @@ void PopupInfo::paintContents() TQPainter p( this ); TQRect r( 6, 6, width()-12, height()-12 ); - p.fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); /* p.setPen(Qt::white); diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index 4ca33a04f..6f7ed5450 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -400,7 +400,7 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( (*it) == current_client ) - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); // draw icon TQPixmap icon; @@ -437,11 +437,11 @@ void TabBox::drawContents( TQPainter * ) // draw text if ( (*it) == current_client ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else if( (*it)->isMinimized()) { - TQColor c1 = tqcolorGroup().text(); - TQColor c2 = tqcolorGroup().background(); + TQColor c1 = colorGroup().text(); + TQColor c2 = colorGroup().background(); // from kicker's TaskContainer::blendColors() int r1, g1, b1; int r2, g2, b2; @@ -456,7 +456,7 @@ void TabBox::drawContents( TQPainter * ) p.setPen(TQColor( r1, g1, b1 )); } else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, s); @@ -494,13 +494,13 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( iDesktop == desk ) // current desktop - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); p.save(); // draw "icon" (here: number of desktop) - p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base()); - p.setPen(tqcolorGroup().text()); + p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base()); + p.setPen(colorGroup().text()); p.drawRect(x+5, y+2, iconWidth, iconHeight); // draw desktop-number @@ -512,9 +512,9 @@ void TabBox::drawContents( TQPainter * ) // draw desktop name text if ( iDesktop == desk ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | TQt::SingleLine, diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp index ec870abe5..7f8aa1e11 100644 --- a/twin/tools/decobenchmark/preview.cpp +++ b/twin/tools/decobenchmark/preview.cpp @@ -127,7 +127,7 @@ void KDecorationPreview::positionPreviews(int shrink) if ( !deco ) return; - TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/; + TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/; TQRect geometry(TQPoint(10, 10), size); deco->widget()->setGeometry(geometry); diff --git a/twin/useractions.cpp b/twin/useractions.cpp index 7f7136724..a265a1784 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -293,7 +293,7 @@ void Workspace::setupWindowShortcut( Client* c ) client_keys_client = c; connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool ))); TQRect r = clientArea( ScreenArea, c ); - TQSize size = client_keys_dialog->tqsizeHint(); + TQSize size = client_keys_dialog->sizeHint(); TQPoint pos = c->pos() + c->clientPos(); if( pos.x() + size.width() >= r.right()) pos.setX( r.right() - size.width()); @@ -1045,8 +1045,8 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) else { TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop()); - clientPopupAboutToShow(); // needed for tqsizeHint() to be correct :-/ - int popupHeight = p->tqsizeHint().height(); + clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/ + int popupHeight = p->sizeHint().height(); if (y + popupHeight < area.height()) p->exec( TQPoint( x, y ) ); else diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 44045838c..93abd68bc 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -2606,7 +2606,7 @@ int Workspace::topMenuHeight() const { // simply create a dummy menubar and use its preffered height as the menu height KMenuBar tmpmenu; tmpmenu.insertItem( "dummy" ); - topmenu_height = tmpmenu.tqsizeHint().height(); + topmenu_height = tmpmenu.sizeHint().height(); } return topmenu_height; } |