TDE
/
tdebase
9
3
Fork 1
Code Issues 119 Pull Requests 10 Releases Wiki Activity

Rename old tq methods that no longer need a unique name

Browse Source
pull/2/head
Timothy Pearson 13 years ago
parent 2c01fd64dd
commit 628043be55
523 changed files with 2140 additions and 2140 deletions
Show Stats Download Patch File Download Diff File

2
drkonqi/backtrace.cpp
Unescape View File

@ -175,7 +175,7 @@ void BackTrace::processBacktrace()
--len; --len;
} }
m_strBt.remove( pos, len ); m_strBt.remove( pos, len );
m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" )); m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
} }
} }
} }

8
drkonqi/debugger.cpp
Unescape View File

@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
TQWidget *w = new TQWidget( this ); TQWidget *w = new TQWidget( this );
( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true ); ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
m_status = new TQLabel( w ); 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 ); //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 ); m_copyButton = new KPushButton( item, w );
connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
m_copyButton->setEnabled( false ); m_copyButton->setEnabled( false );
@ -109,7 +109,7 @@ void KrashDebugger :: slotSave()
} }
else else
{ {
TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" ); TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
if( defname.contains( '/' )) if( defname.contains( '/' ))
defname = defname.mid( defname.findRev( '/' ) + 1 ); defname = defname.mid( defname.findRev( '/' ) + 1 );
TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
bool KrashDebugger::performChecks( TQString* msg ) bool KrashDebugger::performChecks( TQString* msg )
{ {
bool ret = true; bool ret = true;
KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true ); KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
kdedcfg.setGroup( "General" ); kdedcfg.setGroup( "General" );
if( kdedcfg.readBoolEntry( "DelayedCheck", false )) if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
{ {

24
drkonqi/krashconf.cpp
Unescape View File

@ -93,12 +93,12 @@ void KrashConfig :: readConfig()
// maybe we should check if it's relative? // maybe we should check if it's relative?
TQString configname = config->readEntry("ConfigName", TQString configname = config->readEntry("ConfigName",
TQString::tqfromLatin1("enduser")); TQString::fromLatin1("enduser"));
TQString debuggername = config->readEntry("Debugger", 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"); true, false, "appdata");
debuggers.setGroup("General"); debuggers.setGroup("General");
@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
m_kcrashRegExp = debuggers.readEntry("KCrashRegExp"); m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");
KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname), KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
true, false, "appdata"); true, false, "appdata");
preset.setGroup("ErrorDescription"); preset.setGroup("ErrorDescription");
@ -138,7 +138,7 @@ void KrashConfig :: readConfig()
TQString str = TQString::number(m_signalnum); TQString str = TQString::number(m_signalnum);
// use group unknown if signal not found // use group unknown if signal not found
if (!preset.hasGroup(str)) if (!preset.hasGroup(str))
str = TQString::tqfromLatin1("unknown"); str = TQString::fromLatin1("unknown");
preset.setGroup(str); preset.setGroup(str);
m_signalName = preset.readEntry("Name"); m_signalName = preset.readEntry("Name");
if (b) if (b)
@ -149,13 +149,13 @@ void KrashConfig :: readConfig()
void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
{ {
TQMap<TQString,TQString> map; TQMap<TQString,TQString> map;
map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName()); map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("tdeinit") : m_execname; map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("tdeinit") : m_execname;
map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber()); map[TQString::fromLatin1("signum")] = TQString::number(signalNumber());
map[TQString::tqfromLatin1("signame")] = signalName(); map[TQString::fromLatin1("signame")] = signalName();
map[TQString::tqfromLatin1("progname")] = programName(); map[TQString::fromLatin1("progname")] = programName();
map[TQString::tqfromLatin1("pid")] = TQString::number(pid()); map[TQString::fromLatin1("pid")] = TQString::number(pid());
map[TQString::tqfromLatin1("tempfile")] = tempFile; map[TQString::fromLatin1("tempfile")] = tempFile;
if (shell) if (shell)
str = KMacroExpander::expandMacrosShellQuote( str, map ); str = KMacroExpander::expandMacrosShellQuote( str, map );
else else

8
drkonqi/toplevel.cpp
Unescape View File

@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
// picture of konqi // picture of konqi
TQLabel *lab = new TQLabel(page); TQLabel *lab = new TQLabel(page);
lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); 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->setPixmap(pix);
lab->setFixedSize( lab->tqsizeHint() ); lab->setFixedSize( lab->sizeHint() );
TQLabel * info = new TQLabel(generateText(), page); TQLabel * info = new TQLabel(generateText(), page);
info->setMinimumSize(info->tqsizeHint()); info->setMinimumSize(info->sizeHint());
if (m_krashconf->showBacktrace()) if (m_krashconf->showBacktrace())
{ {
@ -196,7 +196,7 @@ void Toplevel :: slotUser3()
void Toplevel :: slotBacktraceDone(const TQString &str) void Toplevel :: slotBacktraceDone(const TQString &str)
{ {
// Do not translate.. This will be included in the _MAIL_. // 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; ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;
m_bugreport->setText(buf); m_bugreport->setText(buf);

2
kappfinder/toplevel.cpp
Unescape View File

@ -54,7 +54,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
"applications on your system and adds " "applications on your system and adds "
"them to the KDE menu system. " "them to the KDE menu system. "
"Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this); "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->addWidget( label );
layout->addSpacing( 5 ); layout->addSpacing( 5 );

4
kate/app/kateconsole.cpp
Unescape View File

@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded()
{ {
if (m_part) return; if (m_part) return;
if (!tqtopLevelWidget() || !parentWidget()) return; if (!topLevelWidget() || !parentWidget()) return;
if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return; if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");

4
kate/app/katedocmanager.cpp
Unescape View File

@ -86,7 +86,7 @@ KateDocManager::~KateDocManager ()
{ {
m_metaInfos->setGroup(*it); m_metaInfos->setGroup(*it);
TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def); 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); m_metaInfos->deleteGroup(*it);
} }
delete def; delete def;
@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc)
m_metaInfos->setGroup(doc->url().prettyURL()); m_metaInfos->setGroup(doc->url().prettyURL());
doc->writeSessionConfig(m_metaInfos); doc->writeSessionConfig(m_metaInfos);
m_metaInfos->writeEntry("MD5", (const char *)md5); m_metaInfos->writeEntry("MD5", (const char *)md5);
m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime()); m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
m_metaInfos->sync(); m_metaInfos->sync();
} }
} }

14
kate/app/kateexternaltools.cpp
Unescape View File

@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl; // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
return false; return false;
} }
KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget()); KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
if (!dmw) { if (!dmw) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl; // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
return false; return false;
@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leName = new TQLineEdit( w ); leName = new TQLineEdit( w );
lo->addWidget( leName, 1, 2 ); lo->addWidget( leName, 1, 2 );
l = new TQLabel( leName, i18n("&Label:"), w ); l = new TQLabel( leName, i18n("&Label:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); l->setAlignment( l->tqalignment()|Qt::AlignRight );
lo->addWidget( l, 1, 1 ); lo->addWidget( l, 1, 1 );
if ( tool ) leName->setText( tool->name ); if ( tool ) leName->setText( tool->name );
TQWhatsThis::add( leName, i18n( TQWhatsThis::add( leName, i18n(
@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
teCommand = new TQTextEdit( w ); teCommand = new TQTextEdit( w );
lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 ); lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
l = new TQLabel( teCommand, i18n("S&cript:"), w ); 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 ); lo->addWidget( l, 2, 1 );
if ( tool ) teCommand->setText( tool->command ); if ( tool ) teCommand->setText( tool->command );
TQWhatsThis::add( teCommand, i18n( TQWhatsThis::add( teCommand, i18n(
@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leExecutable = new TQLineEdit( w ); leExecutable = new TQLineEdit( w );
lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 ); lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
l = new TQLabel( leExecutable, i18n("&Executable:"), w ); l = new TQLabel( leExecutable, i18n("&Executable:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); l->setAlignment( l->tqalignment()|Qt::AlignRight );
lo->addWidget( l, 3, 1 ); lo->addWidget( l, 3, 1 );
if ( tool ) leExecutable->setText( tool->tryexec ); if ( tool ) leExecutable->setText( tool->tryexec );
TQWhatsThis::add( leExecutable, i18n( TQWhatsThis::add( leExecutable, i18n(
@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leMimetypes = new TQLineEdit( w ); leMimetypes = new TQLineEdit( w );
lo->addWidget( leMimetypes, 4, 2 ); lo->addWidget( leMimetypes, 4, 2 );
l = new TQLabel( leMimetypes, i18n("&Mime types:"), w ); 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 ); lo->addWidget( l, 4, 1 );
if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") ); if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
TQWhatsThis::add( leMimetypes, i18n( TQWhatsThis::add( leMimetypes, i18n(
@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
cmbSave = new TQComboBox(w); cmbSave = new TQComboBox(w);
lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 ); lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
l = new TQLabel( cmbSave, i18n("&Save:"), w ); l = new TQLabel( cmbSave, i18n("&Save:"), w );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); l->setAlignment( l->tqalignment()|Qt::AlignRight );
lo->addWidget( l, 5, 1 ); lo->addWidget( l, 5, 1 );
TQStringList sl; TQStringList sl;
sl << i18n("None") << i18n("Current Document") << i18n("All Documents"); sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
leCmdLine = new TQLineEdit( w ); leCmdLine = new TQLineEdit( w );
lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 ); lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
l = new TQLabel( leCmdLine, i18n("&Command line name:"), w ); 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 ); lo->addWidget( l, 6, 1 );
if ( tool ) leCmdLine->setText( tool->cmdname ); if ( tool ) leCmdLine->setText( tool->cmdname );
TQWhatsThis::add( leCmdLine, i18n( TQWhatsThis::add( leCmdLine, i18n(

2
kate/app/katefilelist.cpp
Unescape View File

@ -69,7 +69,7 @@ class ToolTip : public TQToolTip
KateFileListItem *item = ((KateFileListItem*)i); KateFileListItem *item = ((KateFileListItem*)i);
if ( ! item ) return; if ( ! item ) return;
tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) ); tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );
} }

8
kate/app/katefileselector.cpp
Unescape View File

@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
{ {
if (m_tb) if (m_tb)
{ {
setMinimumHeight(m_tb->tqsizeHint().height()); setMinimumHeight(m_tb->sizeHint().height());
m_tb->resize(width(),height()); m_tb->resize(width(),height());
} }
} }
@ -123,7 +123,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
tqInstallMsgHandler( oldHandler ); tqInstallMsgHandler( oldHandler );
cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); 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); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
cmbPath->setCompletionObject( cmpl ); cmbPath->setCompletionObject( cmpl );
cmbPath->setAutoDeleteCompletionObject( true ); cmbPath->setAutoDeleteCompletionObject( true );
@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setIconSet( SmallIconSet("filter" ) );
btnFilter->setToggleButton( true ); btnFilter->setToggleButton( true );
filter = new KHistoryCombo( true, filterBox, "filter"); filter = new KHistoryCombo( true, filterBox, "filter");
filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filterBox->setStretchFactor(filter, 2); filterBox->setStretchFactor(filter, 2);
connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );
@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u )
newurl.setPath(pathstr); newurl.setPath(pathstr);
if ( !kateFileSelectorIsReadable ( newurl ) ) if ( !kateFileSelectorIsReadable ( newurl ) )
newurl.cd(TQString::tqfromLatin1("..")); newurl.cd(TQString::fromLatin1(".."));
if ( !kateFileSelectorIsReadable (newurl) ) if ( !kateFileSelectorIsReadable (newurl) )
newurl.setPath( TQDir::homeDirPath() ); newurl.setPath( TQDir::homeDirPath() );

20
kate/app/kategrepdialog.cpp
Unescape View File

@ -100,7 +100,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
loInput->setColStretch(1, 20); loInput->setColStretch(1, 20);
TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this); TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
lPattern->setFixedSize(lPattern->tqsizeHint()); lPattern->setFixedSize(lPattern->sizeHint());
loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter); loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
TQBoxLayout *loPattern = new TQHBoxLayout( 4 ); TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
@ -112,22 +112,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion); cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion);
lPattern->setBuddy(cmbPattern); lPattern->setBuddy(cmbPattern);
cmbPattern->setFocus(); cmbPattern->setFocus();
cmbPattern->setMinimumSize(cmbPattern->tqsizeHint()); cmbPattern->setMinimumSize(cmbPattern->sizeHint());
loPattern->addWidget( cmbPattern ); loPattern->addWidget( cmbPattern );
cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this); cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width()); cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true)); cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
loPattern->addWidget(cbCasesensitive); loPattern->addWidget(cbCasesensitive);
cbRegex = new TQCheckBox( i18n("Regular expression"), this ); cbRegex = new TQCheckBox( i18n("Regular expression"), this );
cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() ); cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
cbRegex->setChecked( config->readBoolEntry( "Regex", true ) ); cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
loPattern->addWidget( cbRegex ); loPattern->addWidget( cbRegex );
loPattern->setStretchFactor( cmbPattern, 100 ); loPattern->setStretchFactor( cmbPattern, 100 );
TQLabel *lTemplate = new TQLabel(i18n("Template:"), this); TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
lTemplate->setFixedSize(lTemplate->tqsizeHint()); lTemplate->setFixedSize(lTemplate->sizeHint());
loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter); loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
TQBoxLayout *loTemplate = new TQHBoxLayout(4); TQBoxLayout *loTemplate = new TQHBoxLayout(4);
@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
leTemplate = new KLineEdit(this); leTemplate = new KLineEdit(this);
lTemplate->setBuddy(leTemplate); lTemplate->setBuddy(leTemplate);
leTemplate->setText(strTemplate[0]); leTemplate->setText(strTemplate[0]);
leTemplate->setMinimumSize(leTemplate->tqsizeHint()); leTemplate->setMinimumSize(leTemplate->sizeHint());
loTemplate->addWidget(leTemplate); loTemplate->addWidget(leTemplate);
KComboBox *cmbTemplate = new KComboBox(false, this); KComboBox *cmbTemplate = new KComboBox(false, this);
@ -146,19 +146,19 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
loTemplate->addWidget(cmbTemplate); loTemplate->addWidget(cmbTemplate);
TQLabel *lFiles = new TQLabel(i18n("Files:"), this); TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
lFiles->setFixedSize(lFiles->tqsizeHint()); lFiles->setFixedSize(lFiles->sizeHint());
loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter); loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
cmbFiles = new KComboBox(true, this); cmbFiles = new KComboBox(true, this);
lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy())); lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
cmbFiles->setMinimumSize(cmbFiles->tqsizeHint()); cmbFiles->setMinimumSize(cmbFiles->sizeHint());
cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion); cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
cmbFiles->setDuplicatesEnabled(false); cmbFiles->setDuplicatesEnabled(false);
cmbFiles->insertStringList(lastSearchFiles); cmbFiles->insertStringList(lastSearchFiles);
loInput->addWidget(cmbFiles, 2, 1); loInput->addWidget(cmbFiles, 2, 1);
TQLabel *lDir = new TQLabel(i18n("Folder:"), this); TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
lDir->setFixedSize(lDir->tqsizeHint()); lDir->setFixedSize(lDir->sizeHint());
loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter); loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
TQBoxLayout *loDir = new TQHBoxLayout(3); TQBoxLayout *loDir = new TQHBoxLayout(3);
@ -176,7 +176,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
lDir->setBuddy(cmbDir); lDir->setBuddy(cmbDir);
cbRecursive = new TQCheckBox(i18n("Recursive"), this); cbRecursive = new TQCheckBox(i18n("Recursive"), this);
cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width()); cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
cbRecursive->setChecked(config->readBoolEntry("Recursive", true)); cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
loDir->addWidget(cbRecursive); loDir->addWidget(cbRecursive);

6
kate/app/katemailfilesdialog.cpp
Unescape View File

@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin )
} }
list->hide(); list->hide();
connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) ); connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
mw->setMinimumSize( lInfo->tqsizeHint() ); mw->setMinimumSize( lInfo->sizeHint() );
} }
TQPtrList<Kate::Document> KateMailDialog::selectedDocs() TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton()
lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") ); lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") );
} }
mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) ); mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) ); setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
resize( width(), minimumHeight() ); resize( width(), minimumHeight() );
} }
#include "katemailfilesdialog.moc" #include "katemailfilesdialog.moc"

8
kate/app/katemainwindow.cpp
Unescape View File

@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
if (sconfig) if (sconfig)
{ {
sconfig->setGroup (sgroup); sconfig->setGroup (sgroup);
size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
} }
// if thats fails, try to reuse size // if thats fails, try to reuse size
@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
{ {
// first try global app config // first try global app config
KateApp::self()->config()->setGroup ("MainWindow"); KateApp::self()->config()->setGroup ("MainWindow");
size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
if (size.isEmpty()) if (size.isEmpty())
size = TQSize (kMin (700, desk.width()), kMin(480, desk.height())); size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));

12
kate/app/katemdi.cpp
Unescape View File

@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw )
if ( domDocument().documentElement().isNull() ) if ( domDocument().documentElement().isNull() )
{ {
TQString completeDescription = TQString::tqfromLatin1( guiDescription ) TQString completeDescription = TQString::fromLatin1( guiDescription )
.arg( actionListName ); .arg( actionListName );
setXML( completeDescription, false /*merge*/ ); setXML( completeDescription, false /*merge*/ );
@ -239,7 +239,7 @@ ToolView::~ToolView ()
m_mainWin->toolViewDeleted (this); m_mainWin->toolViewDeleted (this);
} }
void ToolView::tqsetVisible (bool vis) void ToolView::setVisible (bool vis)
{ {
if (m_visible == vis) if (m_visible == vis)
return; return;
@ -380,7 +380,7 @@ bool Sidebar::showWidget (ToolView *widget)
{ {
it.current()->hide(); it.current()->hide();
setTab (it.currentKey(), false); setTab (it.currentKey(), false);
it.current()->tqsetVisible(false); it.current()->setVisible(false);
} }
setTab (m_widgetToId[widget], true); setTab (m_widgetToId[widget], true);
@ -388,7 +388,7 @@ bool Sidebar::showWidget (ToolView *widget)
m_ownSplit->show (); m_ownSplit->show ();
widget->show (); widget->show ();
widget->tqsetVisible (true); widget->setVisible (true);
return true; return true;
} }
@ -420,7 +420,7 @@ bool Sidebar::hideWidget (ToolView *widget)
if (!anyVis) if (!anyVis)
m_ownSplit->hide (); m_ownSplit->hide ();
widget->tqsetVisible (false); widget->setVisible (false);
return true; return true;
} }
@ -618,7 +618,7 @@ void Sidebar::restoreSession (KConfig *config)
ToolView *tv = m_toolviews[i]; ToolView *tv = m_toolviews[i];
tv->persistent = config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Persistent").arg(tv->id), false); 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) if (!anyVis)
anyVis = tv->visible(); anyVis = tv->visible();

2
kate/app/katemdi.h
Unescape View File

@ -146,7 +146,7 @@ class ToolView : public TQVBox
Sidebar *sidebar () { return m_sidebar; } Sidebar *sidebar () { return m_sidebar; }
void tqsetVisible (bool vis); void setVisible (bool vis);
public: public:
bool visible () const; bool visible () const;

18
kate/app/kateviewspace.cpp
Unescape View File

@ -67,9 +67,9 @@ protected:
void paintEvent( TQPaintEvent *e ) void paintEvent( TQPaintEvent *e )
{ {
TQPainter p( this ); TQPainter p( this );
p.setPen( tqcolorGroup().shadow() ); p.setPen( colorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); 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 ); 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 ); m_lineColLabel = new TQLabel( this );
addWidget( m_lineColLabel, 0, false ); addWidget( m_lineColLabel, 0, false );
m_lineColLabel->tqsetAlignment( Qt::AlignCenter ); m_lineColLabel->setAlignment( Qt::AlignCenter );
m_lineColLabel->installEventFilter( this ); m_lineColLabel->installEventFilter( this );
m_modifiedLabel = new TQLabel( TQString(" "), this ); m_modifiedLabel = new TQLabel( TQString(" "), this );
addWidget( m_modifiedLabel, 0, false ); addWidget( m_modifiedLabel, 0, false );
m_modifiedLabel->tqsetAlignment( Qt::AlignCenter ); m_modifiedLabel->setAlignment( Qt::AlignCenter );
m_modifiedLabel->installEventFilter( this ); m_modifiedLabel->installEventFilter( this );
m_insertModeLabel = new TQLabel( i18n(" INS "), this ); m_insertModeLabel = new TQLabel( i18n(" INS "), this );
addWidget( m_insertModeLabel, 0, false ); addWidget( m_insertModeLabel, 0, false );
m_insertModeLabel->tqsetAlignment( Qt::AlignCenter ); m_insertModeLabel->setAlignment( Qt::AlignCenter );
m_insertModeLabel->installEventFilter( this ); m_insertModeLabel->installEventFilter( this );
m_selectModeLabel = new TQLabel( i18n(" NORM "), this ); m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
addWidget( m_selectModeLabel, 0, false ); addWidget( m_selectModeLabel, 0, false );
m_selectModeLabel->tqsetAlignment( Qt::AlignCenter ); m_selectModeLabel->setAlignment( Qt::AlignCenter );
m_selectModeLabel->installEventFilter( this ); m_selectModeLabel->installEventFilter( this );
m_fileNameLabel=new KSqueezedTextLabel( this ); m_fileNameLabel=new KSqueezedTextLabel( this );
addWidget( m_fileNameLabel, 1, true ); addWidget( m_fileNameLabel, 1, true );
m_fileNameLabel->setMinimumSize( 0, 0 ); m_fileNameLabel->setMinimumSize( 0, 0 );
m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
m_fileNameLabel->installEventFilter( this ); m_fileNameLabel->installEventFilter( this );
installEventFilter( this ); installEventFilter( this );
@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged()
void KateVSStatusBar::showMenu() 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 ) ); TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
if (menu) if (menu)

4
kate/app/kateviewspacecontainer.cpp
Unescape View File

@ -277,7 +277,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
setActiveView (view); setActiveView (view);
m_viewList.findRef (view); m_viewList.findRef (view);
mainWindow()->toolBar ()->tqsetUpdatesEnabled (false); mainWindow()->toolBar ()->setUpdatesEnabled (false);
if (m_viewManager->guiMergedView) if (m_viewManager->guiMergedView)
mainWindow()->guiFactory()->removeClient (m_viewManager->guiMergedView ); mainWindow()->guiFactory()->removeClient (m_viewManager->guiMergedView );
@ -287,7 +287,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
if (!m_blockViewCreationAndActivation) if (!m_blockViewCreationAndActivation)
mainWindow()->guiFactory ()->addClient( view ); mainWindow()->guiFactory ()->addClient( view );
mainWindow()->toolBar ()->tqsetUpdatesEnabled (true); mainWindow()->toolBar ()->setUpdatesEnabled (true);
statusMsg(); statusMsg();

2
kate/app/kwritemain.cpp
Unescape View File

@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
// init with more usefull size, stolen from konq :) // init with more usefull size, stolen from konq :)
if (!initialGeometrySet()) 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 ;) // call it as last thing, must be sure everything is already set up ;)
setAutoSaveSettings (); setAutoSaveSettings ();

2
kate/utils/dockviewbase.cpp
Unescape View File

@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title )
{ {
setSpacing( 4 ); setSpacing( 4 );
d->header = new TQWidget( this ); 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 ); TQHBoxLayout *lo = new TQHBoxLayout( d->header );
lo->setSpacing( 6 ); lo->setSpacing( 6 );
lo->insertSpacing( 0, 6 ); lo->insertSpacing( 0, 6 );

2
kcontrol/access/kaccess.cpp
Unescape View File

@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
TQVBoxLayout * vlay = new TQVBoxLayout(lay); TQVBoxLayout * vlay = new TQVBoxLayout(lay);
featuresLabel = new TQLabel( "", contents ); featuresLabel = new TQLabel( "", contents );
featuresLabel->tqsetAlignment( WordBreak|AlignVCenter ); featuresLabel->setAlignment( WordBreak|AlignVCenter );
vlay->addWidget( featuresLabel ); vlay->addWidget( featuresLabel );
vlay->addStretch(); vlay->addStretch();

6
kcontrol/access/kcmaccess.cpp
Unescape View File

@ -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.") ); TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") );
hbox->addSpacing(12); hbox->addSpacing(12);
colorButton = new KColorButton(grp); colorButton = new KColorButton(grp);
colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2); colorButton->setFixedWidth(colorButton->sizeHint().height()*2);
hbox->addWidget(colorButton); hbox->addWidget(colorButton);
hbox->addStretch(); hbox->addStretch();
TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); 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 = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addStretch(1); hbox->addStretch(1);
kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp); kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp);
kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyModifiersButton); hbox->addWidget(kNotifyModifiersButton);
connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); 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 = new TQHBoxLayout(vvbox, KDialog::spacingHint());
hbox->addStretch(1); hbox->addStretch(1);
kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp); kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp);
kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyAccessXButton); hbox->addWidget(kNotifyAccessXButton);
connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));

20
kcontrol/accessibility/accessibilityconfigwidget.ui
Unescape View File

@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>15</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <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"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>61</height> <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"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>1</height> <height>1</height>

28
kcontrol/arts/arts.cpp
Unescape View File

@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
if (item >= 0) if (item >= 0)
{ {
audioIO = audioIOList.tqat(item)->name; audioIO = audioIOList.tqat(item)->name;
bool jack = (audioIO == TQString::tqfromLatin1("jack")); bool jack = (audioIO == TQString::fromLatin1("jack"));
if(jack) if(jack)
{ {
customRate->setChecked(false); customRate->setChecked(false);
@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans,
TQString args; TQString args;
if(fragmentCount) if(fragmentCount)
args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount); args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
if(fragmentSize) if(fragmentSize)
args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize); args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
if (!audioIO.isEmpty()) if (!audioIO.isEmpty())
args += TQString::tqfromLatin1(" -a %1").arg(audioIO); args += TQString::fromLatin1(" -a %1").arg(audioIO);
if (duplex) if (duplex)
args += TQString::tqfromLatin1(" -d"); args += TQString::fromLatin1(" -d");
if (netTrans) if (netTrans)
args += TQString::tqfromLatin1(" -n"); args += TQString::fromLatin1(" -n");
if (!deviceName.isEmpty()) if (!deviceName.isEmpty())
args += TQString::tqfromLatin1(" -D ") + deviceName; args += TQString::fromLatin1(" -D ") + deviceName;
if (rate) if (rate)
args += TQString::tqfromLatin1(" -r %1").arg(rate); args += TQString::fromLatin1(" -r %1").arg(rate);
if (bits) if (bits)
args += TQString::tqfromLatin1(" -b %1").arg(bits); args += TQString::fromLatin1(" -b %1").arg(bits);
if (autoSuspend && suspendTime) if (autoSuspend && suspendTime)
args += TQString::tqfromLatin1(" -s %1").arg(suspendTime); args += TQString::fromLatin1(" -s %1").arg(suspendTime);
if (!addOptions.isEmpty()) if (!addOptions.isEmpty())
args += TQChar(' ') + addOptions; args += TQChar(' ') + addOptions;
args += TQString::tqfromLatin1(" -m artsmessage"); args += TQString::fromLatin1(" -m artsmessage");
args += TQString::tqfromLatin1(" -c drkonqi"); args += TQString::fromLatin1(" -c drkonqi");
args += TQString::tqfromLatin1(" -l 3"); args += TQString::fromLatin1(" -l 3");
args += TQString::tqfromLatin1(" -f"); args += TQString::fromLatin1(" -f");
return args; return args;
} }

10
kcontrol/arts/generaltab.ui
Unescape View File

@ -12,7 +12,7 @@
<height>613</height> <height>613</height>
</rect> </rect>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>450</height> <height>450</height>
@ -227,7 +227,7 @@ Recommended if you want sound.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>173</width> <width>173</width>
<height>20</height> <height>20</height>
@ -256,7 +256,7 @@ Recommended if you want sound.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -289,7 +289,7 @@ Recommended if you want sound.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -308,7 +308,7 @@ Recommended if you want sound.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

8
kcontrol/arts/hardwaretab.ui
Unescape View File

@ -133,7 +133,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -189,7 +189,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -252,7 +252,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -345,7 +345,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>60</height> <height>60</height>

10
kcontrol/arts/krichtextlabel.cpp
Unescape View File

@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) { : TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
tqsetAlignment( TQt::WordBreak ); setAlignment( TQt::WordBreak );
setText(text); setText(text);
} }
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) { : TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
tqsetAlignment( TQt::WordBreak ); setAlignment( TQt::WordBreak );
} }
void KRichTextLabel::setDefaultWidth(int defaultWidth) void KRichTextLabel::setDefaultWidth(int defaultWidth)
@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
} }
TQSize KRichTextLabel::tqminimumSizeHint() const TQSize KRichTextLabel::minimumSizeHint() const
{ {
TQString qt_text = qrichtextify( text() ); TQString qt_text = qrichtextify( text() );
int pref_width = 0; int pref_width = 0;
@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
return TQSize(pref_width, rt.height()); return TQSize(pref_width, rt.height());
} }
TQSize KRichTextLabel::tqsizeHint() const TQSize KRichTextLabel::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
void KRichTextLabel::setText( const TQString &text ) { void KRichTextLabel::setText( const TQString &text ) {

4
kcontrol/arts/krichtextlabel.h
Unescape View File

@ -45,8 +45,8 @@ public:
int defaultWidth() const { return m_defaultWidth; } int defaultWidth() const { return m_defaultWidth; }
void setDefaultWidth(int defaultWidth); void setDefaultWidth(int defaultWidth);
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
public slots: public slots:

2
kcontrol/background/bgadvanced.cpp
Unescape View File

@ -432,7 +432,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
m_RefreshEdit->setRange(5, 60); m_RefreshEdit->setRange(5, 60);
m_RefreshEdit->setSteps(5, 10); m_RefreshEdit->setSteps(5, 10);
m_RefreshEdit->setSuffix(i18n(" min")); m_RefreshEdit->setSuffix(i18n(" min"));
m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint()); m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
lbl->setBuddy(m_RefreshEdit); lbl->setBuddy(m_RefreshEdit);
grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft); grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);

10
kcontrol/background/bgadvanced_ui.ui
Unescape View File

@ -91,7 +91,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -138,7 +138,7 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>400</width> <width>400</width>
<height>0</height> <height>0</height>
@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>220</width> <width>220</width>
<height>20</height> <height>20</height>
@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

10
kcontrol/background/bgdialog.cpp
Unescape View File

@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
} }
// background image settings // background image settings
TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
m_urlWallpaperButton->setIconSet( iconSet ); m_urlWallpaperButton->setIconSet( iconSet );
m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens()
screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain); screenLabel->setFrameShadow(TQFrame::Plain);
screenLabel->tqsetAlignment(Qt::AlignCenter); screenLabel->setAlignment(Qt::AlignCenter);
screenLabel->setNum(int(s + 1)); screenLabel->setNum(int(s + 1));
// BUGLET: we should not allow the identification to be entered again // BUGLET: we should not allow the identification to be entered again
// until the timer fires. // until the timer fires.
TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
targetGeometry.moveCenter(screenCenter); targetGeometry.moveCenter(screenCenter);
screenLabel->setGeometry(targetGeometry); screenLabel->setGeometry(targetGeometry);
@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti()
{ {
KBackgroundRenderer *r = eRenderer(); KBackgroundRenderer *r = eRenderer();
BGMultiWallpaperDialog dlg(r, tqtopLevelWidget()); BGMultiWallpaperDialog dlg(r, topLevelWidget());
if (dlg.exec() == TQDialog::Accepted) { if (dlg.exec() == TQDialog::Accepted) {
r->stop(); r->stop();
m_slideShowRandom = r->multiWallpaperMode(); m_slideShowRandom = r->multiWallpaperMode();
@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced()
KBackgroundRenderer *r = eRenderer(); KBackgroundRenderer *r = eRenderer();
m_previewUpdates = false; m_previewUpdates = false;
BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop); BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
if (!m_pMonitorArrangement->isEnabled()) { if (!m_pMonitorArrangement->isEnabled()) {
dlg.makeReadOnly(); dlg.makeReadOnly();

26
kcontrol/background/bgdialog_ui.ui
Unescape View File

@ -105,7 +105,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -132,7 +132,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>0</height> <height>0</height>
@ -161,7 +161,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>4</width> <width>4</width>
<height>20</height> <height>20</height>
@ -197,7 +197,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>4</width> <width>4</width>
<height>20</height> <height>20</height>
@ -219,7 +219,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>4</width> <width>4</width>
<height>20</height> <height>20</height>
@ -255,7 +255,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>4</width> <width>4</width>
<height>20</height> <height>20</height>
@ -277,7 +277,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>4</width> <width>4</width>
<height>20</height> <height>20</height>
@ -313,7 +313,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>4</width> <width>4</width>
<height>20</height> <height>20</height>
@ -333,7 +333,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -522,7 +522,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>120</width> <width>120</width>
<height>10</height> <height>10</height>
@ -539,7 +539,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>10</height> <height>10</height>
@ -613,7 +613,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>260</width> <width>260</width>
<height>20</height> <height>20</height>
@ -641,7 +641,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>110</width> <width>110</width>
<height>16</height> <height>16</height>

8
kcontrol/background/bgmonitor.cpp
Unescape View File

@ -157,7 +157,7 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm )
BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
: TQLabel(parent, name) : TQLabel(parent, name)
{ {
tqsetAlignment(AlignCenter); setAlignment(AlignCenter);
setScaledContents(true); setScaledContents(true);
setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) );
m_pBGMonitor = new BGMonitor(this); m_pBGMonitor = new BGMonitor(this);
@ -168,8 +168,8 @@ BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
void BGMonitorLabel::updateMonitorGeometry() void BGMonitorLabel::updateMonitorGeometry()
{ {
double scaleX = double(width()) / double(tqsizeHint().width()); double scaleX = double(width()) / double(sizeHint().width());
double scaleY = double(height()) / double(tqsizeHint().height()); 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; 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) ); 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) BGMonitor::BGMonitor(TQWidget *parent, const char *name)
: TQLabel(parent, name) : TQLabel(parent, name)
{ {
tqsetAlignment(AlignCenter); setAlignment(AlignCenter);
setScaledContents(true); setScaledContents(true);
setAcceptDrops(true); setAcceptDrops(true);
} }

6
kcontrol/background/bgwallpaper_ui.ui
Unescape View File

@ -69,7 +69,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -98,7 +98,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>100</height> <height>100</height>
@ -123,7 +123,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

10
kcontrol/clock/dtime.cpp
Unescape View File

@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() ); TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() );
cal = new KDatePicker( dateBox ); cal = new KDatePicker( dateBox );
cal->setMinimumSize(cal->tqsizeHint()); cal->setMinimumSize(cal->sizeHint());
l1->addWidget( cal ); l1->addWidget( cal );
TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); 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); TQLabel *dots1 = new TQLabel(":", timeBox);
dots1->setMinimumWidth( 7 ); dots1->setMinimumWidth( 7 );
dots1->tqsetAlignment( TQLabel::AlignCenter ); dots1->setAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots1, 0, 1, 3, 3 ); v3->addMultiCellWidget(dots1, 0, 1, 3, 3 );
minute = new HMSTimeWidget( timeBox ); minute = new HMSTimeWidget( timeBox );
@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQLabel *dots2 = new TQLabel(":", timeBox); TQLabel *dots2 = new TQLabel(":", timeBox);
dots2->setMinimumWidth( 7 ); dots2->setMinimumWidth( 7 );
dots2->tqsetAlignment( TQLabel::AlignCenter ); dots2->setAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots2, 0, 1, 5, 5 ); v3->addMultiCellWidget(dots2, 0, 1, 5, 5 );
second = new HMSTimeWidget( timeBox ); second = new HMSTimeWidget( timeBox );
@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * )
TQPointArray pts; TQPointArray pts;
TQPoint cp = rect().center(); TQPoint cp = rect().center();
int d = QMIN(width(),height()); int d = QMIN(width(),height());
TQColor hands = tqcolorGroup().dark(); TQColor hands = colorGroup().dark();
TQColor shadow = tqcolorGroup().text(); TQColor shadow = colorGroup().text();
paint.setPen( shadow ); paint.setPen( shadow );
paint.setBrush( shadow ); paint.setBrush( shadow );
paint.setViewport(4,4,width(),height()); paint.setViewport(4,4,width(),height());

10
kcontrol/colors/widgetcanvas.cpp
Unescape View File

@ -338,7 +338,7 @@ void WidgetCanvas::drawSampleWidgets()
smplw.resize(width(), height()); smplw.resize(width(), height());
//smplw.fill( parentWidget()->back() ); //smplw.fill( parentWidget()->back() );
smplw.fill( parentWidget()->tqcolorGroup().mid() ); smplw.fill( parentWidget()->colorGroup().mid() );
// Actually start painting in // Actually start painting in
@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets()
popup->setItemEnabled( id, false ); popup->setItemEnabled( id, false );
// HACK: Force Layouting // HACK: Force Layouting
//Sad Eagle: tqsizeHint() forces layouting too, and it's a lot less visible //Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible
//popup->tqsizeHint(); // Breaks with Qt 3.3 //popup->sizeHint(); // Breaks with Qt 3.3
popup->resize(popup->tqsizeHint()); popup->resize(popup->sizeHint());
pm = TQPixmap::grabWidget( popup ); pm = TQPixmap::grabWidget( popup );
delete popup; delete popup;
@ -585,7 +585,7 @@ void WidgetCanvas::drawSampleWidgets()
// Valance // Valance
qDrawWinPanel ( &paint, 0, 0, width(), height(), qDrawWinPanel ( &paint, 0, 0, width(), height(),
parentWidget()->tqcolorGroup(), TRUE, 0); parentWidget()->colorGroup(), TRUE, 0);
// Stop the painting // Stop the painting

4
kcontrol/componentchooser/browserconfig_ui.ui
Unescape View File

@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -134,7 +134,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

14
kcontrol/componentchooser/componentchooser.cpp
Unescape View File

@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *)
kmailCB->setChecked(useKMail); kmailCB->setChecked(useKMail);
otherCB->setChecked(!useKMail); otherCB->setChecked(!useKMail);
txtEMailClient->setText(emailClient); txtEMailClient->setText(emailClient);
txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height()); txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height());
chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true")); chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true"));
emit changed(false); emit changed(false);
@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text(); TQString client = dlg.text();
// get the preferred Terminal Application // get the preferred Terminal Application
KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::tqfromLatin1(" -e "); preferredTerminal += TQString::fromLatin1(" -e ");
int len = preferredTerminal.length(); int len = preferredTerminal.length();
bool b = client.left(len) == preferredTerminal; 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->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
} }
ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width()); ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
ServiceChooser->sort(); ServiceChooser->sort();
connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
ServiceChooser->setSelected(0,true); ServiceChooser->setSelected(0,true);
@ -410,7 +410,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File); KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available"))); ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint()); ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
TQString cfgType=cfg.readEntry("configurationType"); TQString cfgType=cfg.readEntry("configurationType");
@ -461,7 +461,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
delete configWidget; delete configWidget;
configWidget=newConfigWidget; configWidget=newConfigWidget;
connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
configContainer->setMinimumSize(configWidget->tqsizeHint()); configContainer->setMinimumSize(configWidget->sizeHint());
} }
if (configWidget) if (configWidget)

2
kcontrol/componentchooser/componentconfig_ui.ui
Unescape View File

@ -45,7 +45,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>91</height> <height>91</height>

8
kcontrol/componentchooser/emailclientconfig_ui.ui
Unescape View File

@ -73,7 +73,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -126,7 +126,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>16</height> <height>16</height>
@ -165,7 +165,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>16</height> <height>16</height>
@ -182,7 +182,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>16</height> <height>16</height>

6
kcontrol/componentchooser/terminalemulatorconfig_ui.ui
Unescape View File

@ -57,7 +57,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>87</height> <height>87</height>
@ -82,7 +82,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -120,7 +120,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>

16
kcontrol/crypto/crypto.cpp
Unescape View File

@ -842,7 +842,7 @@ TQString whatstr;
tabs->addTab(tabSSLCOpts, i18n("Validation Options")); tabs->addTab(tabSSLCOpts, i18n("Validation Options"));
#endif #endif
tabs->resize(tabs->tqsizeHint()); tabs->resize(tabs->sizeHint());
load(); load();
} }
@ -1500,7 +1500,7 @@ TQString iss = TQString();
TQPalette cspl; TQPalette cspl;
iss = cert->getIssuer(); iss = cert->getIssuer();
cspl = validFrom->palette(); 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)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1508,7 +1508,7 @@ TQString iss = TQString();
validFrom->setPalette(cspl); validFrom->setPalette(cspl);
cspl = validUntil->palette(); 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)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1518,7 +1518,7 @@ TQString iss = TQString();
validFrom->setText(cert->getNotBefore()); validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter()); validUntil->setText(cert->getNotAfter());
untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires()) 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()); untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText()); pHash->setText(cert->getMD5DigestText());
delete cert; delete cert;
@ -1738,7 +1738,7 @@ TQString iss;
TQPalette cspl; TQPalette cspl;
KSSLCertificate *cert = pkcs->getCertificate(); KSSLCertificate *cert = pkcs->getCertificate();
cspl = yValidFrom->palette(); 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)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1746,7 +1746,7 @@ TQString iss;
yValidFrom->setPalette(cspl); yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette(); 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)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1778,7 +1778,7 @@ TQString iss;
KSSLCertificate *cert = pkcs->getCertificate(); KSSLCertificate *cert = pkcs->getCertificate();
iss = cert->getIssuer(); iss = cert->getIssuer();
cspl = yValidFrom->palette(); 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)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1786,7 +1786,7 @@ TQString iss;
yValidFrom->setPalette(cspl); yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette(); 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)); cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else { } else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));

8
kcontrol/css/cssconfig.ui
Unescape View File

@ -103,7 +103,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -157,7 +157,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -185,7 +185,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>451</width> <width>451</width>
<height>20</height> <height>20</height>
@ -206,7 +206,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>

14
kcontrol/css/csscustom.ui
Unescape View File

@ -243,7 +243,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -273,7 +273,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -315,7 +315,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -412,7 +412,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -429,7 +429,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -446,7 +446,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -463,7 +463,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>

2
kcontrol/css/preview.ui
Unescape View File

@ -37,7 +37,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
kcontrol/displayconfig/displayconfig.cpp
Unescape View File

@ -743,7 +743,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin
m_randrsimple = new KRandrSimpleAPI(); m_randrsimple = new KRandrSimpleAPI();
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); 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); systemconfig->setFileWriteMode(0644);
KAboutData *about = KAboutData *about =

14
kcontrol/displayconfig/displayconfigbase.ui
Unescape View File

@ -65,7 +65,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -310,7 +310,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -403,7 +403,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -420,7 +420,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -597,7 +597,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -649,7 +649,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -749,7 +749,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

10
kcontrol/dnssd/configdialog.ui
Unescape View File

@ -20,7 +20,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>130</width> <width>130</width>
<height>21</height> <height>21</height>
@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
@ -281,7 +281,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>21</height> <height>21</height>
@ -300,7 +300,7 @@ is configured with 'Browse local network' option above.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>110</height> <height>110</height>

4
kcontrol/dnssd/kcmdnssd.cpp
Unescape View File

@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); else if (getenv("TDESU_USER")!=0) tabs->removePage(tab);
addConfig(DNSSD::Configuration::self(),this); addConfig(DNSSD::Configuration::self(),this);
// it is host-wide setting so it has to be in global config file // 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"); domain->setGroup("publishing");
load(); load();
connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
@ -124,7 +124,7 @@ void KCMDnssd::load()
while (avahiStatus.isRunning()) { while (avahiStatus.isRunning()) {
kapp->processEvents(); kapp->processEvents();
} }
int exitStatus = avahiStatus.exitqStatus(); int exitStatus = avahiStatus.exiStatus();
if (exitStatus == 0) { // disabled if (exitStatus == 0) { // disabled
enableZeroconf->setChecked(false); enableZeroconf->setChecked(false);
} else if (exitStatus == 1) { // enabled } else if (exitStatus == 1) { // enabled

2
kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
Unescape View File

@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>170</height> <height>170</height>

6
kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
Unescape View File

@ -41,7 +41,7 @@ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,
: KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ), : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ),
DCOPObject( "LocalDomainURIFilterIface" ), DCOPObject( "LocalDomainURIFilterIface" ),
last_time( 0 ), last_time( 0 ),
m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) ) m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) )
{ {
configure(); configure();
} }
@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
if( m_hostPortPattern.exactMatch( cmd ) && if( m_hostPortPattern.exactMatch( cmd ) &&
isLocalDomainHost( cmd ) ) isLocalDomainHost( cmd ) )
{ {
cmd.prepend( TQString::tqfromLatin1("http://") ); cmd.prepend( TQString::fromLatin1("http://") );
setFilteredURI( data, KURL( cmd ) ); setFilteredURI( data, KURL( cmd ) );
setURIType( data, KURIFilterData::NET_PROTOCOL ); setURIType( data, KURIFilterData::NET_PROTOCOL );
@ -76,7 +76,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
if( !(host == last_host && last_time > time( NULL ) - 5 ) ) { 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()) if( helper.isEmpty())
return last_result = false; return last_result = false;

14
kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
Unescape View File

@ -43,7 +43,7 @@
#define IPv6_PATTERN "^\\[.*\\]" #define IPv6_PATTERN "^\\[.*\\]"
#define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*" #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*"
#define QFL1(x) TQString::tqfromLatin1(x) #define QFL1(x) TQString::fromLatin1(x)
/** /**
* IMPORTANT: * IMPORTANT:
@ -164,13 +164,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
if (!isMalformed && if (!isMalformed &&
(url.protocol().length() == 4) && (url.protocol().length() == 4) &&
(url.protocol() != TQString::tqfromLatin1("http")) && (url.protocol() != TQString::fromLatin1("http")) &&
(url.protocol()[0]=='h') && (url.protocol()[0]=='h') &&
(url.protocol()[1]==url.protocol()[2]) && (url.protocol()[1]==url.protocol()[2]) &&
(url.protocol()[3]=='p')) (url.protocol()[3]=='p'))
{ {
// Handle "encrypted" URLs like: h++p://www.kde.org // Handle "encrypted" URLs like: h++p://www.kde.org
url.setProtocol( TQString::tqfromLatin1("http")); url.setProtocol( TQString::fromLatin1("http"));
setFilteredURI( data, url); setFilteredURI( data, url);
setURIType( data, KURIFilterData::NET_PROTOCOL ); setURIType( data, KURIFilterData::NET_PROTOCOL );
return true; return true;
@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
} }
// Detect UNC style (aka windows SMB) URLs // Detect UNC style (aka windows SMB) URLs
if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) ) if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) )
{ {
// make sure path is unix style // make sure path is unix style
cmd.replace('\\', '/'); cmd.replace('\\', '/');
cmd.prepend( TQString::tqfromLatin1( "smb:" ) ); cmd.prepend( TQString::fromLatin1( "smb:" ) );
setFilteredURI( data, KURL( cmd )); setFilteredURI( data, KURL( cmd ));
setURIType( data, KURIFilterData::NET_PROTOCOL ); setURIType( data, KURIFilterData::NET_PROTOCOL );
return true; return true;
@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setRef(ref); u.setRef(ref);
u.setQuery(query); 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 // No authorisation, we pretend it's a file will get
// an access denied error later on. // an access denied error later on.
@ -514,7 +514,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
u.setPath(path); u.setPath(path);
u.setRef(ref); 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 // No authorisation, we pretend it exists and will get
// an access denied error later on. // an access denied error later on.

4
kcontrol/filetypes/filetypedetails.cpp
Unescape View File

@ -100,7 +100,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
secondLayout->addWidget( m_autoEmbed, 1 ); 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 ! // 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 ); new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
@ -120,7 +120,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
secondLayout->addSpacing(10); secondLayout->addSpacing(10);
embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget ); 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))); connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
secondLayout->addWidget(embedServiceListWidget, 3); secondLayout->addWidget(embedServiceListWidget, 3);

2
kcontrol/filetypes/filetypesview.cpp
Unescape View File

@ -126,7 +126,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
// Widget shown on startup // Widget shown on startup
m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack); 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*/ ); m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ );

10
kcontrol/filetypes/typeslistitem.cpp
Unescape View File

@ -69,7 +69,7 @@ void TypesListItem::initMeta( const TQString & major )
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings"); config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting( major ); 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 ) bool TypesListItem::defaultEmbeddingSetting( const TQString& major )
@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings"); config->setGroup("EmbedSettings");
bool defaultValue = defaultEmbeddingSetting(m_major); 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 ) if ( m_autoEmbed != oldAutoEmbed )
return true; return true;
} }
@ -249,7 +249,7 @@ void TypesListItem::sync()
{ {
KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
config->setGroup("EmbedSettings"); config->setGroup("EmbedSettings");
config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 ); config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
return; return;
} }
@ -286,9 +286,9 @@ void TypesListItem::sync()
config.writeEntry("Hidden", false); config.writeEntry("Hidden", false);
if ( m_autoEmbed == 2 ) if ( m_autoEmbed == 2 )
config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false ); config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false );
else else
config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
m_bNewItem = false; m_bNewItem = false;
} }

2
kcontrol/fonts/kxftconfig.cpp
Unescape View File

@ -52,7 +52,7 @@ TQString KXftConfig::contractHome(TQString path)
unsigned int len = home.length(); unsigned int len = home.length();
if(path.length() == len || path[len] == '/') if(path.length() == len || path[len] == '/')
return path.replace(0, len, TQString::tqfromLatin1("~")); return path.replace(0, len, TQString::fromLatin1("~"));
} }
} }

4
kcontrol/iccconfig/iccconfig.cpp
Unescape View File

@ -65,8 +65,8 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
{ {
TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
KAboutData *about = KAboutData *about =
new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"), new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"),

2
kcontrol/iccconfig/iccconfigbase.ui
Unescape View File

@ -168,7 +168,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

38
kcontrol/icons/icons.cpp
Unescape View File

@ -80,7 +80,7 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
// Size // Size
TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1); TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
lbl->setFixedSize(lbl->tqsizeHint()); lbl->setFixedSize(lbl->sizeHint());
grid->addWidget(lbl, 0, 0, Qt::AlignLeft); grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
mpSizeBox = new TQComboBox(m_pTab1); mpSizeBox = new TQComboBox(m_pTab1);
connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int))); connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
@ -105,8 +105,8 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
top->activate(); top->activate();
mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" )); mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
init(); init();
read(); read();
@ -125,7 +125,7 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
TQLabel *lab = new TQLabel(str, parent); TQLabel *lab = new TQLabel(str, parent);
lay->addWidget(lab, 1, i, Qt::AlignCenter); lay->addWidget(lab, 1, i, Qt::AlignCenter);
mpPreview[i] = new TQLabel(parent); mpPreview[i] = new TQLabel(parent);
mpPreview[i]->tqsetAlignment(AlignCenter); mpPreview[i]->setAlignment(AlignCenter);
mpPreview[i]->setMinimumSize(105, 105); mpPreview[i]->setMinimumSize(105, 105);
lay->addWidget(mpPreview[i], 2, i); lay->addWidget(mpPreview[i], 2, i);
TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent); TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
@ -302,12 +302,12 @@ void KIconConfig::apply()
if (mpUsageList->currentText() == i18n("Panel Buttons")) { if (mpUsageList->currentText() == i18n("Panel Buttons")) {
mpSizeBox->clear(); mpSizeBox->clear();
mpSizeBox->insertItem(TQString().tqsetNum(16)); mpSizeBox->insertItem(TQString().setNum(16));
mpSizeBox->insertItem(TQString().tqsetNum(22)); mpSizeBox->insertItem(TQString().setNum(22));
mpSizeBox->insertItem(TQString().tqsetNum(32)); mpSizeBox->insertItem(TQString().setNum(32));
mpSizeBox->insertItem(TQString().tqsetNum(48)); mpSizeBox->insertItem(TQString().setNum(48));
mpSizeBox->insertItem(TQString().tqsetNum(64)); mpSizeBox->insertItem(TQString().setNum(64));
mpSizeBox->insertItem(TQString().tqsetNum(128)); mpSizeBox->insertItem(TQString().setNum(128));
for (i=0;i<(mpSizeBox->count());i++) { for (i=0;i<(mpSizeBox->count());i++) {
if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) { if (mpSizeBox->text(i) == TQString().setNum(mQuickLaunchSize)) {
mpSizeBox->setCurrentItem(i); mpSizeBox->setCurrentItem(i);
@ -316,12 +316,12 @@ void KIconConfig::apply()
} }
else if (mpUsageList->currentText() == i18n("System Tray Icons")) { else if (mpUsageList->currentText() == i18n("System Tray Icons")) {
mpSizeBox->clear(); mpSizeBox->clear();
mpSizeBox->insertItem(TQString().tqsetNum(16)); mpSizeBox->insertItem(TQString().setNum(16));
mpSizeBox->insertItem(TQString().tqsetNum(22)); mpSizeBox->insertItem(TQString().setNum(22));
mpSizeBox->insertItem(TQString().tqsetNum(32)); mpSizeBox->insertItem(TQString().setNum(32));
mpSizeBox->insertItem(TQString().tqsetNum(48)); mpSizeBox->insertItem(TQString().setNum(48));
mpSizeBox->insertItem(TQString().tqsetNum(64)); mpSizeBox->insertItem(TQString().setNum(64));
mpSizeBox->insertItem(TQString().tqsetNum(128)); mpSizeBox->insertItem(TQString().setNum(128));
for (i=0;i<(mpSizeBox->count());i++) { for (i=0;i<(mpSizeBox->count());i++) {
if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) { if (mpSizeBox->text(i) == TQString().setNum(mSysTraySize)) {
mpSizeBox->setCurrentItem(i); mpSizeBox->setCurrentItem(i);
@ -335,7 +335,7 @@ void KIconConfig::apply()
if (mUsage < KIcon::LastGroup) { if (mUsage < KIcon::LastGroup) {
for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++) 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); dw = abs(mSizes[mUsage] - *it);
if (dw < delta) if (dw < delta)
{ {
@ -688,7 +688,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
top->setRowStretch(1,1); top->setRowStretch(1,1);
lbl = new TQLabel(i18n("&Effect:"), page); lbl = new TQLabel(i18n("&Effect:"), page);
lbl->setFixedSize(lbl->tqsizeHint()); lbl->setFixedSize(lbl->sizeHint());
top->addWidget(lbl, 0, 0, Qt::AlignLeft); top->addWidget(lbl, 0, 0, Qt::AlignLeft);
mpEffectBox = new TQListBox(page); mpEffectBox = new TQListBox(page);
mpEffectBox->insertItem(i18n("No Effect")); mpEffectBox->insertItem(i18n("No Effect"));
@ -713,7 +713,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
grid->setRowStretch(1, 1); grid->setRowStretch(1, 1);
mpPreview = new TQLabel(frame); mpPreview = new TQLabel(frame);
mpPreview->tqsetAlignment(AlignCenter); mpPreview->setAlignment(AlignCenter);
mpPreview->setMinimumSize(105, 105); mpPreview->setMinimumSize(105, 105);
grid->addWidget(mpPreview, 1, 0); grid->addWidget(mpPreview, 1, 0);

16
kcontrol/info/info.cpp
Unescape View File

@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits )
{ {
TQString hexstr; TQString hexstr;
int i; 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) for (i=hexstr.length()-1; i>0; --i)
if (hexstr[i]==' ') if (hexstr[i]==' ')
hexstr[i] = '0'; hexstr[i] = '0';
@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
for (i = 0; i < ndepths; i++) { for (i = 0; i < ndepths; i++) {
txt = txt + Value(depths[i]); txt = txt + Value(depths[i]);
if (i < ndepths - 1) if (i < ndepths - 1)
txt = txt + TQString::tqfromLatin1(", "); txt = txt + TQString::fromLatin1(", ");
} }
last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt); 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); &width, &height);
last = new TQListViewItem(item, last, i18n("Largest Cursor"), last = new TQListViewItem(item, last, i18n("Largest Cursor"),
(width == 65535 && height == 65535) (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"), last = new TQListViewItem(item, last, i18n("Current Input Event Mask"),
HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS)); 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"), last = new TQListViewItem(next, i18n("Name of the Display"),
DisplayString(dpy)); 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"), last = new TQListViewItem(next, last, i18n("Vendor Release Number"),
Value((int)VendorRelease(dpy))); Value((int)VendorRelease(dpy)));
last = new TQListViewItem(next, last, i18n("Version Number"), 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))); .arg((int)ProtocolRevision(dpy)));
last = item = new TQListViewItem(next, last, i18n("Available Screens")); last = item = new TQListViewItem(next, last, i18n("Available Screens"));
@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox )
int extCount; int extCount;
char **extensions = XListExtensions( dpy, &extCount ); char **extensions = XListExtensions( dpy, &extCount );
for ( i = 0; i < extCount; i++ ) { 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 ); XFreeExtensionList( extensions );
@ -356,7 +356,7 @@ void KInfoListWidget::load()
retrieve-function. If the function wants the widget to show retrieve-function. If the function wants the widget to show
another string, then it change *GetInfo_ErrorString ! */ another string, then it change *GetInfo_ErrorString ! */
ErrorString = i18n("No information available about %1.").arg(title) 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 */ GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */
sorting_allowed = true; /* the functions may set that */ 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." ) ); TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
NoInfoText = new TQLabel(widgetStack); NoInfoText = new TQLabel(widgetStack);
widgetStack->addWidget(NoInfoText, 1); widgetStack->addWidget(NoInfoText, 1);
NoInfoText->tqsetAlignment(AlignCenter | WordBreak); NoInfoText->setAlignment(AlignCenter | WordBreak);
widgetStack->raiseWidget(NoInfoText); widgetStack->raiseWidget(NoInfoText);
load(); load();
} }

6
kcontrol/info/info_netbsd.cpp
Unescape View File

@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox)
// convert to strings // convert to strings
vv[0] = KIO::convertSize(big[0]); vv[0] = KIO::convertSize(big[0]);
vv[1] = TQString::tqfromLatin1("%1 (%2%%)") vv[1] = TQString::fromLatin1("%1 (%2%%)")
.arg(KIO::convertSize(big[1])) .arg(KIO::convertSize(big[1]))
.arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
// FIXME: these two are large enough to punctuate // FIXME: these two are large enough to punctuate
vv[2] = TQString::number(mnt->f_files); 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_ffree)
.arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0); .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
vv[4] = TQString::null; 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(ASYNC)
MNTF(DEFEXPORTED) MNTF(DEFEXPORTED)
MNTF(EXKERB) MNTF(EXKERB)

8
kcontrol/info/memory.cpp
Unescape View File

@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
break; break;
}; };
Widget = new TQLabel(title, this); Widget = new TQLabel(title, this);
Widget->tqsetAlignment(AlignLeft); Widget->setAlignment(AlignLeft);
vbox->addWidget(Widget, 1); vbox->addWidget(Widget, 1);
} }
@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
if (i == SWAP_MEM) if (i == SWAP_MEM)
vbox->addSpacing(SPACING); vbox->addSpacing(SPACING);
Widget = new TQLabel(this); Widget = new TQLabel(this);
Widget->tqsetAlignment(AlignRight); Widget->setAlignment(AlignRight);
MemSizeLabel[i][j] = Widget; MemSizeLabel[i][j] = Widget;
vbox->addWidget(Widget, 1); vbox->addWidget(Widget, 1);
} }
@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
hint = "<qt>" + hint + "</qt>"; hint = "<qt>" + hint + "</qt>";
Widget = new TQLabel("<b>" + title + "</b>", this); Widget = new TQLabel("<b>" + title + "</b>", this);
Widget->tqsetAlignment(AlignCenter); Widget->setAlignment(AlignCenter);
TQToolTip::add(Widget, hint); TQToolTip::add(Widget, hint);
vbox->addWidget(Widget); vbox->addWidget(Widget);
vbox->addSpacing(SPACING / 2); vbox->addSpacing(SPACING / 2);
@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
vbox->addSpacing(SPACING / 2); vbox->addSpacing(SPACING / 2);
Widget = new TQLabel(this); /* xx MB used. */ Widget = new TQLabel(this); /* xx MB used. */
Widget->tqsetAlignment(AlignCenter); Widget->setAlignment(AlignCenter);
TQToolTip::add(Widget, hint); TQToolTip::add(Widget, hint);
GraphLabel[i] = Widget; GraphLabel[i] = Widget;
vbox->addWidget(Widget); vbox->addWidget(Widget);

2
kcontrol/info/opengl.cpp
Unescape View File

@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1)
if (!ext || !ext[0]) if (!ext || !ext[0])
return; return;
TQString qext = TQString::tqfromLatin1(ext); TQString qext = TQString::fromLatin1(ext);
TQListViewItem *l2 = NULL; TQListViewItem *l2 = NULL;
i = j = 0; i = j = 0;

16
kcontrol/input/kmousedlg.ui
Unescape View File

@ -57,7 +57,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -74,7 +74,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -112,7 +112,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>115</height> <height>115</height>
@ -208,7 +208,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>60</height> <height>60</height>
@ -235,7 +235,7 @@
<property name="name"> <property name="name">
<cstring>slAutoSelect</cstring> <cstring>slAutoSelect</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>250</width> <width>250</width>
<height>0</height> <height>0</height>
@ -258,7 +258,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>230</width> <width>230</width>
<height>20</height> <height>20</height>
@ -301,7 +301,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -331,7 +331,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

6
kcontrol/input/xcursor/previewwidget.cpp
Unescape View File

@ -286,7 +286,7 @@ PreviewWidget::~PreviewWidget()
void PreviewWidget::setTheme( const TQString &theme ) void PreviewWidget::setTheme( const TQString &theme )
{ {
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
int minHeight = previewSize + 20; // Minimum height of the preview widget int minHeight = previewSize + 20; // Minimum height of the preview widget
int maxHeight = height(); // Tallest cursor height int maxHeight = height(); // Tallest cursor height
@ -302,7 +302,7 @@ void PreviewWidget::setTheme( const TQString &theme )
current = -1; current = -1;
setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) ); setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
tqrepaint( false ); tqrepaint( false );
} }
@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
{ {
TQPixmap buffer( size() ); TQPixmap buffer( size() );
TQPainter p( &buffer ); TQPainter p( &buffer );
p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) ); p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
Picture dest; Picture dest;
if ( !qt_has_xft || !qt_use_xrender ) { if ( !qt_has_xft || !qt_use_xrender ) {

4
kcontrol/joystick/caldialog.cpp
Unescape View File

@ -65,7 +65,7 @@ void CalDialog::calibrate()
do do
{ {
tqApp->tqprocessEvents(2000); tqApp->processEvents(2000);
} }
while ( ti.isActive() && (result() != TQDialog::Rejected) ); 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 // loop until the user presses a button on the device or on the dialog
do do
{ {
tqApp->tqprocessEvents(100); tqApp->processEvents(100);
if ( joydev->getEvent(type, number, value) ) if ( joydev->getEvent(type, number, value) )
{ {

2
kcontrol/joystick/joystick.cpp
Unescape View File

@ -95,7 +95,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
joyWidget = new JoyWidget(this); joyWidget = new JoyWidget(this);
setMinimumSize(joyWidget->tqminimumSize()); setMinimumSize(joyWidget->minimumSize());
setButtons(KCModule::Default); setButtons(KCModule::Default);
} }

2
kcontrol/joystick/joywidget.cpp
Unescape View File

@ -56,7 +56,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
TQLabel *icon = new TQLabel(messageBox); TQLabel *icon = new TQLabel(messageBox);
icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
KIcon::SizeMedium, KIcon::DefaultState, 0, true)); KIcon::SizeMedium, KIcon::DefaultState, 0, true));
icon->setFixedSize(icon->tqsizeHint()); icon->setFixedSize(icon->sizeHint());
message = new TQLabel(messageBox); message = new TQLabel(messageBox);
messageBox->hide(); messageBox->hide();
} }

2
kcontrol/kcontrol/aboutwidget.cpp
Unescape View File

@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca
// set qwhatsthis help // set qwhatsthis help
TQWhatsThis::add(this, i18n(intro_text)); TQWhatsThis::add(this, i18n(intro_text));
_viewer = new KHTMLPart( this, "_viewer" ); _viewer = new KHTMLPart( this, "_viewer" );
_viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
connect( _viewer->browserExtension(), connect( _viewer->browserExtension(),
TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );

4
kcontrol/kcontrol/dockcontainer.cpp
Unescape View File

@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent)
, _module(0L) , _module(0L)
{ {
_busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this); _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this);
_busyw->tqsetAlignment(AlignCenter); _busyw->setAlignment(AlignCenter);
_busyw->setTextFormat(RichText); _busyw->setTextFormat(RichText);
_busyw->setGeometry(0,0, width(), height()); _busyw->setGeometry(0,0, width(), height());
addWidget( _busyw ); addWidget( _busyw );
@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n"
ProxyWidget *widget = loadModule( module ); ProxyWidget *widget = loadModule( module );
KCGlobal::repairAccels( tqtopLevelWidget() ); KCGlobal::repairAccels( topLevelWidget() );
return ( widget!=0 ); return ( widget!=0 );
} }

4
kcontrol/kcontrol/global.cpp
Unescape View File

@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup()
if (_infocenter) if (_infocenter)
{ {
kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl; 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 else
{ {
kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl; kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl;
_baseGroup = TQString::tqfromLatin1("Settings/"); _baseGroup = TQString::fromLatin1("Settings/");
} }
} }
} }

4
kcontrol/kcontrol/kcrootonly.cpp
Unescape View File

@ -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>" 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); "Click on the \"Administrator Mode\" button below."), this);
layout->addWidget(label); layout->addWidget(label);
label->tqsetAlignment(AlignCenter); label->setAlignment(AlignCenter);
label->setTextFormat(RichText); label->setTextFormat(RichText);
label->setMinimumSize(label->tqsizeHint()); label->setMinimumSize(label->sizeHint());
} }

8
kcontrol/kcontrol/main.cpp
Unescape View File

@ -77,9 +77,9 @@ KControlApp::KControlApp()
int fontSize = toplevel->fontInfo().pointSize(); int fontSize = toplevel->fontInfo().pointSize();
if (fontSize == 0) if (fontSize == 0)
fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX(); 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 ) ); 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 ) ); QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
toplevel->resize(x,y); toplevel->resize(x,y);
} }
@ -91,8 +91,8 @@ KControlApp::~KControlApp()
KConfig *config = KGlobal::config(); KConfig *config = KGlobal::config();
config->setGroup("General"); config->setGroup("General");
TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop()); TQWidget *desk = TQT_TQWIDGET(TQApplication::desktop());
config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
config->sync(); config->sync();
} }
delete toplevel; delete toplevel;

4
kcontrol/kcontrol/modules.cpp
Unescape View File

@ -147,7 +147,7 @@ void ConfigModule::runAsRoot()
_embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
TQPalette pal( red ); TQPalette pal( red );
pal.setColor( TQColorGroup::Background, pal.setColor( TQColorGroup::Background,
_module->parentWidget()->tqcolorGroup().background() ); _module->parentWidget()->colorGroup().background() );
_embedFrame->setPalette( pal ); _embedFrame->setPalette( pal );
_embedFrame->setLineWidth( 2 ); _embedFrame->setLineWidth( 2 );
_embedFrame->setMidLineWidth( 2 ); _embedFrame->setMidLineWidth( 2 );
@ -158,7 +158,7 @@ void ConfigModule::runAsRoot()
_module->hide(); _module->hide();
_embedFrame->show(); _embedFrame->show();
TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack); TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack);
_busy->tqsetAlignment(AlignCenter); _busy->setAlignment(AlignCenter);
_busy->setTextFormat(RichText); _busy->setTextFormat(RichText);
_busy->setGeometry(0,0, _module->width(), _module->height()); _busy->setGeometry(0,0, _module->width(), _module->height());
_busy->show(); _busy->show();

4
kcontrol/kcontrol/moduletreeview.cpp
Unescape View File

@ -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) ); TQSize( fontMetrics().maxWidth()*35, TQWIDGETSIZE_MAX) );
} }

2
kcontrol/kcontrol/moduletreeview.h
Unescape View File

@ -74,7 +74,7 @@ public:
void makeSelected(ConfigModule* module); void makeSelected(ConfigModule* module);
void makeVisible(ConfigModule *module); void makeVisible(ConfigModule *module);
void fill(); void fill();
TQSize tqsizeHint() const; TQSize sizeHint() const;
signals: signals:
void moduleSelected(ConfigModule*); void moduleSelected(ConfigModule*);

4
kcontrol/kcontrol/proxywidget.cpp
Unescape View File

@ -120,7 +120,7 @@ public:
~ProxyContentWidget(){} ~ProxyContentWidget(){}
// this should be really done by qscrollview in AutoOneFit mode! // 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); client->reparent(contentWidget,0,TQPoint(0,0),true);
vbox->addWidget( client ); vbox->addWidget( client );
vbox->activate(); // make sure we have a proper tqminimumSizeHint vbox->activate(); // make sure we have a proper minimumSizeHint
addChild(contentWidget); addChild(contentWidget);
} }

2
kcontrol/kcontrol/toplevel.cpp
Unescape View File

@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name)
// help widget // help widget
_help = new HelpWidget(_dock); _help = new HelpWidget(_dock);
_stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
// Restore sizes // Restore sizes
config->setGroup("General"); config->setGroup("General");

4
kcontrol/kded/kcmkded.cpp
Unescape View File

@ -149,7 +149,7 @@ void KDEDConfig::load( bool useDefaults ) {
TQStringList files; TQStringList files;
KGlobal::dirs()->findAllResources( "services", KGlobal::dirs()->findAllResources( "services",
TQString::tqfromLatin1( "kded/*.desktop" ), TQString::fromLatin1( "kded/*.desktop" ),
true, true, files ); true, true, files );
TQListViewItem* item = 0L; TQListViewItem* item = 0L;
@ -187,7 +187,7 @@ void KDEDConfig::save() {
TQStringList files; TQStringList files;
KGlobal::dirs()->findAllResources( "services", KGlobal::dirs()->findAllResources( "services",
TQString::tqfromLatin1( "kded/*.desktop" ), TQString::fromLatin1( "kded/*.desktop" ),
true, true, files ); true, true, files );
KConfig kdedrc("kdedrc", false, false); KConfig kdedrc("kdedrc", false, false);

14
kcontrol/kdm/kdm-appear.cpp
Unescape View File

@ -277,7 +277,7 @@ void KDMAppearanceWidget::makeReadOnly()
void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
{ {
TQStringList langlist = KGlobal::dirs()->findAllResources("locale", TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
TQString::tqfromLatin1("*/entry.desktop")); TQString::fromLatin1("*/entry.desktop"));
langlist.sort(); langlist.sort();
for ( TQStringList::ConstIterator it = langlist.begin(); for ( TQStringList::ConstIterator it = langlist.begin();
it != langlist.end(); ++it ) it != langlist.end(); ++it )
@ -287,9 +287,9 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
TQString nid = fpath.mid(index + 1); TQString nid = fpath.mid(index + 1);
KSimpleConfig entry(*it); KSimpleConfig entry(*it);
entry.setGroup(TQString::tqfromLatin1("KCM Locale")); entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null); combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null);
} }
} }
@ -343,7 +343,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
bool KDMAppearanceWidget::setLogo(TQString logo) bool KDMAppearanceWidget::setLogo(TQString logo)
{ {
TQString flogo = logo.isEmpty() ? TQString flogo = logo.isEmpty() ?
locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) : locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
logo; logo;
TQImage p(flogo); TQImage p(flogo);
if (p.isNull()) if (p.isNull())
@ -351,7 +351,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
if (p.width() > 100 || p.height() > 100) if (p.width() > 100 || p.height() > 100)
p = p.smoothScale(100, 100, TQ_ScaleMin); p = p.smoothScale(100, 100, TQ_ScaleMin);
logobutton->setPixmap(p); 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); logobutton->setFixedSize(p.width() + bd, p.height() + bd);
logopath = logo; logopath = logo;
return true; return true;
@ -361,7 +361,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
void KDMAppearanceWidget::slotLogoButtonClicked() void KDMAppearanceWidget::slotLogoButtonClicked()
{ {
KImageIO::registerFormats(); KImageIO::registerFormats();
KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")), KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")),
KImageIO::pattern( KImageIO::Reading ), KImageIO::pattern( KImageIO::Reading ),
this, 0, true); this, 0, true);
dialogue.setOperationMode( KFileDialog::Opening ); dialogue.setOperationMode( KFileDialog::Opening );

4
kcontrol/kdm/kdm-conv.cpp
Unescape View File

@ -50,7 +50,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this ); alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this );
alGroup->setCheckable( true ); alGroup->setCheckable( true );
alGroup->tqsetSizePolicy( vpref ); alGroup->setSizePolicy( vpref );
TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
" This applies only to KDM's graphical login." " 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 = 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(slotPresChanged()));
connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));

12
kcontrol/kdm/kdm-users.cpp
Unescape View File

@ -94,14 +94,14 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
leminuid = new KLineEdit( minGroup ); leminuid = new KLineEdit( minGroup );
minlab->setBuddy( leminuid ); minlab->setBuddy( leminuid );
leminuid->tqsetSizePolicy( sp_ign_fix ); leminuid->setSizePolicy( sp_ign_fix );
leminuid->setValidator( valid ); leminuid->setValidator( valid );
connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup );
lemaxuid = new KLineEdit( minGroup ); lemaxuid = new KLineEdit( minGroup );
maxlab->setBuddy( lemaxuid ); maxlab->setBuddy( lemaxuid );
lemaxuid->tqsetSizePolicy( sp_ign_fix ); lemaxuid->setSizePolicy( sp_ign_fix );
lemaxuid->setValidator( valid ); lemaxuid->setValidator( valid );
connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); 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 = new TQPushButton( hlpw );
userbutton->setAcceptDrops( true ); userbutton->setAcceptDrops( true );
userbutton->installEventFilter( this ); // for drag and drop 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 ); userbutton->setFixedSize( sz, sz );
connect( userbutton, TQT_SIGNAL(clicked()), connect( userbutton, TQT_SIGNAL(clicked()),
TQT_SLOT(slotUserButtonClicked()) ); TQT_SLOT(slotUserButtonClicked()) );
@ -457,11 +457,11 @@ void KDMUsersWidget::load()
cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true)); cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
TQString ps = config->readEntry( "FaceSource" ); TQString ps = config->readEntry( "FaceSource" );
if (ps == TQString::tqfromLatin1("UserOnly")) if (ps == TQString::fromLatin1("UserOnly"))
rbusronly->setChecked(true); rbusronly->setChecked(true);
else if (ps == TQString::tqfromLatin1("PreferUser")) else if (ps == TQString::fromLatin1("PreferUser"))
rbprefusr->setChecked(true); rbprefusr->setChecked(true);
else if (ps == TQString::tqfromLatin1("PreferAdmin")) else if (ps == TQString::fromLatin1("PreferAdmin"))
rbprefadm->setChecked(true); rbprefadm->setChecked(true);
else else
rbadmonly->setChecked(true); rbadmonly->setChecked(true);

4
kcontrol/kdm/main.cpp
Unescape View File

@ -175,10 +175,10 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
struct stat st; struct stat st;
if( stat( KDE_CONFDIR "/kdm/kdmdistrc" ,&st ) == 0) { 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 { else {
config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
} }
TQVBoxLayout *top = new TQVBoxLayout(this); TQVBoxLayout *top = new TQVBoxLayout(this);

4
kcontrol/keys/commandShortcuts.cpp
Unescape View File

@ -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. " 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 " "To edit, add or remove entries from this list use the "
"<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>")); "<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 &))); disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
mainLayout->addWidget(label); mainLayout->addWidget(label);
m_tree = new AppTreeView(this, "appTreeView"); 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->setStretchFactor(m_tree, 10);
mainLayout->addWidget(m_tree); mainLayout->addWidget(m_tree);
TQWhatsThis::add(m_tree, TQWhatsThis::add(m_tree,

2
kcontrol/keys/keyconfig.cpp
Unescape View File

@ -170,7 +170,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
topLayout->addRowSpacing(3, 15); topLayout->addRowSpacing(3, 15);
topLayout->addMultiCellWidget(kc, 5, 5, 0, 1); topLayout->addMultiCellWidget(kc, 5, 5, 0, 1);
setMinimumSize(topLayout->tqsizeHint()); setMinimumSize(topLayout->sizeHint());
} }
KKeyModule::~KKeyModule (){ KKeyModule::~KKeyModule (){

6
kcontrol/keys/shortcuts.cpp
Unescape View File

@ -145,7 +145,7 @@ void ShortcutsModule::initGUI()
m_pcbSchemes = new KComboBox( this ); m_pcbSchemes = new KComboBox( this );
m_pcbSchemes->setMinimumWidth( 100 ); 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)) ); connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
pHLayout->addWidget( m_pcbSchemes ); pHLayout->addWidget( m_pcbSchemes );
@ -190,10 +190,10 @@ void ShortcutsModule::initGUI()
m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true ); m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true );
m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); 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) { 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 = 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 ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys );
pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 );
connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) );

10
kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
Unescape View File

@ -114,7 +114,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsSplitter=new TQSplitter(this); itsSplitter=new TQSplitter(this);
fontsFrame=new TQFrame(itsSplitter), fontsFrame=new TQFrame(itsSplitter),
itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(itsSplitter), "kcmfontinst", "KParts::ReadOnlyPart"); 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)); TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
@ -130,7 +130,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
{ {
#endif #endif
fontsFrame=new TQFrame(this); fontsFrame=new TQFrame(this);
fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
#ifdef HAVE_XFT #ifdef HAVE_XFT
} }
#endif #endif
@ -141,7 +141,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false)); bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
fontsFrame->setLineWidth(0); fontsFrame->setLineWidth(0);
toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
toolbar->setMovingEnabled(false); toolbar->setMovingEnabled(false);
TQString previousPath=itsConfig.readEntry(CFG_PATH); TQString previousPath=itsConfig.readEntry(CFG_PATH);
@ -152,12 +152,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
itsDirOp->setMinimumSize(TQSize(96, 64)); itsDirOp->setMinimumSize(TQSize(96, 64));
setMimeTypes(showBitmap); setMimeTypes(showBitmap);
itsDirOp->dirLister()->setMainWindow(this); itsDirOp->dirLister()->setMainWindow(this);
itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1);
KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame);
connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); 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); fontsLayout->addWidget(button, 1, 0);
TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));

2
kcontrol/kfontinst/kcmfontinst/KFileFontView.h
Unescape View File

@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem
TQRect rect() const TQRect rect() const
{ {
TQRect r = listView()->tqitemRect(this); TQRect r = listView()->itemRect(this);
return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height())); return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height()));
} }

16
kcontrol/kfontinst/kio/KioFonts.cpp
Unescape View File

@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url)
TQString fname(url.fileName()); TQString fname(url.fileName());
int pos; int pos;
if(-1!=(pos=fname.findRev(TQString::tqfromLatin1(constMultipleExtension)))) if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension))))
fname=fname.left(pos); fname=fname.left(pos);
return fname; 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"/system-folder"
: KFI_KIO_FONTS_PROTOCOL"/folder"); : KFI_KIO_FONTS_PROTOCOL"/folder");
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); 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; return true;
} }
else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet! 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_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); 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()) if(!Misc::root())
{ {
url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER); url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
url+=TQString::tqfromLatin1("/"); url+=TQString::fromLatin1("/");
} }
if(multiple) if(multiple)
url+=name+TQString::tqfromLatin1(constMultipleExtension); url+=name+TQString::fromLatin1(constMultipleExtension);
else else
url+=Misc::getFile(path); url+=Misc::getFile(path);
addAtom(entry, KIO::UDS_URL, 0, url); addAtom(entry, KIO::UDS_URL, 0, url);
@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
if (markPartial) if (markPartial)
{ {
TQString destPart(destOrig+TQString::tqfromLatin1(".part")); TQString destPart(destOrig+TQString::fromLatin1(".part"));
TQCString destPartC(TQFile::encodeName(destPart)); TQCString destPartC(TQFile::encodeName(destPart));
dest = destPart; dest = destPart;
@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u)
if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) || if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) || ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+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\".") 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))); \ .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \

4
kcontrol/kfontinst/viewpart/FontPreview.cpp
Unescape View File

@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *)
} }
} }
TQSize CFontPreview::tqsizeHint() const TQSize CFontPreview::sizeHint() const
{ {
return TQSize(132, 132); return TQSize(132, 132);
} }
TQSize CFontPreview::tqminimumSizeHint() const TQSize CFontPreview::minimumSizeHint() const
{ {
return TQSize(32, 32); return TQSize(32, 32);
} }

4
kcontrol/kfontinst/viewpart/FontPreview.h
Unescape View File

@ -50,8 +50,8 @@ class CFontPreview : public TQWidget
virtual ~CFontPreview() {} virtual ~CFontPreview() {}
void paintEvent(TQPaintEvent *); void paintEvent(TQPaintEvent *);
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
void showFont(const KURL &url); void showFont(const KURL &url);
void showFont(); void showFont();

2
kcontrol/kfontinst/viewpart/FontViewPart.cpp
Unescape View File

@ -88,7 +88,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
setInstance(new KInstance("kfontview")); setInstance(new KInstance("kfontview"));
itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame); itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
itsFaceSelector=new KIntNumInput(1, itsToolsFrame); itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button"); itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");

4
kcontrol/kicker/advancedDialog.cpp
Unescape View File

@ -51,7 +51,7 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
layout->addWidget(m_advancedWidget); layout->addWidget(m_advancedWidget);
layout->addStretch(); layout->addStretch();
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
this, TQT_SLOT(changed())); this, TQT_SLOT(changed()));
@ -92,7 +92,7 @@ void advancedDialog::load()
int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14); int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14);
m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize); m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize);
TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() ); TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() );
m_advancedWidget->tintColorB->setColor( color ); m_advancedWidget->tintColorB->setColor( color );
int tintValue = c.readNumEntry( "TintValue", 33 ); int tintValue = c.readNumEntry( "TintValue", 33 );
m_advancedWidget->tintSlider->setValue( tintValue ); m_advancedWidget->tintSlider->setValue( tintValue );

8
kcontrol/kicker/advancedOptions.ui
Unescape View File

@ -71,7 +71,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>101</width> <width>101</width>
<height>20</height> <height>20</height>
@ -145,7 +145,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -194,7 +194,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -225,7 +225,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>81</width> <width>81</width>
<height>20</height> <height>20</height>

10
kcontrol/kicker/applettab.ui
Unescape View File

@ -112,7 +112,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -123,7 +123,7 @@
<property name="name"> <property name="name">
<cstring>pb_add</cstring> <cstring>pb_add</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -143,7 +143,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -162,7 +162,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -182,7 +182,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

22
kcontrol/kicker/hidingtab.ui
Unescape View File

@ -62,7 +62,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>342</width> <width>342</width>
<height>20</height> <height>20</height>
@ -92,7 +92,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -179,7 +179,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -299,7 +299,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -332,7 +332,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>10</height> <height>10</height>
@ -401,7 +401,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -439,7 +439,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -467,7 +467,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -532,7 +532,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -573,7 +573,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -637,7 +637,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

12
kcontrol/kicker/lookandfeeltab.ui
Unescape View File

@ -359,7 +359,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>66</width> <width>66</width>
<height>130</height> <height>130</height>
@ -389,7 +389,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -428,13 +428,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>50</height> <height>50</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>50</width> <width>50</width>
<height>50</height> <height>50</height>
@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>289</width> <width>289</width>
<height>20</height> <height>20</height>
@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

22
kcontrol/kicker/menutab.ui
Unescape View File

@ -63,7 +63,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -197,7 +197,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -261,13 +261,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>26</width> <width>26</width>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>26</width> <width>26</width>
<height>26</height> <height>26</height>
@ -327,7 +327,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -345,7 +345,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -389,7 +389,7 @@
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
@ -487,7 +487,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -558,7 +558,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -654,7 +654,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -698,7 +698,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

10
kcontrol/kicker/menutab_impl.cpp
Unescape View File

@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
btnCustomKMenuIcon->setPixmap(kmenu_icon); btnCustomKMenuIcon->setPixmap(kmenu_icon);
KConfig *config; KConfig *config;
config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
config->setGroup(TQString::tqfromLatin1("RecentDocuments")); config->setGroup(TQString::fromLatin1("RecentDocuments"));
maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10)); maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
m_browserGroupLayout->setColStretch( 1, 1 ); m_browserGroupLayout->setColStretch( 1, 1 );
m_pRecentOrderGroupLayout->setColStretch( 1, 1 ); m_pRecentOrderGroupLayout->setColStretch( 1, 1 );
@ -247,8 +247,8 @@ void MenuTab::save()
// Save recent documents // Save recent documents
KConfig *config; KConfig *config;
config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
config->setGroup(TQString::tqfromLatin1("RecentDocuments")); config->setGroup(TQString::fromLatin1("RecentDocuments"));
config->writeEntry("MaxEntries", maxrecentdocs->value()); config->writeEntry("MaxEntries", maxrecentdocs->value());
config->sync(); config->sync();

68
kcontrol/kicker/positiontab.ui
Unescape View File

@ -66,7 +66,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>342</width> <width>342</width>
<height>20</height> <height>20</height>
@ -104,7 +104,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -123,7 +123,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>151</width> <width>151</width>
<height>115</height> <height>115</height>
@ -149,7 +149,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -176,7 +176,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -235,7 +235,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>101</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>16</height> <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"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>40</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>0</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <height>16</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>16</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
<height>24</height> <height>24</height>

6
kcontrol/kicker/positiontab_impl.cpp
Unescape View File

@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
{ {
TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png")); TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png"));
m_monitorImage->setPixmap(monitor); 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 = new TQWidget(m_monitorImage, "pretendBG");
m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY); m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY);
@ -696,14 +696,14 @@ void PositionTab::showIdentify()
screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameStyle(TQFrame::Panel);
screenLabel->setFrameShadow(TQFrame::Plain); screenLabel->setFrameShadow(TQFrame::Plain);
screenLabel->tqsetAlignment(Qt::AlignCenter); screenLabel->setAlignment(Qt::AlignCenter);
screenLabel->setNum(s + 1); screenLabel->setNum(s + 1);
// BUGLET: we should not allow the identification to be entered again // BUGLET: we should not allow the identification to be entered again
// until the timer fires. // until the timer fires.
TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
targetGeometry.moveCenter(screenCenter); targetGeometry.moveCenter(screenCenter);
screenLabel->setGeometry(targetGeometry); screenLabel->setGeometry(targetGeometry);

4
kcontrol/kio/cache_ui.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>21</height> <height>21</height>
@ -88,7 +88,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>21</height> <height>21</height>

8
kcontrol/kio/fakeuaprovider.cpp
Unescape View File

@ -27,7 +27,7 @@
#include "fakeuaprovider.h" #include "fakeuaprovider.h"
#define UA_PTOS(x) (*it)->property(x).toString() #define UA_PTOS(x) (*it)->property(x).toString()
#define QFL(x) TQString::tqfromLatin1(x) #define QFL(x) TQString::fromLatin1(x)
FakeUASProvider::FakeUASProvider() FakeUASProvider::FakeUASProvider()
{ {
@ -97,13 +97,13 @@ void FakeUASProvider::parseDescription()
TQStringList languageList = KGlobal::locale()->languageList(); TQStringList languageList = KGlobal::locale()->languageList();
if ( languageList.count() ) if ( languageList.count() )
{ {
TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") ); TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
if( it != languageList.end() ) if( it != languageList.end() )
{ {
if( languageList.contains( TQString::tqfromLatin1("en") ) > 0 ) if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
languageList.remove( it ); languageList.remove( it );
else else
(*it) = TQString::tqfromLatin1("en"); (*it) = TQString::fromLatin1("en");
} }
} }

2
kcontrol/kio/kcookiesmanagementdlg_ui.ui
Unescape View File

@ -119,7 +119,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>62</height> <height>62</height>

2
kcontrol/kio/kcookiespolicies.cpp
Unescape View File

@ -392,7 +392,7 @@ void KCookiesPolicies::save()
while( at ) 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(); at = at->nextSibling();
} }

2
kcontrol/kio/kcookiespoliciesdlg_ui.ui
Unescape View File

@ -161,7 +161,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

8
kcontrol/kio/kenvvarproxydlg.cpp
Unescape View File

@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed()
setHighLight (mDlg->lbNoProxy, false); setHighLight (mDlg->lbNoProxy, false);
// Detect HTTP proxy settings... // 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... // 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... // 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... // Detect the NO_PROXY settings...
found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
if ( !found ) if ( !found )
{ {

2
kcontrol/kio/kmanualproxydlg.cpp
Unescape View File

@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name )
mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) ); mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy ); mDlg->pbCopyDown->setSizePolicy( sizePolicy );
init(); init();
} }

4
kcontrol/kio/kproxydlg_ui.ui
Unescape View File

@ -115,7 +115,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -300,7 +300,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>

6
kcontrol/kio/manualproxy_ui.ui
Unescape View File

@ -137,7 +137,7 @@
<property name="name"> <property name="name">
<cstring>sbHttp</cstring> <cstring>sbHttp</cstring>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -160,7 +160,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>20</height> <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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>114</height> <height>114</height>

2
kcontrol/kio/policydlg.cpp
Unescape View File

@ -70,7 +70,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent,
connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotTextChanged(const TQString&))); TQT_SLOT(slotTextChanged(const TQString&)));
setFixedSize (tqsizeHint()); setFixedSize (sizeHint());
m_dlgUI->leDomain->setFocus (); m_dlgUI->leDomain->setFocus ();
} }

6
kcontrol/kio/policydlg.h
Unescape View File

@ -52,11 +52,11 @@ public:
if (advice.isEmpty()) if (advice.isEmpty())
return KCookieAdvice::Dunno; return KCookieAdvice::Dunno;
if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0) if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0)
return KCookieAdvice::Accept; 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; 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::Ask;
return KCookieAdvice::Dunno; return KCookieAdvice::Dunno;

8
kcontrol/kio/socksbase.ui
Unescape View File

@ -127,7 +127,7 @@
<property name="name"> <property name="name">
<cstring>_c_customPath</cstring> <cstring>_c_customPath</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -211,7 +211,7 @@
<property name="name"> <property name="name">
<cstring>_c_newPath</cstring> <cstring>_c_newPath</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>25</height> <height>25</height>
@ -236,7 +236,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -281,7 +281,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

4
kcontrol/kio/uagentproviderdlg_ui.ui
Unescape View File

@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine.
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>16</height> <height>16</height>
@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine.
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>29</width> <width>29</width>
<height>20</height> <height>20</height>

4
kcontrol/kio/useragentdlg_ui.ui
Unescape View File

@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>16</height> <height>16</height>

10
kcontrol/knotify/playersettings.ui
Unescape View File

@ -84,7 +84,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -109,7 +109,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -140,7 +140,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>233</width> <width>233</width>
<height>20</height> <height>20</height>
@ -205,7 +205,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -265,7 +265,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

4
kcontrol/konq/behaviour.cpp
Unescape View File

@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
winPixmap->setPixmap(TQPixmap(locate("data", winPixmap->setPixmap(TQPixmap(locate("data",
"kcontrol/pics/onlyone.png"))); "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); TQHBox *hboxpreview = new TQHBox(vbox);
TQWidget* spacer = new TQWidget( hboxpreview ); TQWidget* spacer = new TQWidget( hboxpreview );
spacer->setMinimumSize( 20, 0 ); 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 ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));

6
kcontrol/konq/desktopbehavior.ui
Unescape View File

@ -74,7 +74,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -268,7 +268,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>191</width> <width>191</width>
<height>80</height> <height>80</height>
@ -287,7 +287,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>

6
kcontrol/konq/desktopbehavior_impl.cpp
Unescape View File

@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
*/ */
bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); 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(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); 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())) it; it=static_cast<DesktopBehaviorMediaItem *>(it->nextSibling()))
{ {
if (it->mimeType().startsWith("media/builtin-") == false) if (it->mimeType().startsWith("media/builtin-") == false)
it->tqsetVisible(enabled); it->setVisible(enabled);
else else
it->tqsetVisible(TRUE); it->setVisible(TRUE);
} }
} }

2
kcontrol/konqhtml/advancedTabOptions.ui
Unescape View File

@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

2
kcontrol/konqhtml/domainlistview.cpp
Unescape View File

@ -39,7 +39,7 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
layout()->setSpacing(0); layout()->setSpacing(0);
layout()->setMargin(0); layout()->setMargin(0);
TQGridLayout* thisLayout = new TQGridLayout(tqlayout()); TQGridLayout* thisLayout = new TQGridLayout(tqlayout());
thisLayout->tqsetAlignment(Qt::AlignTop); thisLayout->setAlignment(Qt::AlignTop);
thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setSpacing(KDialog::spacingHint());
thisLayout->setMargin(KDialog::marginHint()); thisLayout->setMargin(KDialog::marginHint());

2
kcontrol/konqhtml/jspolicies.cpp
Unescape View File

@ -136,7 +136,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
layout()->setSpacing(0); layout()->setSpacing(0);
layout()->setMargin(0); layout()->setMargin(0);
TQGridLayout *this_layout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2); 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->setSpacing(3);
this_layout->setMargin(11); this_layout->setMargin(11);

6
kcontrol/konqhtml/nsconfigwidget.ui
Unescape View File

@ -72,7 +72,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -96,7 +96,7 @@
<property name="name"> <property name="name">
<cstring>GroupBox1</cstring> <cstring>GroupBox1</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>300</width>
<height>0</height> <height>0</height>
@ -184,7 +184,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
kcontrol/konqhtml/pluginopts.cpp
Unescape View File

@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren
TQFrame *hrule = new TQFrame(globalGB); TQFrame *hrule = new TQFrame(globalGB);
hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
/************************************************************************** /**************************************************************************
********************* Domain-specific Settings *************************** ********************* Domain-specific Settings ***************************
*************************************************************************/ *************************************************************************/
TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
globalGB); globalGB);
domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,

6
kcontrol/konsole/kcmkonsoledialog.ui
Unescape View File

@ -55,7 +55,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -184,7 +184,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -282,7 +282,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

14
kcontrol/konsole/schemadialog.ui
Unescape View File

@ -108,7 +108,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -158,7 +158,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -357,7 +357,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -389,7 +389,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -498,13 +498,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>180</width> <width>180</width>
<height>120</height> <height>120</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>180</width> <width>180</width>
<height>120</height> <height>120</height>
@ -540,7 +540,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

8
kcontrol/konsole/sessiondialog.ui
Unescape View File

@ -184,13 +184,13 @@
<property name="name"> <property name="name">
<cstring>previewIcon</cstring> <cstring>previewIcon</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>100</height> <height>100</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>100</height> <height>100</height>
@ -212,7 +212,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>100</height> <height>100</height>
@ -280,7 +280,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
kcontrol/krdb/krdb.cpp
Unescape View File

@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version)
TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
if (list.count() == 0) if (list.count() == 0)
{ {
list.append(TQString::tqfromLatin1(sysGtkrc(version))); list.append(TQString::fromLatin1(sysGtkrc(version)));
list.append(TQDir::homeDirPath()+userGtkrc(version)); list.append(TQDir::homeDirPath()+userGtkrc(version));
} }
list.remove(gtkkde); 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" "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n"
"# \"Apply colors to non-KDE applications\"\n" "# \"Apply colors to non-KDE applications\"\n"
"#\n" "#\n"
"#\n").arg(TQDateTime::tqcurrentDateTime().toString()); "#\n").arg(TQDateTime::currentDateTime().toString());
t << "style \"default\"" << endl; t << "style \"default\"" << endl;
t << "{" << endl; t << "{" << endl;
@ -590,7 +590,7 @@ void runRdb( uint flags )
// Qt-only apps without adversely affecting ourselves. // Qt-only apps without adversely affecting ourselves.
// Cheat and use the current timestamp, since we just saved to qtrc. // 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; static Atom qt_settings_timestamp = 0;
if (!qt_settings_timestamp) { if (!qt_settings_timestamp) {

26
kcontrol/kthememanager/kthemedlg.ui
Unescape View File

@ -60,7 +60,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>170</width> <width>170</width>
<height>20</height> <height>20</height>
@ -211,13 +211,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>60</height> <height>60</height>
@ -251,13 +251,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>60</height> <height>60</height>
@ -291,13 +291,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>60</height> <height>60</height>
@ -331,13 +331,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>60</height> <height>60</height>
@ -371,13 +371,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>60</height> <height>60</height>
@ -411,13 +411,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>60</height> <height>60</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>60</height> <height>60</height>

24
kcontrol/locale/kcmlocale.cpp
Unescape View File

@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
this, TQT_SLOT(changedCountry(const TQString &)) ); this, TQT_SLOT(changedCountry(const TQString &)) );
m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); m_labLang = new TQLabel(this, I18N_NOOP("Languages:"));
m_labLang->tqsetAlignment( AlignTop ); m_labLang->setAlignment( AlignTop );
m_languages = new TQListBox(this); m_languages = new TQListBox(this);
connect(m_languages, TQT_SIGNAL(selectionChanged()), connect(m_languages, TQT_SIGNAL(selectionChanged()),
@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList()
it != first.end(); it != first.end();
++it ) ++it )
{ {
TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop") TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop")
.arg(*it)); .arg(*it));
if (!str.isNull()) if (!str.isNull())
prilang << str; prilang << str;
@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList()
// add all languages to the list // add all languages to the list
TQStringList alllang = KGlobal::dirs()->findAllResources("locale", TQStringList alllang = KGlobal::dirs()->findAllResources("locale",
TQString::tqfromLatin1("*/entry.desktop"), TQString::fromLatin1("*/entry.desktop"),
false, true); false, true);
TQStringList langlist = prilang; TQStringList langlist = prilang;
if (langlist.count() > 0) if (langlist.count() > 0)
@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList()
if ((*it).isNull()) if ((*it).isNull())
{ {
m_addLanguage->insertSeparator(); m_addLanguage->insertSeparator();
submenu = TQString::tqfromLatin1("other"); submenu = TQString::fromLatin1("other");
m_addLanguage->insertSubmenu(m_locale->translate("Other"), m_addLanguage->insertSubmenu(m_locale->translate("Other"),
submenu, TQString::null, -1); submenu, TQString::null, -1);
menu_index = -2; // first entries should _not_ be sorted menu_index = -2; // first entries should _not_ be sorted
@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList()
KLocale *lsave = KGlobal::_locale; KLocale *lsave = KGlobal::_locale;
KGlobal::_locale = m_locale; KGlobal::_locale = m_locale;
TQString sub = TQString::tqfromLatin1("l10n/"); TQString sub = TQString::fromLatin1("l10n/");
// clear the list // clear the list
m_comboCountry->clear(); m_comboCountry->clear();
TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", TQStringList regionlist = KGlobal::dirs()->findAllResources("locale",
sub + TQString::tqfromLatin1("*.desktop"), sub + TQString::fromLatin1("*.desktop"),
false, true ); false, true );
for ( TQStringList::ConstIterator it = regionlist.begin(); for ( TQStringList::ConstIterator it = regionlist.begin();
@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList()
m_locale->translate("without name")); m_locale->translate("without name"));
TQString map( locate( "locale", TQString map( locate( "locale",
TQString::tqfromLatin1( "l10n/%1.png" ) TQString::fromLatin1( "l10n/%1.png" )
.arg(tag) ) ); .arg(tag) ) );
TQIconSet icon; TQIconSet icon;
if ( !map.isNull() ) if ( !map.isNull() )
@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList()
// add all languages to the list // add all languages to the list
TQStringList countrylist = KGlobal::dirs()->findAllResources 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(); for ( TQStringList::ConstIterator it = countrylist.begin();
it != countrylist.end(); ++it ) it != countrylist.end(); ++it )
@ -381,7 +381,7 @@ void KLocaleConfig::loadCountryList()
int menu_index = submenu.isEmpty() ? -1 : -2; int menu_index = submenu.isEmpty() ? -1 : -2;
TQString flag( locate( "locale", TQString flag( locate( "locale",
TQString::tqfromLatin1( "l10n/%1/flag.png" ) TQString::fromLatin1( "l10n/%1/flag.png" )
.arg(tag) ) ); .arg(tag) ) );
TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); 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; KGlobal::_locale = m_locale;
// read the name // read the name
TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop") TQString filepath = TQString::fromLatin1("%1%2/entry.desktop")
.arg(sub) .arg(sub)
.arg(path); .arg(path);
@ -419,7 +419,7 @@ void KLocaleConfig::save()
config->writeEntry("Country", m_locale->country(), true, true); config->writeEntry("Country", m_locale->country(), true, true);
if ( m_locale->languageList().isEmpty() ) if ( m_locale->languageList().isEmpty() )
config->writeEntry("Language", TQString::tqfromLatin1(""), true, true); config->writeEntry("Language", TQString::fromLatin1(""), true, true);
else else
config->writeEntry("Language", config->writeEntry("Language",
m_locale->languageList(), ':', true, true); m_locale->languageList(), ':', true, true);
@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate()
TQStringList KLocaleConfig::languageList() const TQStringList KLocaleConfig::languageList() const
{ {
TQString fileName = locate("locale", TQString fileName = locate("locale",
TQString::tqfromLatin1("l10n/%1/entry.desktop") TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())); .arg(m_locale->country()));
KSimpleConfig entry(fileName); KSimpleConfig entry(fileName);

6
kcontrol/locale/klocalesample.cpp
Unescape View File

@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample()
void KLocaleSample::slotUpdateTime() void KLocaleSample::slotUpdateTime()
{ {
TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQDateTime dt = TQDateTime::currentDateTime();
m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)); m_dateSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), false));
m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true)); m_dateShortSample->setText(m_locale->formatDate(TQT_TQDATE_OBJECT(dt.date()), true));
@ -98,11 +98,11 @@ void KLocaleSample::slotUpdateTime()
void KLocaleSample::slotLocaleChanged() void KLocaleSample::slotLocaleChanged()
{ {
m_numberSample->setText(m_locale->formatNumber(1234567.89) + m_numberSample->setText(m_locale->formatNumber(1234567.89) +
TQString::tqfromLatin1(" / ") + TQString::fromLatin1(" / ") +
m_locale->formatNumber(-1234567.89)); m_locale->formatNumber(-1234567.89));
m_moneySample->setText(m_locale->formatMoney(123456789.00) + m_moneySample->setText(m_locale->formatMoney(123456789.00) +
TQString::tqfromLatin1(" / ") + TQString::fromLatin1(" / ") +
m_locale->formatMoney(-123456789.00)); m_locale->formatMoney(-123456789.00));
slotUpdateTime(); slotUpdateTime();

12
kcontrol/locale/localemon.cpp
Unescape View File

@ -131,7 +131,7 @@ void KLocaleConfigMoney::save()
KConfigGroupSaver saver(config, "Locale"); KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale", KSimpleConfig ent(locate("locale",
TQString::tqfromLatin1("l10n/%1/entry.desktop") TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true); .arg(m_locale->country())), true);
ent.setGroup("KCM Locale"); ent.setGroup("KCM Locale");
@ -139,24 +139,24 @@ void KLocaleConfigMoney::save()
int i; int i;
bool b; bool b;
str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$")); str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$"));
config->deleteEntry("CurrencySymbol", false, true); config->deleteEntry("CurrencySymbol", false, true);
if (str != m_locale->currencySymbol()) if (str != m_locale->currencySymbol())
config->writeEntry("CurrencySymbol", config->writeEntry("CurrencySymbol",
m_locale->currencySymbol(), true, true); m_locale->currencySymbol(), true, true);
str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1(".")); str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1("."));
config->deleteEntry("MonetaryDecimalSymbol", false, true); config->deleteEntry("MonetaryDecimalSymbol", false, true);
if (str != m_locale->monetaryDecimalSymbol()) if (str != m_locale->monetaryDecimalSymbol())
config->writeEntry("MonetaryDecimalSymbol", config->writeEntry("MonetaryDecimalSymbol",
m_locale->monetaryDecimalSymbol(), true, true); m_locale->monetaryDecimalSymbol(), true, true);
str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(",")); str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(","));
str.replace(TQString::tqfromLatin1("$0"), TQString()); str.replace(TQString::fromLatin1("$0"), TQString());
config->deleteEntry("MonetaryThousandsSeparator", false, true); config->deleteEntry("MonetaryThousandsSeparator", false, true);
if (str != m_locale->monetaryThousandsSeparator()) if (str != m_locale->monetaryThousandsSeparator())
config->writeEntry("MonetaryThousandsSeparator", config->writeEntry("MonetaryThousandsSeparator",
TQString::tqfromLatin1("$0%1$0") TQString::fromLatin1("$0%1$0")
.tqarg(m_locale->monetaryThousandsSeparator()), .tqarg(m_locale->monetaryThousandsSeparator()),
true, true); true, true);

12
kcontrol/locale/localenum.cpp
Unescape View File

@ -89,26 +89,26 @@ void KLocaleConfigNumber::save()
KConfigGroupSaver saver(config, "Locale"); KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale", KSimpleConfig ent(locate("locale",
TQString::tqfromLatin1("l10n/%1/entry.desktop") TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true); .arg(m_locale->country())), true);
ent.setGroup("KCM Locale"); ent.setGroup("KCM Locale");
TQString str; TQString str;
str = ent.readEntry("DecimalSymbol", str = ent.readEntry("DecimalSymbol",
TQString::tqfromLatin1(".")); TQString::fromLatin1("."));
config->deleteEntry("DecimalSymbol", false, true); config->deleteEntry("DecimalSymbol", false, true);
if (str != m_locale->decimalSymbol()) if (str != m_locale->decimalSymbol())
config->writeEntry("DecimalSymbol", config->writeEntry("DecimalSymbol",
m_locale->decimalSymbol(), true, true); m_locale->decimalSymbol(), true, true);
str = ent.readEntry("ThousandsSeparator", str = ent.readEntry("ThousandsSeparator",
TQString::tqfromLatin1(",")); TQString::fromLatin1(","));
config->deleteEntry("ThousandsSeparator", false, true); config->deleteEntry("ThousandsSeparator", false, true);
str.replace(TQString::tqfromLatin1("$0"), TQString()); str.replace(TQString::fromLatin1("$0"), TQString());
if (str != m_locale->thousandsSeparator()) if (str != m_locale->thousandsSeparator())
config->writeEntry("ThousandsSeparator", config->writeEntry("ThousandsSeparator",
TQString::tqfromLatin1("$0%1$0") TQString::fromLatin1("$0%1$0")
.tqarg(m_locale->thousandsSeparator()), true, true); .tqarg(m_locale->thousandsSeparator()), true, true);
str = ent.readEntry("PositiveSign"); str = ent.readEntry("PositiveSign");
@ -116,7 +116,7 @@ void KLocaleConfigNumber::save()
if (str != m_locale->positiveSign()) if (str != m_locale->positiveSign())
config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); 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); config->deleteEntry("NegativeSign", false, true);
if (str != m_locale->negativeSign()) if (str != m_locale->negativeSign())
config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true);

2
kcontrol/locale/localeother.cpp
Unescape View File

@ -80,7 +80,7 @@ void KLocaleConfigOther::save()
KConfigGroupSaver saver(config, "Locale"); KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale", KSimpleConfig ent(locate("locale",
TQString::tqfromLatin1("l10n/%1/entry.desktop") TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true); .arg(m_locale->country())), true);
ent.setGroup("KCM Locale"); ent.setGroup("KCM Locale");

14
kcontrol/locale/localetime.cpp
Unescape View File

@ -253,28 +253,28 @@ void KLocaleConfigTime::save()
KConfigGroupSaver saver(config, "Locale"); KConfigGroupSaver saver(config, "Locale");
KSimpleConfig ent(locate("locale", KSimpleConfig ent(locate("locale",
TQString::tqfromLatin1("l10n/%1/entry.desktop") TQString::fromLatin1("l10n/%1/entry.desktop")
.arg(m_locale->country())), true); .arg(m_locale->country())), true);
ent.setGroup("KCM Locale"); ent.setGroup("KCM Locale");
TQString str; TQString str;
str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian")); str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian"));
config->deleteEntry("CalendarSystem", false, true); config->deleteEntry("CalendarSystem", false, true);
if (str != m_locale->calendarType()) if (str != m_locale->calendarType())
config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); 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); config->deleteEntry("TimeFormat", false, true);
if (str != m_locale->timeFormat()) if (str != m_locale->timeFormat())
config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); 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); config->deleteEntry("DateFormat", false, true);
if (str != m_locale->dateFormat()) if (str != m_locale->dateFormat())
config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); 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); config->deleteEntry("DateFormatShort", false, true);
if (str != m_locale->dateFormatShort()) if (str != m_locale->dateFormatShort())
config->writeEntry("DateFormatShort", config->writeEntry("DateFormatShort",
@ -371,7 +371,7 @@ calendarType);
kdDebug(173) << storeToUser(timeMap(), kdDebug(173) << storeToUser(timeMap(),
m_locale->timeFormat()) << endl; m_locale->timeFormat()) << endl;
kdDebug(173) << userToStore(timeMap(), 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 str;
TQString sep = TQString::tqfromLatin1("\n"); TQString sep = TQString::fromLatin1("\n");
TQString old; TQString old;

6
kcontrol/locale/toplevel.cpp
Unescape View File

@ -62,7 +62,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/,
m_nullConfig = new KConfig(TQString::null, false, false); m_nullConfig = new KConfig(TQString::null, false, false);
m_globalConfig = new KConfig(TQString::null, false, true); 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()); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
l->setAutoAdd(TRUE); l->setAutoAdd(TRUE);
@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults )
{ {
m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->setReadDefaults( useDefaults );
m_globalConfig->reparseConfiguration(); m_globalConfig->reparseConfiguration();
*m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig); *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig);
emit localeChanged(); emit localeChanged();
emit languageChanged(); emit languageChanged();
@ -180,7 +180,7 @@ void KLocaleApplication::save()
"language of all programs, you will have to " "language of all programs, you will have to "
"logout first."), "logout first."),
m_locale->translate("Applying Language Settings"), m_locale->translate("Applying Language Settings"),
TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
// restore the old global locale // restore the old global locale
KGlobal::_locale = lsave; KGlobal::_locale = lsave;

6
kcontrol/nics/nic.cpp
Unescape View File

@ -298,21 +298,21 @@ TQString flags_tos (unsigned int flags)
if (flags & IFF_BROADCAST) { if (flags & IFF_BROADCAST) {
if (tmp.length()) { if (tmp.length()) {
tmp += TQString::tqfromLatin1(", "); tmp += TQString::fromLatin1(", ");
} }
tmp += i18n("Broadcast"); tmp += i18n("Broadcast");
} }
if (flags & IFF_MULTICAST) { if (flags & IFF_MULTICAST) {
if (tmp.length()) { if (tmp.length()) {
tmp += TQString::tqfromLatin1(", "); tmp += TQString::fromLatin1(", ");
} }
tmp += i18n("Multicast"); tmp += i18n("Multicast");
} }
if (flags & IFF_LOOPBACK) { if (flags & IFF_LOOPBACK) {
if (tmp.length()) { if (tmp.length()) {
tmp += TQString::tqfromLatin1(", "); tmp += TQString::fromLatin1(", ");
} }
tmp += i18n("Loopback"); tmp += i18n("Loopback");
} }

4
kcontrol/performance/konqueror_ui.ui
Unescape View File

@ -101,7 +101,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>160</height> <height>160</height>

2
kcontrol/performance/system_ui.ui
Unescape View File

@ -55,7 +55,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

16
kcontrol/privacy/kcmprivacydialog.ui
Unescape View File

@ -79,13 +79,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>50</height> <height>50</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>200</height> <height>200</height>
@ -114,13 +114,13 @@
<property name="name"> <property name="name">
<cstring>selectAllButton</cstring> <cstring>selectAllButton</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -134,13 +134,13 @@
<property name="name"> <property name="name">
<cstring>selectNoneButton</cstring> <cstring>selectNoneButton</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>80</width> <width>80</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -160,7 +160,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Maximum</enum> <enum>Maximum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>20</height> <height>20</height>
@ -179,7 +179,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>

2
kcontrol/randr/configdialog.cpp
Unescape View File

@ -60,7 +60,7 @@ void ConfigDialog::show()
{ {
if ( !isVisible() ) { if ( !isVisible() ) {
KWinModule module(0, KWinModule::INFO_DESKTOP); KWinModule module(0, KWinModule::INFO_DESKTOP);
TQSize s1 = tqsizeHint(); TQSize s1 = sizeHint();
TQSize s2 = module.workArea().size(); TQSize s2 = module.workArea().size();
int w = s1.width(); int w = s1.width();
int h = s1.height(); int h = s1.height();

8
kcontrol/randr/configdialog.h
Unescape View File

@ -62,11 +62,11 @@ public:
ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
: KListView( parent, name ), _configWidget( configWidget ), : KListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {} _regExpEditor(0L) {}
// TQListView has a weird idea of a tqsizeHint... // TQListView has a weird idea of a sizeHint...
virtual TQSize tqsizeHint () const { virtual TQSize sizeHint () const {
int w = tqminimumSizeHint().width(); int w = minimumSizeHint().width();
int h = header()->height(); int h = header()->height();
h += viewport()->tqsizeHint().height(); h += viewport()->sizeHint().height();
h += horizontalScrollBar()->height(); h += horizontalScrollBar()->height();
TQListViewItem *item = firstChild(); TQListViewItem *item = firstChild();

2
kcontrol/randr/krandrtray.cpp
Unescape View File

@ -54,7 +54,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
, m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
{ {
setPixmap(KSystemTray::loadSizedIcon("randr", width())); setPixmap(KSystemTray::loadSizedIcon("randr", width()));
tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter); setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
TQToolTip::add(this, i18n("Screen resize & rotate")); TQToolTip::add(this, i18n("Screen resize & rotate"));
my_parent = parent; my_parent = parent;

14
kcontrol/samba/kcmsambalog.cpp
Unescape View File

@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
emit contentsChanged(&viewHistory,0,0); emit contentsChanged(&viewHistory,0,0);
label.setMinimumSize(label.tqsizeHint()); label.setMinimumSize(label.sizeHint());
logFileName.setMinimumSize(250,logFileName.tqsizeHint().height()); logFileName.setMinimumSize(250,logFileName.sizeHint().height());
viewHistory.setMinimumSize(425,200); viewHistory.setMinimumSize(425,200);
showConnOpen.setMinimumSize(showConnOpen.tqsizeHint()); showConnOpen.setMinimumSize(showConnOpen.sizeHint());
showConnClose.setMinimumSize(showConnClose.tqsizeHint()); showConnClose.setMinimumSize(showConnClose.sizeHint());
showFileOpen.setMinimumSize(showFileOpen.tqsizeHint()); showFileOpen.setMinimumSize(showFileOpen.sizeHint());
showFileClose.setMinimumSize(showFileClose.tqsizeHint()); showFileClose.setMinimumSize(showFileClose.sizeHint());
updateButton.setFixedSize(updateButton.tqsizeHint()); updateButton.setFixedSize(updateButton.sizeHint());
} }
void LogView::loadSettings() void LogView::loadSettings()

24
kcontrol/samba/kcmsambastatistics.cpp
Unescape View File

@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam
hostLe->setText("*"); hostLe->setText("*");
viewStatistics->setMinimumSize(375,200); viewStatistics->setMinimumSize(375,200);
connectionsL->setMinimumSize(connectionsL->tqsizeHint()); connectionsL->setMinimumSize(connectionsL->sizeHint());
filesL->setMinimumSize(filesL->tqsizeHint()); filesL->setMinimumSize(filesL->sizeHint());
eventL->setMinimumSize(eventL->tqsizeHint()); eventL->setMinimumSize(eventL->sizeHint());
eventCb->setMinimumSize(eventCb->tqsizeHint()); eventCb->setMinimumSize(eventCb->sizeHint());
hostL->setMinimumSize(hostL->tqsizeHint()); hostL->setMinimumSize(hostL->sizeHint());
hostLe->setMinimumSize(120,hostLe->tqsizeHint().height()); hostLe->setMinimumSize(120,hostLe->sizeHint().height());
serviceL->setMinimumSize(serviceL->tqsizeHint()); serviceL->setMinimumSize(serviceL->sizeHint());
serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height()); serviceLe->setMinimumSize(120,serviceLe->sizeHint().height());
calcButton->setMinimumSize(calcButton->tqsizeHint()); calcButton->setMinimumSize(calcButton->sizeHint());
clearButton->setMinimumSize(clearButton->tqsizeHint()); clearButton->setMinimumSize(clearButton->sizeHint());
expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint()); expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint());
expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint()); expandedUserCb->setMinimumSize(expandedUserCb->sizeHint());
TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(), TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint()); KDialog::spacingHint());

14
kcontrol/screensaver/advanceddialogimpl.ui
Unescape View File

@ -69,7 +69,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -153,7 +153,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>20</height> <height>20</height>
@ -256,7 +256,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -321,7 +321,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -346,7 +346,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>20</height> <height>20</height>
@ -365,7 +365,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -382,7 +382,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

20
kcontrol/screensaver/scrnsave.cpp
Unescape View File

@ -138,7 +138,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mSaverListView = new TQListView( mSaverGroup ); mSaverListView = new TQListView( mSaverGroup );
mSaverListView->setMinimumHeight( 120 ); mSaverListView->setMinimumHeight( 120 );
mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
mSaverListView->addColumn(""); mSaverListView->addColumn("");
mSaverListView->header()->hide(); mSaverListView->header()->hide();
mSelected = -1; mSelected = -1;
@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
mWaitLockEdit->setSuffix(i18n(" sec")); mWaitLockEdit->setSuffix(i18n(" sec"));
mWaitLockEdit->setValue(mLockTimeout/1000); mWaitLockEdit->setValue(mLockTimeout/1000);
mWaitLockEdit->setEnabled(mEnabled && mLock); mWaitLockEdit->setEnabled(mEnabled && mLock);
if ( mWaitLockEdit->tqsizeHint().width() < if ( mWaitLockEdit->sizeHint().width() <
mWaitEdit->tqsizeHint().width() ) { mWaitEdit->sizeHint().width() ) {
mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
} }
else { else {
mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
} }
connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)),
this, TQT_SLOT(slotLockTimeoutChanged(int))); this, TQT_SLOT(slotLockTimeoutChanged(int)));
@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
new TQVBoxLayout(topLayout, KDialog::spacingHint()); new TQVBoxLayout(topLayout, KDialog::spacingHint());
mMonitorLabel = new TQLabel( this ); mMonitorLabel = new TQLabel( this );
mMonitorLabel->tqsetAlignment( AlignCenter ); mMonitorLabel->setAlignment( AlignCenter );
mMonitorLabel->setPixmap( TQPixmap(locate("data", mMonitorLabel->setPixmap( TQPixmap(locate("data",
"kcontrol/pics/monitor.png"))); "kcontrol/pics/monitor.png")));
rightColumnLayout->addWidget(mMonitorLabel, 0); rightColumnLayout->addWidget(mMonitorLabel, 0);
@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
advancedLayout->addWidget( new TQWidget( this ) ); advancedLayout->addWidget( new TQWidget( this ) );
TQPushButton* advancedBt = new TQPushButton( TQPushButton* advancedBt = new TQPushButton(
i18n( "Advanced &Options" ), this, "advancedBtn" ); i18n( "Advanced &Options" ), this, "advancedBtn" );
advancedBt->tqsetSizePolicy( TQSizePolicy( advancedBt->setSizePolicy( TQSizePolicy(
TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
connect( advancedBt, TQT_SIGNAL( clicked() ), connect( advancedBt, TQT_SIGNAL( clicked() ),
this, TQT_SLOT( slotAdvanced() ) ); this, TQT_SLOT( slotAdvanced() ) );
@ -739,7 +739,7 @@ void KScreenSaver::slotSetup()
// //
void KScreenSaver::slotAdvanced() void KScreenSaver::slotAdvanced()
{ {
KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); KScreenSaverAdvancedDialog dlg( topLevelWidget() );
if ( dlg.exec() ) { if ( dlg.exec() ) {
mChanged = true; mChanged = true;
emit changed(true); emit changed(true);

2
kcontrol/smartcard/nosmartcardbase.ui
Unescape View File

@ -64,7 +64,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
kcontrol/smartcard/smartcardbase.ui
Unescape View File

@ -74,7 +74,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>15</width> <width>15</width>
<height>20</height> <height>20</height>
@ -118,7 +118,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
kcontrol/smserver/smserverconfigdlg.ui
Unescape View File

@ -190,7 +190,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>130</height> <height>130</height>

16
kcontrol/style/kcmstyle.cpp
Unescape View File

@ -161,7 +161,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() ); gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop ); gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@ -169,7 +169,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
hbLayout->addWidget( cbStyle ); hbLayout->addWidget( cbStyle );
pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
pbConfigStyle->setEnabled( FALSE ); pbConfigStyle->setEnabled( FALSE );
hbLayout->addWidget( pbConfigStyle ); hbLayout->addWidget( pbConfigStyle );
@ -296,16 +296,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
box1->setSpacing( KDialog::spacingHint() ); box1->setSpacing( KDialog::spacingHint() );
box1->setMargin( 0 ); box1->setMargin( 0 );
TQLabel* lbl = new TQLabel( i18n("0%"), box1 ); TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
lbl->tqsetAlignment( AlignLeft ); lbl->setAlignment( AlignLeft );
lbl = new TQLabel( i18n("50%"), box1 ); lbl = new TQLabel( i18n("50%"), box1 );
lbl->tqsetAlignment( AlignHCenter ); lbl->setAlignment( AlignHCenter );
lbl = new TQLabel( i18n("100%"), box1 ); lbl = new TQLabel( i18n("100%"), box1 );
lbl->tqsetAlignment( AlignRight ); lbl->setAlignment( AlignRight );
lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); 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 = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft ); lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 ); menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 );
@ -844,7 +844,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force)
setStyleRecursive( stylePreview, style ); setStyleRecursive( stylePreview, style );
// this flickers, but reliably draws the widgets correctly. // this flickers, but reliably draws the widgets correctly.
stylePreview->resize( stylePreview->tqsizeHint() ); stylePreview->resize( stylePreview->sizeHint() );
delete appliedStyle; delete appliedStyle;
appliedStyle = style; appliedStyle = style;

6
kcontrol/style/menupreview.cpp
Unescape View File

@ -68,7 +68,7 @@ void MenuPreview::createPixmaps()
if (pixBlended) if (pixBlended)
pixBlended->resize( w, h ); pixBlended->resize( w, h );
TQColorGroup cg = tqcolorGroup(); TQColorGroup cg = colorGroup();
TQColor c1 = cg.background(); TQColor c1 = cg.background();
TQColor c2 = cg.mid(); TQColor c2 = cg.mid();
@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps()
KImageEffect::blend(src, dst, menuOpacity); KImageEffect::blend(src, dst, menuOpacity);
pixBlended->convertFromImage( dst ); pixBlended->convertFromImage( dst );
} else if (mode == Tint) { } else if (mode == Tint) {
TQColor clr = tqcolorGroup().button(); TQColor clr = colorGroup().button();
TQImage dst = pixBackground->convertToImage(); TQImage dst = pixBackground->convertToImage();
KImageEffect::blend(clr, dst, menuOpacity); KImageEffect::blend(clr, dst, menuOpacity);
pixBlended->convertFromImage( dst ); pixBlended->convertFromImage( dst );
@ -137,7 +137,7 @@ void MenuPreview::setPreviewMode( PreviewMode pvm )
void MenuPreview::paintEvent( TQPaintEvent* /* pe */ ) void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
{ {
// Paint the frame and blended pixmap // Paint the frame and blended pixmap
TQColorGroup cg = tqcolorGroup(); TQColorGroup cg = colorGroup();
int x2 = width()-1; int x2 = width()-1;
int y2 = height()-1; int y2 = height()-1;

14
kcontrol/style/stylepreview.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>
@ -177,7 +177,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -196,13 +196,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>32767</height> <height>32767</height>
@ -224,13 +224,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>200</width> <width>200</width>
<height>32767</height> <height>32767</height>
@ -250,7 +250,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>

10
kcontrol/taskbar/kcmtaskbarui.ui
Unescape View File

@ -209,7 +209,7 @@ By default, this option is selected and all windows are shown.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>191</width> <width>191</width>
<height>20</height> <height>20</height>
@ -234,7 +234,7 @@ By default, this option is selected and all windows are shown.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>191</width> <width>191</width>
<height>20</height> <height>20</height>
@ -300,7 +300,7 @@ By default, this option is selected and all windows are shown.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>191</width> <width>191</width>
<height>20</height> <height>20</height>
@ -319,7 +319,7 @@ By default, this option is selected and all windows are shown.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -434,7 +434,7 @@ By default, this option is selected and all windows are shown.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
kcontrol/usbview/usbdevices.cpp
Unescape View File

@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
_bus = di.udi_bus; _bus = di.udi_bus;
_device = di.udi_addr; _device = di.udi_addr;
_product = TQString::tqfromLatin1(di.udi_product); _product = TQString::fromLatin1(di.udi_product);
if ( _device == 1 ) if ( _device == 1 )
_product += " " + TQString::number( _bus ); _product += " " + TQString::number( _bus );
_manufacturer = TQString::tqfromLatin1(di.udi_vendor); _manufacturer = TQString::fromLatin1(di.udi_vendor);
_prodID = di.udi_productNo; _prodID = di.udi_productNo;
_vendorID = di.udi_vendorNo; _vendorID = di.udi_vendorNo;
_class = di.udi_class; _class = di.udi_class;

2
kcontrol/view1394/view1394widget.ui
Unescape View File

@ -163,7 +163,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>

4
kcontrol/xinerama/kcmxinerama.cpp
Unescape View File

@ -223,10 +223,10 @@ TQWidget *KCMXinerama::indicator(int dpy) {
si->setFont(fnt); si->setFont(fnt);
si->setFrameStyle(TQFrame::Panel); si->setFrameStyle(TQFrame::Panel);
si->setFrameShadow(TQFrame::Plain); si->setFrameShadow(TQFrame::Plain);
si->tqsetAlignment(Qt::AlignCenter); si->setAlignment(Qt::AlignCenter);
TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center());
TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint()); TQRect targetGeometry(TQPoint(0,0), si->sizeHint());
targetGeometry.moveCenter(screenCenter); targetGeometry.moveCenter(screenCenter);
si->setGeometry(targetGeometry); si->setGeometry(targetGeometry);
si->show(); si->show();

2
kcontrol/xinerama/xineramawidget.ui
Unescape View File

@ -156,7 +156,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>431</width> <width>431</width>
<height>21</height> <height>21</height>

2
kdcop/kdcopview.ui
Unescape View File

@ -98,7 +98,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>

2
kdcop/kdcopwindow.cpp
Unescape View File

@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
{ {
setExpandable(true); setExpandable(true);
setText(0, TQString::fromUtf8(app_)); 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. /* Get the icon: we use the icon from a mainwindow in that class.

8
kdebugdialog/kabstractdebugdialog.cpp
Unescape View File

@ -52,11 +52,11 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
pCancelButton = new KPushButton( KStdGuiItem::cancel(), this ); pCancelButton = new KPushButton( KStdGuiItem::cancel(), this );
hbox->addWidget( pCancelButton ); hbox->addWidget( pCancelButton );
int w1 = pHelpButton->tqsizeHint().width(); int w1 = pHelpButton->sizeHint().width();
int w2 = pOKButton->tqsizeHint().width(); int w2 = pOKButton->sizeHint().width();
int w3 = pCancelButton->tqsizeHint().width(); int w3 = pCancelButton->sizeHint().width();
int w4 = QMAX( w1, QMAX( w2, w3 ) ); int w4 = QMAX( w1, QMAX( w2, w3 ) );
int w5 = pApplyButton->tqsizeHint().width(); int w5 = pApplyButton->sizeHint().width();
w4 = QMAX(w4, w5); w4 = QMAX(w4, w5);
pHelpButton->setFixedWidth( w4 ); pHelpButton->setFixedWidth( w4 );

2
kdebugdialog/kdebugdialog.cpp
Unescape View File

@ -54,7 +54,7 @@ KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char
// Build combo of debug areas // Build combo of debug areas
pDebugAreas = new TQComboBox( false, this ); pDebugAreas = new TQComboBox( false, this );
pDebugAreas->setFixedHeight( pDebugAreas->tqsizeHint().height() ); pDebugAreas->setFixedHeight( pDebugAreas->sizeHint().height() );
pDebugAreas->insertStringList( areaList ); pDebugAreas->insertStringList( areaList );
topLayout->addWidget( pDebugAreas ); topLayout->addWidget( pDebugAreas );

2
kdebugdialog/klistdebugdialog.cpp
Unescape View File

@ -182,7 +182,7 @@ void KListDebugDialog::activateArea( TQCString area, bool activate )
for ( ; it.current() ; ++it ) for ( ; it.current() ; ++it )
{ {
if ( area == (*it)->name() // debug area code = cb's name 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 ); (*it)->setChecked( activate );
return; return;

6
kdepasswd/kcm/main.cpp
Unescape View File

@ -150,11 +150,11 @@ void KCMUserAccount::load()
KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/";
TQString fs = KCFGUserAccount::faceSource(); TQString fs = KCFGUserAccount::faceSource();
if (fs == TQString::tqfromLatin1("UserOnly")) if (fs == TQString::fromLatin1("UserOnly"))
_facePerm = userOnly; _facePerm = userOnly;
else if (fs == TQString::tqfromLatin1("PreferUser")) else if (fs == TQString::fromLatin1("PreferUser"))
_facePerm = userFirst; _facePerm = userFirst;
else if (fs == TQString::tqfromLatin1("PreferAdmin")) else if (fs == TQString::fromLatin1("PreferAdmin"))
_facePerm = adminFirst; _facePerm = adminFirst;
else else
_facePerm = adminOnly; // Admin Only _facePerm = adminOnly; // Admin Only

8
kdepasswd/kcm/main_widget.ui
Unescape View File

@ -32,13 +32,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>74</width> <width>74</width>
<height>74</height> <height>74</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>74</width> <width>74</width>
<height>74</height> <height>74</height>
@ -154,7 +154,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -217,7 +217,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>111</width> <width>111</width>
<height>20</height> <height>20</height>

24
kdesktop/kdiconview.cc
Unescape View File

@ -296,7 +296,7 @@ void KDIconView::initConfig( bool init )
m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst(); m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst();
m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in
if (KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"))) if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")))
m_enableMedia=KDesktopSettings::mediaEnabled(); m_enableMedia=KDesktopSettings::mediaEnabled();
else else
m_enableMedia=false; m_enableMedia=false;
@ -960,20 +960,20 @@ bool KDIconView::isDesktopFile( KFileItem * _item ) const
return false; return false;
// return true if desktop file // return true if desktop file
return ( (_item->mimetype() == TQString::tqfromLatin1("application/x-desktop")) return ( (_item->mimetype() == TQString::fromLatin1("application/x-desktop"))
|| (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mydocuments")) || (_item->mimetype() == TQString::fromLatin1("media/builtin-mydocuments"))
|| (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mycomputer")) || (_item->mimetype() == TQString::fromLatin1("media/builtin-mycomputer"))
|| (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mynetworkplaces")) || (_item->mimetype() == TQString::fromLatin1("media/builtin-mynetworkplaces"))
|| (_item->mimetype() == TQString::tqfromLatin1("media/builtin-printers")) || (_item->mimetype() == TQString::fromLatin1("media/builtin-printers"))
|| (_item->mimetype() == TQString::tqfromLatin1("media/builtin-trash")) || (_item->mimetype() == TQString::fromLatin1("media/builtin-trash"))
|| (_item->mimetype() == TQString::tqfromLatin1("media/builtin-webbrowser")) ); || (_item->mimetype() == TQString::fromLatin1("media/builtin-webbrowser")) );
} }
TQString KDIconView::stripDesktopExtension( const TQString & text ) 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); 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.left(text.length() - 8);
return text; 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 bool firstRun = (count() == 0); // no icons yet, this seems to be the initial loading
// delay updates until all new items have been created // delay updates until all new items have been created
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
TQRect area = iconArea(); TQRect area = iconArea();
setIconArea( TQRect( 0, 0, -1, -1 ) ); setIconArea( TQRect( 0, 0, -1, -1 ) );
@ -1150,7 +1150,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
if ( m_autoAlign ) if ( m_autoAlign )
lineupIcons(); lineupIcons();
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

8
kdesktop/kfileividesktop.cpp
Unescape View File

@ -73,15 +73,15 @@ void KFileIVIDesktop::calcRect( const TQString& _text )
int spread = shadowThickness(); int spread = shadowThickness();
TQRect itemTextRect = textRect(); TQRect itemTextRect = textRect();
TQRect tqitemRect = rect(); TQRect itemRect = rect();
itemTextRect.setBottom( itemTextRect.bottom() + spread ); itemTextRect.setBottom( itemTextRect.bottom() + spread );
itemTextRect.setRight( itemTextRect.right() + spread ); itemTextRect.setRight( itemTextRect.right() + spread );
tqitemRect.setBottom( tqitemRect.bottom() + spread ); itemRect.setBottom( itemRect.bottom() + spread );
tqitemRect.setRight( tqitemRect.right() + spread ); itemRect.setRight( itemRect.right() + spread );
setTextRect( itemTextRect ); setTextRect( itemTextRect );
setItemRect( tqitemRect ); setItemRect( itemRect );
} }
void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg) void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)

6
kdesktop/krootwm.cc
Unescape View File

@ -636,8 +636,8 @@ void KRootWm::slotWindowList() {
windowListMenu->init(); windowListMenu->init();
disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ), disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
// windowListMenu->rect() is not valid before showing, use tqsizeHint() // windowListMenu->rect() is not valid before showing, use sizeHint()
windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->tqsizeHint()).center()); windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center());
windowListMenu->selectActiveWindow(); // make the popup more useful windowListMenu->selectActiveWindow(); // make the popup more useful
connect( windowListMenu, TQT_SIGNAL( aboutToShow() ), connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
this, TQT_SLOT( slotWindowListAboutToShow() ) ); this, TQT_SLOT( slotWindowListAboutToShow() ) );
@ -656,7 +656,7 @@ void KRootWm::slotSwitchUser() {
slotPopulateSessions(); slotPopulateSessions();
disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice 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() ), connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
TQT_SLOT( slotPopulateSessions() ) ); TQT_SLOT( slotPopulateSessions() ) );
} }

2
kdesktop/lock/autologout.cc
Unescape View File

@ -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); 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 = new TQLabel("<b> </b>", frame);
mStatusLabel->tqsetAlignment(TQLabel::AlignCenter); mStatusLabel->setAlignment(TQLabel::AlignCenter);
TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame); TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame);
mProgressRemaining = new TQProgressBar(frame); mProgressRemaining = new TQProgressBar(frame);

2
kdesktop/lock/infodlg.cc
Unescape View File

@ -86,7 +86,7 @@ InfoDlg::InfoDlg(LockProcess *parent)
KUser user; KUser user;
mStatusLabel = new TQLabel( "<b> </b>", frame ); mStatusLabel = new TQLabel( "<b> </b>", frame );
mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); mStatusLabel->setAlignment( TQLabel::AlignCenter );
TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame ); unlockDialogLayout->addWidget( frame );

10
kdesktop/lock/lockdlg.cc
Unescape View File

@ -140,7 +140,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin)
} }
mStatusLabel = new TQLabel( "<b> </b>", frame ); mStatusLabel = new TQLabel( "<b> </b>", frame );
mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); mStatusLabel->setAlignment( TQLabel::AlignCenter );
mLayoutButton = new TQPushButton( frame ); mLayoutButton = new TQPushButton( frame );
mLayoutButton->setFlat( true ); mLayoutButton->setFlat( true );
@ -268,7 +268,7 @@ void PasswordDlg::setLayoutText( const TQString &txt )
{ {
mLayoutButton->setText( txt ); mLayoutButton->setText( txt );
TQSize sz = mLayoutButton->fontMetrics().size( 0, 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 ); 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 ); TQLabel *label2 = new TQLabel( text, winFrame );
KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
button->setDefault( true ); 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() ) ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 ); TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
@ -788,9 +788,9 @@ void PasswordDlg::slotSwitchUser()
ns++; ns++;
} }
int fw = lv->frameWidth() * 2; int fw = lv->frameWidth() * 2;
TQSize hds( lv->header()->tqsizeHint() ); TQSize hds( lv->header()->sizeHint() );
lv->setMinimumWidth( fw + hds.width() + 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() + lv->setFixedHeight( fw + hds.height() +
itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) ); itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
lv->header()->adjustHeaderSize(); lv->header()->adjustHeaderSize();

6
kdesktop/lock/lockprocess.cc
Unescape View File

@ -243,7 +243,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
TQStringList dmopt = TQStringList dmopt =
TQStringList::split(TQChar(','), TQStringList::split(TQChar(','),
TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" ))); TQString::fromLatin1( ::getenv( "XDM_MANAGED" )));
for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it) for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
if ((*it).startsWith("method=")) if ((*it).startsWith("method="))
mMethod = (*it).mid(7); mMethod = (*it).mid(7);
@ -1194,7 +1194,7 @@ void LockProcess::stopSaver()
TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt) TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt)
{ {
LockProcess *that = (LockProcess *)ctx; LockProcess *that = (LockProcess *)ctx;
TQString fkey = TQString::tqfromLatin1( key ) + '='; TQString fkey = TQString::fromLatin1( key ) + '=';
for (TQStringList::ConstIterator it = that->mPluginOptions.begin(); for (TQStringList::ConstIterator it = that->mPluginOptions.begin();
it != that->mPluginOptions.end(); ++it) it != that->mPluginOptions.end(); ++it)
if ((*it).startsWith( fkey )) if ((*it).startsWith( fkey ))
@ -1931,7 +1931,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
TQLabel *label2 = new TQLabel( txt, winFrame ); TQLabel *label2 = new TQLabel( txt, winFrame );
KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
button->setDefault( true ); 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() ) ); connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
TQVBoxLayout *vbox = new TQVBoxLayout( &box ); TQVBoxLayout *vbox = new TQVBoxLayout( &box );

4
kdesktop/lock/querydlg.cc
Unescape View File

@ -86,8 +86,8 @@ QueryDlg::QueryDlg(LockProcess *parent)
KUser user; KUser user;
mStatusLabel = new TQLabel( "<b> </b>", frame ); mStatusLabel = new TQLabel( "<b> </b>", frame );
//mStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); //mStatusLabel->setAlignment( TQLabel::AlignCenter );
mStatusLabel->tqsetAlignment( TQLabel::AlignLeft ); mStatusLabel->setAlignment( TQLabel::AlignLeft );
KSeparator *sep = new KSeparator( KSeparator::HLine, frame ); KSeparator *sep = new KSeparator( KSeparator::HLine, frame );

2
kdesktop/lock/sakdlg.cc
Unescape View File

@ -87,7 +87,7 @@ SAKDlg::SAKDlg(LockProcess *parent)
KUser user; KUser user;
mStatusLabel = new TQLabel( "<b> </b>", frame ); mStatusLabel = new TQLabel( "<b> </b>", frame );
mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter ); mStatusLabel->setAlignment( TQLabel::AlignVCenter );
TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame ); unlockDialogLayout->addWidget( frame );

14
kdesktop/minicli.cpp
Unescape View File

@ -87,7 +87,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
mainLayout->addWidget(m_dlg); mainLayout->addWidget(m_dlg);
m_dlg->lbRunIcon->setPixmap(DesktopIcon("kmenu")); 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->setDuplicatesEnabled( false );
m_dlg->cbCommand->setTrapReturnKey( true ); 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(); int maxWidth = tqApp->desktop()->screenGeometry((TQWidget*)this).width();
if (maxWidth < 603) 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. // Set the focus back to the widget that had it to begin with, i.e.
// do not put the focus on the "Options" button. // do not put the focus on the "Options" button.
m_FocusWidget = tqfocusWidget(); m_FocusWidget = focusWidget();
if( m_FocusWidget ) if( m_FocusWidget )
m_FocusWidget->setFocus(); m_FocusWidget->setFocus();
@ -846,7 +846,7 @@ void Minicli::parseLine( bool final )
void Minicli::setIcon () void Minicli::setIcon ()
{ {
if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" ) 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 ); TQPixmap icon = DesktopIcon( m_iconName );
@ -891,9 +891,9 @@ void Minicli::updateAuthLabel()
m_prevChecked = m_dlg->cbRunAsOther->isChecked(); m_prevChecked = m_dlg->cbRunAsOther->isChecked();
m_prevCached = true; 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->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->setChecked(true);
m_dlg->cbRunAsOther->setEnabled(false); m_dlg->cbRunAsOther->setEnabled(false);
m_dlg->leUsername->setEnabled(false); m_dlg->leUsername->setEnabled(false);
@ -938,7 +938,7 @@ void Minicli::slotTerminal(bool enable)
if (enable) if (enable)
{ {
m_prevIconName = m_iconName; m_prevIconName = m_iconName;
m_iconName = TQString::tqfromLatin1( "konsole" ); m_iconName = TQString::fromLatin1( "konsole" );
setIcon(); setIcon();
} }
else if (!m_prevIconName.isEmpty()) else if (!m_prevIconName.isEmpty())

2
kdesktop/minicli.h
Unescape View File

@ -57,7 +57,7 @@ public:
void clearHistory(); void clearHistory();
virtual void show(); virtual void show();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
public slots: public slots:
void saveConfig(); void saveConfig();

12
kdesktop/minicli_ui.ui
Unescape View File

@ -61,7 +61,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>80</width> <width>80</width>
<height>20</height> <height>20</height>
@ -123,7 +123,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>57</width> <width>57</width>
<height>20</height> <height>20</height>
@ -157,7 +157,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -331,7 +331,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>9</height> <height>9</height>
@ -460,7 +460,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -543,7 +543,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>388</width> <width>388</width>
<height>0</height> <height>0</height>

40
kdialog/kdialog.cpp
Unescape View File

@ -241,9 +241,9 @@ static int directCommand(KCmdLineArgs *args)
TQString text = TQString::fromLocal8Bit(args->getOption( option )); TQString text = TQString::fromLocal8Bit(args->getOption( option ));
int pos; 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 ) { if ( type == KMessageBox::WarningContinueCancel ) {
@ -597,43 +597,43 @@ static int directCommand(KCmdLineArgs *args)
contextStr = TQString::fromLocal8Bit(args->arg(0)); contextStr = TQString::fromLocal8Bit(args->arg(0));
} }
KIcon::Group group = KIcon::NoGroup; KIcon::Group group = KIcon::NoGroup;
if ( groupStr == TQString::tqfromLatin1( "Desktop" ) ) if ( groupStr == TQString::fromLatin1( "Desktop" ) )
group = KIcon::Desktop; group = KIcon::Desktop;
else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) ) else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
group = KIcon::Toolbar; group = KIcon::Toolbar;
else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) ) else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
group = KIcon::MainToolbar; group = KIcon::MainToolbar;
else if ( groupStr == TQString::tqfromLatin1( "Small" ) ) else if ( groupStr == TQString::fromLatin1( "Small" ) )
group = KIcon::Small; group = KIcon::Small;
else if ( groupStr == TQString::tqfromLatin1( "Panel" ) ) else if ( groupStr == TQString::fromLatin1( "Panel" ) )
group = KIcon::Panel; group = KIcon::Panel;
else if ( groupStr == TQString::tqfromLatin1( "User" ) ) else if ( groupStr == TQString::fromLatin1( "User" ) )
group = KIcon::User; group = KIcon::User;
KIcon::Context context = KIcon::Any; KIcon::Context context = KIcon::Any;
// From kicontheme.cpp // From kicontheme.cpp
if ( contextStr == TQString::tqfromLatin1( "Devices" ) ) if ( contextStr == TQString::fromLatin1( "Devices" ) )
context = KIcon::Device; context = KIcon::Device;
else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) ) else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
context = KIcon::MimeType; context = KIcon::MimeType;
else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) ) else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
context = KIcon::FileSystem; context = KIcon::FileSystem;
else if ( contextStr == TQString::tqfromLatin1( "Applications" ) ) else if ( contextStr == TQString::fromLatin1( "Applications" ) )
context = KIcon::Application; context = KIcon::Application;
else if ( contextStr == TQString::tqfromLatin1( "Actions" ) ) else if ( contextStr == TQString::fromLatin1( "Actions" ) )
context = KIcon::Action; context = KIcon::Action;
else if ( contextStr == TQString::tqfromLatin1( "Animations" ) ) else if ( contextStr == TQString::fromLatin1( "Animations" ) )
context = KIcon::Animation; context = KIcon::Animation;
else if ( contextStr == TQString::tqfromLatin1( "Categories" ) ) else if ( contextStr == TQString::fromLatin1( "Categories" ) )
context = KIcon::Category; context = KIcon::Category;
else if ( contextStr == TQString::tqfromLatin1( "Emblems" ) ) else if ( contextStr == TQString::fromLatin1( "Emblems" ) )
context = KIcon::Emblem; context = KIcon::Emblem;
else if ( contextStr == TQString::tqfromLatin1( "Emotes" ) ) else if ( contextStr == TQString::fromLatin1( "Emotes" ) )
context = KIcon::Emote; context = KIcon::Emote;
else if ( contextStr == TQString::tqfromLatin1( "International" ) ) else if ( contextStr == TQString::fromLatin1( "International" ) )
context = KIcon::International; context = KIcon::International;
else if ( contextStr == TQString::tqfromLatin1( "Places" ) ) else if ( contextStr == TQString::fromLatin1( "Places" ) )
context = KIcon::Place; context = KIcon::Place;
else if ( contextStr == TQString::tqfromLatin1( "Status" ) ) else if ( contextStr == TQString::fromLatin1( "Status" ) )
context = KIcon::StatusIcon; context = KIcon::StatusIcon;
KIconDialog dlg(0, "icon dialog"); KIconDialog dlg(0, "icon dialog");

2
kdialog/klistboxdialog.cpp
Unescape View File

@ -32,7 +32,7 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent)
TQVBox *page = makeVBoxMainWidget(); TQVBox *page = makeVBoxMainWidget();
label = new TQLabel(text, page); label = new TQLabel(text, page);
label->tqsetAlignment(AlignCenter); label->setAlignment(AlignCenter);
table = new TQListBox(page); table = new TQListBox(page);
table->setFocus(); table->setFocus();

6
kdialog/widgets.cpp
Unescape View File

@ -218,7 +218,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
table.setCurrentItem(0); // This is to circumvent a Qt bug table.setCurrentItem(0); // This is to circumvent a Qt bug
for (unsigned int i=0; i+2<args.count(); i += 3) { 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); handleXGeometry(&box);
@ -233,7 +233,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
} else { } else {
for (unsigned int i=0; i<table.count(); i++) for (unsigned int i=0; i<table.count(); i++)
if (table.isSelected(i)) if (table.isSelected(i))
rs += TQString::tqfromLatin1("\"") + tags[i] + TQString::tqfromLatin1("\" "); rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" ");
result.append(rs); result.append(rs);
} }
} }
@ -260,7 +260,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
table.insertStringList(entries); table.insertStringList(entries);
for (unsigned int i=0; i+2<args.count(); i += 3) { 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); handleXGeometry(&box);

8
kdm/kfrontend/kchooser.cpp
Unescape View File

@ -59,7 +59,7 @@ ChooserDlg::ChooserDlg()
TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 ); TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 );
TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this ); TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this );
title->tqsetAlignment( AlignCenter ); title->setAlignment( AlignCenter );
vbox->addWidget( title ); vbox->addWidget( title );
host_view = new TQListView( this, "hosts" ); host_view = new TQListView( this, "hosts" );
@ -145,14 +145,14 @@ void ChooserDlg::pingHosts()
void ChooserDlg::accept() void ChooserDlg::accept()
{ {
if (tqfocusWidget() == iline) { if (focusWidget() == iline) {
if (!iline->text().isEmpty()) { if (!iline->text().isEmpty()) {
GSendInt( G_Ch_DirectChoice ); GSendInt( G_Ch_DirectChoice );
GSendStr( iline->text().latin1() ); GSendStr( iline->text().latin1() );
iline->clear(); iline->clear();
} }
return; return;
} else /*if (tqfocusWidget() == host_view)*/ { } else /*if (focusWidget() == host_view)*/ {
TQListViewItem *item = host_view->currentItem(); TQListViewItem *item = host_view->currentItem();
if (item) { if (item) {
GSendInt( G_Ready ); GSendInt( G_Ready );
@ -170,7 +170,7 @@ TQString ChooserDlg::recvStr()
{ {
char *arr = GRecvStr(); char *arr = GRecvStr();
if (arr) { if (arr) {
TQString str = TQString::tqfromLatin1( arr ); TQString str = TQString::fromLatin1( arr );
free( arr ); free( arr );
return str; return str;
} else } else

6
kdm/kfrontend/kdmadmindialog.cpp
Unescape View File

@ -75,10 +75,10 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent )
box->addWidget( new KSeparator( KSeparator::HLine, this ) ); box->addWidget( new KSeparator( KSeparator::HLine, this ) );
okButton = new KPushButton( KStdGuiItem::ok(), this ); okButton = new KPushButton( KStdGuiItem::ok(), this );
okButton->tqsetSizePolicy( fp ); okButton->setSizePolicy( fp );
okButton->setDefault( true ); okButton->setDefault( true );
cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
cancelButton->tqsetSizePolicy( fp ); cancelButton->setSizePolicy( fp );
hlay = new TQHBoxLayout( box ); hlay = new TQHBoxLayout( box );
hlay->addStretch( 1 ); hlay->addStretch( 1 );
@ -103,7 +103,7 @@ void
KDMAdmin::slotActivatePlugMenu() KDMAdmin::slotActivatePlugMenu()
{ {
TQPopupMenu *cmnu = verify->getPlugMenu(); TQPopupMenu *cmnu = verify->getPlugMenu();
TQSize sh( cmnu->tqsizeHint() / 2 ); TQSize sh( cmnu->sizeHint() / 2 );
cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
} }

2
kdm/kfrontend/kdmclock.cpp
Unescape View File

@ -50,7 +50,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
mBorder = false;//config->readNumEntry( "border", FALSE ); mBorder = false;//config->readNumEntry( "border", FALSE );
//config->setGroup( "Font" ); //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.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ );
mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ ); mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ );
mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ ); mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ );

6
kdm/kfrontend/kdmconfig.cpp
Unescape View File

@ -72,7 +72,7 @@ Str2Font( const TQString &aValue )
TQFont aRetFont; TQFont aRetFont;
TQString chStr; TQString chStr;
TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue ); TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue );
if (sl.count() == 1) { if (sl.count() == 1) {
/* X11 font spec */ /* X11 font spec */
@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
sess->vt ? sess->vt ?
TQString("vt%1").arg( sess->vt ) : TQString("vt%1").arg( sess->vt ) :
#endif #endif
TQString::tqfromLatin1( *sess->from ? sess->from : sess->display ); TQString::fromLatin1( *sess->from ? sess->from : sess->display );
} else { } else {
user = user =
!sess->user ? !sess->user ?
@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
sess->vt ? sess->vt ?
TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) : TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
#endif #endif
TQString::tqfromLatin1( sess->display ); TQString::fromLatin1( sess->display );
} }
} }

20
kdm/kfrontend/kdmshutdown.cpp
Unescape View File

@ -117,7 +117,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
hlay->addStretch( 1 ); hlay->addStretch( 1 );
if (mayOk) { if (mayOk) {
okButton = new KPushButton( KStdGuiItem::ok(), this ); okButton = new KPushButton( KStdGuiItem::ok(), this );
okButton->tqsetSizePolicy( fp ); okButton->setSizePolicy( fp );
okButton->setDefault( true ); okButton->setDefault( true );
hlay->addWidget( okButton ); hlay->addWidget( okButton );
hlay->addStretch( 1 ); hlay->addStretch( 1 );
@ -126,13 +126,13 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
if (maySched) { if (maySched) {
KPushButton *schedButton = KPushButton *schedButton =
new KPushButton( KGuiItem( i18n("&Schedule...") ), this ); new KPushButton( KGuiItem( i18n("&Schedule...") ), this );
schedButton->tqsetSizePolicy( fp ); schedButton->setSizePolicy( fp );
hlay->addWidget( schedButton ); hlay->addWidget( schedButton );
hlay->addStretch( 1 ); hlay->addStretch( 1 );
connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
} }
cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
cancelButton->tqsetSizePolicy( fp ); cancelButton->setSizePolicy( fp );
if (!mayOk) if (!mayOk)
cancelButton->setDefault( true ); cancelButton->setDefault( true );
hlay->addWidget( cancelButton ); hlay->addWidget( cancelButton );
@ -149,7 +149,7 @@ KDMShutdownBase::slotActivatePlugMenu()
TQPopupMenu *cmnu = verify->getPlugMenu(); TQPopupMenu *cmnu = verify->getPlugMenu();
if (!cmnu) if (!cmnu)
return; return;
TQSize sh( cmnu->tqsizeHint() / 2 ); TQSize sh( cmnu->sizeHint() / 2 );
cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
} }
} }
@ -276,7 +276,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
freeStrArr( tlist ); freeStrArr( tlist );
targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget ); targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh ); 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(); + howGroup->insideSpacing();
hb->addSpacing( spc ); hb->addSpacing( spc );
hb->addWidget( targets ); hb->addWidget( targets );
@ -284,7 +284,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
} }
GSet( 0 ); GSet( 0 );
howGroup->tqsetSizePolicy( fp ); howGroup->setSizePolicy( fp );
schedGroup = new TQGroupBox( i18n("Scheduling"), this ); schedGroup = new TQGroupBox( i18n("Scheduling"), this );
hlay->addWidget( schedGroup, 0, AlignTop ); hlay->addWidget( schedGroup, 0, AlignTop );
@ -310,7 +310,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
grid->addWidget( le_timeout, 2, 1 ); grid->addWidget( le_timeout, 2, 1 );
grid->addMultiCellWidget( cb_force, 3,3, 0,1 ); grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
schedGroup->tqsetSizePolicy( fp ); schedGroup->setSizePolicy( fp );
le_start->setText( "0" ); le_start->setText( "0" );
if (_defSdMode == SHUT_SCHEDULE) if (_defSdMode == SHUT_SCHEDULE)
@ -484,7 +484,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
lfrm->setFrameStyle( TQFrame::NoFrame ); lfrm->setFrameStyle( TQFrame::NoFrame );
else else
lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); 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 // we need to set the minimum size for the logout box, since it
// gets too small if there all options are not available // gets too small if there all options are not available
lfrm->setMinimumSize(300,120); lfrm->setMinimumSize(300,120);
@ -494,7 +494,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
// first line of buttons // first line of buttons
hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); hbuttonbox->setAlignment( Qt::AlignHCenter );
// Reboot // Reboot
FlatButton* btnReboot = new FlatButton( lfrm ); FlatButton* btnReboot = new FlatButton( lfrm );
@ -538,7 +538,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
// cancel buttonbox // cancel buttonbox
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
hbuttonbox2->tqsetAlignment( Qt::AlignRight ); hbuttonbox2->setAlignment( Qt::AlignRight );
// Back to kdm // Back to kdm
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );

4
kdm/kfrontend/kfdialog.cpp
Unescape View File

@ -169,10 +169,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
TQLabel *label2 = new TQLabel( text, this ); TQLabel *label2 = new TQLabel( text, this );
TQRect d = KGlobalSettings::desktopGeometry(this); TQRect d = KGlobalSettings::desktopGeometry(this);
if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5) 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 ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
button->setDefault( true ); 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()) ); connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );

2
kdm/kfrontend/kgdialog.cpp
Unescape View File

@ -134,7 +134,7 @@ void
KGDialog::slotActivateMenu( int id ) KGDialog::slotActivateMenu( int id )
{ {
TQPopupMenu *cmnu = optMenu->findItem( id )->popup(); 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() ) ); cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
} }

14
kdm/kfrontend/kgreeter.cpp
Unescape View File

@ -96,7 +96,7 @@ class UserListView : public KListView {
: KListView( parent, name ) : KListView( parent, name )
, themed(_them), cachedSizeHint( -1, 0 ) , themed(_them), cachedSizeHint( -1, 0 )
{ {
tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
header()->hide(); header()->hide();
addColumn( TQString::null ); addColumn( TQString::null );
setColumnAlignment( 0, AlignVCenter ); setColumnAlignment( 0, AlignVCenter );
@ -122,10 +122,10 @@ class UserListView : public KListView {
return sum; return sum;
} }
public: public:
virtual TQSize tqsizeHint() const virtual TQSize sizeHint() const
{ {
if (themed) if (themed)
return KListView::tqsizeHint(); return KListView::sizeHint();
if (!cachedSizeHint.isValid()) { if (!cachedSizeHint.isValid()) {
constPolish(); constPolish();
@ -136,7 +136,7 @@ public:
maxw = thisw; maxw = thisw;
} }
cachedSizeHint.setWidth( cachedSizeHint.setWidth(
tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) +
frameWidth() * 2 + maxw ); frameWidth() * 2 + maxw );
} }
return cachedSizeHint; return cachedSizeHint;
@ -157,7 +157,7 @@ public:
kdDebug() << "paintEmpty " << rect << endl; kdDebug() << "paintEmpty " << rect << endl;
TQRect devRect = p->xForm( rect ); TQRect devRect = p->xForm( rect );
kdDebug() << "paintEmpty2 " << devRect << endl; kdDebug() << "paintEmpty2 " << devRect << endl;
p->tqdrawPixmap(0, 0, *pm, devRect.left(), devRect.top() ); p->drawPixmap(0, 0, *pm, devRect.left(), devRect.top() );
} }
TQPixmap background; TQPixmap background;
@ -890,14 +890,14 @@ KStdGreeter::KStdGreeter()
i18n("This display requires no X authorization.\n" i18n("This display requires no X authorization.\n"
"This means that anybody can connect to it,\n" "This means that anybody can connect to it,\n"
"open windows on it or intercept your input.") ); "open windows on it or intercept your input.") );
complainLabel->tqsetAlignment( AlignCenter ); complainLabel->setAlignment( AlignCenter );
complainLabel->setFont( _failFont ); complainLabel->setFont( _failFont );
complainLabel->setPaletteForegroundColor( Qt::red ); complainLabel->setPaletteForegroundColor( Qt::red );
inner_box->addWidget( complainLabel ); inner_box->addWidget( complainLabel );
} }
if (!_greetString.isEmpty()) { if (!_greetString.isEmpty()) {
TQLabel *welcomeLabel = new TQLabel( _greetString, this ); TQLabel *welcomeLabel = new TQLabel( _greetString, this );
welcomeLabel->tqsetAlignment( AlignCenter ); welcomeLabel->setAlignment( AlignCenter );
welcomeLabel->setFont( _greetFont ); welcomeLabel->setFont( _greetFont );
inner_box->addWidget( welcomeLabel ); inner_box->addWidget( welcomeLabel );
} }

12
kdm/kfrontend/kgverify.cpp
Unescape View File

@ -856,7 +856,7 @@ KGVerify::getConf( void *, const char *key, const TQVariant &dflt )
if (!qstrcmp( key, "EchoMode" )) if (!qstrcmp( key, "EchoMode" ))
return TQVariant( _echoMode ); return TQVariant( _echoMode );
else { else {
TQString fkey = TQString::tqfromLatin1( key ) + '='; TQString fkey = TQString::fromLatin1( key ) + '=';
for (TQStringList::ConstIterator it = _pluginOptions.begin(); for (TQStringList::ConstIterator it = _pluginOptions.begin();
it != _pluginOptions.end(); ++it) it != _pluginOptions.end(); ++it)
if ((*it).startsWith( fkey )) if ((*it).startsWith( fkey ))
@ -930,7 +930,7 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
, failedLabelState( 0 ) , failedLabelState( 0 )
{ {
grid = new TQGridLayout; grid = new TQGridLayout;
grid->tqsetAlignment( AlignCenter ); grid->setAlignment( AlignCenter );
failedLabel = new TQLabel( parent ); failedLabel = new TQLabel( parent );
failedLabel->setFont( _failFont ); failedLabel->setFont( _failFont );
@ -959,7 +959,7 @@ KGStdVerify::slotPluginSelected( int id )
return; return;
if (id != curPlugin) { if (id != curPlugin) {
plugMenu->setItemChecked( curPlugin, false ); plugMenu->setItemChecked( curPlugin, false );
parent->tqsetUpdatesEnabled( false ); parent->setUpdatesEnabled( false );
grid->removeItem( greet->getLayoutItem() ); grid->removeItem( greet->getLayoutItem() );
Debug( "delete %s\n", pName.data() ); Debug( "delete %s\n", pName.data() );
delete greet; delete greet;
@ -967,7 +967,7 @@ KGStdVerify::slotPluginSelected( int id )
handler->verifyPluginChanged( id ); handler->verifyPluginChanged( id );
if (running) if (running)
start(); start();
parent->tqsetUpdatesEnabled( true ); parent->setUpdatesEnabled( true );
} }
} }
@ -1087,10 +1087,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
{ {
TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
okButton = new KPushButton( KStdGuiItem::ok(), this ); okButton = new KPushButton( KStdGuiItem::ok(), this );
okButton->tqsetSizePolicy( fp ); okButton->setSizePolicy( fp );
okButton->setDefault( true ); okButton->setDefault( true );
cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
cancelButton->tqsetSizePolicy( fp ); cancelButton->setSizePolicy( fp );
verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx ); verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx );
verify->selectPlugin( curPlugin ); verify->selectPlugin( curPlugin );

2
kdm/kfrontend/sakdlg.cc
Unescape View File

@ -108,7 +108,7 @@ SAKDlg::SAKDlg(TQWidget *parent)
KUser user; KUser user;
mStatusLabel = new TQLabel( "<b> </b>", frame ); mStatusLabel = new TQLabel( "<b> </b>", frame );
mStatusLabel->tqsetAlignment( TQLabel::AlignVCenter ); mStatusLabel->setAlignment( TQLabel::AlignVCenter );
TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
unlockDialogLayout->addWidget( frame ); unlockDialogLayout->addWidget( frame );

8
kdm/kfrontend/themer/kdmitem.cpp
Unescape View File

@ -443,12 +443,12 @@ KdmItem::statusChanged()
// BEGIN protected inheritable // BEGIN protected inheritable
TQSize TQSize
KdmItem::tqsizeHint() KdmItem::sizeHint()
{ {
if (myWidget) if (myWidget)
return myWidget->size(); return myWidget->size();
if (myLayoutItem) if (myLayoutItem)
return myLayoutItem->tqsizeHint(); return myLayoutItem->sizeHint();
int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1, int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1,
h = pos.hType == DTpixel ? kAbs( pos.height ) : -1; h = pos.hType == DTpixel ? kAbs( pos.height ) : -1;
return TQSize( w, h ); return TQSize( w, h );
@ -457,7 +457,7 @@ KdmItem::tqsizeHint()
TQRect TQRect
KdmItem::placementHint( const TQRect &parentRect ) KdmItem::placementHint( const TQRect &parentRect )
{ {
TQSize hintedSize = tqsizeHint(); TQSize hintedSize = sizeHint();
TQSize boxHint; TQSize boxHint;
int x = parentRect.left(), int x = parentRect.left(),
@ -474,7 +474,7 @@ KdmItem::placementHint( const TQRect &parentRect )
else { else {
if (!boxManager) if (!boxManager)
return parentRect; return parentRect;
boxHint = boxManager->tqsizeHint(); boxHint = boxManager->sizeHint();
} }
kdDebug() << timestamp() << " boxHint " << boxHint << endl; kdDebug() << timestamp() << " boxHint " << boxHint << endl;
} }

4
kdm/kfrontend/themer/kdmitem.h
Unescape View File

@ -120,7 +120,7 @@ public:
void mouseEvent( int x, int y, bool pressed = false, bool released = false ); 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 * given the @p parentGeometry. The default implementation
* takes into account geometric constraints and layoutings. * takes into account geometric constraints and layoutings.
* @param parentGeometry the geometry of the caller item or a * @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 * @return (-1,-1) if no size can be determined (so it should
* default to parent's size). * default to parent's size).
*/ */
virtual TQSize tqsizeHint(); virtual TQSize sizeHint();
/** /**
* Low level graphical function to paint the item. * Low level graphical function to paint the item.

4
kdm/kfrontend/themer/kdmlabel.cpp
Unescape View File

@ -138,7 +138,7 @@ KdmLabel::setText( const TQString &txt )
} }
TQSize TQSize
KdmLabel::tqsizeHint() KdmLabel::sizeHint()
{ {
// choose the correct label class // choose the correct label class
struct LabelStruct::LabelClass *l = &label.normal; struct LabelStruct::LabelClass *l = &label.normal;
@ -268,7 +268,7 @@ KdmLabel::lookupText( const TQString &t )
m['s'] = KThemedGreeter::timedUser; m['s'] = KThemedGreeter::timedUser;
// xgettext:no-c-format // xgettext:no-c-format
KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") ); 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 ); return KMacroExpander::expandMacros( text, m );
} }

2
kdm/kfrontend/themer/kdmlabel.h
Unescape View File

@ -42,7 +42,7 @@ public:
protected: protected:
// reimplemented; returns the minimum size of rendered text // reimplemented; returns the minimum size of rendered text
virtual TQSize tqsizeHint(); virtual TQSize sizeHint();
// draw the label // draw the label
virtual void drawContents( TQPainter *p, const TQRect &r ); virtual void drawContents( TQPainter *p, const TQRect &r );

26
kdm/kfrontend/themer/kdmlayout.cpp
Unescape View File

@ -74,7 +74,7 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
// Check if box size was computed. If not compute it // Check if box size was computed. If not compute it
// TODO check if this prevents updating changing items // TODO check if this prevents updating changing items
// if (!hintedSize.isValid()) // if (!hintedSize.isValid())
// tqsizeHint(); // sizeHint();
// kdDebug() << this << " hintedSize " << hintedSize << endl; // kdDebug() << this << " hintedSize " << hintedSize << endl;
@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
if ((*it)->isExplicitlyHidden()) if ((*it)->isExplicitlyHidden())
continue; continue;
TQRect temp = childrenRect, tqitemRect; TQRect temp = childrenRect, itemRect;
if (box.isVertical) { if (box.isVertical) {
temp.setHeight( 0 ); temp.setHeight( 0 );
tqitemRect = (*it)->placementHint( temp ); itemRect = (*it)->placementHint( temp );
temp.setHeight( tqitemRect.height() ); temp.setHeight( itemRect.height() );
childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing ); childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing );
} else { } else {
temp.setWidth( 0 ); temp.setWidth( 0 );
tqitemRect = (*it)->placementHint( temp ); itemRect = (*it)->placementHint( temp );
kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl; kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl;
temp.setWidth( tqitemRect.width() ); temp.setWidth( itemRect.width() );
childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing ); childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing );
kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl; kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl;
} }
tqitemRect = (*it)->placementHint( temp ); itemRect = (*it)->placementHint( temp );
kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl; kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl;
(*it)->setGeometry( tqitemRect, force ); (*it)->setGeometry( itemRect, force );
} }
} }
} }
//FIXME truly experimental (is so close to greeter_geometry.c) //FIXME truly experimental (is so close to greeter_geometry.c)
TQSize TQSize
KdmLayoutBox::tqsizeHint() KdmLayoutBox::sizeHint()
{ {
// Sum up area taken by children // Sum up area taken by children
int w = 0, h = 0; int w = 0, h = 0;

2
kdm/kfrontend/themer/kdmlayout.h
Unescape View File

@ -80,7 +80,7 @@ public:
// Computes the size hint of the box, telling which is the // Computes the size hint of the box, telling which is the
// smallest size inside which boxed items will fit // smallest size inside which boxed items will fit
TQSize tqsizeHint(); TQSize sizeHint();
private: private:
struct { struct {

4
kdm/kfrontend/themer/kdmpixmap.cpp
Unescape View File

@ -107,7 +107,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
} }
TQSize TQSize
KdmPixmap::tqsizeHint() KdmPixmap::sizeHint()
{ {
// choose the correct pixmap class // choose the correct pixmap class
PixmapStruct::PixmapClass * pClass = &pixmap.normal; PixmapStruct::PixmapClass * pClass = &pixmap.normal;
@ -118,7 +118,7 @@ KdmPixmap::tqsizeHint()
// use the pixmap size as the size hint // use the pixmap size as the size hint
if (!pClass->pixmap.isNull()) if (!pClass->pixmap.isNull())
return pClass->pixmap.size(); return pClass->pixmap.size();
return KdmItem::tqsizeHint(); return KdmItem::sizeHint();
} }
void void

2
kdm/kfrontend/themer/kdmpixmap.h
Unescape View File

@ -42,7 +42,7 @@ public:
protected: protected:
// reimplemented; returns the size of loaded pixmap // reimplemented; returns the size of loaded pixmap
virtual TQSize tqsizeHint(); virtual TQSize sizeHint();
// draw the pixmap // draw the pixmap
virtual void drawContents( TQPainter *p, const TQRect &r ); virtual void drawContents( TQPainter *p, const TQRect &r );

4
kdm/kfrontend/themer/kdmthemer.h
Unescape View File

@ -61,9 +61,9 @@ public:
bool isOK() { return rootItem != 0; } 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 * Takes a shot of the current widget

6
kfind/kdatecombo.cpp
Unescape View File

@ -33,7 +33,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *)
popupFrame = new KPopupFrame(this, "popupFrame"); popupFrame = new KPopupFrame(this, "popupFrame");
popupFrame->installEventFilter(this); popupFrame->installEventFilter(this);
datePicker = new KDatePicker(popupFrame, date, "datePicker"); datePicker = new KDatePicker(popupFrame, date, "datePicker");
datePicker->setMinimumSize(datePicker->tqsizeHint()); datePicker->setMinimumSize(datePicker->sizeHint());
datePicker->installEventFilter(this); datePicker->installEventFilter(this);
popupFrame->setMainWidget(datePicker); popupFrame->setMainWidget(datePicker);
setDate(date); setDate(date);
@ -57,9 +57,9 @@ TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd)
return *qd = KGlobal::locale()->readDate(str); 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) bool KDateCombo::setDate(const TQDate & newDate)

2
kfind/kdatecombo.h
Unescape View File

@ -26,7 +26,7 @@ public:
KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0); KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0);
~KDateCombo(); ~KDateCombo();
TQDate & getDate(TQDate *tqcurrentDate); TQDate & getDate(TQDate *currentDate);
bool setDate(const TQDate & newDate); bool setDate(const TQDate & newDate);
private: private:

2
kfind/kfind.cpp
Unescape View File

@ -70,7 +70,7 @@ Kfind::Kfind(TQWidget *parent, const char *name)
mTopLayout->addWidget(mButtonBox); mTopLayout->addWidget(mButtonBox);
mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), 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() ) ); connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) );
mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox ); mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox );
connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) ); connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );

2
kfind/kfindpart.cpp
Unescape View File

@ -44,7 +44,7 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName,
kdDebug() << "KFindPart::KFindPart " << this << endl; kdDebug() << "KFindPart::KFindPart " << this << endl;
m_kfindWidget = new Kfind( parentWidget, widgetName ); 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(); const KFileItem *item = ((KonqDirPart*)parent)->currentItem();
kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl; kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl;
TQDir d; TQDir d;

14
kfind/kftabdlg.cpp
Unescape View File

@ -60,11 +60,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
pages[0] = new TQWidget( this, "page1" ); pages[0] = new TQWidget( this, "page1" );
nameBox = new KComboBox(TRUE, pages[0], "combo1"); 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"); TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named");
TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") ); TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") );
dirBox = new KComboBox(TRUE, pages[0], "combo2"); 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"); TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named");
subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]); subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]);
caseSensCb = new TQCheckBox(i18n("Case s&ensitive search"), 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); sizeUnitBox ->setCurrentItem(1);
int tmp = sizeEdit->fontMetrics().width(" 000000000 "); int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
m_usernameBox->setDuplicatesEnabled(FALSE); m_usernameBox->setDuplicatesEnabled(FALSE);
m_groupBox->setDuplicatesEnabled(FALSE); m_groupBox->setDuplicatesEnabled(FALSE);
@ -245,7 +245,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
pages[2] = new TQWidget( this, "page3" ); pages[2] = new TQWidget( this, "page3" );
typeBox =new KComboBox(FALSE, pages[2], "typeBox"); 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"); TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type");
textEdit=new KLineEdit(pages[2], "textEdit" ); textEdit=new KLineEdit(pages[2], "textEdit" );
TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text"); TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text");
@ -315,7 +315,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
// Layout // Layout
tmp = sizeEdit->fontMetrics().width(" 00000 "); 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, TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4,
KDialog::marginHint(), KDialog::marginHint(),
@ -854,13 +854,13 @@ static void save_pattern(TQComboBox *obj,
conf->writePathEntry(entry, sl); 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 // #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, // 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 // and then we simply provide a reasonable size hint for the whole window, depending
// on the screen width. // on the screen width.
TQSize sz = TQTabWidget::tqsizeHint(); TQSize sz = TQTabWidget::sizeHint();
KfindTabWidget* me = const_cast<KfindTabWidget*>( this ); KfindTabWidget* me = const_cast<KfindTabWidget*>( this );
const int screenWidth = tqApp->desktop()->screenGeometry(me).width(); const int screenWidth = tqApp->desktop()->screenGeometry(me).width();
if ( sz.width() > screenWidth / 2 ) if ( sz.width() > screenWidth / 2 )

2
kfind/kftabdlg.h
Unescape View File

@ -49,7 +49,7 @@ public:
void setURL( const KURL & url ); void setURL( const KURL & url );
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
public slots: public slots:
void setFocus(); void setFocus();

12
kfind/kfwin.cpp
Unescape View File

@ -222,7 +222,7 @@ void KfindWindow::saveResults()
stream.setEncoding( TQTextStream::Locale ); stream.setEncoding( TQTextStream::Locale );
if ( mimeType->name() == "text/html") { if ( mimeType->name() == "text/html") {
stream << TQString::tqfromLatin1("<HTML><HEAD>\n" stream << TQString::fromLatin1("<HTML><HEAD>\n"
"<!DOCTYPE %1>\n" "<!DOCTYPE %1>\n"
"<TITLE>%2</TITLE></HEAD>\n" "<TITLE>%2</TITLE></HEAD>\n"
"<BODY><H1>%3</H1>" "<BODY><H1>%3</H1>"
@ -236,13 +236,13 @@ void KfindWindow::saveResults()
{ {
TQString path=((KfFileLVI*)item)->fileitem.url().url(); TQString path=((KfFileLVI*)item)->fileitem.url().url();
TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL(); TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL();
stream << TQString::tqfromLatin1("<DT><A HREF=\"") << path stream << TQString::fromLatin1("<DT><A HREF=\"") << path
<< TQString::tqfromLatin1("\">") << pretty << TQString::fromLatin1("\">") << pretty
<< TQString::tqfromLatin1("</A>\n"); << TQString::fromLatin1("</A>\n");
item = item->nextSibling(); item = item->nextSibling();
} }
stream << TQString::tqfromLatin1("</DL><P></BODY></HTML>\n"); stream << TQString::fromLatin1("</DL><P></BODY></HTML>\n");
} }
else { else {
item = firstChild(); item = firstChild();
@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init)
{ {
setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15); setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
TQString sampleDate = TQString sampleDate =
KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15); 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(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15); setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);

2
khelpcenter/docmetainfo.cpp
Unescape View File

@ -108,7 +108,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode )
if ( langcode == "en" ) return i18n("English"); if ( langcode == "en" ) return i18n("English");
TQString cfgfile = locate( "locale", TQString cfgfile = locate( "locale",
TQString::tqfromLatin1( "%1/entry.desktop" ).arg( langcode ) ); TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) );
kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl; kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl;

38
khelpcenter/glossary.cpp
Unescape View File

@ -49,7 +49,7 @@ class SectionItem : public KListViewItem
{ {
KListViewItem::setOpen(open); 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_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 = kapp->config();
m_config->setGroup( "Glossary" ); m_config->setGroup( "Glossary" );
@ -150,10 +150,10 @@ void Glossary::rebuildGlossaryCache()
connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ), connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
this, TQT_SLOT( meinprocExited( KProcess * ) ) ); this, TQT_SLOT( meinprocExited( KProcess * ) ) );
*meinproc << locate( "exe", TQString::tqfromLatin1( "meinproc" ) ); *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
*meinproc << TQString::tqfromLatin1( "--output" ) << m_cacheFile; *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
*meinproc << TQString::tqfromLatin1( "--stylesheet" ) *meinproc << TQString::fromLatin1( "--stylesheet" )
<< locate( "data", TQString::tqfromLatin1( "khelpcenter/glossary.xslt" ) ); << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
*meinproc << m_sourceFile; *meinproc << m_sourceFile;
meinproc->start( KProcess::NotifyOnExit ); meinproc->start( KProcess::NotifyOnExit );
@ -189,21 +189,21 @@ void Glossary::buildGlossaryTree()
if ( !doc.setContent( &cacheFile ) ) if ( !doc.setContent( &cacheFile ) )
return; 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++ ) { for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) {
TQDomElement sectionElement = sectionNodes.item( i ).toElement(); 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 ); 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++ ) { for ( unsigned int j = 0; j < entryNodes.count(); j++ ) {
TQDomElement entryElement = entryNodes.item( j ).toElement(); TQDomElement entryElement = entryNodes.item( j ).toElement();
TQString entryId = entryElement.attribute( TQString::tqfromLatin1( "id" ) ); TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) );
if ( entryId.isNull() ) if ( entryId.isNull() )
continue; continue;
TQDomElement termElement = childElement( entryElement, TQString::tqfromLatin1( "term" ) ); TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) );
TQString term = termElement.text().simplifyWhiteSpace(); TQString term = termElement.text().simplifyWhiteSpace();
EntryItem *entry = new EntryItem(topicSection, term, entryId ); EntryItem *entry = new EntryItem(topicSection, term, entryId );
@ -221,19 +221,19 @@ void Glossary::buildGlossaryTree()
new EntryItem( alphabSection, term, entryId ); new EntryItem( alphabSection, term, entryId );
TQDomElement definitionElement = childElement( entryElement, TQString::tqfromLatin1( "definition" ) ); TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) );
TQString definition = definitionElement.text().simplifyWhiteSpace(); TQString definition = definitionElement.text().simplifyWhiteSpace();
GlossaryEntryXRef::List seeAlso; GlossaryEntryXRef::List seeAlso;
TQDomElement referencesElement = childElement( entryElement, TQString::tqfromLatin1( "references" ) ); TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) );
TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::tqfromLatin1( "reference" ) ); TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) );
if ( referenceNodes.count() > 0 ) if ( referenceNodes.count() > 0 )
for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) { for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) {
TQDomElement referenceElement = referenceNodes.item( k ).toElement(); TQDomElement referenceElement = referenceNodes.item( k ).toElement();
TQString term = referenceElement.attribute( TQString::tqfromLatin1( "term" ) ); TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) );
TQString id = referenceElement.attribute( TQString::tqfromLatin1( "id" ) ); TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) );
seeAlso += GlossaryEntryXRef( term, id ); seeAlso += GlossaryEntryXRef( term, id );
} }
@ -279,10 +279,10 @@ TQString Glossary::entryToHtml( const GlossaryEntry &entry )
GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin(); GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin();
GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end(); GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end();
for (; it != end; ++it) { for (; it != end; ++it) {
seeAlso += TQString::tqfromLatin1("<a href=\"glossentry:"); seeAlso += TQString::fromLatin1("<a href=\"glossentry:");
seeAlso += (*it).id(); seeAlso += (*it).id();
seeAlso += TQString::tqfromLatin1("\">") + (*it).term(); seeAlso += TQString::fromLatin1("\">") + (*it).term();
seeAlso += TQString::tqfromLatin1("</a>, "); seeAlso += TQString::fromLatin1("</a>, ");
} }
seeAlso = seeAlso.left(seeAlso.length() - 2); seeAlso = seeAlso.left(seeAlso.length() - 2);
} }

4
khelpcenter/history.cpp
Unescape View File

@ -257,7 +257,7 @@ void History::fillForwardMenu()
void History::fillGoMenu() void History::fillGoMenu()
{ {
KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); 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 ) if ( !goMenu || m_goMenuIndex == -1 )
return; return;
@ -290,7 +290,7 @@ void History::fillGoMenu()
void History::goMenuActivated( int id ) void History::goMenuActivated( int id )
{ {
KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); 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 ) if ( !goMenu )
return; return;

14
khelpcenter/htmlsearch/kcmhtmlsearch.cpp
Unescape View File

@ -50,15 +50,15 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
"ht://dig HTML search engine. " "ht://dig HTML search engine. "
"You can get ht://dig at the"), gb); "You can get ht://dig at the"), gb);
l->tqsetAlignment(TQLabel::WordBreak); l->setAlignment(TQLabel::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
grid->addMultiCellWidget(l, 1, 1, 0, 1); grid->addMultiCellWidget(l, 1, 1, 0, 1);
TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
KURLLabel *url = new KURLLabel(gb); KURLLabel *url = new KURLLabel(gb);
url->setURL("http://www.htdig.org"); url->setURL("http://www.htdig.org");
url->setText(i18n("ht://dig home page")); url->setText(i18n("ht://dig home page"));
url->tqsetAlignment(TQLabel::AlignHCenter); url->setAlignment(TQLabel::AlignHCenter);
grid->addMultiCellWidget(url, 2,2, 0, 1); grid->addMultiCellWidget(url, 2,2, 0, 1);
connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
this, TQT_SLOT(urlClicked(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); runButton = new TQPushButton(i18n("Generate Index..."), this);
TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) ); 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); vbox->addWidget(runButton, AlignRight);
connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex())); connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
@ -179,14 +179,14 @@ void KHTMLSearchConfig::loadLanguages()
// add all languages to the list // add all languages to the list
TQStringList langs = KGlobal::dirs()->findAllResources("locale", TQStringList langs = KGlobal::dirs()->findAllResources("locale",
TQString::tqfromLatin1("*/entry.desktop")); TQString::fromLatin1("*/entry.desktop"));
langs.sort(); langs.sort();
for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it) for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
{ {
KSimpleConfig entry(*it); KSimpleConfig entry(*it);
entry.setGroup(TQString::tqfromLatin1("KCM Locale")); entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
TQString path = *it; TQString path = *it;
int index = path.findRev('/'); int index = path.findRev('/');

6
khelpcenter/htmlsearch/klangcombo.cpp
Unescape View File

@ -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) 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(")"); TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png"))); TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
insertItem(TQIconSet(flag), output, path, submenu, index); insertItem(TQIconSet(flag), output, path, submenu, index);
} }
void KLanguageCombo::changeLanguage(const TQString& name, int i) void KLanguageCombo::changeLanguage(const TQString& name, int i)
{ {
if (i < 0 || i >= count()) return; 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); changeItem(output, i);
} }

2
khelpcenter/htmlsearch/ktagcombobox.cpp
Unescape View File

@ -192,7 +192,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
TQRect clip(2, 2, width() - 4, height() - 4); TQRect clip(2, 2, width() - 4, height() - 4);
#if 0 #if 0
if ( hasFocus() && style().guiStyle() != MotifStyle ) if ( hasFocus() && style().guiStyle() != MotifStyle )
p.setPen( tqcolorGroup().highlightedText() ); p.setPen( colorGroup().highlightedText() );
#endif #endif
p.drawText(clip, AlignCenter | SingleLine, popup->text( current )); p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));

6
khelpcenter/htmlsearchconfig.cpp
Unescape View File

@ -51,15 +51,15 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
"ht://dig HTML search engine. " "ht://dig HTML search engine. "
"You can get ht://dig at the"), gb); "You can get ht://dig at the"), gb);
l->tqsetAlignment(TQLabel::WordBreak); l->setAlignment(TQLabel::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
grid->addMultiCellWidget(l, 1, 1, 0, 1); grid->addMultiCellWidget(l, 1, 1, 0, 1);
TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
KURLLabel *url = new KURLLabel(gb); KURLLabel *url = new KURLLabel(gb);
url->setURL("http://www.htdig.org"); url->setURL("http://www.htdig.org");
url->setText(i18n("ht://dig home page")); url->setText(i18n("ht://dig home page"));
url->tqsetAlignment(TQLabel::AlignHCenter); url->setAlignment(TQLabel::AlignHCenter);
grid->addMultiCellWidget(url, 2,2, 0, 1); grid->addMultiCellWidget(url, 2,2, 0, 1);
connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
this, TQT_SLOT(urlClicked(const TQString&))); this, TQT_SLOT(urlClicked(const TQString&)));

2
khelpcenter/kcmhelpcenter.cpp
Unescape View File

@ -101,7 +101,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
topLayout->setSpacing( spacingHint() ); topLayout->setSpacing( spacingHint() );
mLabel = new TQLabel( this ); mLabel = new TQLabel( this );
mLabel->tqsetAlignment( AlignHCenter ); mLabel->setAlignment( AlignHCenter );
topLayout->addWidget( mLabel ); topLayout->addWidget( mLabel );
mProgressBar = new TQProgressBar( this ); mProgressBar = new TQProgressBar( this );

2
khelpcenter/mainwindow.cpp
Unescape View File

@ -325,7 +325,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
mDoc->browserExtension()->setURLArgs( args ); mDoc->browserExtension()->setURLArgs( args );
if ( proto == TQString::tqfromLatin1("glossentry") ) { if ( proto == TQString::fromLatin1("glossentry") ) {
TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() ); TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );
slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) ); slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) );
mNavigator->slotSelectGlossEntry( decodedEntryId ); mNavigator->slotSelectGlossEntry( decodedEntryId );

4
khelpcenter/navigator.cpp
Unescape View File

@ -262,8 +262,8 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem
void Navigator::insertAppletDocs( NavigatorItem *topItem ) void Navigator::insertAppletDocs( NavigatorItem *topItem )
{ {
TQDir appletDir( locate( "data", TQString::tqfromLatin1( "kicker/applets/" ) ) ); TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) );
appletDir.setNameFilter( TQString::tqfromLatin1( "*.desktop" ) ); appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) );
TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable ); TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable );
TQStringList::ConstIterator it = files.begin(); TQStringList::ConstIterator it = files.begin();

8
khelpcenter/toc.cpp
Unescape View File

@ -188,9 +188,9 @@ void TOC::fillTree()
TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" ); TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" );
for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) { for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) {
TQDomElement chapElem = chapters.item( chapterCount ).toElement(); 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(); TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace();
TQDomElement chapRefElem = childElement( chapElem, TQString::tqfromLatin1( "anchor" ) ); TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) );
TQString chapRef = chapRefElem.text().stripWhiteSpace(); TQString chapRef = chapRefElem.text().stripWhiteSpace();
chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef ); chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef );
@ -199,9 +199,9 @@ void TOC::fillTree()
TQDomNodeList sections = chapElem.elementsByTagName( "section" ); TQDomNodeList sections = chapElem.elementsByTagName( "section" );
for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) { for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) {
TQDomElement sectElem = sections.item( sectCount ).toElement(); 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(); TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace();
TQDomElement sectRefElem = childElement( sectElem, TQString::tqfromLatin1( "anchor" ) ); TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) );
TQString sectRef = sectRefElem.text().stripWhiteSpace(); TQString sectRef = sectRefElem.text().stripWhiteSpace();
sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef ); sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef );

2
khotkeys/kcontrol/gesturedrawer.cpp
Unescape View File

@ -20,7 +20,7 @@ namespace KHotKeys
GestureDrawer::GestureDrawer(TQWidget *parent, const char *name) GestureDrawer::GestureDrawer(TQWidget *parent, const char *name)
: TQFrame(parent, name), _data(TQString::null) : TQFrame(parent, name), _data(TQString::null)
{ {
setBackgroundColor( tqcolorGroup().base()); setBackgroundColor( colorGroup().base());
setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
setMinimumSize(30, 30); setMinimumSize(30, 30);
} }

2
khotkeys/kcontrol/gesturedrawer.h
Unescape View File

@ -31,7 +31,7 @@ class GestureDrawer : public TQFrame
void setData(const TQString &data); void setData(const TQString &data);
virtual TQSize tqsizeHint() const { return TQSize(30, 30); } virtual TQSize sizeHint() const { return TQSize(30, 30); }
protected: protected:
void paintEvent(TQPaintEvent *ev); void paintEvent(TQPaintEvent *ev);

2
khotkeys/kcontrol/gesturerecorder.cpp
Unescape View File

@ -20,7 +20,7 @@ namespace KHotKeys
GestureRecorder::GestureRecorder(TQWidget *parent, const char *name) GestureRecorder::GestureRecorder(TQWidget *parent, const char *name)
: TQFrame(parent, name), _mouseButtonDown(false) : TQFrame(parent, name), _mouseButtonDown(false)
{ {
setBackgroundColor( tqcolorGroup().base()); setBackgroundColor( colorGroup().base());
setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setFrameStyle(TQFrame::Sunken | TQFrame::Panel);
setLineWidth(2); setLineWidth(2);
setMidLineWidth(0); setMidLineWidth(0);

2
khotkeys/kcontrol/gesturerecordpage.cpp
Unescape View File

@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
"button below.\n\nDraw here:"); "button below.\n\nDraw here:");
TQLabel *label = new TQLabel(message, this, "label"); TQLabel *label = new TQLabel(message, this, "label");
label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
TQLabel::AlignVCenter); TQLabel::AlignVCenter);
_recorder = new GestureRecorder(this, "recorder"); _recorder = new GestureRecorder(this, "recorder");

4
khotkeys/kcontrol/kcmkhotkeys.cpp
Unescape View File

@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows )
void Module::import() 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" )); i18n( "Select File with Actions to Be Imported" ));
if( file.isEmpty()) if( file.isEmpty())
return; return;
KSimpleConfig cfg( file, true ); KSimpleConfig cfg( file, true );
if( !settings.import( cfg, 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 " i18n( "Import of the specified file failed. Most probably the file is not a valid "
"file with actions." )); "file with actions." ));
return; return;

2
khotkeys/kcontrol/main_buttons_widget.cpp
Unescape View File

@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P
module, TQT_SLOT( changed())); module, TQT_SLOT( changed()));
connect( delete_action_button, TQT_SIGNAL( clicked()), connect( delete_action_button, TQT_SIGNAL( clicked()),
module, TQT_SLOT( changed())); 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 ) void Main_buttons_widget::enable_delete( bool enable_P )

4
khotkeys/kcontrol/triggers_tab.cpp
Unescape View File

@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data()
void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P ) void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
{ {
if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget()) if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
|| KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget())) || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))
return; return;
// KHotKeys::Module::changed() // KHotKeys::Module::changed()
module->changed(); module->changed();

4
khotkeys/kcontrol/ui/action_group_tab_ui.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -73,7 +73,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

14
khotkeys/kcontrol/ui/dcop_widget_ui.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -81,7 +81,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -114,7 +114,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -147,7 +147,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -178,7 +178,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -203,7 +203,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -228,7 +228,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

6
khotkeys/kcontrol/ui/general_settings_tab_ui.ui
Unescape View File

@ -42,7 +42,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -67,7 +67,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -86,7 +86,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

4
khotkeys/kcontrol/ui/general_tab_ui.ui
Unescape View File

@ -80,7 +80,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -105,7 +105,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

38
khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
Unescape View File

@ -46,7 +46,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>30</height> <height>30</height>
@ -77,7 +77,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -102,7 +102,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -121,7 +121,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>100</height> <height>100</height>
@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -163,7 +163,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -182,7 +182,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>30</height> <height>30</height>
@ -213,7 +213,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -238,7 +238,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -257,7 +257,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>100</height> <height>100</height>
@ -274,7 +274,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -299,7 +299,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -318,7 +318,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>30</height> <height>30</height>
@ -349,7 +349,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -374,7 +374,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -393,7 +393,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>100</width> <width>100</width>
<height>100</height> <height>100</height>
@ -410,7 +410,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -435,7 +435,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -454,7 +454,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>30</height> <height>30</height>

2
khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
Unescape View File

@ -116,7 +116,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>

2
khotkeys/kcontrol/ui/info_tab_ui.ui
Unescape View File

@ -47,7 +47,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
khotkeys/kcontrol/ui/menuentry_widget_ui.ui
Unescape View File

@ -72,7 +72,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>

2
khotkeys/kcontrol/ui/voice_input_widget_ui.ui
Unescape View File

@ -28,7 +28,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>

4
khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
Unescape View File

@ -61,7 +61,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>241</width> <width>241</width>
<height>21</height> <height>21</height>
@ -80,7 +80,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>90</height> <height>90</height>

14
khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -137,7 +137,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -226,7 +226,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -315,7 +315,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>
@ -346,7 +346,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -371,7 +371,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -390,7 +390,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>0</width> <width>0</width>
<height>20</height> <height>20</height>

2
khotkeys/kcontrol/voicerecordpage.cpp
Unescape View File

@ -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."); _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 = new TQLabel(_message, this, "label");
_label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
TQLabel::AlignVCenter); TQLabel::AlignVCenter);
_lineEdit = new KLineEdit( this ); _lineEdit = new KLineEdit( this );

8
kicker/applets/clock/analog.ui
Unescape View File

@ -75,7 +75,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -149,7 +149,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -241,7 +241,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>310</width> <width>310</width>
<height>20</height> <height>20</height>
@ -269,7 +269,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>50</height> <height>50</height>

54
kicker/applets/clock/clock.cpp
Unescape View File

@ -123,7 +123,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)), connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
TQT_SLOT(dateToggled())); TQT_SLOT(dateToggled()));
addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings")); addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
} }
void KConfigDialogSingle::updateSettings() void KConfigDialogSingle::updateSettings()
@ -242,7 +242,7 @@ void PlainClock::updateClock()
void PlainClock::loadSettings() void PlainClock::loadSettings()
{ {
setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame); setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame);
tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine); setAlignment(AlignVCenter | AlignHCenter | SingleLine);
setFont(_prefs->plainFont()); setFont(_prefs->plainFont());
} }
@ -353,9 +353,9 @@ void DigitalClock::updateClock()
if (_force || newStr != _timeStr) if (_force || newStr != _timeStr)
{ {
_timeStr = newStr; _timeStr = newStr;
tqsetUpdatesEnabled( FALSE ); setUpdatesEnabled( FALSE );
display(_timeStr); display(_timeStr);
tqsetUpdatesEnabled( TRUE ); setUpdatesEnabled( TRUE );
update(); update();
} }
@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
// but other colors would break the lcd-lock anyway // but other colors would break the lcd-lock anyway
void DigitalClock::drawContents( TQPainter * p) void DigitalClock::drawContents( TQPainter * p)
{ {
tqsetUpdatesEnabled( FALSE ); setUpdatesEnabled( FALSE );
TQPalette pal = palette(); TQPalette pal = palette();
if (_prefs->digitalLCDStyle()) if (_prefs->digitalLCDStyle())
pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128)); pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128));
@ -430,7 +430,7 @@ void DigitalClock::drawContents( TQPainter * p)
pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor()); pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
setPalette( pal ); setPalette( pal );
p->translate( -2, -2 ); p->translate( -2, -2 );
tqsetUpdatesEnabled( TRUE ); setUpdatesEnabled( TRUE );
TQLCDNumber::drawContents( p ); TQLCDNumber::drawContents( p );
p->translate( +1, +1 ); p->translate( +1, +1 );
} }
@ -908,12 +908,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
setBackgroundOrigin(AncestorOrigin); setBackgroundOrigin(AncestorOrigin);
_dayOfWeek = new TQLabel(this); _dayOfWeek = new TQLabel(this);
_dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
_dayOfWeek->setBackgroundOrigin(AncestorOrigin); _dayOfWeek->setBackgroundOrigin(AncestorOrigin);
_dayOfWeek->installEventFilter(this); // catch mouse clicks _dayOfWeek->installEventFilter(this); // catch mouse clicks
_date = new TQLabel(this); _date = new TQLabel(this);
_date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
_date->setBackgroundOrigin(AncestorOrigin); _date->setBackgroundOrigin(AncestorOrigin);
_date->installEventFilter(this); // catch mouse clicks _date->installEventFilter(this); // catch mouse clicks
@ -980,18 +980,18 @@ int ClockApplet::widthForHeight(int h) const
bool mustShowDate = showDate || (zone->zoneIndex() != 0); bool mustShowDate = showDate || (zone->zoneIndex() != 0);
if (mustShowDate) if (mustShowDate)
{ {
_date->tqsetAlignment(AlignVCenter | AlignHCenter); _date->setAlignment(AlignVCenter | AlignHCenter);
if (!dateToSide) if (!dateToSide)
{ {
shareDateHeight = _date->tqsizeHint().height(); shareDateHeight = _date->sizeHint().height();
} }
} }
if (showDayOfWeek) if (showDayOfWeek)
{ {
_dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter); _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter);
if (!dateToSide) if (!dateToSide)
{ {
shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height(); shareDayOfWeekHeight = _dayOfWeek->sizeHint().height();
} }
} }
@ -1007,8 +1007,8 @@ int ClockApplet::widthForHeight(int h) const
} }
else else
{ {
int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0; int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0;
int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0; int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0;
if (dateToSide) if (dateToSide)
{ {
@ -1064,13 +1064,13 @@ int ClockApplet::widthForHeight(int h) const
_clock->widget()->move(0, 0); _clock->widget()->move(0, 0);
if (showDayOfWeek) if (showDayOfWeek)
{ {
_dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height()); _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height());
_dayOfWeek->move(0, _clock->widget()->height()); _dayOfWeek->move(0, _clock->widget()->height());
} }
if (mustShowDate) if (mustShowDate)
{ {
_date->setFixedSize(w, _date->tqsizeHint().height()); _date->setFixedSize(w, _date->sizeHint().height());
_date->move(0, _clock->widget()->height() + shareDayOfWeekHeight); _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 // add 4 pixels in height for each of date+dayOfWeek, if visible
if (showDayOfWeek) if (showDayOfWeek)
{ {
if (_dayOfWeek->tqminimumSizeHint().width() > w) if (_dayOfWeek->minimumSizeHint().width() > w)
{ {
_dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak); _dayOfWeek->setAlignment(AlignVCenter | WordBreak);
} }
else 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); _dayOfWeek->move(0, clockHeight);
clockHeight += _dayOfWeek->height(); 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 // display on panel that is too narrow and then they made it wider
const_cast<ClockApplet*>(this)->updateDateLabel(false); const_cast<ClockApplet*>(this)->updateDateLabel(false);
if (_date->tqminimumSizeHint().width() > w) if (_date->minimumSizeHint().width() > w)
{ {
TQString dateStr = _date->text(); TQString dateStr = _date->text();
// if we're too wide to fit, replace the first non-digit from the end with a space // 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 else
{ {
_date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
} }
_date->setFixedSize(w, _date->heightForWidth(w)); _date->setFixedSize(w, _date->heightForWidth(w));
_date->move(0, clockHeight); _date->move(0, clockHeight);
@ -1541,7 +1541,7 @@ void ClockApplet::aboutToShowContextMenu()
menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
KLocale *loc = KGlobal::locale(); KLocale *loc = KGlobal::locale();
TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQDateTime dt = TQDateTime::currentDateTime();
dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset)); dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
KPopupMenu *copyMenu = new KPopupMenu( menu ); KPopupMenu *copyMenu = new KPopupMenu( menu );
@ -1615,7 +1615,7 @@ TQTime ClockApplet::clockGetTime()
TQDate ClockApplet::clockGetDate() 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) void ClockApplet::showZone(int z)
@ -1840,7 +1840,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
(m_clock->type() == Prefs::EnumType::Analog) ) (m_clock->type() == Prefs::EnumType::Analog) )
{ {
// show full time (incl. hour) as tooltip for Fuzzy clock // 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 else
{ {

6
kicker/applets/clock/digital.ui
Unescape View File

@ -83,7 +83,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -193,7 +193,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>110</width> <width>110</width>
<height>20</height> <height>20</height>
@ -226,7 +226,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

6
kicker/applets/clock/fuzzy.ui
Unescape View File

@ -79,7 +79,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -109,7 +109,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>
@ -153,7 +153,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>

12
kicker/applets/clock/settings.ui
Unescape View File

@ -102,7 +102,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -188,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -284,7 +284,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>230</width> <width>230</width>
<height>20</height> <height>20</height>
@ -306,7 +306,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -371,7 +371,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>343</width> <width>343</width>
<height>20</height> <height>20</height>
@ -421,7 +421,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>100</height> <height>100</height>

6
kicker/applets/launcher/configdlgbase.ui
Unescape View File

@ -83,7 +83,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>332</width> <width>332</width>
<height>20</height> <height>20</height>
@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>20</height> <height>20</height>
@ -192,7 +192,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>

2
kicker/applets/launcher/quickbutton.cpp
Unescape View File

@ -163,7 +163,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction,
TQToolTip::add(this, _qurl->name()); TQToolTip::add(this, _qurl->name());
resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); 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( QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(
parent, this, _qurl->url()); parent, this, _qurl->url());

6
kicker/applets/launcher/quickbuttongroup.h
Unescape View File

@ -24,15 +24,15 @@ public:
void setDragging(bool drag); void setDragging(bool drag);
void setEnableDrag(bool enable); void setEnableDrag(bool enable);
void deleteContents(); void deleteContents();
void tqsetUpdatesEnabled(bool enable); void setUpdatesEnabled(bool enable);
}; };
QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc) QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc)
{ return findProperty(desc, std::mem_fun(&QuickButton::url));} { 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) { { for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
(*i)->tqsetUpdatesEnabled(enable); (*i)->setUpdatesEnabled(enable);
if (enable) { (*i)->update();} if (enable) { (*i)->update();}
} }
} }

8
kicker/applets/launcher/quicklauncher.cpp
Unescape View File

@ -770,8 +770,8 @@ void QuickLauncher::refreshContents()
unsigned index; unsigned index;
TQPoint pos; TQPoint pos;
tqsetUpdatesEnabled(false); setUpdatesEnabled(false);
m_buttons->tqsetUpdatesEnabled(false); m_buttons->setUpdatesEnabled(false);
for (index = 0; index < m_buttons->size(); index++) for (index = 0; index < m_buttons->size(); index++)
{ {
pos = m_manager->pos(index); pos = m_manager->pos(index);
@ -791,9 +791,9 @@ void QuickLauncher::refreshContents()
m_dragButtons->setDragging(true); m_dragButtons->setDragging(true);
} }
m_buttons->show(); m_buttons->show();
tqsetUpdatesEnabled(true); setUpdatesEnabled(true);
update(); update();
m_buttons->tqsetUpdatesEnabled(true); m_buttons->setUpdatesEnabled(true);
updateGeometry(); updateGeometry();
emit updateLayout(); emit updateLayout();
updateStickyHighlightLayer(); updateStickyHighlightLayer();

14
kicker/applets/lockout/lockout.cpp
Unescape View File

@ -94,8 +94,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
if (!kapp->authorize("logout")) if (!kapp->authorize("logout"))
logoutButton->hide(); logoutButton->hide();
lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
@ -113,7 +113,7 @@ Lockout::~Lockout()
// direction and wasting a lot of space. // direction and wasting a lot of space.
void Lockout::checkLayout( int height ) const void Lockout::checkLayout( int height ) const
{ {
TQSize s = tqminimumSizeHint(); TQSize s = minimumSizeHint();
TQBoxLayout::Direction direction = layout->direction(); TQBoxLayout::Direction direction = layout->direction();
if ( direction == TQBoxLayout::LeftToRight && if ( direction == TQBoxLayout::LeftToRight &&
@ -131,13 +131,13 @@ void Lockout::checkLayout( int height ) const
int Lockout::widthForHeight( int height ) const int Lockout::widthForHeight( int height ) const
{ {
checkLayout( height ); checkLayout( height );
return tqsizeHint().width(); return sizeHint().width();
} }
int Lockout::heightForWidth( int width ) const int Lockout::heightForWidth( int width ) const
{ {
checkLayout( width ); checkLayout( width );
return tqsizeHint().height(); return sizeHint().height();
} }
void Lockout::lock() void Lockout::lock()
@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e)
void Lockout::propagateMouseEvent(TQMouseEvent* e) void Lockout::propagateMouseEvent(TQMouseEvent* e)
{ {
if ( !isTopLevel() ) { if ( !isTopLevel() ) {
TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ), TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ),
e->globalPos(), e->button(), e->state() ); e->globalPos(), e->button(), e->state() );
TQApplication::sendEvent( tqtopLevelWidget(), &me ); TQApplication::sendEvent( topLevelWidget(), &me );
} }
} }

2
kicker/applets/menu/menuapplet.cpp
Unescape View File

@ -264,7 +264,7 @@ void Applet::positionChange( Position )
// Kicker's frame). // Kicker's frame).
void Applet::updateTopEdgeOffset() 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 if( p.y() <= 2 ) // 2 = work also when running in appletproxy
topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y();
else else

36
kicker/applets/minipager/pagerbutton.cpp
Unescape View File

@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
// transparent windows get an 1 pixel frame... // transparent windows get an 1 pixel frame...
if (on) if (on)
{ {
bp->setPen(tqcolorGroup().midlight()); bp->setPen(colorGroup().midlight());
} }
else if (down) else if (down)
{ {
bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(), bp->setPen(KickerLib::blendColors(colorGroup().mid(),
tqcolorGroup().midlight())); colorGroup().midlight()));
} }
else else
{ {
bp->setPen(tqcolorGroup().dark()); bp->setPen(colorGroup().dark());
} }
bp->drawRect(0, 0, w, h); bp->drawRect(0, 0, w, h);
@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (on) if (on)
{ {
background = tqcolorGroup().brush(TQColorGroup::Midlight); background = colorGroup().brush(TQColorGroup::Midlight);
} }
else if (down) else if (down)
{ {
background = TQBrush(KickerLib::blendColors(tqcolorGroup().mid(), background = TQBrush(KickerLib::blendColors(colorGroup().mid(),
tqcolorGroup().midlight())); colorGroup().midlight()));
} }
else else
{ {
background = tqcolorGroup().brush(TQColorGroup::Mid); background = colorGroup().brush(TQColorGroup::Mid);
} }
bp->fillRect(0, 0, w, h, background); bp->fillRect(0, 0, w, h, background);
@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (twin->activeWindow() == info->win()) if (twin->activeWindow() == info->win())
{ {
TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); TQBrush brush = colorGroup().brush(TQColorGroup::Highlight);
qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush);
} }
else else
{ {
TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button); TQBrush brush = colorGroup().brush(TQColorGroup::Button);
if (on) if (on)
{ {
@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
} }
bp->fillRect(r, brush); 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) 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. // makes it look a bit more finished.
if (on) if (on)
{ {
bp->setPen(tqcolorGroup().midlight()); bp->setPen(colorGroup().midlight());
} }
else else
{ {
bp->setPen(tqcolorGroup().mid()); bp->setPen(colorGroup().mid());
} }
bp->drawRect(0, 0, w, h); bp->drawRect(0, 0, w, h);
@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
if (transparent || liveBkgnd) 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()); m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size());
} }
else else
@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
} }
if (m_inside) 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) void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
TQPixmap windowImage(ww, wh); TQPixmap windowImage(ww, wh);
TQPainter bp(&windowImage, this); TQPainter bp(&windowImage, this);
bp.setPen(tqcolorGroup().foreground()); bp.setPen(colorGroup().foreground());
bp.drawRect(0, 0, ww, wh); 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; Task::List tasklist;
tasklist.append(m_currentWindow); tasklist.append(m_currentWindow);

12
kicker/applets/run/runapplet.cpp
Unescape View File

@ -121,14 +121,14 @@ void RunApplet::resizeEvent(TQResizeEvent*)
_input->reparent(this, TQPoint(0,0), true); _input->reparent(this, TQPoint(0,0), true);
_label->setGeometry(0,0, width(), _label->height()); _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 inputVOffset = height() - _input->sizeHint().height() - 2;
int labelHeight = _label->tqsizeHint().height(); int labelHeight = _label->sizeHint().height();
_label->setGeometry(0, inputVOffset - labelHeight, _label->setGeometry(0, inputVOffset - labelHeight,
width(), labelHeight); width(), labelHeight);
_input->setGeometry(0, inputVOffset, _input->setGeometry(0, inputVOffset,
width(), _input->tqsizeHint().height()); width(), _input->sizeHint().height());
_label->show(); _label->show();
} }
else else
@ -138,7 +138,7 @@ void RunApplet::resizeEvent(TQResizeEvent*)
// make it as high as the combobox naturally wants to be // make it as high as the combobox naturally wants to be
// but no taller than the panel is! // but no taller than the panel is!
// don't forget to center it vertically either. // don't forget to center it vertically either.
int newHeight = _input->tqsizeHint().height(); int newHeight = _input->sizeHint().height();
if (newHeight > height()) if (newHeight > height())
newHeight = height(); newHeight = height();
_input->setGeometry(0, (height() - newHeight) / 2, _input->setGeometry(0, (height() - newHeight) / 2,
@ -184,7 +184,7 @@ void RunApplet::setButtonText()
int RunApplet::widthForHeight(int ) const int RunApplet::widthForHeight(int ) const
{ {
return _label->tqsizeHint().width(); return _label->sizeHint().width();
} }
int RunApplet::heightForWidth(int ) const int RunApplet::heightForWidth(int ) const

2
kicker/applets/swallow/prefwidgetbase.ui
Unescape View File

@ -110,7 +110,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

18
kicker/applets/systemtray/systemtrayapplet.cpp
Unescape View File

@ -427,12 +427,12 @@ void SystemTrayApplet::showExpandButton(bool show)
if (orientation() == Qt::Vertical) if (orientation() == Qt::Vertical)
{ {
m_expandButton->setFixedSize(width() - 4, m_expandButton->setFixedSize(width() - 4,
m_expandButton->tqsizeHint() m_expandButton->sizeHint()
.height()); .height());
} }
else else
{ {
m_expandButton->setFixedSize(m_expandButton->tqsizeHint() m_expandButton->setFixedSize(m_expandButton->sizeHint()
.width(), .width(),
height() - 4); height() - 4);
} }
@ -869,7 +869,7 @@ int SystemTrayApplet::widthForHeight(int h) const
me->setFixedHeight(h); me->setFixedHeight(h);
} }
return tqsizeHint().width(); return sizeHint().width();
} }
int SystemTrayApplet::heightForWidth(int w) const int SystemTrayApplet::heightForWidth(int w) const
@ -888,7 +888,7 @@ int SystemTrayApplet::heightForWidth(int w) const
me->setFixedWidth(w); me->setFixedWidth(w);
} }
return tqsizeHint().height(); return sizeHint().height();
} }
void SystemTrayApplet::moveEvent( TQMoveEvent* ) void SystemTrayApplet::moveEvent( TQMoveEvent* )
@ -906,7 +906,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* )
void SystemTrayApplet::layoutTray() void SystemTrayApplet::layoutTray()
{ {
tqsetUpdatesEnabled(false); setUpdatesEnabled(false);
int iconCount = m_shownWins.count(); int iconCount = m_shownWins.count();
@ -927,11 +927,11 @@ void SystemTrayApplet::layoutTray()
{ {
if (orientation() == Qt::Vertical) if (orientation() == Qt::Vertical)
{ {
m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height()); m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height());
} }
else 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(); updateGeometry();
setBackground(); setBackground();
@ -1138,7 +1138,7 @@ TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent )
void TrayEmbed::getIconSize(int defaultIconSize) void TrayEmbed::getIconSize(int defaultIconSize)
{ {
TQSize minSize = tqminimumSizeHint(); TQSize minSize = minimumSizeHint();
int width = minSize.width(); int width = minSize.width();
int height = minSize.height(); int height = minSize.height();

4
kicker/applets/taskbar/taskbarapplet.cpp
Unescape View File

@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const
KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Position d = orientation() == Qt::Horizontal ?
KPanelExtension::Top : KPanelExtension::Top :
KPanelExtension::Left; KPanelExtension::Left;
return container->tqsizeHint(d, TQSize(200, h)).width(); return container->sizeHint(d, TQSize(200, h)).width();
} }
int TaskbarApplet::heightForWidth(int w) const int TaskbarApplet::heightForWidth(int w) const
@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const
KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Position d = orientation() == Qt::Horizontal ?
KPanelExtension::Top : KPanelExtension::Top :
KPanelExtension::Left; KPanelExtension::Left;
return container->tqsizeHint(d, TQSize(w, 200)).height(); return container->sizeHint(d, TQSize(w, 200)).height();
} }
void TaskbarApplet::preferences() void TaskbarApplet::preferences()

4
kicker/extensions/dockbar/dockbarextension.cpp
Unescape View File

@ -60,7 +60,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
twin_module = new KWinModule(TQT_TQOBJECT(this)); twin_module = new KWinModule(TQT_TQOBJECT(this));
connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
setMinimumSize(DockContainer::sz(), DockContainer::sz()); setMinimumSize(DockContainer::sz(), DockContainer::sz());
tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
loadContainerConfig(); loadContainerConfig();
} }
@ -77,7 +77,7 @@ DockBarExtension::~DockBarExtension()
if (dragging_container) delete dragging_container; 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) if (p == Left || p == Right)
return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count()); return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count());

2
kicker/extensions/dockbar/dockbarextension.h
Unescape View File

@ -40,7 +40,7 @@ public:
virtual ~DockBarExtension(); virtual ~DockBarExtension();
TQSize tqsizeHint(Position, TQSize maxSize) const; TQSize sizeHint(Position, TQSize maxSize) const;
Position preferedPosition() const { return Right; } Position preferedPosition() const { return Right; }
protected slots: protected slots:

12
kicker/extensions/kasbar/kasbar.cpp
Unescape View File

@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f )
rootPix( 0 ), rootPix( 0 ),
enableTint_( false ), enableTint_( false ),
tintAmount_( 0.1 ), tintAmount_( 0.1 ),
tintColour_( tqcolorGroup().mid() ), tintColour_( colorGroup().mid() ),
useMask_( true ), useMask_( true ),
res(0) res(0)
{ {
@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam
rootPix( 0 ), rootPix( 0 ),
enableTint_( false ), enableTint_( false ),
tintAmount_( 0.1 ), tintAmount_( 0.1 ),
tintColour_( tqcolorGroup().mid() ), tintColour_( colorGroup().mid() ),
useMask_( true ), useMask_( true ),
res(0) res(0)
{ {
@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach )
emit detachedChanged( detached ); emit detachedChanged( detached );
} }
TQSize KasBar::tqsizeHint( Orientation o, TQSize sz ) TQSize KasBar::sizeHint( Orientation o, TQSize sz )
{ {
if ( o == Qt::Horizontal ) if ( o == Qt::Horizontal )
setBoxesPerLine( sz.width() / itemExtent() ); setBoxesPerLine( sz.width() / itemExtent() );
@ -414,7 +414,7 @@ void KasBar::updateLayout()
if ( !isUpdatesEnabled() ) if ( !isUpdatesEnabled() )
return; return;
bool updates = isUpdatesEnabled(); bool updates = isUpdatesEnabled();
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
// This is for testing a rectangular layout // This is for testing a rectangular layout
// boxesPerLine_ = (uint) ceil(sqrt( items.count() )); // boxesPerLine_ = (uint) ceil(sqrt( items.count() ));
@ -443,9 +443,9 @@ void KasBar::updateLayout()
resize( sz ); resize( sz );
} }
tqsetUpdatesEnabled( updates ); setUpdatesEnabled( updates );
TQWidget *top = tqtopLevelWidget(); TQWidget *top = topLevelWidget();
TQRegion mask; TQRegion mask;
KasItem *i; KasItem *i;

2
kicker/extensions/kasbar/kasbar.h
Unescape View File

@ -152,7 +152,7 @@ public:
bool isDrag() const { return inDrag; } bool isDrag() const { return inDrag; }
TQSize tqsizeHint( Qt::Orientation, TQSize max ); TQSize sizeHint( Qt::Orientation, TQSize max );
// //
// Look and feel options // Look and feel options

4
kicker/extensions/kasbar/kasbarextension.cpp
Unescape View File

@ -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; Orientation o = Qt::Horizontal;
@ -167,7 +167,7 @@ TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const
return TQSize( 0, kasbar->itemExtent()/2 ); return TQSize( 0, kasbar->itemExtent()/2 );
} }
return kasbar->tqsizeHint( o, maxSize ); return kasbar->sizeHint( o, maxSize );
} }
void KasBarExtension::positionChange( Position /* position */) void KasBarExtension::positionChange( Position /* position */)

2
kicker/extensions/kasbar/kasbarextension.h
Unescape View File

@ -76,7 +76,7 @@ public:
virtual ~KasBarExtension(); virtual ~KasBarExtension();
TQSize tqsizeHint( Position, TQSize maxSize ) const; TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const { return Right; } Position preferedPosition() const { return Right; }
virtual void positionChange( Position position ); virtual void positionChange( Position position );

4
kicker/extensions/kasbar/kasclockitem.cpp
Unescape View File

@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent )
lcd = new LCD( parent ); lcd = new LCD( parent );
lcd->hide(); lcd->hide();
lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
lcd->setBackgroundMode( NoBackground ); lcd->setBackgroundMode( NoBackground );
lcd->setFrameStyle( TQFrame::NoFrame ); lcd->setFrameStyle( TQFrame::NoFrame );
lcd->setSegmentStyle( TQLCDNumber::Flat ); lcd->setSegmentStyle( TQLCDNumber::Flat );
@ -89,7 +89,7 @@ void KasClockItem::paint( TQPainter *p )
p->save(); p->save();
p->translate( 3, 15 ); p->translate( 3, 15 );
lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() ); lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() );
lcd->draw( p ); lcd->draw( p );
p->restore(); p->restore();

2
kicker/extensions/kasbar/kasitem.cpp
Unescape View File

@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p )
if ( !frame ) if ( !frame )
return; return;
qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2); qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2);
TQPen pen; TQPen pen;

2
kicker/extensions/kasbar/kasitem.h
Unescape View File

@ -218,7 +218,7 @@ protected:
TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } TQFontMetrics fontMetrics() const { return kas->fontMetrics(); }
/** Gets the color group from the parent. */ /** 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. */ /** Factory method that creates a popup widget for the item. */
virtual KasPopup *createPopup(); virtual KasPopup *createPopup();

4
kicker/extensions/kasbar/kasloaditem.cpp
Unescape View File

@ -95,7 +95,7 @@ void KasLoadItem::paint( TQPainter *p )
KasItem::paint( p ); KasItem::paint( p );
TQColor light = kasbar()->tqcolorGroup().highlight(); TQColor light = kasbar()->colorGroup().highlight();
TQColor dark = light.dark(); TQColor dark = light.dark();
KPixmap pix; KPixmap pix;
@ -103,7 +103,7 @@ void KasLoadItem::paint( TQPainter *p )
KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient ); KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient );
p->drawPixmap( 2, extent()-2-h, pix ); 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 ) { for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) {
int ypos = (int) floor((extent()-2) - (dh*maxValue*pos)); int ypos = (int) floor((extent()-2) - (dh*maxValue*pos));
p->drawLine( 2, ypos, extent()-3, ypos ); p->drawLine( 2, ypos, extent()-3, ypos );

4
kicker/extensions/kasbar/kasresources.cpp
Unescape View File

@ -308,7 +308,7 @@ KPixmap KasResources::activeBg()
if ( actBg.isNull() ) { if ( actBg.isNull() ) {
actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() );
KPixmapEffect::gradient( actBg, KPixmapEffect::gradient( actBg,
kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(), kasbar->colorGroup().light(), kasbar->colorGroup().mid(),
KPixmapEffect::DiagonalGradient ); KPixmapEffect::DiagonalGradient );
} }
@ -320,7 +320,7 @@ KPixmap KasResources::inactiveBg()
if ( inactBg.isNull() ) { if ( inactBg.isNull() ) {
inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() );
KPixmapEffect::gradient( inactBg, KPixmapEffect::gradient( inactBg,
kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(), kasbar->colorGroup().mid(), kasbar->colorGroup().dark(),
KPixmapEffect::DiagonalGradient ); KPixmapEffect::DiagonalGradient );
} }

12
kicker/extensions/kasbar/kastasker.cpp
Unescape View File

@ -315,7 +315,7 @@ void KasTasker::moveToMain( KasGroupItem *gi, Task::Ptr t )
void KasTasker::moveToMain( KasGroupItem *gi ) void KasTasker::moveToMain( KasGroupItem *gi )
{ {
bool updates = isUpdatesEnabled(); bool updates = isUpdatesEnabled();
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
int i = indexOf( gi ); int i = indexOf( gi );
@ -327,7 +327,7 @@ void KasTasker::moveToMain( KasGroupItem *gi )
gi->hidePopup(); gi->hidePopup();
remove( gi ); remove( gi );
tqsetUpdatesEnabled( updates ); setUpdatesEnabled( updates );
updateLayout(); updateLayout();
} }
@ -346,7 +346,7 @@ void KasTasker::removeStartup( Startup::Ptr s )
void KasTasker::refreshAll() void KasTasker::refreshAll()
{ {
bool updates = isUpdatesEnabled(); bool updates = isUpdatesEnabled();
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
clear(); clear();
@ -365,7 +365,7 @@ void KasTasker::refreshAll()
addTask( t.data() ); addTask( t.data() );
} }
tqsetUpdatesEnabled( updates ); setUpdatesEnabled( updates );
updateLayout(); updateLayout();
} }
@ -572,7 +572,7 @@ void KasTasker::readConfig( KConfig *conf )
} }
bool updates = isUpdatesEnabled(); bool updates = isUpdatesEnabled();
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
// //
@ -653,7 +653,7 @@ void KasTasker::readConfig( KConfig *conf )
// fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true ); // fillActiveBg = conf->readBoolEntry( "FillActiveIconBackground", true );
// enablePopup = conf->readBoolEntry( "EnablePopup", true ); // enablePopup = conf->readBoolEntry( "EnablePopup", true );
tqsetUpdatesEnabled( updates ); setUpdatesEnabled( updates );
emit configChanged(); emit configChanged();
} }

8
kicker/extensions/kasbar/kastaskitem.cpp
Unescape View File

@ -173,14 +173,14 @@ void KasTaskItem::updateTask(bool geometryChangeOnly)
} }
bool updates = kasbar()->isUpdatesEnabled(); bool updates = kasbar()->isUpdatesEnabled();
kasbar()->tqsetUpdatesEnabled( false ); kasbar()->setUpdatesEnabled( false );
setProgress( kasbar()->showProgress() ? 0 : -1 ); setProgress( kasbar()->showProgress() ? 0 : -1 );
setText( task_->visibleIconicName() ); setText( task_->visibleIconicName() );
setModified( task_->isModified() ); setModified( task_->isModified() );
setActive( task_->isActive() ); setActive( task_->isActive() );
kasbar()->tqsetUpdatesEnabled( updates ); kasbar()->setUpdatesEnabled( updates );
update(); update();
} }
@ -422,7 +422,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool
taskprops->addColumn( i18n("Value") ); taskprops->addColumn( i18n("Value") );
// Create List Items // Create List Items
TQMetaObject *mo = target->tqmetaObject(); TQMetaObject *mo = target->metaObject();
for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { for ( int i = 0; i < mo->numProperties( recursive ); i++ ) {
const TQMetaProperty *p = mo->property(i, recursive); const TQMetaProperty *p = mo->property(i, recursive);
@ -456,7 +456,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data )
TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) TQWidget *KasTaskItem::createX11Props( TQWidget *parent )
{ {
TQVBox *vb2 = new TQVBox( parent ); TQVBox *vb2 = new TQVBox( parent );
vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
vb2->setSpacing( KDialog::spacingHint() ); vb2->setSpacing( KDialog::spacingHint() );
vb2->setMargin( KDialog::marginHint() ); vb2->setMargin( KDialog::marginHint() );

2
kicker/extensions/kasbar/kastaskpopup.cpp
Unescape View File

@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name )
} }
KPixmapEffect::gradient( titleBg, KPixmapEffect::gradient( titleBg,
Qt::black, tqcolorGroup().mid(), Qt::black, colorGroup().mid(),
KPixmapEffect::DiagonalGradient ); KPixmapEffect::DiagonalGradient );
connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) );

12
kicker/extensions/sidebar/sidebarextension.cpp
Unescape View File

@ -94,7 +94,7 @@ void SidebarExtension::needLayoutUpdate(bool exp) {
m_currentWidth=24; m_currentWidth=24;
m_resizeHandle->hide(); m_resizeHandle->hide();
} }
tqtopLevelWidget()->setFixedWidth(m_currentWidth); topLevelWidget()->setFixedWidth(m_currentWidth);
emit updateLayout(); emit updateLayout();
} }
@ -117,7 +117,7 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
return true; return true;
} else if (e->type()==TQEvent::MouseButtonRelease) { } else if (e->type()==TQEvent::MouseButtonRelease) {
m_resizing=false; m_resizing=false;
m_expandedSize=tqtopLevelWidget()->width(); m_expandedSize=topLevelWidget()->width();
needLayoutUpdate(true); needLayoutUpdate(true);
return true; return true;
} else if (e->type()==TQEvent::MouseMove) { } else if (e->type()==TQEvent::MouseMove) {
@ -126,14 +126,14 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) {
if (p==Left) { if (p==Left) {
int diff=((TQMouseEvent*)e)->globalX()-m_x; int diff=((TQMouseEvent*)e)->globalX()-m_x;
if (abs(diff)>3) { if (abs(diff)>3) {
tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff); topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff);
m_x=((TQMouseEvent*)e)->globalX(); m_x=((TQMouseEvent*)e)->globalX();
} }
} else if (p==Right) { } else if (p==Right) {
int diff=((TQMouseEvent*)e)->globalX()-m_x; int diff=((TQMouseEvent*)e)->globalX()-m_x;
if (abs(diff)>3) { if (abs(diff)>3) {
tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff); topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff);
tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y()); topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y());
m_x=((TQMouseEvent*)e)->globalX(); m_x=((TQMouseEvent*)e)->globalX();
} }
} }
@ -148,7 +148,7 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const {
return KPanelExtension::Left; return KPanelExtension::Left;
} }
TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const
{ {
return TQSize(m_currentWidth,maxSize.height()); return TQSize(m_currentWidth,maxSize.height());
} }

2
kicker/extensions/sidebar/sidebarextension.h
Unescape View File

@ -36,7 +36,7 @@ public:
virtual ~SidebarExtension(); virtual ~SidebarExtension();
TQSize tqsizeHint( Position, TQSize maxSize ) const; TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const; Position preferedPosition() const;
virtual void positionChange( Position position ); virtual void positionChange( Position position );

6
kicker/extensions/taskbar/taskbarextension.cpp
Unescape View File

@ -123,17 +123,17 @@ void TaskBarExtension::preferences()
m_container->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) if (p == Left || p == Right)
maxSize.setWidth(sizeInPixels()); maxSize.setWidth(sizeInPixels());
else else
maxSize.setHeight(sizeInPixels()); 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) << " width: " << size.width() << endl;
// kdDebug(1210) << "height: " << size.height() << endl; // kdDebug(1210) << "height: " << size.height() << endl;
return m_container->tqsizeHint(p, maxSize); return m_container->sizeHint(p, maxSize);
} }
void TaskBarExtension::configure() void TaskBarExtension::configure()

2
kicker/extensions/taskbar/taskbarextension.h
Unescape View File

@ -49,7 +49,7 @@ public:
int actions = 0, TQWidget *parent = 0, const char *name = 0 ); int actions = 0, TQWidget *parent = 0, const char *name = 0 );
~TaskBarExtension(); ~TaskBarExtension();
TQSize tqsizeHint( Position, TQSize maxSize ) const; TQSize sizeHint( Position, TQSize maxSize ) const;
Position preferedPosition() const { return Bottom; } Position preferedPosition() const { return Bottom; }
protected: protected:

2
kicker/kicker/buttons/browserbutton.cpp
Unescape View File

@ -103,7 +103,7 @@ void BrowserButton::dropEvent( TQDropEvent *ev )
{ {
KURL path ( topMenu->path() ); KURL path ( topMenu->path() );
_menuTimer->stop(); _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 ); KonqOperations::doDrop( &item, path, ev, this );
PanelButton::dropEvent(ev); PanelButton::dropEvent(ev);
} }

2
kicker/kicker/buttons/desktopbutton.cpp
Unescape View File

@ -77,7 +77,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev )
void DesktopButton::dropEvent( TQDropEvent *ev ) void DesktopButton::dropEvent( TQDropEvent *ev )
{ {
KURL dPath ( KGlobalSettings::desktopPath() ); 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 ); KonqOperations::doDrop( &item, dPath, ev, this );
PanelButton::dropEvent(ev); PanelButton::dropEvent(ev);
} }

16
kicker/kicker/core/applethandle.cpp
Unescape View File

@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent)
int AppletHandle::heightForWidth( int /* w */ ) const int AppletHandle::heightForWidth( int /* w */ ) const
{ {
int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
return size; return size;
} }
int AppletHandle::widthForHeight( int /* h */ ) const int AppletHandle::widthForHeight( int /* h */ ) const
{ {
int size = tqstyle().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int size = tqstyle().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
return size; return size;
} }
@ -282,7 +282,7 @@ void AppletHandle::checkHandleHover()
bool AppletHandle::onMenuButton(const TQPoint& point) const 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() void AppletHandle::toggleMenuButtonOff()
@ -308,9 +308,9 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent)
setBackgroundOrigin( AncestorOrigin ); 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) if (m_parent->orientation() == Qt::Horizontal)
{ {
@ -368,7 +368,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
TQRect r = rect(); TQRect r = rect();
tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, tqstyle().tqdrawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
tqcolorGroup(), flags); colorGroup(), flags);
} }
else 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; int width = height;
if (m_parent->orientation() == Qt::Horizontal) if (m_parent->orientation() == Qt::Horizontal)

12
kicker/kicker/core/applethandle.h
Unescape View File

@ -92,9 +92,9 @@ class AppletHandleDrag : public TQWidget
public: public:
AppletHandleDrag(AppletHandle* parent); AppletHandleDrag(AppletHandle* parent);
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSize tqminimumSize() const { return tqminimumSizeHint(); } TQSize minimumSize() const { return minimumSizeHint(); }
TQSize tqsizeHint() const { return tqminimumSize(); } TQSize sizeHint() const { return minimumSize(); }
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
protected: protected:
@ -113,9 +113,9 @@ class AppletHandleButton : public SimpleArrowButton
public: public:
AppletHandleButton(AppletHandle *parent); AppletHandleButton(AppletHandle *parent);
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSize tqminimumSize() const { return tqminimumSizeHint(); } TQSize minimumSize() const { return minimumSizeHint(); }
TQSize tqsizeHint() const { return tqminimumSize(); } TQSize sizeHint() const { return minimumSize(); }
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
private: private:

8
kicker/kicker/core/container_applet.cpp
Unescape View File

@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
_valid = true; _valid = true;
_applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection())); _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection()));
_applet->tqsetAlignment((KPanelApplet::Alignment)tqalignment()); _applet->setAlignment((KPanelApplet::Alignment)tqalignment());
_actions = _applet->actions(); _actions = _applet->actions();
_type = _applet->type(); _type = _applet->type();
@ -275,14 +275,14 @@ void AppletContainer::slotRemoved(KConfig* config)
void AppletContainer::activateWindow() void AppletContainer::activateWindow()
{ {
KWin::forceActiveWindow(tqtopLevelWidget()->winId()); KWin::forceActiveWindow(topLevelWidget()->winId());
} }
void AppletContainer::focusRequested(bool focus) void AppletContainer::focusRequested(bool focus)
{ {
if (focus) if (focus)
{ {
KWin::forceActiveWindow(tqtopLevelWidget()->winId()); KWin::forceActiveWindow(topLevelWidget()->winId());
} }
emit maintainFocus(focus); emit maintainFocus(focus);
@ -361,7 +361,7 @@ void AppletContainer::alignmentChange(KPanelExtension::Alignment a)
return; return;
} }
_applet->tqsetAlignment( (KPanelApplet::Alignment)a ); _applet->setAlignment( (KPanelApplet::Alignment)a );
} }
int AppletContainer::widthForHeight(int h) const int AppletContainer::widthForHeight(int h) const

2
kicker/kicker/core/container_base.cpp
Unescape View File

@ -110,7 +110,7 @@ void BaseContainer::slotRemoved(KConfig* config)
config->sync(); config->sync();
} }
void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a) void BaseContainer::setAlignment(KPanelExtension::Alignment a)
{ {
if (_tqalignment == a) if (_tqalignment == a)
{ {

2
kicker/kicker/core/container_base.h
Unescape View File

@ -97,7 +97,7 @@ public slots:
virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; } virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; }
virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; } virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; }
void tqsetAlignment(KPanelExtension::Alignment a); void setAlignment(KPanelExtension::Alignment a);
signals: signals:
void removeme(BaseContainer*); void removeme(BaseContainer*);

24
kicker/kicker/core/container_extension.cpp
Unescape View File

@ -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 width = 0;
int height = 0; int height = 0;
@ -284,7 +284,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize
if (m_extension) if (m_extension)
{ {
size = m_extension->tqsizeHint(p, maxSize - size) + size; size = m_extension->sizeHint(p, maxSize - size) + size;
} }
return size.boundedTo(maxSize); return size.boundedTo(maxSize);
@ -510,7 +510,7 @@ void ExtensionContainer::moveMe()
// on other parameters this can lead to Bad Things(tm) // on other parameters this can lead to Bad Things(tm)
// //
// we need to find a way to do this that doesn't result in // 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 // or else we need to change the semantics for applets so that
// they don't get their "you're changing position" signals through // they don't get their "you're changing position" signals through
@ -578,7 +578,7 @@ void ExtensionContainer::enableMouseOverEffects()
KickerTip::enableTipping(true); KickerTip::enableTipping(true);
TQPoint globalPos = TQCursor::pos(); TQPoint globalPos = TQCursor::pos();
TQPoint localPos = mapFromGlobal(globalPos); TQPoint localPos = mapFromGlobal(globalPos);
TQWidget* child = tqchildAt(localPos); TQWidget* child = childAt(localPos);
if (child) if (child)
{ {
@ -1408,11 +1408,11 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e)
// KPanelExtension::Left/Right don't seem to draw the separators at all! // KPanelExtension::Left/Right don't seem to draw the separators at all!
if (position() == KPanelExtension::Left) { if (position() == KPanelExtension::Left) {
rect = TQRect(width()-2,0,PANEL_RESIZE_HANDLE_WIDTH,height()); 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) { else if (position() == KPanelExtension::Right) {
rect = TQRect(0,0,PANEL_RESIZE_HANDLE_WIDTH,height()); 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) { else if (position() == KPanelExtension::Top) {
// Nastiness to both vertically flip the PE_Separator // 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); TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH);
TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm));
rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH);
TQColorGroup darkcg = tqcolorGroup(); TQColorGroup darkcg = colorGroup();
darkcg.setColor(TQColorGroup::Light, tqcolorGroup().dark()); darkcg.setColor(TQColorGroup::Light, colorGroup().dark());
tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default ); tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, &myp, rect, darkcg, TQStyle::Style_Default );
p.drawPixmap(0,height()-2,inv_pm); p.drawPixmap(0,height()-2,inv_pm);
} }
else { else {
rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); 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; return;
} }
m_extension->tqsetAlignment(a); m_extension->setAlignment(a);
} }
void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) void ExtensionContainer::setSize(KPanelExtension::Size size, int custom)
@ -1551,7 +1551,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p,
if (a != m_settings.alignment()) if (a != m_settings.alignment())
{ {
m_settings.setAlignment(a); m_settings.setAlignment(a);
tqsetAlignment(a); setAlignment(a);
} }
if (XineramaScreen != xineramaScreen()) if (XineramaScreen != xineramaScreen())
@ -1777,7 +1777,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA
", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() <<
", " << workArea.bottomRight().y() << ")" << endl;*/ ", " << 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 width = 0;
int height = 0; int height = 0;

4
kicker/kicker/core/container_extension.h
Unescape View File

@ -66,7 +66,7 @@ public:
TQWidget *parent = 0); TQWidget *parent = 0);
virtual ~ExtensionContainer(); 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; } const AppletInfo& info() const { return _info; }
@ -101,7 +101,7 @@ public:
bool reserveStrut() const; bool reserveStrut() const;
KPanelExtension::Alignment tqalignment() 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 currentGeometry() const;
TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a,

12
kicker/kicker/core/containerarea.cpp
Unescape View File

@ -1430,7 +1430,7 @@ void ContainerArea::setBackground()
if (KickerSettings::transparent() && if (KickerSettings::transparent() &&
(KickerSettings::menubarPanelTransparent() || (KickerSettings::menubarPanelTransparent() ||
!ExtensionManager::the()->isMenuBar(tqtopLevelWidget()))) !ExtensionManager::the()->isMenuBar(topLevelWidget())))
{ {
if (!_rootPixmap) if (!_rootPixmap)
{ {
@ -1639,7 +1639,7 @@ void ContainerArea::moveDragIndicator(int pos)
void ContainerArea::updateBackground( const TQPixmap& pm ) void ContainerArea::updateBackground( const TQPixmap& pm )
{ {
TQBrush bgBrush(tqcolorGroup().background(), pm); TQBrush bgBrush(colorGroup().background(), pm);
TQPalette pal = kapp->palette(); TQPalette pal = kapp->palette();
pal.setBrush(TQColorGroup::Background, bgBrush); pal.setBrush(TQColorGroup::Background, bgBrush);
setPalette(pal); setPalette(pal);
@ -1728,13 +1728,13 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
//tqrepaint(); //tqrepaint();
} }
void ContainerArea::tqsetAlignment(KPanelExtension::Alignment a) void ContainerArea::setAlignment(KPanelExtension::Alignment a)
{ {
for (BaseContainer::ConstIterator it = m_containers.begin(); for (BaseContainer::ConstIterator it = m_containers.begin();
it != m_containers.end(); it != m_containers.end();
++it) ++it)
{ {
(*it)->tqsetAlignment(a); (*it)->setAlignment(a);
} }
} }
@ -1958,8 +1958,8 @@ void DragIndicator::paintEvent(TQPaintEvent*)
{ {
TQPainter painter(this); TQPainter painter(this);
TQRect rect(0, 0, width(), height()); TQRect rect(0, 0, width(), height());
tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, tqcolorGroup(), tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
TQStyle::Style_Default, tqcolorGroup().base() ); TQStyle::Style_Default, colorGroup().base() );
} }
void DragIndicator::mousePressEvent(TQMouseEvent*) void DragIndicator::mousePressEvent(TQMouseEvent*)

2
kicker/kicker/core/containerarea.h
Unescape View File

@ -101,7 +101,7 @@ public slots:
void removeContainers(BaseContainer::List containers); void removeContainers(BaseContainer::List containers);
void takeContainer(BaseContainer* a); void takeContainer(BaseContainer* a);
void setPosition(KPanelExtension::Position p); void setPosition(KPanelExtension::Position p);
void tqsetAlignment(KPanelExtension::Alignment a); void setAlignment(KPanelExtension::Alignment a);
void slotSaveContainerConfig(); void slotSaveContainerConfig();
void tqrepaint(); void tqrepaint();
void showAddAppletDialog(); void showAddAppletDialog();

8
kicker/kicker/core/containerarealayout.cpp
Unescape View File

@ -81,7 +81,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const
} }
else else
{ {
return item->tqsizeHint().height(); return item->sizeHint().height();
} }
} }
@ -94,7 +94,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const
} }
else 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(); return m_items[index]->item->widget();
} }
TQSize ContainerAreaLayout::tqsizeHint() const TQSize ContainerAreaLayout::sizeHint() const
{ {
const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); 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); const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny);

4
kicker/kicker/core/containerarealayout.h
Unescape View File

@ -83,8 +83,8 @@ class ContainerAreaLayout : public TQLayout
void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint);
TQStringList listItems() const; TQStringList listItems() const;
TQWidget* widgetAt(int index) const; TQWidget* widgetAt(int index) const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSize() const; TQSize minimumSize() const;
TQLayoutIterator iterator(); TQLayoutIterator iterator();
void setGeometry(const TQRect& rect); void setGeometry(const TQRect& rect);

2
kicker/kicker/core/extensionmanager.cpp
Unescape View File

@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar()
KMenuBar tmpmenu; KMenuBar tmpmenu;
tmpmenu.insertItem("KDE Rocks!"); tmpmenu.insertItem("KDE Rocks!");
m_menubarPanel->setSize(KPanelExtension::SizeCustom, m_menubarPanel->setSize(KPanelExtension::SizeCustom,
tmpmenu.tqsizeHint().height()); tmpmenu.sizeHint().height());
m_menubarPanel->writeConfig(); m_menubarPanel->writeConfig();
emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()),

16
kicker/kicker/core/kmenubase.ui
Unescape View File

@ -55,13 +55,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>52</height> <height>52</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>52</height> <height>52</height>
@ -129,13 +129,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>32</height> <height>32</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>32</height> <height>32</height>
@ -165,7 +165,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -222,7 +222,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>10</width> <width>10</width>
<height>20</height> <height>20</height>
@ -241,7 +241,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>90</width> <width>90</width>
<height>24</height> <height>24</height>
@ -270,7 +270,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>14</width> <width>14</width>
<height>20</height> <height>20</height>

8
kicker/kicker/core/menumanager.cpp
Unescape View File

@ -156,8 +156,8 @@ void MenuManager::kmenuAccelActivated()
r = desktop->geometry(); r = desktop->geometry();
else else
r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos()));
// kMenu->rect() is not valid before showing, use tqsizeHint() // kMenu->rect() is not valid before showing, use sizeHint()
p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->tqsizeHint()).center(); p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center();
m_kmenu->popup(p); m_kmenu->popup(p);
// when the cursor is in the area where the menu pops up, // 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 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 // 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(). // shown before, so we resize it here according to its sizeHint().
const TQSize size = m_kmenu->tqsizeHint(); const TQSize size = m_kmenu->sizeHint();
m_kmenu->resize(size.width(),size.height()); m_kmenu->resize(size.width(),size.height());
PanelPopupButton* button = findKButtonFor(m_kmenu->widget()); PanelPopupButton* button = findKButtonFor(m_kmenu->widget());

4
kicker/kicker/core/panelextension.cpp
Unescape View File

@ -100,7 +100,7 @@ void PanelExtension::populateContainerArea()
{ {
_containerArea->show(); _containerArea->show();
if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget())) if (ExtensionManager::the()->isMainPanel(topLevelWidget()))
{ {
setObjId("Panel"); setObjId("Panel");
_containerArea->initialize(true); _containerArea->initialize(true);
@ -139,7 +139,7 @@ void PanelExtension::positionChange(Position p)
_containerArea->setPosition(p); _containerArea->setPosition(p);
} }
TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const
{ {
TQSize size; TQSize size;

2
kicker/kicker/core/panelextension.h
Unescape View File

@ -80,7 +80,7 @@ k_dcop:
void configure(); // KDE4: remove, moved to Kikcker void configure(); // KDE4: remove, moved to Kikcker
public: public:
TQSize tqsizeHint(Position, TQSize maxSize) const; TQSize sizeHint(Position, TQSize maxSize) const;
Position preferedPosition() const { return Bottom; } Position preferedPosition() const { return Bottom; }
bool eventFilter( TQObject *, TQEvent * ); bool eventFilter( TQObject *, TQEvent * );

2
kicker/kicker/plugins/beaglesearch.cpp
Unescape View File

@ -347,7 +347,7 @@ BeagleUtil::timestringToBeagleTimestamp(TQString timestring)
//kdDebug () << "datetime string:" << timestring << endl; //kdDebug () << "datetime string:" << timestring << endl;
// FIXME: error check timestring format // FIXME: error check timestring format
if (timestring.isNull () || timestring.stripWhiteSpace () == "" || timestring.length() != 8 ) 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); //TQDateTime dt = TQDateTime::fromString (timestring, Qt::ISODate);
struct tm tm_time; struct tm tm_time;
time_t timet_time; time_t timet_time;

4
kicker/kicker/ui/addapplet.cpp
Unescape View File

@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView()
{ {
m_appletBox->layout()->activate(); m_appletBox->layout()->activate();
w = v->visibleWidth(); w = v->visibleWidth();
h = m_appletBox->tqlayout()->tqminimumSize().height(); h = m_appletBox->tqlayout()->minimumSize().height();
v->resizeContents(w, QMAX(h, v->visibleHeight())); v->resizeContents(w, QMAX(h, v->visibleHeight()));
if (w == m_appletBox->width() && h == m_appletBox->height()) if (w == m_appletBox->width() && h == m_appletBox->height())
break; break;
@ -456,7 +456,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet)
if (appletContainer) if (appletContainer)
{ {
ExtensionContainer* ec = ExtensionContainer* ec =
dynamic_cast<ExtensionContainer*>(m_containerArea->tqtopLevelWidget()); dynamic_cast<ExtensionContainer*>(m_containerArea->topLevelWidget());
if (ec) if (ec)
{ {

6
kicker/kicker/ui/addappletvisualfeedback.cpp
Unescape View File

@ -157,7 +157,7 @@ void AddAppletVisualFeedback::displayInternal()
// draw background // draw background
TQPainter bufferPainter(&m_pixmap); TQPainter bufferPainter(&m_pixmap);
bufferPainter.setPen(Qt::black); bufferPainter.setPen(Qt::black);
bufferPainter.setBrush(tqcolorGroup().background()); bufferPainter.setBrush(colorGroup().background());
bufferPainter.drawRoundRect(0, 0, width, height, bufferPainter.drawRoundRect(0, 0, width, height,
1600 / width, 1600 / height); 1600 / width, 1600 / height);
@ -175,14 +175,14 @@ void AddAppletVisualFeedback::displayInternal()
int textY = (height - textRect.height()) / 2; int textY = (height - textRect.height()) / 2;
// draw text shadow // draw text shadow
TQColorGroup cg = tqcolorGroup(); TQColorGroup cg = colorGroup();
cg.setColor(TQColorGroup::Text, cg.background().dark(115)); cg.setColor(TQColorGroup::Text, cg.background().dark(115));
int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, m_richText->draw(&bufferPainter, 5 + textX + shadowOffset,
textY + 1, TQRect(), cg); textY + 1, TQRect(), cg);
// draw text // draw text
cg = tqcolorGroup(); cg = colorGroup();
m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg);
} }
} }

6
kicker/kicker/ui/appletitem.ui
Unescape View File

@ -20,13 +20,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>80</height> <height>80</height>
@ -105,7 +105,7 @@
<property name="name"> <property name="name">
<cstring>itemPixmap</cstring> <cstring>itemPixmap</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
<height>64</height> <height>64</height>

4
kicker/kicker/ui/appletview.ui
Unescape View File

@ -110,7 +110,7 @@
<verstretch>1</verstretch> <verstretch>1</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>32767</height> <height>32767</height>
@ -141,7 +141,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>284</width> <width>284</width>
<height>20</height> <height>20</height>

2
kicker/kicker/ui/browser_mnu.cpp
Unescape View File

@ -429,7 +429,7 @@ void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev)
void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) void PanelBrowserMenu::dropEvent( TQDropEvent *ev )
{ {
KURL u( path() ); 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 ); KonqOperations::doDrop( &item, u, ev, this );
KPanelMenu::dropEvent(ev); KPanelMenu::dropEvent(ev);
// ### TODO: Update list // ### TODO: Update list

4
kicker/kicker/ui/exe_dlg.cpp
Unescape View File

@ -78,8 +78,8 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
this, TQT_SLOT(slotIconChanged(TQString))); this, TQT_SLOT(slotIconChanged(TQString)));
// leave decent space for the commandline // leave decent space for the commandline
resize(tqsizeHint().width() > 300 ? tqsizeHint().width() : 300, resize(sizeHint().width() > 300 ? sizeHint().width() : 300,
tqsizeHint().height()); sizeHint().height());
} }
void PanelExeDialog::slotOk() void PanelExeDialog::slotOk()

2
kicker/kicker/ui/flipscrollview.cpp
Unescape View File

@ -57,7 +57,7 @@ void BackFrame::drawContents( TQPainter *p )
{ {
TQColor gray( 230, 230, 230 ); TQColor gray( 230, 230, 230 );
if ( mouse_inside ) 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 else
p->fillRect( 3, 3, width() - 6, height() - 6, gray ); p->fillRect( 3, 3, width() - 6, height() - 6, gray );
p->setPen( gray.dark(110) ); p->setPen( gray.dark(110) );

8
kicker/kicker/ui/hidebutton.cpp
Unescape View File

@ -51,22 +51,22 @@ void HideButton::drawButton(TQPainter *p)
{ {
if (m_arrow == Qt::LeftArrow) if (m_arrow == Qt::LeftArrow)
{ {
p->setPen(tqcolorGroup().mid()); p->setPen(colorGroup().mid());
p->drawLine(width()-1, 0, width()-1, height()); p->drawLine(width()-1, 0, width()-1, height());
} }
else if (m_arrow == Qt::RightArrow) else if (m_arrow == Qt::RightArrow)
{ {
p->setPen(tqcolorGroup().mid()); p->setPen(colorGroup().mid());
p->drawLine(0, 0, 0, height()); p->drawLine(0, 0, 0, height());
} }
else if (m_arrow == Qt::UpArrow) else if (m_arrow == Qt::UpArrow)
{ {
p->setPen(tqcolorGroup().mid()); p->setPen(colorGroup().mid());
p->drawLine(0, height()-1, width(), height()-1); p->drawLine(0, height()-1, width(), height()-1);
} }
else if (m_arrow == Qt::DownArrow) else if (m_arrow == Qt::DownArrow)
{ {
p->setPen(tqcolorGroup().mid()); p->setPen(colorGroup().mid());
p->drawLine(0, 0, width(), 0); p->drawLine(0, 0, width(), 0);
} }

18
kicker/kicker/ui/itemview.cpp
Unescape View File

@ -166,7 +166,7 @@ void KMenuItem::setup()
void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align)
{ {
ItemView *listview = static_cast<ItemView*>( listView() ); ItemView *listview = static_cast<ItemView*>( listView() );
int bottom = listView()->tqitemRect( this ).bottom(); int bottom = listView()->itemRect( this ).bottom();
int diff = bottom - listView()->viewport()->height(); int diff = bottom - listView()->viewport()->height();
KPixmap pm; KPixmap pm;
@ -608,7 +608,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos )
if ( item->toolTip().isNull() ) if ( item->toolTip().isNull() )
return; return;
TQRect r = view->tqitemRect( item ); TQRect r = view->itemRect( item );
int headerPos = view->header()->sectionPos( 0 ); int headerPos = view->header()->sectionPos( 0 );
r.setLeft( headerPos ); r.setLeft( headerPos );
r.setRight( headerPos + view->header()->sectionSize( 0 ) ); r.setRight( headerPos + view->header()->sectionSize( 0 ) );
@ -915,7 +915,7 @@ void ItemView::contentsMousePressEvent ( TQMouseEvent * e )
KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) ); KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) );
if ( si ) if ( si )
{ {
if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) ) if ( si->hitsLink( vp - itemRect(si).topLeft() ) )
emit startURL( si->linkUrl() ); emit startURL( si->linkUrl() );
} }
} }
@ -928,7 +928,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
bool link_cursor = false; bool link_cursor = false;
KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( i ); KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( i );
if ( si ) if ( si )
link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() ); link_cursor = si->hitsLink( vp - itemRect(si).topLeft() );
if (i && !i->isSelectable() && !link_cursor) { if (i && !i->isSelectable() && !link_cursor) {
unsetCursor(); unsetCursor();
@ -965,7 +965,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e )
{ {
KListView::resizeEvent( e ); KListView::resizeEvent( e );
// if ( m_lastOne ) // if ( m_lastOne )
// int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height(); // int diff = itemRect( m_lastOne ).bottom() - viewport()->height();
} }
void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) 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:/")) { else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) {
TQString uri = kitem->path(); TQString uri = kitem->path();
if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
KDesktopFile df(uri,true); KDesktopFile df(uri,true);
uri=df.readURL(); uri=df.readURL();
} }
@ -1103,7 +1103,7 @@ const char * KMenuItemDrag::format(int i) const
return 0; return 0;
} }
TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const
{ {
if (TQString("application/kmenuitem") == mimeType) if (TQString("application/kmenuitem") == mimeType)
return a; return a;
@ -1138,7 +1138,7 @@ bool ItemView::acceptDrag (TQDropEvent* event) const
bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item)
{ {
TQByteArray a = e->tqencodedData("application/kmenuitem"); TQByteArray a = e->encodedData("application/kmenuitem");
if (a.isEmpty()) { if (a.isEmpty()) {
TQStringList l; TQStringList l;
@ -1211,7 +1211,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
TQString uri = item.m_path; 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); KDesktopFile df(uri,true);
uri=df.readURL(); uri=df.readURL();
} }

2
kicker/kicker/ui/itemview.h
Unescape View File

@ -248,7 +248,7 @@ class KMenuItemDrag : public TQDragObject
~KMenuItemDrag(); ~KMenuItemDrag();
virtual const char * format(int i = 0) const; 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 canDecode(const TQMimeSource * e);
static bool decode(const TQMimeSource* e, KMenuItemInfo& item); static bool decode(const TQMimeSource* e, KMenuItemInfo& item);

16
kicker/kicker/ui/k_mnu.cpp
Unescape View File

@ -211,7 +211,7 @@ void PanelKMenu::paletteChanged()
if (!loadSidePixmap()) if (!loadSidePixmap())
{ {
sidePixmap = sideTilePixmap = TQPixmap(); sidePixmap = sideTilePixmap = TQPixmap();
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
} }
} }
@ -584,7 +584,7 @@ void PanelKMenu::showMenu()
TQRect PanelKMenu::sideImageRect() TQRect PanelKMenu::sideImageRect()
{ {
return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(),
height() - 2*frameWidth() ), this ); height() - 2*frameWidth() ), this );
} }
@ -595,21 +595,21 @@ void PanelKMenu::resizeEvent(TQResizeEvent * e)
PanelServiceMenu::resizeEvent(e); PanelServiceMenu::resizeEvent(e);
setFrameRect( TQStyle::tqvisualRect( TQRect( sidePixmap.width(), 0, setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0,
width() - sidePixmap.width(), height() ), this ) ); width() - sidePixmap.width(), height() ), this ) );
} }
//Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. //Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough.
void PanelKMenu::resize(int width, int height) void PanelKMenu::resize(int width, int height)
{ {
width = kMax(width, tqmaximumSize().width()); width = kMax(width, maximumSize().width());
PanelServiceMenu::resize(width, height); PanelServiceMenu::resize(width, height);
} }
TQSize PanelKMenu::tqsizeHint() const TQSize PanelKMenu::sizeHint() const
{ {
TQSize s = PanelServiceMenu::tqsizeHint(); TQSize s = PanelServiceMenu::sizeHint();
// kdDebug(1210) << "PanelKMenu::tqsizeHint()" << endl; // kdDebug(1210) << "PanelKMenu::sizeHint()" << endl;
// kdDebug(1210) << s.width() << ", " << s.height() << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl;
return s; return s;
} }
@ -626,7 +626,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e)
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ), TQRect( 0, 0, width(), height() ),
tqcolorGroup(), TQStyle::Style_Default, colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) ); TQStyleOption( frameWidth(), 0 ) );
TQRect r = sideImageRect(); TQRect r = sideImageRect();

2
kicker/kicker/ui/k_mnu.h
Unescape View File

@ -59,7 +59,7 @@ public:
int insertClientMenu(KickerClientMenu *p); int insertClientMenu(KickerClientMenu *p);
void removeClientMenu(int id); void removeClientMenu(int id);
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
virtual void setMinimumSize(const TQSize &); virtual void setMinimumSize(const TQSize &);
virtual void setMaximumSize(const TQSize &); virtual void setMaximumSize(const TQSize &);
virtual void setMinimumSize(int, int); virtual void setMinimumSize(int, int);

6
kicker/kicker/ui/k_mnu_stub.cpp
Unescape View File

@ -97,11 +97,11 @@ void KMenuStub::resize(int w, int h)
return m_w.panelkmenu->resize(w, h); return m_w.panelkmenu->resize(w, h);
} }
TQSize KMenuStub::tqsizeHint() const TQSize KMenuStub::sizeHint() const
{ {
if(m_type == t_KMenu) if(m_type == t_KMenu)
return m_w.kmenu->tqsizeHint(); return m_w.kmenu->sizeHint();
return m_w.panelkmenu->tqsizeHint(); return m_w.panelkmenu->sizeHint();
} }
bool KMenuStub::highlightMenuItem( const TQString &menuId ) bool KMenuStub::highlightMenuItem( const TQString &menuId )

2
kicker/kicker/ui/k_mnu_stub.h
Unescape View File

@ -53,7 +53,7 @@ public:
void popup(const TQPoint &pos, int indexAtPoint = -1); void popup(const TQPoint &pos, int indexAtPoint = -1);
void selectFirstItem(); void selectFirstItem();
void resize(int, int); void resize(int, int);
TQSize tqsizeHint() const; TQSize sizeHint() const;
bool highlightMenuItem( const TQString &menuId ); bool highlightMenuItem( const TQString &menuId );
void clearRecentMenuItems(); void clearRecentMenuItems();
void initialize(); void initialize();

90
kicker/kicker/ui/k_new_mnu.cpp
Unescape View File

@ -302,7 +302,7 @@ KMenu::KMenu()
m_searchInternet->setPixmap(0,icon); m_searchInternet->setPixmap(0,icon);
setTabOrder(m_kcommand, m_searchResultsWidget); setTabOrder(m_kcommand, m_searchResultsWidget);
m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty(); m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty();
m_isShowing = false; m_isShowing = false;
if (!m_kerryInstalled) { if (!m_kerryInstalled) {
@ -421,7 +421,7 @@ void KMenu::setupUi()
{ {
m_stacker = new TQWidgetStack( this, "m_stacker" ); m_stacker = new TQWidgetStack( this, "m_stacker" );
m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); 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->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) );
// m_stacker->setFocusPolicy( TQ_StrongFocus ); // m_stacker->setFocusPolicy( TQ_StrongFocus );
m_stacker->setLineWidth( 0 ); m_stacker->setLineWidth( 0 );
@ -522,7 +522,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
m_sloppySourceClicked = true; m_sloppySourceClicked = true;
if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { 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) if (m_sloppySourceClicked)
timeout = 3000; timeout = 3000;
m_sloppyTimer.start(timeout); m_sloppyTimer.start(timeout);
@ -1699,14 +1699,14 @@ void KMenu::setOrientation(MenuOrientation orientation)
TQWidget *footer = m_footer->mainWidget(); TQWidget *footer = m_footer->mainWidget();
TQPixmap pix( 64, footer->height() ); TQPixmap pix( 64, footer->height() );
TQPainter p( &pix ); 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, p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0,
64, 3, KNewButton::self()->borderColor() ); 64, 3, KNewButton::self()->borderColor() );
p.end(); p.end();
footer->setPaletteBackgroundPixmap( pix ); footer->setPaletteBackgroundPixmap( pix );
} }
resizeEvent(new TQResizeEvent(tqsizeHint(), tqsizeHint())); resizeEvent(new TQResizeEvent(sizeHint(), sizeHint()));
} }
void KMenu::showMenu() void KMenu::showMenu()
@ -1762,7 +1762,7 @@ void KMenu::paintEvent(TQPaintEvent * e)
const BackgroundMode bgmode = backgroundMode(); const BackgroundMode bgmode = backgroundMode();
const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
p.setBrush( tqcolorGroup().brush( crole ) ); p.setBrush( colorGroup().brush( crole ) );
p.drawRect( 0, 0, width(), height() ); p.drawRect( 0, 0, width(), height() );
int ypos = m_search->mainWidget()->geometry().bottom(); int ypos = m_search->mainWidget()->geometry().bottom();
@ -1923,7 +1923,7 @@ void KMenu::createNewProgramList()
m_seenPrograms = KickerSettings::firstSeenApps(); m_seenPrograms = KickerSettings::firstSeenApps();
m_newInstalledPrograms.clear(); m_newInstalledPrograms.clear();
m_tqcurrentDate = TQDate::currentDate().toString(Qt::ISODate); m_currentDate = TQDate::currentDate().toString(Qt::ISODate);
bool initialize = (m_seenPrograms.count() == 0); bool initialize = (m_seenPrograms.count() == 0);
@ -1978,7 +1978,7 @@ void KMenu::createNewProgramList(TQString relPath)
if (!found) { if (!found) {
m_seenProgramsChanged=true; m_seenProgramsChanged=true;
m_seenPrograms+=shortStorageId; m_seenPrograms+=shortStorageId;
m_seenPrograms+=m_tqcurrentDate; m_seenPrograms+=m_currentDate;
if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
m_newInstalledPrograms+=s->storageId(); m_newInstalledPrograms+=s->storageId();
} }
@ -2744,7 +2744,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
m_popupPath.path = kitem->path(); m_popupPath.path = kitem->path();
m_popupPath.icon = kitem->icon(); 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); KDesktopFile df(m_popupPath.path,true);
m_popupPath.path=df.readURL(); m_popupPath.path=df.readURL();
} }
@ -2936,7 +2936,7 @@ void KMenu::slotContextMenu(int selected)
case EditMenu: case EditMenu:
accept(); accept();
proc = new KProcess(TQT_TQOBJECT(this)); 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 << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
proc->start(); proc->start();
break; 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 // put the search widget at the top of the menu and give it its desired
// height // height
m_search->mainWidget()->setGeometry( 0, ypos, width(), m_search->mainWidget()->setGeometry( 0, ypos, width(),
m_search->tqminimumSize().height() ); m_search->minimumSize().height() );
left_height -= m_search->tqminimumSize().height(); left_height -= m_search->minimumSize().height();
ypos += m_search->tqminimumSize().height(); ypos += m_search->minimumSize().height();
// place the footer widget at the bottom of the menu and give it its desired // place the footer widget at the bottom of the menu and give it its desired
// height // height
m_footer->mainWidget()->setGeometry( 0, height() - m_footer->tqminimumSize().height(), m_footer->mainWidget()->setGeometry( 0, height() - m_footer->minimumSize().height(),
width(), m_footer->tqminimumSize().height() ); width(), m_footer->minimumSize().height() );
left_height -= m_footer->tqminimumSize().height(); left_height -= m_footer->minimumSize().height();
// place the button box above the footer widget, horizontal placement // place the button box above the footer widget, horizontal placement
// has the width of the edge graphics subtracted // has the width of the edge graphics subtracted
m_tabBar->setGeometry(button_box_left.width(), m_tabBar->setGeometry(button_box_left.width(),
height() - m_footer->tqminimumSize().height() - height() - m_footer->minimumSize().height() -
m_tabBar->tqsizeHint().height(), m_tabBar->sizeHint().height(),
width() - button_box_left.width(), width() - button_box_left.width(),
m_tabBar->tqsizeHint().height() ); m_tabBar->sizeHint().height() );
left_height -= m_tabBar->tqsizeHint().height(); left_height -= m_tabBar->sizeHint().height();
// place the main (stacker) widget below the search widget, // place the main (stacker) widget below the search widget,
// in the remaining vertical space // 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 // place the 'footer' widget at the top of the menu and give it
// its desired height // its desired height
m_footer->mainWidget()->setGeometry( 0, m_footer->mainWidget()->setGeometry( 0,
ypos /*height() - m_footer->tqminimumSize().height()*/, ypos /*height() - m_footer->minimumSize().height()*/,
width(), width(),
m_footer->tqminimumSize().height() ); m_footer->minimumSize().height() );
ypos += m_footer->tqminimumSize().height(); ypos += m_footer->minimumSize().height();
left_height -= m_footer->tqminimumSize().height(); left_height -= m_footer->minimumSize().height();
// place the button box next at the top of the menu. // place the button box next at the top of the menu.
// has the width of the edge graphics subtracted // has the width of the edge graphics subtracted
m_tabBar->setGeometry(button_box_left.width(), ypos, width() - button_box_left.width(), 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(); ypos += m_tabBar->sizeHint().height();
left_height -= m_tabBar->tqsizeHint().height(); left_height -= m_tabBar->sizeHint().height();
// put the search widget above the footer widget // put the search widget above the footer widget
// height // height
m_search->mainWidget()->setGeometry( 0, m_search->mainWidget()->setGeometry( 0,
height() - m_search->tqminimumSize().height(), height() - m_search->minimumSize().height(),
width(), 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, // place the main (stacker) widget below the button box,
// in the remaining vertical space // in the remaining vertical space
@ -3167,14 +3167,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e )
if ( hasMouseTracking() && m_isresizing ) { if ( hasMouseTracking() && m_isresizing ) {
m_stacker->setMinimumSize( TQSize(0, 0) ); m_stacker->setMinimumSize( TQSize(0, 0) );
m_stacker->setMaximumSize( TQSize(32000, 32000) ); 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 ) { 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; int newY = y() + height() - newHeight;
setGeometry( x(), newY, newWidth, newHeight); setGeometry( x(), newY, newWidth, newHeight);
} }
else { 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; RecentlyLaunchedApps::the().m_bNeedToUpdate = true;
} }
TQSize KMenu::tqsizeHint() const TQSize KMenu::sizeHint() const
{ {
#warning FIXME #warning FIXME
// this should be only for the inner area so layout changes do not break it // 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); const int height = kMin(KickerSettings::kMenuHeight(), TQApplication::desktop()->screen()->height()-50);
TQSize wanted(width, height); TQSize wanted(width, height);
kdDebug() << "show " << tqminimumSizeHint() << " " << m_stacker->tqminimumSizeHint() << " " kdDebug() << "show " << minimumSizeHint() << " " << m_stacker->minimumSizeHint() << " "
<< m_searchFrame->tqminimumSizeHint() << " " << wanted << endl; << m_searchFrame->minimumSizeHint() << " " << wanted << endl;
bool isDefault = wanted.isNull(); bool isDefault = wanted.isNull();
wanted = wanted.expandedTo(tqminimumSizeHint()); wanted = wanted.expandedTo(minimumSizeHint());
if ( isDefault ) 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; return wanted;
} }
TQSize KMenu::tqminimumSizeHint() const TQSize KMenu::minimumSizeHint() const
{ {
TQSize minsize; TQSize minsize;
minsize.setWidth( minsize.width() + m_tabBar->tqsizeHint().width() ); minsize.setWidth( minsize.width() + m_tabBar->sizeHint().width() );
minsize.setWidth( QMAX( minsize.width(), minsize.setWidth( QMAX( minsize.width(),
m_search->tqminimumSize().width() ) ); m_search->minimumSize().width() ) );
minsize.setWidth( QMAX( minsize.width(), minsize.setWidth( QMAX( minsize.width(),
m_search->tqminimumSize().width() ) ); m_search->minimumSize().width() ) );
minsize.setHeight( minsize.height() + minsize.setHeight( minsize.height() +
m_search->tqminimumSize().height() + m_search->minimumSize().height() +
m_footer->tqminimumSize().height() + m_footer->minimumSize().height() +
180 ); // 180 is a very rough guess for 32 icon size 180 ); // 180 is a very rough guess for 32 icon size
return minsize; return minsize;
} }
@ -3558,7 +3558,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
else else
{ {
TQString uri = item.m_path; 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); KDesktopFile df(uri,true);
uri=df.readURL(); uri=df.readURL();
} }

6
kicker/kicker/ui/k_new_mnu.h
Unescape View File

@ -104,8 +104,8 @@ public:
enum MaskEffect { Plain, Dissolve }; enum MaskEffect { Plain, Dissolve };
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
void searchOver(); void searchOver();
void initCategoryTitlesUpdate(); void initCategoryTitlesUpdate();
@ -319,7 +319,7 @@ private:
TQStringList m_programsInMenu; TQStringList m_programsInMenu;
TQStringList m_newInstalledPrograms, m_seenPrograms; TQStringList m_newInstalledPrograms, m_seenPrograms;
bool m_seenProgramsChanged; bool m_seenProgramsChanged;
TQString m_tqcurrentDate; TQString m_currentDate;
MenuOrientation m_orientation; MenuOrientation m_orientation;
bool m_toolTipsEnabled; bool m_toolTipsEnabled;

20
kicker/kicker/ui/kickoff_bar.cpp
Unescape View File

@ -58,8 +58,8 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const
//selection flags //selection flags
if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
flags |= TQStyle::Style_MouseOver; flags |= TQStyle::Style_MouseOver;
tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), tqstyle().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
tqcolorGroup(), flags, TQStyleOption(t) ); colorGroup(), flags, TQStyleOption(t) );
paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); 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; TQRect r = br;
bool selected = m_tabsActivated && (currentTab() == t->identifier()); 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() ); p->setFont( font() );
TQFontMetrics fm = p->fontMetrics(); TQFontMetrics fm = p->fontMetrics();
@ -116,14 +116,14 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
// flags |= TQStyle::Style_Sunken; // flags |= TQStyle::Style_Sunken;
if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
flags |= TQStyle::Style_MouseOver; flags |= TQStyle::Style_MouseOver;
tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt, tqstyle().drawControl( TQStyle::CE_TabBarLabel, p, this, rt,
t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(), t->isEnabled() ? colorGroup(): tqpalette().disabled(),
flags, TQStyleOption(t) ); flags, TQStyleOption(t) );
} }
TQSize KickoffTabBar::tqsizeHint() const TQSize KickoffTabBar::sizeHint() const
{ {
TQSize s = TQTabBar::tqsizeHint(); TQSize s = TQTabBar::sizeHint();
return s; return s;
} }
@ -135,9 +135,9 @@ void KickoffTabBar::layoutTabs()
TQFontMetrics fm = fontMetrics(); TQFontMetrics fm = fontMetrics();
int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;
int hframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); int hframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); int vframe = tqstyle().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
int overlap = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); int overlap = tqstyle().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
TQSize s; TQSize s;
for (int t = 0; t < count(); ++t) for (int t = 0; t < count(); ++t)

2
kicker/kicker/ui/kickoff_bar.h
Unescape View File

@ -32,7 +32,7 @@ public:
KickoffTabBar(TQWidget* parent, const char* name); KickoffTabBar(TQWidget* parent, const char* name);
void deactivateTabs(bool b); void deactivateTabs(bool b);
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
protected: protected:
virtual void paint(TQPainter*, TQTab*, bool) const; virtual void paint(TQPainter*, TQTab*, bool) const;

6
kicker/kicker/ui/kmenuitembase.ui
Unescape View File

@ -20,13 +20,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>0</height> <height>0</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32767</width> <width>32767</width>
<height>80</height> <height>80</height>
@ -120,7 +120,7 @@
<property name="name"> <property name="name">
<cstring>itemPixmap</cstring> <cstring>itemPixmap</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
<height>64</height> <height>64</height>

8
kicker/kicker/ui/nonKDEButtonSettings.ui
Unescape View File

@ -121,7 +121,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -140,13 +140,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>58</width> <width>58</width>
<height>58</height> <height>58</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>58</width> <width>58</width>
<height>58</height> <height>58</height>
@ -199,7 +199,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>8</height> <height>8</height>

4
kicker/kicker/ui/popupmenutitle.h
Unescape View File

@ -69,11 +69,11 @@ public:
m_font.setBold(true); m_font.setBold(true);
} }
TQSize tqsizeHint() TQSize sizeHint()
{ {
TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
size.setHeight(size.height() + size.setHeight(size.height() +
(kapp->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); (kapp->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
return size; return size;
} }

4
kicker/kicker/ui/service_mnu.cpp
Unescape View File

@ -695,7 +695,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
case EditItem: case EditItem:
proc = new KProcess(TQT_TQOBJECT(this)); 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 << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
proc->start(); proc->start();
break; break;
@ -739,7 +739,7 @@ void PanelServiceMenu::slotContextMenu(int selected)
case EditMenu: case EditMenu:
proc = new KProcess(TQT_TQOBJECT(this)); 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 << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
proc->start(); proc->start();
break; break;

10
kicker/libkicker/global.cpp
Unescape View File

@ -161,7 +161,7 @@ int maxButtonDim()
int maxDim; int maxDim;
//return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge;
KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
kickerconfig->setGroup("General"); kickerconfig->setGroup("General");
maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);;
delete kickerconfig; delete kickerconfig;
@ -236,13 +236,13 @@ TQPoint popupPosition(KPanelApplet::Direction d,
{ {
case KPanelApplet::Left: case KPanelApplet::Left:
case KPanelApplet::Right: case KPanelApplet::Right:
r.setLeft( source->tqtopLevelWidget()->x() ); r.setLeft( source->topLevelWidget()->x() );
r.setWidth( source->tqtopLevelWidget()->width() ); r.setWidth( source->topLevelWidget()->width() );
break; break;
case KPanelApplet::Up: case KPanelApplet::Up:
case KPanelApplet::Down: case KPanelApplet::Down:
r.setTop( source->tqtopLevelWidget()->y() ); r.setTop( source->topLevelWidget()->y() );
r.setHeight( source->tqtopLevelWidget()->height() ); r.setHeight( source->topLevelWidget()->height() );
break; break;
} }
} }

8
kicker/libkicker/kickertip.cpp
Unescape View File

@ -392,8 +392,8 @@ void KickerTip::displayInternal()
// draw background // draw background
TQPainter bufferPainter(&m_pixmap); TQPainter bufferPainter(&m_pixmap);
bufferPainter.setPen(tqcolorGroup().foreground()); bufferPainter.setPen(colorGroup().foreground());
bufferPainter.setBrush(tqcolorGroup().background()); bufferPainter.setBrush(colorGroup().background());
//bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height);
drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); drawRoundRect(bufferPainter, TQRect(0, 0, width, height));
@ -409,13 +409,13 @@ void KickerTip::displayInternal()
if (KickerSettings::mouseOversShowText()) if (KickerSettings::mouseOversShowText())
{ {
// draw text shadow // draw text shadow
TQColorGroup cg = tqcolorGroup(); TQColorGroup cg = colorGroup();
cg.setColor(TQColorGroup::Text, cg.background().dark(115)); cg.setColor(TQColorGroup::Text, cg.background().dark(115));
int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg);
// draw text // draw text
cg = tqcolorGroup(); cg = colorGroup();
m_richText->draw(&bufferPainter, textX, textY, rect(), cg); m_richText->draw(&bufferPainter, textX, textY, rect(), cg);
} }
} }

2
kicker/libkicker/menuinfo.cpp
Unescape View File

@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
MenuInfo::MenuInfo(const TQString& desktopFile) 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"); df.setGroup("Desktop Entry");
TQStringList list = df.readListEntry("X-KDE-AuthorizeAction"); TQStringList list = df.readListEntry("X-KDE-AuthorizeAction");

22
kicker/libkicker/panelbutton.cpp
Unescape View File

@ -539,7 +539,7 @@ void PanelButton::drawButton(TQPainter *p)
if (m_tileColor.isValid()) if (m_tileColor.isValid())
{ {
p->fillRect(rect(), m_tileColor); p->fillRect(rect(), m_tileColor);
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
} }
else if (paletteBackgroundPixmap()) else if (paletteBackgroundPixmap())
{ {
@ -559,7 +559,7 @@ void PanelButton::drawButton(TQPainter *p)
else if (isDown() || isOn()) else if (isDown() || isOn())
{ {
// Draw tqshapes to indicate the down state. // 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); drawButtonLabel(p);
@ -569,8 +569,8 @@ void PanelButton::drawButton(TQPainter *p)
int x1, y1, x2, y2; int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&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); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
TQStyle::Style_Default, tqcolorGroup().button()); TQStyle::Style_Default, colorGroup().button());
} }
} }
@ -581,7 +581,7 @@ void PanelButton::drawDeepButton(TQPainter *p)
if (m_tileColor.isValid()) if (m_tileColor.isValid())
{ {
p->fillRect(rect(), m_tileColor); p->fillRect(rect(), m_tileColor);
tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup());
} }
else if (paletteBackgroundPixmap()) 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); TQRect btn_rect = TQRect(rect().x(), rect().y()+1, rect().width(), rect().height()-2);
if (isDown() || isOn()) { 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 { 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); drawButtonLabel(p,0,FALSE);
@ -608,8 +608,8 @@ void PanelButton::drawDeepButton(TQPainter *p)
int x1, y1, x2, y2; int x1, y1, x2, y2;
TQT_TQRECT_OBJECT(rect()).coords(&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); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3);
tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(),
TQStyle::Style_Default, tqcolorGroup().button()); 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) if (m_drawArrow && (m_highlight || active) && drawArrow)
{ {
TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; 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); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize);
switch (m_arrowDirection) switch (m_arrowDirection)
@ -762,7 +762,7 @@ void PanelButton::drawButtonLabel(TQPainter *p, int voffset, bool drawArrow)
{ {
flags |= TQStyle::Style_Down; flags |= TQStyle::Style_Down;
} }
tqstyle().tqdrawPrimitive(e, p, r, tqcolorGroup(), flags); tqstyle().tqdrawPrimitive(e, p, r, colorGroup(), flags);
} }
} }

10
kicker/libkicker/paneldrag.cpp
Unescape View File

@ -46,7 +46,7 @@ PanelDrag::~PanelDrag()
bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container) 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) if (a.size() != PANELDRAG_BUFSIZE)
{ {
@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
return false; return false;
} }
TQByteArray a = e->tqencodedData("application/basecontainerptr"); TQByteArray a = e->encodedData("application/basecontainerptr");
if (a.size() != PANELDRAG_BUFSIZE) if (a.size() != PANELDRAG_BUFSIZE)
{ {
return false; return false;
@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e)
return true; return true;
} }
TQByteArray PanelDrag::tqencodedData(const char * mimeType) const TQByteArray PanelDrag::encodedData(const char * mimeType) const
{ {
if (TQString("application/basecontainerptr") == mimeType && if (TQString("application/basecontainerptr") == mimeType &&
a.size() == PANELDRAG_BUFSIZE) a.size() == PANELDRAG_BUFSIZE)
@ -136,7 +136,7 @@ const char * AppletInfoDrag::format(int i) const
return 0; return 0;
} }
TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const
{ {
if (TQString("application/appletinfo") == mimeType) if (TQString("application/appletinfo") == mimeType)
{ {
@ -158,7 +158,7 @@ bool AppletInfoDrag::canDecode(const TQMimeSource * e)
bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container) bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container)
{ {
TQByteArray a = e->tqencodedData("application/appletinfo"); TQByteArray a = e->encodedData("application/appletinfo");
if (a.isEmpty()) if (a.isEmpty())
{ {

4
kicker/libkicker/paneldrag.h
Unescape View File

@ -39,7 +39,7 @@ class KDE_EXPORT PanelDrag : public TQDragObject
~PanelDrag(); ~PanelDrag();
virtual const char * format(int i = 0) const; 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 canDecode(const TQMimeSource * e);
static bool decode(const TQMimeSource* e, BaseContainer** container); static bool decode(const TQMimeSource* e, BaseContainer** container);
@ -55,7 +55,7 @@ class KDE_EXPORT AppletInfoDrag : public TQDragObject
~AppletInfoDrag(); ~AppletInfoDrag();
virtual const char * format(int i = 0) const; 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 canDecode(const TQMimeSource * e);
static bool decode(const TQMimeSource* e, AppletInfo& container); static bool decode(const TQMimeSource* e, AppletInfo& container);

8
kicker/libkicker/panner.cpp
Unescape View File

@ -103,8 +103,8 @@ void Panner::setupButtons()
{ {
_luSB->setArrowType(Qt::LeftArrow); _luSB->setArrowType(Qt::LeftArrow);
_rdSB->setArrowType(Qt::RightArrow); _rdSB->setArrowType(Qt::RightArrow);
_luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
_rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding));
TQToolTip::add(_luSB, i18n("Scroll left")); TQToolTip::add(_luSB, i18n("Scroll left"));
TQToolTip::add(_rdSB, i18n("Scroll right")); TQToolTip::add(_rdSB, i18n("Scroll right"));
setMinimumSize(24, 0); setMinimumSize(24, 0);
@ -117,8 +117,8 @@ void Panner::setupButtons()
{ {
_luSB->setArrowType(Qt::UpArrow); _luSB->setArrowType(Qt::UpArrow);
_rdSB->setArrowType(Qt::DownArrow); _rdSB->setArrowType(Qt::DownArrow);
_luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
_rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum));
TQToolTip::add(_luSB, i18n("Scroll up")); TQToolTip::add(_luSB, i18n("Scroll up"));
TQToolTip::add(_rdSB, i18n("Scroll down")); TQToolTip::add(_rdSB, i18n("Scroll down"));
setMinimumSize(0, 24); setMinimumSize(0, 24);

2
kicker/libkicker/panner.h
Unescape View File

@ -39,7 +39,7 @@ public:
Panner( TQWidget* parent, const char* name = 0 ); Panner( TQWidget* parent, const char* name = 0 );
~Panner(); ~Panner();
TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); } TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); }
Qt::Orientation orientation() const { return _orient; } Qt::Orientation orientation() const { return _orient; }
virtual void setOrientation(Qt::Orientation orientation); virtual void setOrientation(Qt::Orientation orientation);

14
kicker/libkicker/simplebutton.cpp
Unescape View File

@ -71,22 +71,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
update(); update();
} }
TQSize SimpleButton::tqsizeHint() const TQSize SimpleButton::sizeHint() const
{ {
const TQPixmap* pm = pixmap(); const TQPixmap* pm = pixmap();
if (!pm) if (!pm)
return TQButton::tqsizeHint(); return TQButton::sizeHint();
else else
return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN);
} }
TQSize SimpleButton::tqminimumSizeHint() const TQSize SimpleButton::minimumSizeHint() const
{ {
const TQPixmap* pm = pixmap(); const TQPixmap* pm = pixmap();
if (!pm) if (!pm)
return TQButton::tqminimumSizeHint(); return TQButton::minimumSizeHint();
else else
return TQSize(pm->width(), pm->height()); return TQSize(pm->width(), pm->height());
} }
@ -99,7 +99,7 @@ void SimpleButton::drawButton( TQPainter *p )
if (m_highlight || isDown() || isOn()) { if (m_highlight || isDown() || isOn()) {
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down; 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; _inside = false;
} }
TQSize SimpleArrowButton::tqsizeHint() const TQSize SimpleArrowButton::sizeHint() const
{ {
return TQSize( 12, 12 ); return TQSize( 12, 12 );
} }
@ -263,7 +263,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
if (isDown() || isOn()) flags |= TQStyle::Style_Down; if (isDown() || isOn()) flags |= TQStyle::Style_Down;
tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags); tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
if (m_forceStandardCursor) { if (m_forceStandardCursor) {
SimpleButton::drawButton(p); SimpleButton::drawButton(p);

6
kicker/libkicker/simplebutton.h
Unescape View File

@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public TQButton
SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE); SimpleButton(TQWidget *parent, const char *name = 0, bool forceStandardCursor = FALSE);
void setPixmap(const TQPixmap &pix); void setPixmap(const TQPixmap &pix);
void setOrientation(Qt::Orientation orientaton); void setOrientation(Qt::Orientation orientaton);
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
protected: protected:
void drawButton( TQPainter *p ); void drawButton( TQPainter *p );
@ -68,7 +68,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
public: public:
SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE); SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0, bool forceStandardCursor = FALSE);
virtual ~SimpleArrowButton() {}; virtual ~SimpleArrowButton() {};
TQSize tqsizeHint() const; TQSize sizeHint() const;
protected: protected:
virtual void enterEvent( TQEvent *e ); virtual void enterEvent( TQEvent *e );

10
kicker/menuext/tom/tom.cc
Unescape View File

@ -109,7 +109,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
l2->setBuddy(this); l2->setBuddy(this);
runLayout->addWidget(l2);*/ runLayout->addWidget(l2);*/
m_runEdit = new KHistoryCombo(this); 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->addWidget(m_runEdit, 10);
runLayout->addSpacing(KDialog::spacingHint()); runLayout->addSpacing(KDialog::spacingHint());
@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem
TQPainter p(this); TQPainter p(this);
TQRect r(rect()); TQRect r(rect());
// ew, nasty hack. may result in coredumps due to horrid C-style cast??? // 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 )); TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium ));
p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawPixmap(KDialog::spacingHint(), 1, icon);
p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); 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() 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 ); height() - 2*frameWidth() ), this );
} }
void TOM::resizeEvent(TQResizeEvent * e) 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 ) ); width() - m_sidePixmap.width(), height() ), this ) );
} }
@ -757,7 +757,7 @@ void TOM::paintEvent(TQPaintEvent * e)
tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
TQRect( 0, 0, width(), height() ), TQRect( 0, 0, width(), height() ),
tqcolorGroup(), TQStyle::Style_Default, colorGroup(), TQStyle::Style_Default,
TQStyleOption( frameWidth(), 0 ) ); TQStyleOption( frameWidth(), 0 ) );
TQRect r = sideImageRect(); TQRect r = sideImageRect();

4
kicker/proxy/appletproxy.cpp
Unescape View File

@ -372,14 +372,14 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data,
} }
return true; return true;
} }
else if ( fun == "tqsetAlignment(int)" ) else if ( fun == "setAlignment(int)" )
{ {
TQDataStream dataStream( data, IO_ReadOnly ); TQDataStream dataStream( data, IO_ReadOnly );
int tqalignment; int tqalignment;
dataStream >> tqalignment; dataStream >> tqalignment;
if(_applet) { if(_applet) {
_applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment ); _applet->setAlignment( (KPanelApplet::Alignment)tqalignment );
} }
return true; return true;
} }

8
kicker/proxy/extensionproxy.cpp
Unescape View File

@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID)
bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
TQCString& replyType, TQByteArray &replyData) TQCString& replyType, TQByteArray &replyData)
{ {
if ( fun == "tqsizeHint(int,TQSize)" ) if ( fun == "sizeHint(int,TQSize)" )
{ {
TQDataStream dataStream( data, IO_ReadOnly ); TQDataStream dataStream( data, IO_ReadOnly );
int pos; int pos;
@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
if(!_extension) if(!_extension)
reply << maxSize; reply << maxSize;
else else
reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize);
return true; return true;
} }
@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data,
} }
return true; return true;
} }
else if ( fun == "tqsetAlignment(int)" ) else if ( fun == "setAlignment(int)" )
{ {
TQDataStream dataStream( data, IO_ReadOnly ); TQDataStream dataStream( data, IO_ReadOnly );
int tqalignment; int tqalignment;
dataStream >> tqalignment; dataStream >> tqalignment;
if(_extension) { if(_extension) {
_extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); _extension->setAlignment( (KPanelExtension::Alignment)tqalignment );
} }
return true; return true;
} }

10
kicker/taskbar/taskbar.cpp
Unescape View File

@ -66,7 +66,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name )
blocklayout = true; blocklayout = true;
// init // init
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
// setup animation frames // setup animation frames
for (int i = 1; i < 11; i++) 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 // get our minimum height based on the minimum button height or the
// height of the font in use, which is largest // height of the font in use, which is largest
@ -171,7 +171,7 @@ TQSize TaskBar::tqsizeHint() const
return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); 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 // get our minimum height based on the minimum button height or the
// height of the font in use, which is largest // height of the font in use, which is largest
@ -898,9 +898,9 @@ void TaskBar::propagateMouseEvent( TQMouseEvent* e )
{ {
if ( !isTopLevel() ) if ( !isTopLevel() )
{ {
TQMouseEvent me( e->type(), mapTo( tqtopLevelWidget(), e->pos() ), TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ),
e->globalPos(), e->button(), e->state() ); e->globalPos(), e->button(), e->state() );
TQApplication::sendEvent( tqtopLevelWidget(), &me ); TQApplication::sendEvent( topLevelWidget(), &me );
} }
} }

4
kicker/taskbar/taskbar.h
Unescape View File

@ -47,8 +47,8 @@ public:
TaskBar( TQWidget *parent = 0, const char *name = 0 ); TaskBar( TQWidget *parent = 0, const char *name = 0 );
~TaskBar(); ~TaskBar();
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const;
void setOrientation( Orientation ); void setOrientation( Orientation );
void setArrowType( TQt::ArrowType at ); void setArrowType( TQt::ArrowType at );

12
kicker/taskbar/taskbarcontainer.cpp
Unescape View File

@ -135,7 +135,7 @@ void TaskBarContainer::configure()
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
KIcon::Panel, KIcon::Panel,
16)); 16));
windowListButton->setMinimumSize(windowListButton->tqsizeHint()); windowListButton->setMinimumSize(windowListButton->sizeHint());
layout->insertWidget(0, windowListButton); layout->insertWidget(0, windowListButton);
windowListButton->show(); windowListButton->show();
} }
@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
KIcon::Panel, KIcon::Panel,
16)); 16));
windowListButton->setMinimumSize(windowListButton->tqsizeHint()); windowListButton->setMinimumSize(windowListButton->sizeHint());
} }
} }
@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu()
pos.setX( pos.x() + width() ); pos.setX( pos.x() + width() );
break; break;
case KPanelApplet::Left: case KPanelApplet::Left:
pos.setX( pos.x() - windowListMenu->tqsizeHint().width() ); pos.setX( pos.x() - windowListMenu->sizeHint().width() );
break; break;
case KPanelApplet::Down: case KPanelApplet::Down:
pos.setY( pos.y() + height() ); pos.setY( pos.y() + height() );
break; break;
case KPanelApplet::Up: case KPanelApplet::Up:
pos.setY( pos.y() - windowListMenu->tqsizeHint().height() ); pos.setY( pos.y() - windowListMenu->sizeHint().height() );
default: default:
break; break;
} }
@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton()
connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); 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 ) { if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) {
return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE );
} }

2
kicker/taskbar/taskbarcontainer.h
Unescape View File

@ -48,7 +48,7 @@ public:
void popupDirectionChange( KPanelApplet::Direction ); void popupDirectionChange( KPanelApplet::Direction );
void preferences(); void preferences();
//FIXME: don't use Position, use Orientation //FIXME: don't use Position, use Orientation
TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const;
void setBackground(); void setBackground();
k_dcop: k_dcop:

22
kicker/taskbar/taskcontainer.cpp
Unescape View File

@ -315,7 +315,7 @@ void TaskContainer::resizeEvent( TQResizeEvent * )
{ {
// calculate the icon rect // calculate the icon rect
TQRect br( tqstyle().subRect( TQStyle::SR_PushButtonContents, this ) ); 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) void TaskContainer::add(Task::Ptr task)
@ -583,8 +583,8 @@ void TaskContainer::drawButton(TQPainter *p)
bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate));
bool reverse = TQApplication::reverseLayout(); bool reverse = TQApplication::reverseLayout();
TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this)); TQRect br(tqstyle().subRect(TQStyle::SR_PushButtonContents, this));
TQPoint shift = TQPoint(tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), TQPoint shift = TQPoint(tqstyle().pixelMetric(TQStyle::PM_ButtonShiftHorizontal),
tqstyle().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); tqstyle().pixelMetric(TQStyle::PM_ButtonShiftVertical));
// draw button background // draw button background
if (drawButton) if (drawButton)
@ -653,7 +653,7 @@ void TaskContainer::drawButton(TQPainter *p)
// draw modified overlay // draw modified overlay
if (!modPixmap.isNull()) if (!modPixmap.isNull())
{ {
TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos, TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos,
(height() - 16) / 2, 16, 16), (height() - 16) / 2, 16, 16),
this); this);
@ -670,7 +670,7 @@ void TaskContainer::drawButton(TQPainter *p)
// draw text // draw text
if (!text.isEmpty()) 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()), width() - textPos, height()),
this); this);
int textFlags = AlignVCenter | SingleLine; int textFlags = AlignVCenter | SingleLine;
@ -787,7 +787,7 @@ void TaskContainer::drawButton(TQPainter *p)
} }
int flags = TQStyle::Style_Enabled; 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); br.y(), 8, br.height()), this);
if (sunken) if (sunken)
{ {
@ -799,7 +799,7 @@ void TaskContainer::drawButton(TQPainter *p)
// draw mouse over frame in transparent mode // draw mouse over frame in transparent mode
if (m_mouseOver && halo) 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) if (aboutToActivate)
{ {
@ -1161,17 +1161,17 @@ void TaskContainer::popupMenu(int action)
pos.setX(pos.x() + width()); pos.setX(pos.x() + width());
break; break;
case LeftArrow: case LeftArrow:
pos.setX(pos.x() - m_menu->tqsizeHint().width()); pos.setX(pos.x() - m_menu->sizeHint().width());
break; break;
case DownArrow: case DownArrow:
if ( TQApplication::reverseLayout() ) 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() ); pos.setY( pos.y() + height() );
break; break;
case UpArrow: case UpArrow:
if ( TQApplication::reverseLayout() ) 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() - m_menu->tqsizeHint().height()); pos.setY(pos.y() - m_menu->sizeHint().height());
break; break;
default: default:
break; break;

2
kicker/taskmanager/tasklmbmenu.cpp
Unescape View File

@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg,
p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text);
} }
TQSize TaskMenuItem::tqsizeHint() TQSize TaskMenuItem::sizeHint()
{ {
TQFont font = TQFont(); TQFont font = TQFont();
if (m_isActive) if (m_isActive)

2
kicker/taskmanager/tasklmbmenu.h
Unescape View File

@ -38,7 +38,7 @@ public:
~TaskMenuItem(); ~TaskMenuItem();
void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
TQSize tqsizeHint(); TQSize sizeHint();
void setAttentionState(bool state) { m_attentionState = state; } void setAttentionState(bool state) { m_attentionState = state; }
private: private:

2
kicker/taskmanager/taskmanager.cpp
Unescape View File

@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e)
Task::List TaskDrag::decode( 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; Task::List tasks;
if (data.size()) if (data.size())

4
kioslave/filter/filter.cc
Unescape View File

@ -56,7 +56,7 @@ int kdemain( int argc, char ** argv)
FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app ) FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app )
: KIO::SlaveBase( protocol, pool, 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 ); filter = KFilterBase::findFilterByMimeType( mimetype );
Q_ASSERT(filter); Q_ASSERT(filter);
} }
@ -157,7 +157,7 @@ void FilterProtocol::get( const KURL & )
void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ ) 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) void FilterProtocol::setSubURL(const KURL &url)

2
kioslave/fish/fish.cpp
Unescape View File

@ -1436,7 +1436,7 @@ void fishProtocol::run() {
if (rc > 0) { if (rc > 0) {
int noff = received(buf,rc+offset); int noff = received(buf,rc+offset);
if (noff > 0) memmove(buf,buf+offset+rc-noff,noff); 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; offset = noff;
} else { } else {
if (errno == EINTR) if (errno == EINTR)

10
kioslave/ldap/kio_ldap.cpp
Unescape View File

@ -166,8 +166,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls,
{ {
TQString oid; bool critical; TQByteArray value; TQString oid; bool critical; TQByteArray value;
int i = 0; int i = 0;
while ( hasMetaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ) ) { while ( hasMetaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) {
TQCString val = metaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); TQCString val = metaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8();
LDIF::splitControl( val, oid, critical, value ); LDIF::splitControl( val, oid, critical, value );
kdDebug(7125) << "server ctrl #" << i << " value: " << val << kdDebug(7125) << "server ctrl #" << i << " value: " << val <<
" oid: " << oid << " critical: " << critical << " value: " << " oid: " << oid << " critical: " << critical << " value: " <<
@ -176,8 +176,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls,
i++; i++;
} }
i = 0; i = 0;
while ( hasMetaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ) ) { while ( hasMetaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) {
TQCString val = metaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); TQCString val = metaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8();
LDIF::splitControl( val, oid, critical, value ); LDIF::splitControl( val, oid, critical, value );
kdDebug(7125) << "client ctrl #" << i << " value: " << val << kdDebug(7125) << "client ctrl #" << i << " value: " << val <<
" oid: " << oid << " critical: " << critical << " value: " << " oid: " << oid << " critical: " << critical << " value: " <<
@ -519,7 +519,7 @@ void LDAPProtocol::fillAuthInfo( AuthInfo &info )
info.url.setPort( mPort ); info.url.setPort( mPort );
info.url.setUser( mUser ); info.url.setUser( mUser );
info.caption = i18n("LDAP Login"); info.caption = i18n("LDAP Login");
info.comment = TQString::tqfromLatin1( mProtocol ) + "://" + mHost + ":" + info.comment = TQString::fromLatin1( mProtocol ) + "://" + mHost + ":" +
TQString::number( mPort ); TQString::number( mPort );
info.commentLabel = i18n("site:"); info.commentLabel = i18n("site:");
info.username = mAuthSASL ? mUser : mBindName; info.username = mAuthSASL ? mUser : mBindName;

8
kioslave/mac/kio_mac.cpp
Unescape View File

@ -455,12 +455,12 @@ int MacProtocol::makeTime(TQString mday, TQString mon, TQString third) {
// otherwise it only prints the year // otherwise it only prints the year
TQRegExp hourMin("(..):(..)"); TQRegExp hourMin("(..):(..)");
if (hourMin.exactMatch(third)) { if (hourMin.exactMatch(third)) {
TQDate tqcurrentDate(TQDate::currentDate()); TQDate currentDate(TQDate::currentDate());
if (month > tqcurrentDate.month()) { if (month > currentDate.month()) {
year = tqcurrentDate.year() - 1; year = currentDate.year() - 1;
} else { } else {
year = tqcurrentDate.year(); year = currentDate.year();
} }
TQString h(hourMin.cap(1)); TQString h(hourMin.cap(1));
TQString m(hourMin.cap(2)); TQString m(hourMin.cap(2));

4
kioslave/man/kio_man.cpp
Unescape View File

@ -404,7 +404,7 @@ void MANProtocol::output(const char *insert)
{ {
m_outputBuffer.close(); m_outputBuffer.close();
data(m_outputBuffer.buffer()); data(m_outputBuffer.buffer());
m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); m_outputBuffer.setBuffer(TQByteArray());
m_outputBuffer.open(IO_WriteOnly); m_outputBuffer.open(IO_WriteOnly);
} }
} }
@ -505,7 +505,7 @@ void MANProtocol::get(const KURL& url )
m_outputBuffer.close(); m_outputBuffer.close();
data(m_outputBuffer.buffer()); data(m_outputBuffer.buffer());
m_outputBuffer.tqsetBufferFromCopy(TQByteArray()); m_outputBuffer.setBuffer(TQByteArray());
// tell we are done // tell we are done
data(TQByteArray()); data(TQByteArray());
} }

2
kioslave/media/kcmodule/managermoduleview.ui
Unescape View File

@ -59,7 +59,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>360</height> <height>360</height>

2
kioslave/media/kcmodule/notifiermoduleview.ui
Unescape View File

@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>70</width> <width>70</width>
<height>101</height> <height>101</height>

10
kioslave/media/kcmodule/serviceview.ui
Unescape View File

@ -20,7 +20,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>640</width> <width>640</width>
<height>480</height> <height>480</height>
@ -80,13 +80,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>40</width> <width>40</width>
<height>40</height> <height>40</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>40</width> <width>40</width>
<height>40</height> <height>40</height>
@ -117,7 +117,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -147,7 +147,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>

2
kioslave/media/mediamanager/halbackend.cpp
Unescape View File

@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi)
void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification) void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification)
{ {
kdDebug(1219) << "HALBackend::setProperties" << endl; 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); const Medium *cmedium = m_mediaList.findById(mediumUdi);
if ( cmedium ) if ( cmedium )

2
kioslave/media/medianotifier/notificationdialog.cpp
Unescape View File

@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett
updateActionsListBox(); updateActionsListBox();
resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) ); resize( TQSize(400,400).expandedTo( minimumSizeHint() ) );
m_actionWatcher = new KDirWatch(); m_actionWatcher = new KDirWatch();

4
kioslave/media/medianotifier/notificationdialogview.ui
Unescape View File

@ -42,13 +42,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>64</width> <width>64</width>
<height>64</height> <height>64</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>64</width> <width>64</width>
<height>64</height> <height>64</height>

6
kioslave/media/mounthelper/decryptdialog.ui
Unescape View File

@ -55,13 +55,13 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>48</height> <height>48</height>
</size> </size>
</property> </property>
<property name="tqmaximumSize"> <property name="maximumSize">
<size> <size>
<width>32</width> <width>32</width>
<height>32</height> <height>32</height>
@ -84,7 +84,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>41</height> <height>41</height>

2
kioslave/media/propsdlgplugin/propertiespagegui.ui
Unescape View File

@ -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"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

4
kioslave/nfs/kio_nfs.cpp
Unescape View File

@ -807,7 +807,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString&
struct passwd *user = getpwuid( uid ); struct passwd *user = getpwuid( uid );
if ( user ) 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; atom.m_str = user->pw_name;
} }
else else
@ -825,7 +825,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString&
struct group *grp = getgrgid( gid ); struct group *grp = getgrgid( gid );
if ( grp ) 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; atom.m_str = grp->gr_name;
} }
else else

18
kioslave/pop3/pop3.cc
Unescape View File

@ -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))); QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4)));
} }
TQString command = TQString::tqfromLatin1(cmd); TQString command = TQString::fromLatin1(cmd);
TQString serverMsg = TQString::tqfromLatin1(buf).mid(5).stripWhiteSpace(); TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace();
if (command.left(4) == "PASS") { if (command.left(4) == "PASS") {
command = i18n("PASS <your password>"); command = i18n("PASS <your password>");
@ -353,7 +353,7 @@ int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai )
{ {
char buf[512]; char buf[512];
TQString apop_string = TQString::tqfromLatin1("APOP "); TQString apop_string = TQString::fromLatin1("APOP ");
if (m_sUser.isEmpty() || m_sPass.isEmpty()) { if (m_sUser.isEmpty() || m_sPass.isEmpty()) {
// Prompt for usernames // Prompt for usernames
if (!openPassDlg(ai)) { if (!openPassDlg(ai)) {
@ -461,7 +461,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
{ {
#ifdef HAVE_LIBSASL2 #ifdef HAVE_LIBSASL2
char buf[512]; char buf[512];
TQString sasl_buffer = TQString::tqfromLatin1("AUTH"); TQString sasl_buffer = TQString::fromLatin1("AUTH");
int result; int result;
sasl_conn_t *conn = NULL; sasl_conn_t *conn = NULL;
@ -525,13 +525,13 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai )
TQByteArray challenge, tmp; TQByteArray challenge, tmp;
TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mechusing ); TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing );
challenge.setRawData( out, outlen ); challenge.setRawData( out, outlen );
KCodecs::base64Encode( challenge, tmp ); KCodecs::base64Encode( challenge, tmp );
challenge.resetRawData( out, outlen ); challenge.resetRawData( out, outlen );
if ( !tmp.isEmpty() ) { if ( !tmp.isEmpty() ) {
firstCommand += " "; firstCommand += " ";
firstCommand += TQString::tqfromLatin1( tmp.data(), tmp.size() ); firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() );
} }
challenge.resize( 2049 ); challenge.resize( 2049 );
@ -624,7 +624,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
m_sOldUser = m_sUser; m_sOldUser = m_sUser;
m_sOldPass = m_sPass; m_sOldPass = m_sPass;
TQString one_string = TQString::tqfromLatin1("USER "); TQString one_string = TQString::fromLatin1("USER ");
one_string.append( m_sUser ); one_string.append( m_sUser );
if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) {
@ -638,7 +638,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai )
return false; return false;
} }
one_string = TQString::tqfromLatin1("PASS "); one_string = TQString::fromLatin1("PASS ");
one_string.append(m_sPass); one_string.append(m_sPass);
if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { 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.setUser(m_sUser);
uds_url.setPass(m_sPass); uds_url.setPass(m_sPass);
uds_url.setHost(m_sServer); 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_str = uds_url.url();
atom.m_long = 0; atom.m_long = 0;
entry.append(atom); entry.append(atom);

6
kioslave/sftp/ksshprocess.cpp
Unescape View File

@ -206,7 +206,7 @@ void KSshProcess::removeSignalHandlers() {
KSshProcess::KSshProcess() KSshProcess::KSshProcess()
: mVersion(UNKNOWN_VER), mConnected(false), : mVersion(UNKNOWN_VER), mConnected(false),
mRunning(false), mConnectState(0) { mRunning(false), mConnectState(0) {
mSshPath = KStandardDirs::findExe(TQString::tqfromLatin1("ssh")); mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh"));
kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" <<
mSshPath << "]" << endl; mSshPath << "]" << endl;
@ -292,7 +292,7 @@ TQString KSshProcess::versionStr() {
return TQString::null; 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."); i18n("Error encountered while talking to ssh.");
mConnectState = STATE_FATAL; 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; mConnectState = STATE_TRY_PASSWD;
} }
else if( line.find(passphrasePrompt[mVersion]) != -1 ) { else if( line.find(passphrasePrompt[mVersion]) != -1 ) {

4
kioslave/smb/kio_smb_browse.cpp
Unescape View File

@ -409,7 +409,7 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom); udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE; 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); udsentry.append(atom);
} }
@ -429,7 +429,7 @@ void SMBSlave::listDir( const KURL& kurl )
udsentry.append(atom); udsentry.append(atom);
atom.m_uds = KIO::UDS_MIME_TYPE; 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); udsentry.append(atom);
atom.m_uds = KIO::UDS_URL; atom.m_uds = KIO::UDS_URL;

2
kioslave/smtp/capabilities.h
Unescape View File

@ -57,7 +57,7 @@ namespace KioSMTP {
return mCapabilities.find( cap.upper() ) != mCapabilities.end(); return mCapabilities.find( cap.upper() ) != mCapabilities.end();
} }
bool have( const TQCString & cap ) const { return have( TQString( cap.data() ) ); } 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; TQString asMetaDataString() const;

4
kioslave/smtp/command.cc
Unescape View File

@ -321,14 +321,14 @@ static sasl_callback_t callbacks[] = {
cmd = mUngetSASLResponse; cmd = mUngetSASLResponse;
mUngetSASLResponse = 0; mUngetSASLResponse = 0;
} else if ( mFirstTime ) { } else if ( mFirstTime ) {
TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mMechusing ); TQString firstCommand = "AUTH " + TQString::fromLatin1( mMechusing );
tmp.setRawData( mOut, mOutlen ); tmp.setRawData( mOut, mOutlen );
KCodecs::base64Encode( tmp, challenge ); KCodecs::base64Encode( tmp, challenge );
tmp.resetRawData( mOut, mOutlen ); tmp.resetRawData( mOut, mOutlen );
if ( !challenge.isEmpty() ) { if ( !challenge.isEmpty() ) {
firstCommand += " "; firstCommand += " ";
firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() ); firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() );
} }
cmd = firstCommand.latin1(); cmd = firstCommand.latin1();

8
kioslave/tar/tar.cc
Unescape View File

@ -125,7 +125,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro
path.truncate( len - 1 ); path.truncate( len - 1 );
} }
else else
path = TQString::tqfromLatin1("/"); path = TQString::fromLatin1("/");
kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl; kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl;
break; break;
} }
@ -248,9 +248,9 @@ void ArchiveProtocol::listDir( const KURL & url )
if ( path.isEmpty() ) if ( path.isEmpty() )
{ {
KURL redir( url.protocol() + TQString::tqfromLatin1( ":/") ); KURL redir( url.protocol() + TQString::fromLatin1( ":/") );
kdDebug( 7109 ) << "url.path()==" << url.path() << endl; 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; kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl;
redirection( redir ); redirection( redir );
finished(); finished();
@ -360,7 +360,7 @@ void ArchiveProtocol::stat( const KURL & url )
const KArchiveEntry* archiveEntry; const KArchiveEntry* archiveEntry;
if ( path.isEmpty() ) if ( path.isEmpty() )
{ {
path = TQString::tqfromLatin1( "/" ); path = TQString::fromLatin1( "/" );
archiveEntry = root; archiveEntry = root;
} else { } else {
path = TQString::fromLocal8Bit(remoteEncoding()->encode(path)); path = TQString::fromLocal8Bit(remoteEncoding()->encode(path));

4
kioslave/trash/kio_trash.cpp
Unescape View File

@ -78,10 +78,10 @@ TrashProtocol::TrashProtocol( const TQCString& protocol, const TQCString &pool,
{ {
struct passwd *user = getpwuid( getuid() ); struct passwd *user = getpwuid( getuid() );
if ( user ) if ( user )
m_userName = TQString::tqfromLatin1(user->pw_name); m_userName = TQString::fromLatin1(user->pw_name);
struct group *grp = getgrgid( getgid() ); struct group *grp = getgrgid( getgid() );
if ( grp ) if ( grp )
m_groupName = TQString::tqfromLatin1(grp->gr_name); m_groupName = TQString::fromLatin1(grp->gr_name);
} }
TrashProtocol::~TrashProtocol() TrashProtocol::~TrashProtocol()

4
kioslave/trash/trashimpl.cpp
Unescape View File

@ -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 += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1();
info += "\n"; info += "\n";
info += "DeletionDate="; info += "DeletionDate=";
info += TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ).latin1(); info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1();
info += "\n"; info += "\n";
size_t sz = info.size() - 1; // avoid trailing 0 from QCString 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; kdDebug() << k_funcinfo << src << " -> " << dest << endl;
if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) { if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) {
if (errno == EXDEV) { if (errno == EXDEV) {
error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename") ); error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") );
} else { } else {
if (( errno == EACCES ) || (errno == EPERM)) { if (( errno == EACCES ) || (errno == EPERM)) {
error( KIO::ERR_ACCESS_DENIED, dest ); error( KIO::ERR_ACCESS_DENIED, dest );

2
klipper/applet.cpp
Unescape View File

@ -91,7 +91,7 @@ void KlipperApplet::preferences()
void KlipperApplet::help() void KlipperApplet::help()
{ {
kapp->invokeHelp(TQString::null, TQString::tqfromLatin1("klipper")); kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper"));
} }
void KlipperApplet::about() void KlipperApplet::about()

10
klipper/configdialog.cpp
Unescape View File

@ -66,7 +66,7 @@ void ConfigDialog::show()
{ {
if ( !isVisible() ) { if ( !isVisible() ) {
KWinModule module(0, KWinModule::INFO_DESKTOP); KWinModule module(0, KWinModule::INFO_DESKTOP);
TQSize s1 = tqsizeHint(); TQSize s1 = sizeHint();
TQSize s2 = module.workArea().size(); TQSize s2 = module.workArea().size();
int w = s1.width(); int w = s1.width();
int h = s1.height(); int h = s1.height();
@ -299,13 +299,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget,
connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() )); 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); 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->setStretchFactor( label, 5 );
box = new TQHBox( this ); box = new TQHBox( this );
TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box ); TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box );
advanced->setFixedSize( advanced->tqsizeHint() ); advanced->setFixedSize( advanced->sizeHint() );
connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() )); connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() ));
(void) new TQWidget( box ); // spacer (void) new TQWidget( box ); // spacer
@ -410,8 +410,8 @@ void ActionWidget::slotAdvanced()
AdvancedWidget *widget = new AdvancedWidget( box ); AdvancedWidget *widget = new AdvancedWidget( box );
widget->setWMClasses( m_wmClasses ); widget->setWMClasses( m_wmClasses );
dlg.resize( dlg.tqsizeHint().width(), dlg.resize( dlg.sizeHint().width(),
dlg.tqsizeHint().height() +40); // or we get an ugly scrollbar :( dlg.sizeHint().height() +40); // or we get an ugly scrollbar :(
if ( dlg.exec() == TQDialog::Accepted ) { if ( dlg.exec() == TQDialog::Accepted ) {
m_wmClasses = widget->wmClasses(); m_wmClasses = widget->wmClasses();

8
klipper/configdialog.h
Unescape View File

@ -237,11 +237,11 @@ public:
ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
: KListView( parent, name ), _configWidget( configWidget ), : KListView( parent, name ), _configWidget( configWidget ),
_regExpEditor(0L) {} _regExpEditor(0L) {}
// TQListView has a weird idea of a tqsizeHint... // TQListView has a weird idea of a sizeHint...
virtual TQSize tqsizeHint () const { virtual TQSize sizeHint () const {
int w = tqminimumSizeHint().width(); int w = minimumSizeHint().width();
int h = header()->height(); int h = header()->height();
h += viewport()->tqsizeHint().height(); h += viewport()->sizeHint().height();
h += horizontalScrollBar()->height(); h += horizontalScrollBar()->height();
TQListViewItem *item = firstChild(); TQListViewItem *item = firstChild();

2
klipper/historyitem.cpp
Unescape View File

@ -52,7 +52,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource )
TQMap<TQString,TQString> metaData; TQMap<TQString,TQString> metaData;
if( KURLDrag::decode( &aSource, urls, metaData )) { if( KURLDrag::decode( &aSource, urls, metaData )) {
// this is from KonqDrag (libkonq) // 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 bool cut = !a.isEmpty() && (a.tqat(0) == '1'); // true if 1
return new HistoryURLItem( urls, metaData, cut ); return new HistoryURLItem( urls, metaData, cut );
} }

2
klipper/popupproxy.cpp
Unescape View File

@ -133,7 +133,7 @@ int PopupProxy::insertFromSpill( int index ) {
// discarding any that doesn't match the current filter. // discarding any that doesn't match the current filter.
// stop when the total number of items equal m_itemsPerMenu; // stop when the total number of items equal m_itemsPerMenu;
int count = 0; 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. // Force at least one item to be inserted.
remainingHeight = QMAX( remainingHeight, 0 ); remainingHeight = QMAX( remainingHeight, 0 );
for ( const HistoryItem* item = spillPointer.current(); for ( const HistoryItem* item = spillPointer.current();

14
klipper/toplevel.cpp
Unescape View File

@ -327,7 +327,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu )
{ {
Q_ASSERT( menu != 0L ); 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) { if (bPopupAtMouse) {
TQPoint g = TQCursor::pos(); TQPoint g = TQCursor::pos();
if ( size.height() < g.y() ) if ( size.height() < g.y() )
@ -1013,13 +1013,13 @@ TQString KlipperWidget::getClipboardHistoryItem(int i)
// //
bool KlipperWidget::ignoreClipboardChanges() const bool KlipperWidget::ignoreClipboardChanges() const
{ {
TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); TQWidget *focusWidget = tqApp->focusWidget();
if ( tqfocusWidget ) if ( focusWidget )
{ {
if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) || if ( focusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
(tqfocusWidget->parentWidget() && (focusWidget->parentWidget() &&
tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) && focusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
tqfocusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) ) focusWidget->parentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
{ {
return true; return true;
} }

2
klipper/urlgrabber.h
Unescape View File

@ -132,7 +132,7 @@ public:
inline bool matches( const TQString& string ) { inline bool matches( const TQString& string ) {
int res = myRegExp.search( string ) ; int res = myRegExp.search( string ) ;
if ( res != -1 ) { if ( res != -1 ) {
myCapturedTexts = myRegExp.tqcapturedTexts(); myCapturedTexts = myRegExp.capturedTexts();
return true; return true;
} }
return false; return false;

4
kmenuedit/basictab.cpp
Unescape View File

@ -468,8 +468,8 @@ void BasicTab::slotCapturedShortcut(const KShortcut& cut)
if (signalsBlocked()) if (signalsBlocked())
return; return;
if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, tqtopLevelWidget()) if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget())
|| KKeyChooser::checkStandardShortcutsConflict( cut, true, tqtopLevelWidget())) || KKeyChooser::checkStandardShortcutsConflict( cut, true, topLevelWidget()))
return; return;
if ( KHotKeys::present() ) if ( KHotKeys::present() )

2
kmenuedit/kmenuedit.cpp
Unescape View File

@ -121,7 +121,7 @@ void KMenuEdit::slotChangeView()
#endif #endif
// disabling the updates prevents unnecessary redraws // disabling the updates prevents unnecessary redraws
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
guiFactory()->removeClient( this ); guiFactory()->removeClient( this );
delete m_actionDelete; delete m_actionDelete;

10
knetattach/knetattach.ui
Unescape View File

@ -96,7 +96,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>250</width> <width>250</width>
<height>0</height> <height>0</height>
@ -131,7 +131,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>31</width> <width>31</width>
<height>16</height> <height>16</height>
@ -159,7 +159,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -200,7 +200,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>21</height> <height>21</height>
@ -327,7 +327,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>560</width> <width>560</width>
<height>16</height> <height>16</height>

16
konqueror/KonquerorIface.cc
Unescape View File

@ -251,18 +251,18 @@ bool KonquerorIface::processCanBeReused( int screen )
TQStringList allowed_parts = KonqSettings::safeParts(); TQStringList allowed_parts = KonqSettings::safeParts();
bool all_parts_allowed = false; 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(); allowed_parts.clear();
// is duplicated in client/kfmclient.cc // is duplicated in client/kfmclient.cc
allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
<< TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) << TQString::fromLatin1( "konq_multicolumnview.desktop" )
<< TQString::tqfromLatin1( "konq_sidebartng.desktop" ) << TQString::fromLatin1( "konq_sidebartng.desktop" )
<< TQString::tqfromLatin1( "konq_infolistview.desktop" ) << TQString::fromLatin1( "konq_infolistview.desktop" )
<< TQString::tqfromLatin1( "konq_treeview.desktop" ) << TQString::fromLatin1( "konq_treeview.desktop" )
<< TQString::tqfromLatin1( "konq_detailedlistview.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(); allowed_parts.clear();
all_parts_allowed = true; all_parts_allowed = true;

14
konqueror/about/konq_aboutpage.cc
Unescape View File

@ -77,9 +77,9 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file )
res = t.read(); res = t.read();
// otherwise all embedded objects are referenced as about:/... // 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( '/' )) + file.left( file.findRev( '/' )) +
TQString::tqfromLatin1("/\">\n"); TQString::fromLatin1("/\">\n");
TQRegExp reg("<head>"); TQRegExp reg("<head>");
reg.setCaseSensitive(FALSE); reg.setCaseSensitive(FALSE);
res.replace(reg, "<head>\n\t" + basehref); res.replace(reg, "<head>\n\t" + basehref);
@ -507,32 +507,32 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con
return; return;
} }
if ( url == TQString::tqfromLatin1("launch.html") ) if ( url == TQString::fromLatin1("launch.html") )
{ {
emit browserExtension()->openURLNotify(); emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::launch(), "konqueror" ); serve( KonqAboutPageFactory::launch(), "konqueror" );
return; return;
} }
else if ( url == TQString::tqfromLatin1("intro.html") ) else if ( url == TQString::fromLatin1("intro.html") )
{ {
emit browserExtension()->openURLNotify(); emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::intro(), "konqueror" ); serve( KonqAboutPageFactory::intro(), "konqueror" );
return; return;
} }
else if ( url == TQString::tqfromLatin1("specs.html") ) else if ( url == TQString::fromLatin1("specs.html") )
{ {
emit browserExtension()->openURLNotify(); emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::specs(), "konqueror" ); serve( KonqAboutPageFactory::specs(), "konqueror" );
return; return;
} }
else if ( url == TQString::tqfromLatin1("tips.html") ) else if ( url == TQString::fromLatin1("tips.html") )
{ {
emit browserExtension()->openURLNotify(); emit browserExtension()->openURLNotify();
serve( KonqAboutPageFactory::tips(), "konqueror" ); serve( KonqAboutPageFactory::tips(), "konqueror" );
return; return;
} }
else if ( url == TQString::tqfromLatin1("config:/disable_overview") ) else if ( url == TQString::fromLatin1("config:/disable_overview") )
{ {
if ( KMessageBox::questionYesNo( widget(), if ( KMessageBox::questionYesNo( widget(),
i18n("Do you want to disable showing " i18n("Do you want to disable showing "

52
konqueror/client/kfmclient.cc
Unescape View File

@ -178,33 +178,33 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
*/ */
static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile ) 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" ); cfg.setGroup( "Reusing" );
TQStringList allowed_parts; TQStringList allowed_parts;
// is duplicated in ../KonquerorIface.cc // is duplicated in ../KonquerorIface.cc
allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
<< TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) << TQString::fromLatin1( "konq_multicolumnview.desktop" )
<< TQString::tqfromLatin1( "konq_sidebartng.desktop" ) << TQString::fromLatin1( "konq_sidebartng.desktop" )
<< TQString::tqfromLatin1( "konq_infolistview.desktop" ) << TQString::fromLatin1( "konq_infolistview.desktop" )
<< TQString::tqfromLatin1( "konq_treeview.desktop" ) << TQString::fromLatin1( "konq_treeview.desktop" )
<< TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); << TQString::fromLatin1( "konq_detailedlistview.desktop" );
if( cfg.hasKey( "SafeParts" ) if( cfg.hasKey( "SafeParts" )
&& cfg.readEntry( "SafeParts" ) != TQString::tqfromLatin1( "SAFE" )) && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" ))
allowed_parts = cfg.readListEntry( "SafeParts" ); 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 return false; // all parts allowed
if( url.isEmpty()) if( url.isEmpty())
{ {
if( profile.isEmpty()) if( profile.isEmpty())
return true; return true;
TQString profilepath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profile ); TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile );
if( profilepath.isEmpty()) if( profilepath.isEmpty())
return true; return true;
KConfig cfg( profilepath, true ); KConfig cfg( profilepath, true );
cfg.setDollarExpansion( true ); cfg.setDollarExpansion( true );
cfg.setGroup( "Profile" ); cfg.setGroup( "Profile" );
TQMap< TQString, TQString > entries = cfg.entryMap( TQString::tqfromLatin1( "Profile" )); TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" ));
TQRegExp urlregexp( TQString::tqfromLatin1( "^View[0-9]*_URL$" )); TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" ));
TQStringList urls; TQStringList urls;
for( TQMap< TQString, TQString >::ConstIterator it = entries.begin(); for( TQMap< TQString, TQString >::ConstIterator it = entries.begin();
it != entries.end(); it != entries.end();
@ -218,16 +218,16 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
if( urls.count() != 1 ) if( urls.count() != 1 )
return true; return true;
url = urls.first(); url = urls.first();
mimetype = TQString::tqfromLatin1( "" ); mimetype = TQString::fromLatin1( "" );
} }
if( mimetype.isEmpty()) if( mimetype.isEmpty())
mimetype = KMimeType::findByURL( KURL( url ) )->name(); 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 ); TQString::null, TQString::null );
KService::Ptr serv; KService::Ptr serv;
if( offers.count() > 0 ) if( offers.count() > 0 )
serv = offers.first(); 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() 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 ! // when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile !
static TQCString getPreloadedKonqy() static TQCString getPreloadedKonqy()
{ {
KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
cfg.setGroup( "Reusing" ); cfg.setGroup( "Reusing" );
if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 ) if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 )
return ""; return "";
@ -301,8 +301,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
// check if user wants to use external browser // check if user wants to use external browser
// ###### this option seems to have no GUI and to be redundant with BrowserApplication now. // ###### this option seems to have no GUI and to be redundant with BrowserApplication now.
// ###### KDE4: remove // ###### KDE4: remove
KConfig config( TQString::tqfromLatin1("kfmclientrc")); KConfig config( TQString::fromLatin1("kfmclientrc"));
config.setGroup( TQString::tqfromLatin1("Settings")); config.setGroup( TQString::fromLatin1("Settings"));
TQString strBrowser = config.readPathEntry("ExternalBrowser"); TQString strBrowser = config.readPathEntry("ExternalBrowser");
if (!strBrowser.isEmpty()) if (!strBrowser.isEmpty())
{ {
@ -314,7 +314,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
return true; return true;
} }
if (url.protocol().startsWith(TQString::tqfromLatin1("http"))) if (url.protocol().startsWith(TQString::fromLatin1("http")))
{ {
config.setGroup("General"); config.setGroup("General");
if (!config.readEntry("BrowserApplication").isEmpty()) 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" ); cfg.setGroup( "FMSettings" );
if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) ) if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) )
{ {
@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co
{ {
TQString error; TQString error;
/* Well, we can't pass a mimetype through startServiceByDesktopPath ! /* 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 ) url.url(), &error ) > 0 )
{ {
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; 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()) if( appId.isEmpty())
{ {
TQString error; TQString error;
if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"),
TQString::tqfromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 )
{ {
kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl;
return false; 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 // 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() ) if ( profile.isEmpty() )
{ {
fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() ); fprintf( stderr, "%s", i18n("Profile %1 not found\n").tqarg(profileName).local8Bit().data() );
@ -479,7 +479,7 @@ bool clientApp::doIt()
} }
if ( argc == 3 ) 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" ) else if ( command == "openProfile" )
@ -529,7 +529,7 @@ bool clientApp::doIt()
{ {
KURL::List urls; KURL::List urls;
urls.append( args->url(1) ); 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; if (offers.isEmpty()) return 1;
KService::Ptr serv = offers.first(); KService::Ptr serv = offers.first();
return KRun::run( *serv, urls ); return KRun::run( *serv, urls );

18
konqueror/iconview/konq_iconview.cc
Unescape View File

@ -359,7 +359,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons
// Create the directory lister // Create the directory lister
m_dirLister = new KDirLister( true ); m_dirLister = new KDirLister( true );
setDirLister( m_dirLister ); setDirLister( m_dirLister );
m_dirLister->setMainWindow(m_pIconView->tqtopLevelWidget()); m_dirLister->setMainWindow(m_pIconView->topLevelWidget());
connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ),
this, TQT_SLOT( slotStarted() ) ); this, TQT_SLOT( slotStarted() ) );
@ -872,7 +872,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url )
// the completed() signal, so handle that case. // the completed() signal, so handle that case.
if ( !m_pIconView->viewport()->isUpdatesEnabled() ) if ( !m_pIconView->viewport()->isUpdatesEnabled() )
{ {
m_pIconView->viewport()->tqsetUpdatesEnabled( true ); m_pIconView->viewport()->setUpdatesEnabled( true );
m_pIconView->viewport()->tqrepaint(); m_pIconView->viewport()->tqrepaint();
} }
if ( m_pEnsureVisible ){ if ( m_pEnsureVisible ){
@ -892,7 +892,7 @@ void KonqKfmIconView::slotCompleted()
// not been called), a viewport tqrepaint is forced. // not been called), a viewport tqrepaint is forced.
if ( !m_pIconView->viewport()->isUpdatesEnabled() ) if ( !m_pIconView->viewport()->isUpdatesEnabled() )
{ {
m_pIconView->viewport()->tqsetUpdatesEnabled( true ); m_pIconView->viewport()->setUpdatesEnabled( true );
m_pIconView->viewport()->tqrepaint(); m_pIconView->viewport()->tqrepaint();
} }
@ -952,7 +952,7 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
// We need to disable graphics updates on the iconview when // We need to disable graphics updates on the iconview when
// inserting items, or else a blank paint operation will be // inserting items, or else a blank paint operation will be
// performed on the top-left corner for each inserted item! // 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) for (KFileItemListIterator it(entries); it.current(); ++it)
{ {
//kdDebug(1202) << "KonqKfmIconView::slotNewItem(...)" << _fileitem->url().url() << endl; //kdDebug(1202) << "KonqKfmIconView::slotNewItem(...)" << _fileitem->url().url() << endl;
@ -1006,11 +1006,11 @@ void KonqKfmIconView::slotNewItems( const KFileItemList& entries )
m_itemDict.insert( *it, item ); m_itemDict.insert( *it, item );
} }
// After filtering out updates-on-insertions we can re-enable updates // 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 // Locking the viewport has filtered out blanking and now, since we
// have some items to draw, we can restore updating. // have some items to draw, we can restore updating.
if ( !m_pIconView->viewport()->isUpdatesEnabled() ) if ( !m_pIconView->viewport()->isUpdatesEnabled() )
m_pIconView->viewport()->tqsetUpdatesEnabled( true ); m_pIconView->viewport()->setUpdatesEnabled( true );
KonqDirPart::newItems( entries ); KonqDirPart::newItems( entries );
} }
@ -1150,7 +1150,7 @@ void KonqKfmIconView::slotClear()
// meaningless paint operations (such as a clear() just before drawing // meaningless paint operations (such as a clear() just before drawing
// fresh contents) we disable updating the viewport until we'll // fresh contents) we disable updating the viewport until we'll
// receive some data or a timeout timer expires. // receive some data or a timeout timer expires.
m_pIconView->viewport()->tqsetUpdatesEnabled( false ); m_pIconView->viewport()->setUpdatesEnabled( false );
if ( !m_pTimeoutRefreshTimer ) if ( !m_pTimeoutRefreshTimer )
{ {
m_pTimeoutRefreshTimer = new TQTimer( this ); m_pTimeoutRefreshTimer = new TQTimer( this );
@ -1247,9 +1247,9 @@ void KonqKfmIconView::slotRefreshViewport()
kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl; kdDebug(1202) << "KonqKfmIconView::slotRefreshViewport()" << endl;
TQWidget * vp = m_pIconView->viewport(); TQWidget * vp = m_pIconView->viewport();
bool prevState = vp->isUpdatesEnabled(); bool prevState = vp->isUpdatesEnabled();
vp->tqsetUpdatesEnabled( true ); vp->setUpdatesEnabled( true );
vp->tqrepaint(); vp->tqrepaint();
vp->tqsetUpdatesEnabled( prevState ); vp->setUpdatesEnabled( prevState );
} }
bool KonqKfmIconView::doOpenURL( const KURL & url ) bool KonqKfmIconView::doOpenURL( const KURL & url )

4
konqueror/keditbookmarks/commands.cpp
Unescape View File

@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource(
bool modified = false; bool modified = false;
const char *format = 0; const char *format = 0;
for (int i = 0; format = data->format(i), format; i++) { 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 // blah is not a stored mimetype should return null
// or not. so, we search. sucky... // or not. so, we search. sucky...
if (strcmp(format, "GALEON_BOOKMARK") == 0) { if (strcmp(format, "GALEON_BOOKMARK") == 0) {
modified = true; modified = true;
TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel"); TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel");
mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK")); mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK"));
data = mydrag; data = mydrag;
break; break;
} else if( strcmp(format, "application/x-xbel" )==0) { } else if( strcmp(format, "application/x-xbel" )==0) {

4
konqueror/keditbookmarks/main.cpp
Unescape View File

@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) {
bool gotArg = (args->count() == 1); bool gotArg = (args->count() == 1);
TQString filename = gotArg TQString filename = gotArg
? TQString::tqfromLatin1(args->arg(0)) ? TQString::fromLatin1(args->arg(0))
: locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
if (!isGui) { if (!isGui) {
CurrentMgr::self()->createManager(filename); CurrentMgr::self()->createManager(filename);

8
konqueror/keditbookmarks/toplevel.cpp
Unescape View File

@ -184,7 +184,7 @@ TQString CurrentMgr::makeTimeStr(int b)
{ {
TQDateTime dt; TQDateTime dt;
dt.setTime_t(b); 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()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false)
: KGlobal::locale()->formatDateTime(dt, false); : KGlobal::locale()->formatDateTime(dt, false);
} }
@ -233,11 +233,11 @@ KEBApp::KEBApp(
vsplitter->setOrientation(Qt::Vertical); vsplitter->setOrientation(Qt::Vertical);
vsplitter->setSizes(TQValueList<int>() << h << 380 vsplitter->setSizes(TQValueList<int>() << h << 380
<< m_bkinfo->tqsizeHint().height() ); << m_bkinfo->sizeHint().height() );
setCentralWidget(vsplitter); setCentralWidget(vsplitter);
resize(ListView::self()->widget()->tqsizeHint().width(), resize(ListView::self()->widget()->sizeHint().width(),
vsplitter->tqsizeHint().height()); vsplitter->sizeHint().height());
createActions(); createActions();
if (m_browser) if (m_browser)

34
konqueror/konq_combo.cc
Unescape View File

@ -99,7 +99,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name )
m_pageSecurity( KonqMainWindow::NotCrypted ) m_pageSecurity( KonqMainWindow::NotCrypted )
{ {
setInsertionPolicy( NoInsertion ); setInsertionPolicy( NoInsertion );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
Q_ASSERT( s_config ); Q_ASSERT( s_config );
@ -272,14 +272,14 @@ void KonqCombo::updateItem( const TQPixmap& pix, const TQString& t, int index, c
listBox()->changeItem( item, index ); listBox()->changeItem( item, index );
/* /*
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
lineEdit()->tqsetUpdatesEnabled( false ); lineEdit()->setUpdatesEnabled( false );
removeItem( index ); removeItem( index );
insertItem( pix, t, index ); insertItem( pix, t, index );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
lineEdit()->tqsetUpdatesEnabled( true ); lineEdit()->setUpdatesEnabled( true );
update(); update();
*/ */
} }
@ -301,12 +301,12 @@ void KonqCombo::updatePixmaps()
{ {
saveState(); saveState();
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
KonqPixmapProvider *prov = KonqPixmapProvider::self(); KonqPixmapProvider *prov = KonqPixmapProvider::self();
for ( int i = 1; i < count(); i++ ) { for ( int i = 1; i < count(); i++ ) {
updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) ); updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) );
} }
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
tqrepaint(); tqrepaint();
restoreState(); restoreState();
@ -521,15 +521,15 @@ void KonqCombo::slotRemoved( const TQString& item )
void KonqCombo::removeURL( const TQString& url ) void KonqCombo::removeURL( const TQString& url )
{ {
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
lineEdit()->tqsetUpdatesEnabled( false ); lineEdit()->setUpdatesEnabled( false );
removeFromHistory( url ); removeFromHistory( url );
applyPermanent(); applyPermanent();
setTemporary( currentText() ); setTemporary( currentText() );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
lineEdit()->tqsetUpdatesEnabled( true ); lineEdit()->setUpdatesEnabled( true );
update(); update();
} }
@ -540,7 +540,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) { if ( e->button() == Qt::LeftButton && pixmap( currentItem()) ) {
// check if the pixmap was clicked // check if the pixmap was clicked
int x = e->pos().x(); 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() ) { if ( x > x0 + 2 && x < lineEdit()->x() ) {
m_dragStart = e->pos(); m_dragStart = e->pos();
@ -551,7 +551,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e )
if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { if ( e->button() == Qt::LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) {
// check if the lock icon was clicked // check if the lock icon was clicked
int x = e->pos().x(); 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 ) if ( x < x0 )
emit showPageSecurity(); emit showPageSecurity();
@ -605,7 +605,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe )
TQLineEdit *edit = lineEdit(); TQLineEdit *edit = lineEdit();
TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); 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 ) { if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) {
TQColor color(245, 246, 190); TQColor color(245, 246, 190);
@ -723,8 +723,8 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter )
pmWidth = pm->width() + 5; pmWidth = pm->width() + 5;
} }
int entryWidth = listBox()->width() - listBox()->tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) - int entryWidth = listBox()->width() - listBox()->tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) -
2 * listBox()->tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); 2 * listBox()->tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth );
int titleWidth = ( entryWidth / 3 ) - 1; int titleWidth = ( entryWidth / 3 ) - 1;
int urlWidth = entryWidth - titleWidth - pmWidth - 2; int urlWidth = entryWidth - titleWidth - pmWidth - 2;
@ -884,7 +884,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items )
triggerUpdate( false ); triggerUpdate( false );
} }
if ( isVisible() && size().height() != tqsizeHint().height() ) if ( isVisible() && size().height() != sizeHint().height() )
sizeAndPosition(); sizeAndPosition();
blockSignals( block ); blockSignals( block );

2
konqueror/konq_factory.cc
Unescape View File

@ -42,7 +42,7 @@ KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args
: m_factory( factory ), m_args( args ), m_createBrowser( createBrowser ) : m_factory( factory ), m_args( args ), m_createBrowser( createBrowser )
{ {
if ( m_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, KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName,

52
konqueror/konq_frame.cc
Unescape View File

@ -68,20 +68,20 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name )
setSizeGripEnabled( false ); setSizeGripEnabled( false );
m_led = new TQLabel( this ); m_led = new TQLabel( this );
m_led->tqsetAlignment( Qt::AlignCenter ); m_led->setAlignment( Qt::AlignCenter );
m_led->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ));
addWidget( m_led, 0, false ); // led (active view indicator) addWidget( m_led, 0, false ); // led (active view indicator)
m_led->hide(); m_led->hide();
m_pStatusLabel = new KSqueezedTextLabel( this ); m_pStatusLabel = new KSqueezedTextLabel( this );
m_pStatusLabel->setMinimumSize( 0, 0 ); 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); m_pStatusLabel->installEventFilter(this);
addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label
m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" );
m_pLinkedViewCheckBox->setFocusPolicy(TQ_NoFocus); 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, TQWhatsThis::add( m_pLinkedViewCheckBox,
i18n("Checking this box on at least two views sets those views as 'linked'. " 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 " "Then, when you change directories in one view, the other views "
@ -301,7 +301,7 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer,
// the frame statusbar // the frame statusbar
m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); 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(clicked()), this, TQT_SLOT(slotStatusBarClicked()));
connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) );
m_separator = 0; 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*/ ) void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ )
{ {
if (saveURLs) if (saveURLs)
config->writePathEntry( TQString::tqfromLatin1( "URL" ).prepend( prefix ), config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ),
childView()->url().url() ); childView()->url().url() );
config->writeEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() );
config->writeEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() );
config->writeEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() );
config->writeEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() );
config->writeEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() );
config->writeEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() );
//config->writeEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() );
if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true );
KonqConfigEvent ev( config, prefix+"_", true/*save*/); KonqConfigEvent ev( config, prefix+"_", true/*save*/);
TQApplication::sendEvent( childView()->part(), &ev ); 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 ); int idSecond = id + (int)pow( 2.0, depth );
//write children sizes //write children sizes
config->writeEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() );
//write children //write children
TQStringList strlst; TQStringList strlst;
if( firstChild() ) if( firstChild() )
strlst.append( TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) );
if( secondChild() ) 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 //write orientation
TQString o; TQString o;
if( orientation() == Qt::Horizontal ) if( orientation() == Qt::Horizontal )
o = TQString::tqfromLatin1("Horizontal"); o = TQString::fromLatin1("Horizontal");
else if( orientation() == Qt::Vertical ) else if( orientation() == Qt::Vertical )
o = TQString::tqfromLatin1("Vertical"); o = TQString::fromLatin1("Vertical");
config->writeEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ), o ); config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o );
//write docContainer //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 ); if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 );
else config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 );
//write child configs //write child configs
if( firstChild() ) { if( firstChild() ) {
TQString newPrefix = TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1);
newPrefix.append( '_' ); newPrefix.append( '_' );
firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 ); firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 );
} }
if( secondChild() ) { if( secondChild() ) {
TQString newPrefix = TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond );
newPrefix.append( '_' ); newPrefix.append( '_' );
secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 ); secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 );
} }

4
konqueror/konq_guiclients.cc
Unescape View File

@ -230,7 +230,7 @@ TQPtrList<KAction> ToggleViewGUIClient::actions() const
void ToggleViewGUIClient::slotToggleView( bool toggle ) 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 ]; bool horizontal = m_mapOrientation[ serviceName ];
@ -240,7 +240,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle )
{ {
KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal,
TQString::tqfromLatin1( "Browser/View" ), TQString::fromLatin1( "Browser/View" ),
serviceName, serviceName,
!horizontal /* vertical = make it first */); !horizontal /* vertical = make it first */);

6
konqueror/konq_main.cc
Unescape View File

@ -76,7 +76,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
while ( KonqMainWindow::canBeRestored( n ) ) while ( KonqMainWindow::canBeRestored( n ) )
{ {
TQString className = KMainWindow::classNameOfToplevel( n ); TQString className = KMainWindow::classNameOfToplevel( n );
if( className == TQString::tqfromLatin1( "KonqMainWindow" )) if( className == TQString::fromLatin1( "KonqMainWindow" ))
(new KonqMainWindow( KURL(), false ) )->restore( n ); (new KonqMainWindow( KURL(), false ) )->restore( n );
else else
kdWarning() << "Unknown class " << className << " in session saved data!" << endl; 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 profile = TQString::fromLocal8Bit(args->getOption("profile"));
TQString profilePath = profile; TQString profilePath = profile;
if (profile[0] != '/') if (profile[0] != '/')
profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile );
TQString url; TQString url;
TQStringList filesToSelect; TQStringList filesToSelect;
if (args->count() == 1) 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. // By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager.
TQString profile = "webbrowsing"; TQString profile = "webbrowsing";
TQString profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile );
if ( !profilePath.isEmpty() ) { if ( !profilePath.isEmpty() ) {
KonqMisc::createBrowserWindowFromProfile( profilePath, profile ); KonqMisc::createBrowserWindowFromProfile( profilePath, profile );
} else { } else {

68
konqueror/konq_mainwindow.cc
Unescape View File

@ -235,7 +235,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con
connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) );
if ( !m_toggleViewGUIClient->empty() ) if ( !m_toggleViewGUIClient->empty() )
plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() );
else else
{ {
delete m_toggleViewGUIClient; delete m_toggleViewGUIClient;
@ -342,8 +342,8 @@ KonqMainWindow::~KonqMainWindow()
TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
{ {
static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" );
static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); static TQString tagToolBar = TQString::fromLatin1( "ToolBar" );
TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id ); 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 ) void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id )
{ {
static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" );
static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); static TQString tagToolBar = TQString::fromLatin1( "ToolBar" );
if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar )
{ {
@ -966,10 +966,10 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs
if ( !frameName.isEmpty() ) if ( !frameName.isEmpty() )
{ {
static TQString _top = TQString::tqfromLatin1( "_top" ); static TQString _top = TQString::fromLatin1( "_top" );
static TQString _self = TQString::tqfromLatin1( "_self" ); static TQString _self = TQString::fromLatin1( "_self" );
static TQString _parent = TQString::tqfromLatin1( "_parent" ); static TQString _parent = TQString::fromLatin1( "_parent" );
static TQString _blank = TQString::tqfromLatin1( "_blank" ); static TQString _blank = TQString::fromLatin1( "_blank" );
if ( frameName.lower() == _blank ) if ( frameName.lower() == _blank )
{ {
@ -1234,7 +1234,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
mainWindow->viewManager()->setActivePart( part, true ); 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 ); KSimpleConfig cfg( locate( "data", profileName ), true );
cfg.setGroup( "Profile" ); cfg.setGroup( "Profile" );
@ -1284,7 +1284,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs
if ( !windowArgs.resizable ) if ( !windowArgs.resizable )
// ### this doesn't seem to work :-( // ### 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, // 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. // as this involves the window manager, which may see things differently.
@ -1336,12 +1336,12 @@ void KonqMainWindow::slotNewWindow()
if ( profile.isEmpty() ) if ( profile.isEmpty() )
{ {
if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) ) if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) )
profile = TQString::tqfromLatin1("webbrowsing"); profile = TQString::fromLatin1("webbrowsing");
else else
profile = TQString::tqfromLatin1("filemanagement"); profile = TQString::fromLatin1("filemanagement");
} }
KonqMisc::createBrowserWindowFromProfile( KonqMisc::createBrowserWindowFromProfile(
locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ), locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ),
profile ); profile );
} }
@ -1528,7 +1528,7 @@ void KonqMainWindow::slotToolFind()
else else
url.setPath( TQDir::homeDirPath() ); url.setPath( TQDir::homeDirPath() );
KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile( 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"*/ ); "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ );
mw->m_paFindFiles->setChecked(true); mw->m_paFindFiles->setChecked(true);
// Delay it after the openURL call (hacky!) // Delay it after the openURL call (hacky!)
@ -1652,7 +1652,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle )
// current viewmode // current viewmode
TQPtrListIterator<KAction> it( m_toolBarViewModeActions ); TQPtrListIterator<KAction> it( m_toolBarViewModeActions );
for (; it.current(); ++it ) 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" ) ); assert( it.current()->inherits( "KonqViewModeAction" ) );
@ -1815,7 +1815,7 @@ void KonqMainWindow::slotReload( KonqView* reloadView )
if ( !reloadView || reloadView->url().isEmpty() ) if ( !reloadView || reloadView->url().isEmpty() )
return; 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"); TQVariant prop = reloadView->part()->property("modified");
if (prop.isValid() && prop.toBool()) if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this, if ( KMessageBox::warningContinueCancel( this,
@ -2032,7 +2032,7 @@ void KonqMainWindow::slotConfigureToolbars()
void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked
{ {
if ( m_toggleViewGUIClient ) 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 ) if ( m_currentView && m_currentView->appServiceOffers().count() > 0 )
plugActionList( "openwith", m_openWithActions ); plugActionList( "openwith", m_openWithActions );
@ -2048,7 +2048,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail )
if ( avail && m_currentView && m_currentView->part() ) if ( avail && m_currentView && m_currentView->part() )
{ {
// Avoid qWarning from TQObject::property if it doesn't exist // 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" ); TQVariant prop = m_currentView->part()->property( "supportsUndo" );
if ( prop.isValid() && prop.toBool() ) if ( prop.isValid() && prop.toBool() )
@ -2665,7 +2665,7 @@ void KonqMainWindow::slotDuplicateTabPopup()
void KonqMainWindow::slotBreakOffTab() void KonqMainWindow::slotBreakOffTab()
{ {
if (m_currentView && m_currentView->part() && 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"); TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool()) if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this, if ( KMessageBox::warningContinueCancel( this,
@ -2682,7 +2682,7 @@ void KonqMainWindow::slotBreakOffTabPopup()
{ {
KonqView* originalView = m_currentView; KonqView* originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView(); 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"); TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) { if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view ); m_pViewManager->showTab( view );
@ -2787,7 +2787,7 @@ void KonqMainWindow::openMultiURL( KURL::List url )
void KonqMainWindow::slotRemoveView() void KonqMainWindow::slotRemoveView()
{ {
if (m_currentView && m_currentView->part() && 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"); TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool()) if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this, if ( KMessageBox::warningContinueCancel( this,
@ -2803,7 +2803,7 @@ void KonqMainWindow::slotRemoveView()
void KonqMainWindow::slotRemoveTab() void KonqMainWindow::slotRemoveTab()
{ {
if (m_currentView && m_currentView->part() && 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"); TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool()) if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( this, if ( KMessageBox::warningContinueCancel( this,
@ -2819,7 +2819,7 @@ void KonqMainWindow::slotRemoveTabPopup()
{ {
KonqView *originalView = m_currentView; KonqView *originalView = m_currentView;
KonqView *view = m_pWorkingTab->activeChildView(); 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"); TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) { if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view ); m_pViewManager->showTab( view );
@ -2856,7 +2856,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup()
MapViews::ConstIterator end = m_mapViews.end(); MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) { for (; it != end; ++it ) {
KonqView *view = it.data(); 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"); TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) { if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view ); m_pViewManager->showTab( view );
@ -2889,7 +2889,7 @@ void KonqMainWindow::slotReloadAllTabs()
MapViews::ConstIterator end = m_mapViews.end(); MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) { for (; it != end; ++it ) {
KonqView *view = it.data(); 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"); TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) { if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view ); m_pViewManager->showTab( view );
@ -3454,7 +3454,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev)
ext = m_currentView->browserExtension(); ext = m_currentView->browserExtension();
TQStrList slotNames; TQStrList slotNames;
if (ext) if (ext)
slotNames = ext->tqmetaObject()->slotNames(); slotNames = ext->metaObject()->slotNames();
//for ( char * s = slotNames.first() ; s ; s = slotNames.next() ) //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 it = actionSlotMap->begin();
KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end();
TQStrList slotNames = ext->tqmetaObject()->slotNames(); TQStrList slotNames = ext->metaObject()->slotNames();
for ( ; it != itEnd ; ++it ) 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 it = actionSlotMap->begin();
KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end();
TQStrList slotNames = ext->tqmetaObject()->slotNames(); TQStrList slotNames = ext->metaObject()->slotNames();
for ( ; it != itEnd ; ++it ) for ( ; it != itEnd ; ++it )
{ {
@ -4888,7 +4888,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa
m_currentView = m_oldView; m_currentView = m_oldView;
} }
// Special case: RMB + renaming in sidebar; setFocus would abort editing. // Special case: RMB + renaming in sidebar; setFocus would abort editing.
TQWidget* fw = tqfocusWidget(); TQWidget* fw = focusWidget();
if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) ) if ( !fw || !::tqqt_cast<TQLineEdit*>( fw ) )
m_oldView->part()->widget()->setFocus(); m_oldView->part()->widget()->setFocus();
} }
@ -5111,7 +5111,7 @@ void KonqMainWindow::updateViewModeActions()
itname = (*it)->name(); itname = (*it)->name();
TQString icon = (*it)->icon(); 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) // 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() ); action = new KRadioAction( itname, icon, 0, TQT_TQOBJECT(this), (*it)->desktopEntryName().ascii() );
else else
@ -5282,7 +5282,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
if ( tabContainer->count() > 1 ) if ( tabContainer->count() > 1 )
{ {
KConfig *config = KGlobal::config(); KConfig *config = KGlobal::config();
KConfigGroupSaver cs( config, TQString::tqfromLatin1("Notification Messages") ); KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") );
if ( !config->hasKey( "MultipleTabConfirm" ) ) if ( !config->hasKey( "MultipleTabConfirm" ) )
{ {
@ -5320,7 +5320,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
MapViews::ConstIterator end = m_mapViews.end(); MapViews::ConstIterator end = m_mapViews.end();
for (; it != end; ++it ) { for (; it != end; ++it ) {
KonqView *view = it.data(); 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"); TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) { if (prop.isValid() && prop.toBool()) {
m_pViewManager->showTab( view ); m_pViewManager->showTab( view );
@ -5338,7 +5338,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e )
// m_pViewManager->showTab( originalView ); // m_pViewManager->showTab( originalView );
} }
else if ( m_currentView && m_currentView->part() && 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"); TQVariant prop = m_currentView->part()->property("modified");
if (prop.isValid() && prop.toBool()) if (prop.isValid() && prop.toBool())

4
konqueror/konq_misc.cc
Unescape View File

@ -106,7 +106,7 @@ KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLAr
KMimeType::findByURL(url)->name() == "text/html") KMimeType::findByURL(url)->name() == "text/html")
? "webbrowsing" : "filemanagement"; ? "webbrowsing" : "filemanagement";
TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName );
return createBrowserWindowFromProfile(profile, profileName, return createBrowserWindowFromProfile(profile, profileName,
url, args, url, args,
forbidUseHTML, filesToSelect, tempFile, openURL ); forbidUseHTML, filesToSelect, tempFile, openURL );
@ -225,7 +225,7 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text
, m_mw(mw) , m_mw(mw)
{ {
setBackgroundMode( TQt::PaletteButton ); setBackgroundMode( TQt::PaletteButton );
tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) |
Qt::AlignVCenter | TQt::ShowPrefix ); Qt::AlignVCenter | TQt::ShowPrefix );
setAcceptDrops(true); setAcceptDrops(true);
adjustSize(); adjustSize();

4
konqueror/konq_profiledlg.cc
Unescape View File

@ -104,7 +104,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese
TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) );
loadAllProfiles( preselectProfile ); 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 = new TQCheckBox( i18n("Save &URLs in profile"), box );
m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() ); 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_RENAME, m_pListView->selectedItem ()!=0 );
enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 );
resize( tqsizeHint() ); resize( sizeHint() );
} }
KonqProfileDlg::~KonqProfileDlg() KonqProfileDlg::~KonqProfileDlg()

6
konqueror/konq_tabs.cc
Unescape View File

@ -196,16 +196,16 @@ void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool sa
TQString newPrefix; TQString newPrefix;
for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) 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 ); strlst.append( newPrefix );
newPrefix.append( '_' ); newPrefix.append( '_' );
it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i ); it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i );
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() ); currentPageIndex() );
} }

12
konqueror/konq_view.cc
Unescape View File

@ -528,8 +528,8 @@ void KonqView::slotStarted( KIO::Job * job )
// Manage passwords properly... // Manage passwords properly...
if (m_pMainWindow) if (m_pMainWindow)
{ {
kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->tqtopLevelWidget()->winId() << endl; kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->topLevelWidget()->winId() << endl;
job->setWindow (m_pMainWindow->tqtopLevelWidget ()); job->setWindow (m_pMainWindow->topLevelWidget ());
} }
connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); 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 ! if ( !obj ) // not all views have a browser extension !
return false; return false;
int id = obj->tqmetaObject()->findSlot( methodName ); int id = obj->metaObject()->findSlot( methodName );
if ( id == -1 ) if ( id == -1 )
return false; return false;
TQUObject o[ 1 ]; TQUObject o[ 1 ];
@ -1092,7 +1092,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value )
if ( !obj ) // not all views have a browser extension ! if ( !obj ) // not all views have a browser extension !
return false; return false;
int id = obj->tqmetaObject()->findSlot( methodName ); int id = obj->metaObject()->findSlot( methodName );
if ( id == -1 ) if ( id == -1 )
return false; return false;
TQUObject o[ 2 ]; TQUObject o[ 2 ];
@ -1109,7 +1109,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value
if ( !obj ) // not all views have a browser extension ! if ( !obj ) // not all views have a browser extension !
return false; return false;
int id = obj->tqmetaObject()->findSlot( methodName ); int id = obj->metaObject()->findSlot( methodName );
if ( id == -1 ) if ( id == -1 )
return false; return false;
TQUObject o[ 2 ]; 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 ! if ( !obj ) // not all views have a browser extension !
return false; return false;
int id = obj->tqmetaObject()->findSlot( methodName ); int id = obj->metaObject()->findSlot( methodName );
if ( id == -1 ) if ( id == -1 )
return false; return false;
TQUObject o[ 2 ]; TQUObject o[ 2 ];

66
konqueror/konq_viewmgr.cc
Unescape View File

@ -132,7 +132,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
//printSizeInfo( splitFrame, parentContainer, "before split"); //printSizeInfo( splitFrame, parentContainer, "before split");
#endif #endif
parentContainer->widget()->tqsetUpdatesEnabled( false ); parentContainer->widget()->setUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl; //kdDebug(1202) << "Move out child" << endl;
TQPoint pos = splitFrame->widget()->pos(); TQPoint pos = splitFrame->widget()->pos();
@ -184,7 +184,7 @@ KonqView* KonqViewManager::splitView ( Qt::Orientation orientation,
//newView->frame()->show(); //newView->frame()->show();
newContainer->show(); newContainer->show();
parentContainer->widget()->tqsetUpdatesEnabled( true ); parentContainer->widget()->setUpdatesEnabled( true );
if (m_pDocContainer == splitFrame) m_pDocContainer = newContainer; if (m_pDocContainer == splitFrame) m_pDocContainer = newContainer;
@ -226,7 +226,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
KonqFrameBase* mainFrame = m_pMainWindow->childFrame(); KonqFrameBase* mainFrame = m_pMainWindow->childFrame();
mainFrame->widget()->tqsetUpdatesEnabled( false ); mainFrame->widget()->setUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl; //kdDebug(1202) << "Move out child" << endl;
TQPoint pos = mainFrame->widget()->pos(); TQPoint pos = mainFrame->widget()->pos();
@ -249,7 +249,7 @@ KonqView* KonqViewManager::splitWindow( Qt::Orientation orientation,
newContainer->show(); newContainer->show();
mainFrame->widget()->tqsetUpdatesEnabled( true ); mainFrame->widget()->setUpdatesEnabled( true );
if( childView ) if( childView )
childView->openURL( url, locationBarURL ); childView->openURL( url, locationBarURL );
@ -279,7 +279,7 @@ void KonqViewManager::convertDocContainer()
splitterSizes = static_cast<KonqFrameContainer*>(parentContainer)->sizes(); splitterSizes = static_cast<KonqFrameContainer*>(parentContainer)->sizes();
} }
parentContainer->widget()->tqsetUpdatesEnabled( false ); parentContainer->widget()->setUpdatesEnabled( false );
//kdDebug(1202) << "Move out child" << endl; //kdDebug(1202) << "Move out child" << endl;
TQPoint pos = m_pDocContainer->widget()->pos(); TQPoint pos = m_pDocContainer->widget()->pos();
@ -302,7 +302,7 @@ void KonqViewManager::convertDocContainer()
newContainer->show(); newContainer->show();
parentContainer->widget()->tqsetUpdatesEnabled( true ); parentContainer->widget()->setUpdatesEnabled( true );
m_pDocContainer = newContainer; m_pDocContainer = newContainer;
} }
@ -423,7 +423,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag
KConfig config( tempFile.name() ); KConfig config( tempFile.name() );
config.setGroup( "View Profile" ); 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 ); config.writeEntry( "RootItem", prefix );
prefix.append( '_' ); prefix.append( '_' );
currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
@ -493,10 +493,10 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab )
KConfig config( tempFile.name() ); KConfig config( tempFile.name() );
config.setGroup( "View Profile" ); 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 ); config.writeEntry( "RootItem", prefix );
prefix.append( '_' ); 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); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1);
KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false ); KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false );
@ -784,7 +784,7 @@ void KonqViewManager::removeView( KonqView *view )
if (m_pDocContainer == parentContainer) m_pDocContainer = otherFrame; if (m_pDocContainer == parentContainer) m_pDocContainer = otherFrame;
grandParentContainer->widget()->tqsetUpdatesEnabled( false ); grandParentContainer->widget()->setUpdatesEnabled( false );
static_cast<KonqFrameContainer*>(parentContainer)->setAboutToBeDeleted(); static_cast<KonqFrameContainer*>(parentContainer)->setAboutToBeDeleted();
//kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl; //kdDebug(1202) << "--- Reparenting otherFrame to m_pMainWindow " << m_pMainWindow << endl;
@ -826,7 +826,7 @@ void KonqViewManager::removeView( KonqView *view )
grandParentContainer->setActiveChild( otherFrame ); grandParentContainer->setActiveChild( otherFrame );
grandParentContainer->activateChild(); grandParentContainer->activateChild();
grandParentContainer->widget()->tqsetUpdatesEnabled( true ); grandParentContainer->widget()->setUpdatesEnabled( true );
} }
else if (parentContainer->frameType()=="Tabs") { else if (parentContainer->frameType()=="Tabs") {
kdDebug(1202) << "parentContainer " << parentContainer << " is a KonqFrameTabs" << endl; 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 ) 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() ); fileName, KGlobal::instance() );
if ( TQFile::exists( path ) ) if ( TQFile::exists( path ) )
@ -1096,7 +1096,7 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi
{ {
//kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl;
if( m_pMainWindow->childFrame() != 0L ) { if( m_pMainWindow->childFrame() != 0L ) {
TQString prefix = TQString::tqfromLatin1( m_pMainWindow->childFrame()->frameType() ) TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() )
+ TQString::number(0); + TQString::number(0);
cfg.writeEntry( "RootItem", prefix ); cfg.writeEntry( "RootItem", prefix );
prefix.append( '_' ); prefix.append( '_' );
@ -1156,7 +1156,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
for ( it.toFirst(); it != 0L; ++it ) for ( it.toFirst(); it != 0L; ++it )
{ {
KonqView *view = it.current()->activeChildView(); 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"); TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) { if (prop.isValid() && prop.toBool()) {
showTab( view ); showTab( view );
@ -1175,7 +1175,7 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename,
else else
{ {
KonqView *view = m_pMainWindow->currentView(); 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"); TQVariant prop = view->part()->property("modified");
if (prop.isValid() && prop.toBool()) if (prop.isValid() && prop.toBool())
if ( KMessageBox::warningContinueCancel( 0, if ( KMessageBox::warningContinueCancel( 0,
@ -1465,8 +1465,8 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
serviceType = "text/html"; serviceType = "text/html";
serviceName = "html"; serviceName = "html";
} else { } else {
serviceType = cfg.readEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory");
serviceName = cfg.readEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ) ); serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) );
} }
//kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl;
@ -1480,17 +1480,17 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
return; //ugh.. 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; //kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl;
KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage ); KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage );
if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), false ) ); if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) );
childView->setToggleView( cfg.readBoolEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), false ) ); childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) );
if( !cfg.readBoolEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) )
childView->frame()->statusbar()->hide(); 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(); m_pDocContainer = childView->frame();
if (!m_pDocContainer) if (!m_pDocContainer)
@ -1536,7 +1536,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
childView->frame()->show(); childView->frame()->show();
TQString key = TQString::tqfromLatin1( "URL" ).prepend( prefix ); TQString key = TQString::fromLatin1( "URL" ).prepend( prefix );
if ( openURL ) if ( openURL )
{ {
KURL url; KURL url;
@ -1546,11 +1546,11 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
{ {
TQString u = cfg.readPathEntry( key ); TQString u = cfg.readPathEntry( key );
if ( u.isEmpty() ) if ( u.isEmpty() )
u = TQString::tqfromLatin1("about:blank"); u = TQString::fromLatin1("about:blank");
url = u; url = u;
} }
else if(key == "empty_URL") else if(key == "empty_URL")
url = TQString::tqfromLatin1("about:blank"); url = TQString::fromLatin1("about:blank");
else else
url = defaultURL; url = defaultURL;
@ -1567,13 +1567,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
//else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl; //else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl;
} }
// Do this after opening the URL, so that it's actually possible to open it :) // 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") ) { else if( name.startsWith("Container") ) {
//kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl; //kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl;
//load container config //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; //kdDebug(1202) << "Orientation: " << ostr << endl;
Qt::Orientation o; Qt::Orientation o;
if( ostr == "Vertical" ) if( ostr == "Vertical" )
@ -1586,12 +1586,12 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
} }
TQValueList<int> sizes = 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; 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; kdWarning() << "Profile Loading Error: Less than two children in " << name << endl;
// fallback to defaults // fallback to defaults
@ -1608,7 +1608,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
parent->insertChildFrame( newContainer, tabindex ); 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; m_pDocContainer = newContainer;
loadItem( cfg, newContainer, childList.tqat(0), defaultURL, openURL ); loadItem( cfg, newContainer, childList.tqat(0), defaultURL, openURL );
@ -1634,9 +1634,9 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent,
parent->insertChildFrame( newContainer ); parent->insertChildFrame( newContainer );
m_pDocContainer = 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 ) for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it )
{ {
loadItem( cfg, newContainer, *it, defaultURL, openURL ); loadItem( cfg, newContainer, *it, defaultURL, openURL );

8
konqueror/listview/konq_infolistviewwidget.cc
Unescape View File

@ -181,8 +181,8 @@ void KonqInfoListViewWidget::rebuildView()
if ( !viewport()->isUpdatesEnabled() ) if ( !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }
} }
@ -215,8 +215,8 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list)
if ( !viewport()->isUpdatesEnabled() ) if ( !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }

2
konqueror/listview/konq_listviewitems.cc
Unescape View File

@ -421,7 +421,7 @@ KonqBaseListViewItem::~KonqBaseListViewItem()
TQRect KonqBaseListViewItem::rect() const 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() ) ); return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) );
} }

38
konqueror/listview/konq_listviewwidget.cc
Unescape View File

@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *
{ {
kdDebug(1202) << "+KonqBaseListViewWidget" << endl; kdDebug(1202) << "+KonqBaseListViewWidget" << endl;
m_dirLister->setMainWindow(tqtopLevelWidget()); m_dirLister->setMainWindow(topLevelWidget());
m_bTopLevelComplete = true; m_bTopLevelComplete = true;
@ -489,7 +489,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e )
emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() ); emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() );
m_pBrowserView->emitMouseOver( item->item() ); m_pBrowserView->emitMouseOver( item->item() );
vp.setY( tqitemRect( item ).y() ); vp.setY( itemRect( item ).y() );
TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) );
m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) );
m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) );
@ -553,7 +553,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
pt = contentsToViewport( pt ); pt = contentsToViewport( pt );
tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p, tqstyle().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), 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; TQRect rect;
if ( allColumnsShowFocus() ) if ( allColumnsShowFocus() )
rect = tqitemRect( cur ); rect = itemRect( cur );
else { else {
rect = tqitemRect( cur ); rect = itemRect( cur );
rect.setWidth( executeArea( cur ) ); rect.setWidth( executeArea( cur ) );
} }
@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{ {
setSelected( cur, true ); setSelected( cur, true );
changed = TRUE; changed = TRUE;
rr = rr.unite( tqitemRect( cur ) ); rr = rr.unite( itemRect( cur ) );
} }
} }
else else
@ -631,7 +631,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( cur->isSelected() ) if ( cur->isSelected() )
{ {
changed = TRUE; changed = TRUE;
rr = rr.unite( tqitemRect( cur ) ); rr = rr.unite( itemRect( cur ) );
} }
if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
{ {
setSelected( cur, true ); setSelected( cur, true );
changed = TRUE; changed = TRUE;
rr = rr.unite( tqitemRect( cur ) ); rr = rr.unite( itemRect( cur ) );
} }
} }
else else
@ -667,7 +667,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
if ( cur->isSelected() ) if ( cur->isSelected() )
{ {
changed = TRUE; changed = TRUE;
rr = rr.unite( tqitemRect( cur ) ); rr = rr.unite( itemRect( cur ) );
} }
if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
@ -985,7 +985,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
if (_item->pixmap(0) != 0) if (_item->pixmap(0) != 0)
{ {
// Rect of the TQListViewItem's pixmap area. // Rect of the TQListViewItem's pixmap area.
TQRect rect = _item->listView()->tqitemRect(_item); TQRect rect = _item->listView()->itemRect(_item);
// calculate nesting depth // calculate nesting depth
int nestingDepth = 0; int nestingDepth = 0;
@ -1111,7 +1111,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url )
args.yOffset = contentsY(); args.yOffset = contentsY();
m_pBrowserView->extension()->setURLArgs( args ); m_pBrowserView->extension()->setURLArgs( args );
if ( currentItem() && tqitemRect( currentItem() ).isValid() ) if ( currentItem() && itemRect( currentItem() ).isValid() )
m_itemToGoTo = currentItem()->text(0); m_itemToGoTo = currentItem()->text(0);
m_pBrowserView->m_filesToSelect.clear(); m_pBrowserView->m_filesToSelect.clear();
@ -1192,8 +1192,8 @@ void KonqBaseListViewWidget::setComplete()
if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }
@ -1237,8 +1237,8 @@ void KonqBaseListViewWidget::slotClear()
m_pBrowserView->resetCount(); m_pBrowserView->resetCount();
m_pBrowserView->lstPendingMimeIconItems().clear(); m_pBrowserView->lstPendingMimeIconItems().clear();
viewport()->tqsetUpdatesEnabled( false ); viewport()->setUpdatesEnabled( false );
tqsetUpdatesEnabled( false ); setUpdatesEnabled( false );
clear(); clear();
} }
@ -1268,8 +1268,8 @@ void KonqBaseListViewWidget::slotNewItems( const KFileItemList & entries )
if ( !viewport()->isUpdatesEnabled() ) if ( !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }
slotUpdateBackground(); slotUpdateBackground();
@ -1314,8 +1314,8 @@ void KonqBaseListViewWidget::slotDeleteItem( KFileItem * _fileitem )
// OK, but this code also gets activated when deleting a hidden file... (dfaure) // OK, but this code also gets activated when deleting a hidden file... (dfaure)
if ( !viewport()->isUpdatesEnabled() ) if ( !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }
slotUpdateBackground(); slotUpdateBackground();

8
konqueror/listview/konq_textviewwidget.cc
Unescape View File

@ -101,8 +101,8 @@ void KonqTextViewWidget::slotNewItems( const KFileItemList & entries )
if ( !viewport()->isUpdatesEnabled() ) if ( !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }
slotUpdateBackground(); slotUpdateBackground();
@ -146,8 +146,8 @@ void KonqTextViewWidget::setComplete()
if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() ) if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }
} }

8
konqueror/listview/konq_treeviewwidget.cc
Unescape View File

@ -121,8 +121,8 @@ void KonqTreeViewWidget::slotCompleted( const KURL & _url )
if ( !viewport()->isUpdatesEnabled() ) if ( !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }
} }
@ -268,8 +268,8 @@ void KonqTreeViewWidget::slotNewItems( const KFileItemList &entries )
if ( !viewport()->isUpdatesEnabled() ) if ( !viewport()->isUpdatesEnabled() )
{ {
viewport()->tqsetUpdatesEnabled( true ); viewport()->setUpdatesEnabled( true );
tqsetUpdatesEnabled( true ); setUpdatesEnabled( true );
triggerUpdate(); triggerUpdate();
} }

4
konqueror/preloader/preloader.cc
Unescape View File

@ -109,8 +109,8 @@ void KonqyPreloader::updateCount()
{ {
if( !check_always_preloaded_timer.isActive()) if( !check_always_preloaded_timer.isActive())
{ {
if( kapp->tdeinitExec( TQString::tqfromLatin1( "konqueror" ), if( kapp->tdeinitExec( TQString::fromLatin1( "konqueror" ),
TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 )
{ {
kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; kdDebug( 1202 ) << "Preloading Konqueror instance" << endl;
check_always_preloaded_timer.start( 5000, true ); check_always_preloaded_timer.start( 5000, true );

2
konqueror/remoteencodingplugin/kremoteencodingplugin.cpp
Unescape View File

@ -41,7 +41,7 @@
#include "kremoteencodingplugin.h" #include "kremoteencodingplugin.h"
#define DATA_KEY TQString::tqfromLatin1("Charset") #define DATA_KEY TQString::fromLatin1("Charset")
KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent,
const char *name, const char *name,

8
konqueror/shellcmdplugin/kshellcmddialog.cpp
Unescape View File

@ -43,10 +43,10 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString&
closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox); closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox);
closeButton->setDefault(true); closeButton->setDefault(true);
label->resize(label->tqsizeHint()); label->resize(label->sizeHint());
m_shell->resize(m_shell->tqsizeHint()); m_shell->resize(m_shell->sizeHint());
closeButton->setFixedSize(closeButton->tqsizeHint()); closeButton->setFixedSize(closeButton->sizeHint());
cancelButton->setFixedSize(cancelButton->tqsizeHint()); cancelButton->setFixedSize(cancelButton->sizeHint());
box->addWidget(label,0); box->addWidget(label,0);
box->addWidget(m_shell,1); box->addWidget(m_shell,1);

2
konqueror/sidebar/konqsidebar.cpp
Unescape View File

@ -30,7 +30,7 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName,
setInstance( KonqSidebarFactory::instance() ); setInstance( KonqSidebarFactory::instance() );
m_extension = 0; m_extension = 0;
// this should be your custom internal widget // 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" ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" );
connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), connect(m_widget,TQT_SIGNAL(started(KIO::Job *)),
this, TQT_SIGNAL(started(KIO::Job*))); this, TQT_SIGNAL(started(KIO::Job*)));

30
konqueror/sidebar/sidebar_widget.cpp
Unescape View File

@ -252,7 +252,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
m_buttons.setAutoDelete(true); m_buttons.setAutoDelete(true);
m_hasStoredUrl = false; m_hasStoredUrl = false;
m_latestViewed = -1; m_latestViewed = -1;
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
TQSplitter *splitterWidget = splitter(); TQSplitter *splitterWidget = splitter();
if (splitterWidget) { if (splitterWidget) {
@ -262,7 +262,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons
} }
m_area = new KDockArea(this); 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 = m_area->createDockWidget("free", 0);
m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget)); m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget));
m_area->setMainDockWidget(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; 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 ) if ( id == -1 )
return; return;
kdDebug() << "Action slot was found, it will be called now" << endl; kdDebug() << "Action slot was found, it will be called now" << endl;
@ -1049,7 +1049,7 @@ void Sidebar_Widget::collapseExpandSidebar()
if (m_visibleViews.count()==0) if (m_visibleViews.count()==0)
{ {
m_somethingVisible = false; m_somethingVisible = false;
parentWidget()->setMaximumWidth(tqminimumSizeHint().width()); parentWidget()->setMaximumWidth(minimumSizeHint().width());
updateGeometry(); updateGeometry();
emit panelHasBeenExpanded(false); emit panelHasBeenExpanded(false);
} else { } else {
@ -1060,11 +1060,11 @@ void Sidebar_Widget::collapseExpandSidebar()
} }
} }
TQSize Sidebar_Widget::tqsizeHint() const TQSize Sidebar_Widget::sizeHint() const
{ {
if (m_somethingVisible) if (m_somethingVisible)
return TQSize(m_savedWidth,200); return TQSize(m_savedWidth,200);
return tqminimumSizeHint(); return minimumSizeHint();
} }
void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid)
@ -1195,50 +1195,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client,
void Sidebar_Widget::connectModule(TQObject *mod) 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*))); 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())); 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 &, connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &,
const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const
TQPoint &, const KURL&, const TQString &, mode_t))); 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 &, connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &,
const KURL &,const TQString &, mode_t)),this, const KURL &,const TQString &, mode_t)),this,
TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &,
const KURL &,const TQString &, mode_t))); 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 & )), connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )),
this,TQT_SLOT(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 &)), connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)),
this,TQT_SLOT(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, connect(mod,
TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)),
this, this,
TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); 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)), connect(mod,TQT_SIGNAL(enableAction( const char *, bool)),
this,TQT_SLOT(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 &)), connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)),
this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &)));
} }

2
konqueror/sidebar/sidebar_widget.h
Unescape View File

@ -107,7 +107,7 @@ public:
void stdAction(const char *handlestd); void stdAction(const char *handlestd);
//virtual KParts::ReadOnlyPart *getPart(); //virtual KParts::ReadOnlyPart *getPart();
KParts::BrowserExtension *getExtension(); KParts::BrowserExtension *getExtension();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
public slots: public slots:
void addWebSideBar(const KURL& url, const TQString& name); void addWebSideBar(const KURL& url, const TQString& name);

4
konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
Unescape View File

@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab()
else else
return; return;
DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name()); DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name());
if (bookmark.isGroup()) { if (bookmark.isGroup()) {
KBookmarkGroup group = bookmark.toGroup(); KBookmarkGroup group = bookmark.toGroup();
@ -490,7 +490,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo
item->setOpen(false); item->setOpen(false);
} }
else if ( bk.isSeparator() ) else if ( bk.isSeparator() )
item->tqsetVisible( false ); item->setVisible( false );
else else
item->setExpandable( false ); item->setExpandable( false );
} }

2
konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp
Unescape View File

@ -163,7 +163,7 @@ void KonqSidebarDirTreeItem::itemSelected()
bInTrash = true; bInTrash = true;
TQMimeSource *data = TQApplication::tqclipboard()->data(); 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 ); tree()->enableActions( true, true, paste, true && !bInTrash, true, true );
} }

6
konqueror/sidebar/trees/history_module/history_dlg.ui
Unescape View File

@ -40,7 +40,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>240</width> <width>240</width>
<height>16</height> <height>16</height>
@ -193,7 +193,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>418</width> <width>418</width>
<height>0</height> <height>0</height>
@ -212,7 +212,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>30</height> <height>30</height>

2
konqueror/sidebar/trees/history_module/history_item.cpp
Unescape View File

@ -129,7 +129,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg,
int column, int width, int tqalignment ) int column, int width, int tqalignment )
{ {
TQDateTime dt; TQDateTime dt;
TQDateTime current = TQDateTime::tqcurrentDateTime(); TQDateTime current = TQDateTime::currentDateTime();
if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS )
dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan )); dt = TQT_TQDATETIME_OBJECT(current.addDays( - s_settings->m_valueYoungerThan ));

6
konqueror/sidebar/trees/history_module/history_module.cpp
Unescape View File

@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree
connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() ));
m_dict.setAutoDelete( true ); m_dict.setAutoDelete( true );
m_currentTime = TQDateTime::tqcurrentDateTime(); m_currentTime = TQDateTime::currentDateTime();
KConfig *kc = KGlobal::config(); KConfig *kc = KGlobal::config();
KConfigGroupSaver cs( kc, "HistorySettings" ); KConfigGroupSaver cs( kc, "HistorySettings" );
@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems()
KonqHistoryEntry *entry; KonqHistoryEntry *entry;
KonqHistoryList entries( KonqHistoryManager::kself()->entries() ); KonqHistoryList entries( KonqHistoryManager::kself()->entries() );
KonqHistoryIterator it( 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 // the group item and the item of the serverroot '/' get a fav-icon
// if available. All others get the protocol icon. // if available. All others get the protocol icon.
@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry )
if ( !m_initialized ) if ( !m_initialized )
return; return;
m_currentTime = TQDateTime::tqcurrentDateTime(); m_currentTime = TQDateTime::currentDateTime();
KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url ); KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url );
KonqSidebarHistoryItem *item = group->findChild( entry ); KonqSidebarHistoryItem *item = group->findChild( entry );
if ( !item ) if ( !item )

8
konqueror/sidebar/trees/history_module/history_settings.cpp
Unescape View File

@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global)
m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 ); m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 );
m_valueOlderThan = config->readNumEntry("Value olderThan", 2 ); m_valueOlderThan = config->readNumEntry("Value olderThan", 2 );
TQString minutes = TQString::tqfromLatin1("minutes"); TQString minutes = TQString::fromLatin1("minutes");
TQString days = TQString::tqfromLatin1("days"); TQString days = TQString::fromLatin1("days");
TQString metric = config->readEntry("Metric youngerThan", days ); TQString metric = config->readEntry("Metric youngerThan", days );
m_metricYoungerThan = (metric == days) ? DAYS : MINUTES; m_metricYoungerThan = (metric == days) ? DAYS : MINUTES;
metric = config->readEntry("Metric olderThan", days ); metric = config->readEntry("Metric olderThan", days );
@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings()
config->writeEntry("Value youngerThan", m_valueYoungerThan ); config->writeEntry("Value youngerThan", m_valueYoungerThan );
config->writeEntry("Value olderThan", m_valueOlderThan ); config->writeEntry("Value olderThan", m_valueOlderThan );
TQString minutes = TQString::tqfromLatin1("minutes"); TQString minutes = TQString::fromLatin1("minutes");
TQString days = TQString::tqfromLatin1("days"); TQString days = TQString::fromLatin1("days");
config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ? config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ?
days : minutes ); days : minutes );
config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ? config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ?

10
konqueror/sidebar/trees/konq_sidebartree.cpp
Unescape View File

@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path
// Version 5 includes the audiocd browser // Version 5 includes the audiocd browser
// Version 6 includes the printmanager and lan browser // Version 6 includes the printmanager and lan browser
const int currentVersion = 6; const int currentVersion = 6;
TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber"); TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber");
KSimpleConfig versionCfg( path + "/.directory" ); KSimpleConfig versionCfg( path + "/.directory" );
int versionNumber = versionCfg.readNumEntry( key, 1 ); int versionNumber = versionCfg.readNumEntry( key, 1 );
kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl;
@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation()
for (; it != end; ++it ) for (; it != end; ++it )
{ {
uint & iconNumber = it.data().iconNumber; 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)); it.key()->setPixmap( 0, SmallIcon( icon));
iconNumber++; iconNumber++;
@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste,
bool KonqSidebarTree::tabSupport() bool KonqSidebarTree::tabSupport()
{ {
// see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror) // 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()"); DCOPReply reply = ref.call("functions()");
if (reply.isValid()) { if (reply.isValid()) {
QCStringList funcs; QCStringList funcs;
@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow()
void KonqSidebarTree::slotOpenTab() void KonqSidebarTree::slotOpenTab()
{ {
if (!m_currentTopLevelItem) return; 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() ); ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() );
} }
@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point )
if ( item ) { if ( item ) {
TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText(); TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText();
if ( !text.isEmpty() ) if ( !text.isEmpty() )
tip ( m_view->tqitemRect( item ), text ); tip ( m_view->itemRect( item ), text );
} }
} }

22
konsole/konsole/TEWidget.cpp
Unescape View File

@ -814,7 +814,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
int y,x,len; int y,x,len;
const TQPixmap* pm = backgroundPixmap(); const TQPixmap* pm = backgroundPixmap();
TQPainter paint; TQPainter paint;
tqsetUpdatesEnabled(false); setUpdatesEnabled(false);
paint.begin( this ); paint.begin( this );
TQPoint tL = contentsRect().topLeft(); TQPoint tL = contentsRect().topLeft();
@ -926,7 +926,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns)
} }
drawFrame( &paint ); drawFrame( &paint );
paint.end(); paint.end();
tqsetUpdatesEnabled(true); setUpdatesEnabled(true);
if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms if ( hasBlinker && !blinkT->isActive()) blinkT->start(1000); // 1000 ms
if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = false; } if (!hasBlinker && blinkT->isActive()) { blinkT->stop(); blinking = false; }
free(dirtyMask); 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); mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget);
l->addWidget(mResizeLabel, 1, AlignCenter); l->addWidget(mResizeLabel, 1, AlignCenter);
mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); 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); mResizeTimer = new TQTimer(this);
connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide()));
} }
@ -993,7 +993,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
{ {
const TQPixmap* pm = backgroundPixmap(); const TQPixmap* pm = backgroundPixmap();
TQPainter paint; TQPainter paint;
tqsetUpdatesEnabled(false); setUpdatesEnabled(false);
paint.begin( this ); paint.begin( this );
paint.setBackgroundMode( Qt::TransparentMode ); paint.setBackgroundMode( Qt::TransparentMode );
@ -1051,7 +1051,7 @@ void TEWidget::paintEvent( TQPaintEvent* pe )
erase( er ); erase( er );
paint.end(); paint.end();
tqsetUpdatesEnabled(true); setUpdatesEnabled(true);
} }
void TEWidget::print(TQPainter &paint, bool friendly, bool exact) void TEWidget::print(TQPainter &paint, bool friendly, bool exact)
@ -1185,9 +1185,9 @@ void TEWidget::propagateSize()
if (isFixedSize) if (isFixedSize)
{ {
setSize(columns, lines); setSize(columns, lines);
TQFrame::setFixedSize(tqsizeHint()); TQFrame::setFixedSize(sizeHint());
parentWidget()->adjustSize(); parentWidget()->adjustSize();
parentWidget()->setFixedSize(parentWidget()->tqsizeHint()); parentWidget()->setFixedSize(parentWidget()->sizeHint());
return; return;
} }
if (image) if (image)
@ -1880,7 +1880,7 @@ void TEWidget::doScroll(int lines)
bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) bool TEWidget::eventFilter( TQObject *obj, TQEvent *e )
{ {
if ( (e->type() == TQEvent::Accel || if ( (e->type() == TQEvent::Accel ||
e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this ) e->type() == TQEvent::AccelAvailable ) && tqApp->focusWidget() == this )
{ {
TQT_TQKEYEVENT( e )->ignore(); TQT_TQKEYEVENT( e )->ignore();
return false; return false;
@ -2104,7 +2104,7 @@ void TEWidget::clearImage()
void TEWidget::calcGeometry() void TEWidget::calcGeometry()
{ {
scrollbar->resize(TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent), scrollbar->resize(TQApplication::tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent),
contentsRect().height()); contentsRect().height());
switch(scrollLoc) switch(scrollLoc)
{ {
@ -2177,7 +2177,7 @@ void TEWidget::setFixedSize(int cols, int lins)
TQFrame::setFixedSize(m_size); TQFrame::setFixedSize(m_size);
} }
TQSize TEWidget::tqsizeHint() const TQSize TEWidget::sizeHint() const
{ {
return m_size; return m_size;
} }
@ -2242,7 +2242,7 @@ void TEWidget::dropEvent(TQDropEvent* event)
TQString tmp; TQString tmp;
if (url.isLocalFile()) { if (url.isLocalFile()) {
tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others 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; justPaste = true;
break; break;
} else { } else {

2
konsole/konsole/TEWidget.h
Unescape View File

@ -98,7 +98,7 @@ public:
void updateImageSize(); void updateImageSize();
void setSize(int cols, int lins); void setSize(int cols, int lins);
void setFixedSize(int cols, int lins); void setFixedSize(int cols, int lins);
TQSize tqsizeHint() const; TQSize sizeHint() const;
void setWordCharacters(TQString wc); void setWordCharacters(TQString wc);
TQString wordCharacters() { return word_characters; } TQString wordCharacters() { return word_characters; }

2
konsole/konsole/keytrans.cpp
Unescape View File

@ -362,7 +362,7 @@ void KeyTrans::readConfig()
; ;
TQBuffer* newbuf; TQBuffer* newbuf;
newbuf = new TQBuffer(); newbuf = new TQBuffer();
newbuf->tqsetBufferFromCopy(txt); newbuf->setBuffer(txt);
buf=TQT_TQIODEVICE(newbuf); buf=TQT_TQIODEVICE(newbuf);
} }
else else

10
konsole/konsole/konsole.cpp
Unescape View File

@ -1289,7 +1289,7 @@ void Konsole::setColLin(int columns, int lines)
te->setSize(columns, lines); te->setSize(columns, lines);
adjustSize(); adjustSize();
if (b_fixedSize) if (b_fixedSize)
setFixedSize(tqsizeHint()); setFixedSize(sizeHint());
notifySize(columns, lines); // set menu items notifySize(columns, lines); // set menu items
} }
} }
@ -1437,7 +1437,7 @@ void Konsole::slotSaveSessionsProfile()
TQString::null, &ok, this ); TQString::null, &ok, this );
if ( ok ) { if ( ok ) {
TQString path = locateLocal( "data", TQString path = locateLocal( "data",
TQString::tqfromLatin1( "konsole/profiles/" ) + prof, TQString::fromLatin1( "konsole/profiles/" ) + prof,
KGlobal::instance() ); KGlobal::instance() );
if ( TQFile::exists( path ) ) if ( TQFile::exists( path ) )
@ -1927,7 +1927,7 @@ void Konsole::slotToggleMenubar() {
if (b_fixedSize) if (b_fixedSize)
{ {
adjustSize(); adjustSize();
setFixedSize(tqsizeHint()); setFixedSize(sizeHint());
} }
if (!showMenubar->isChecked()) { if (!showMenubar->isChecked()) {
setCaption(i18n("Use the right mouse button to bring back the menu")); setCaption(i18n("Use the right mouse button to bring back the menu"));
@ -2007,7 +2007,7 @@ void Konsole::slotSelectTabbar() {
if (b_fixedSize) if (b_fixedSize)
{ {
adjustSize(); adjustSize();
setFixedSize(tqsizeHint()); setFixedSize(sizeHint());
} }
} }
@ -3498,7 +3498,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket)
co->writeEntry("Name", socket); co->writeEntry("Name", socket);
TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket);
co->writeEntry("Comment", txt); 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)); .arg(path).arg(socket));
TQString icon = "konsole"; TQString icon = "konsole";
cmd_serial++; cmd_serial++;

2
konsole/konsole/konsole_part.cpp
Unescape View File

@ -1137,7 +1137,7 @@ void konsolePart::showShellInDir( const TQString& dir )
{ {
TQString text = dir; TQString text = dir;
KRun::shellQuote(text); KRun::shellQuote(text);
text = TQString::tqfromLatin1("cd ") + text + '\n'; text = TQString::fromLatin1("cd ") + text + '\n';
te->emitText( text ); te->emitText( text );
}; };
} }

4
konsole/konsole/main.cpp
Unescape View File

@ -271,7 +271,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[])
TQString term = ""; TQString term = "";
if(args->isSet("tn")) { if(args->isSet("tn")) {
term=TQString::tqfromLatin1(args->getOption("tn")); term=TQString::fromLatin1(args->getOption("tn"));
} }
login_shell = args->isSet("ls"); 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 //// Temporary code, waiting for Qt to do this properly
// Delete all toplevel widgets that have WDestructiveClose // 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 // remove all toplevel widgets that have a parent (i.e. they
// got WTopLevel explicitly), they'll be deleted by the parent // got WTopLevel explicitly), they'll be deleted by the parent
list->first(); list->first();

6
konsole/konsole/schema.cpp
Unescape View File

@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname)
,lastRead(new TQDateTime()) ,lastRead(new TQDateTime())
{ {
//start with a valid time, aleXXX //start with a valid time, aleXXX
*lastRead = TQDateTime::tqcurrentDateTime(); *lastRead = TQDateTime::currentDateTime();
TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname); TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname);
if (fPath.isEmpty() || !TQFile::exists(fPath)) if (fPath.isEmpty() || !TQFile::exists(fPath))
{ {
@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile()
char line[100]; char line[100];
*lastRead = TQDateTime::tqcurrentDateTime(); *lastRead = TQDateTime::currentDateTime();
while (fscanf(sysin,"%80[^\n]\n",line) > 0) while (fscanf(sysin,"%80[^\n]\n",line) > 0)
{ {
@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas()
// now. // now.
// //
// //
TQDateTime now = TQDateTime::tqcurrentDateTime(); TQDateTime now = TQDateTime::currentDateTime();
r = updateAllSchemaTimes(now); r = updateAllSchemaTimes(now);

8
konsole/konsole/session.cpp
Unescape View File

@ -133,11 +133,11 @@ void TESession::ptyError()
{ {
// FIXME: sh->error() is always empty // FIXME: sh->error() is always empty
if ( sh->error().isEmpty() ) 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("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") ); i18n("A Fatal Error Has Occurred") );
else else
KMessageBox::error(te->tqtopLevelWidget(), sh->error()); KMessageBox::error(te->topLevelWidget(), sh->error());
emit done(this); 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(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) );
connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); 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")); i18n("ZModem Progress"));
connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), connect(zmodemProgress, TQT_SIGNAL(user1Clicked()),
@ -767,7 +767,7 @@ QCStringList TESession::functionsDynamic()
void TESession::onRcvBlock( const char* buf, int len ) void TESession::onRcvBlock( const char* buf, int len )
{ {
em->onRcvBlock( buf, 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 ) void TESession::print( TQPainter &paint, bool friendly, bool exact )

16
kpager/desktop.cpp
Unescape View File

@ -295,7 +295,7 @@ TQPixmap *Desktop::paintNewWindow(const KWin::WindowInfo *info)
p.begin(pixmap); p.begin(pixmap);
p.setFont(font()); p.setFont(font());
p.fillRect( r, tqcolorGroup().brush(TQColorGroup::Dark)); p.fillRect( r, colorGroup().brush(TQColorGroup::Dark));
paintWindow(p, info, false); paintWindow(p, info, false);
p.end(); p.end();
@ -425,7 +425,7 @@ void Desktop::paintEvent( TQPaintEvent * )
p.begin(&pixmap); p.begin(&pixmap);
// p.setFont(font()); // p.setFont(font());
// p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Dark)); // p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark));
// p.setPen(Qt::black); // p.setPen(Qt::black);
// p.drawRect(rect()); // p.drawRect(rect());
@ -450,7 +450,7 @@ void Desktop::paintEvent( TQPaintEvent * )
else pixmap.fill(Qt::gray); else pixmap.fill(Qt::gray);
} }
else else
p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Mid)); p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid));
// set in/active pen // set in/active pen
if (isCurrent()) if (isCurrent())
@ -523,8 +523,8 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
TQBrush brush; TQBrush brush;
if ( isActive ) brush=tqcolorGroup().brush( TQColorGroup::Highlight ); if ( isActive ) brush=colorGroup().brush( TQColorGroup::Highlight );
else brush=tqcolorGroup().brush( TQColorGroup::Button ); else brush=colorGroup().brush( TQColorGroup::Button );
if ( m_transparentMode==AllWindows if ( m_transparentMode==AllWindows
|| (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) ) || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) )
@ -532,12 +532,12 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
if ( isActive ) if ( isActive )
{ {
qDrawShadeRect( &p, r, tqcolorGroup(), false, 1, 0, &brush ); qDrawShadeRect( &p, r, colorGroup(), false, 1, 0, &brush );
} }
else else
{ {
p.fillRect( r, brush ); 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"; } else kdDebug() << "Error getting the background\n";
} }
TQSize Desktop::tqsizeHint() const TQSize Desktop::sizeHint() const
{ {
return TQSize(67,50); return TQSize(67,50);
} }

2
kpager/desktop.h
Unescape View File

@ -74,7 +74,7 @@ public:
static void removeCachedPixmap(int nWin) { m_windowPixmaps.remove(nWin); }; 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 * active is a bool that specifies if the frame is the active

8
kpager/kpager.cpp
Unescape View File

@ -76,7 +76,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name)
if (w > 0 && h > 0) if (w > 0 && h > 0)
resize(w,h); resize(w,h);
else else
resize(m_pPager->tqsizeHint()); resize(m_pPager->sizeHint());
// resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90)); // resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90));
int xpos=cfg->readNumEntry("xPos",-1); 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()); // rect.pos.y+rect.size.height-m_pPager->height());
// antonio:The above lines don't work. I should look at them when I have // antonio:The above lines don't work. I should look at them when I have
// more time // 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 // Set the wm flags to this window
@ -652,12 +652,12 @@ void KPager::slotGrabWindows()
m_desktops[m_currentDesktop-1]->tqrepaint(); m_desktops[m_currentDesktop-1]->tqrepaint();
} }
TQSize KPager::tqsizeHint() const TQSize KPager::sizeHint() const
{ {
int n=m_desktops.count(); int n=m_desktops.count();
int w=-1,h=-1; int w=-1,h=-1;
TQSize size=m_desktops[0]->tqsizeHint(); TQSize size=m_desktops[0]->sizeHint();
int wDsk=size.width(); int wDsk=size.width();
int hDsk=size.height(); int hDsk=size.height();
switch (m_layoutType) switch (m_layoutType)

2
kpager/kpager.h
Unescape View File

@ -76,7 +76,7 @@ public:
KWin::WindowInfo* info( WId win ); KWin::WindowInfo* info( WId win );
TQSize tqsizeHint() const; TQSize sizeHint() const;
enum LayoutTypes { Classical=0, Horizontal, Vertical }; enum LayoutTypes { Classical=0, Horizontal, Vertical };

28
kpersonalizer/kcountrypage.cpp
Unescape View File

@ -76,7 +76,7 @@ KCountryPage::~KCountryPage(){
void KCountryPage::loadCountryList(KLanguageButton *combo) { void KCountryPage::loadCountryList(KLanguageButton *combo) {
TQString sub = TQString::tqfromLatin1("l10n/"); TQString sub = TQString::fromLatin1("l10n/");
// clear the list // clear the list
combo->clear(); combo->clear();
@ -86,8 +86,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
KSimpleConfig entry(*it); KSimpleConfig entry(*it);
entry.setGroup(TQString::tqfromLatin1("KCM Locale")); entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
TQString tag = *it; TQString tag = *it;
int index; int index;
@ -113,8 +113,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
KSimpleConfig entry(*it); KSimpleConfig entry(*it);
entry.setGroup(TQString::tqfromLatin1("KCM Locale")); entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
TQString submenu = '-' + entry.readEntry("Region"); TQString submenu = '-' + entry.readEntry("Region");
TQString tag = *it; TQString tag = *it;
@ -123,7 +123,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
index = tag.findRev('/'); index = tag.findRev('/');
tag = tag.mid(index+1); 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 ); TQIconSet icon( flag );
combo->insertItem( icon, name, tag, submenu ); combo->insertItem( icon, name, tag, submenu );
} }
@ -138,7 +138,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) {
for ( it = langlist.begin(); it != langlist.end(); ++it ) { for ( it = langlist.begin(); it != langlist.end(); ++it ) {
if ((*it).isNull()) { if ((*it).isNull()) {
combo->insertSeparator(); combo->insertSeparator();
submenu = TQString::tqfromLatin1("all"); submenu = TQString::fromLatin1("all");
combo->insertSubmenu(i18n("All"), submenu, TQString::null); combo->insertSubmenu(i18n("All"), submenu, TQString::null);
continue; continue;
} }
@ -151,9 +151,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
kdDebug() << "KCountryPage::save()" << endl; kdDebug() << "KCountryPage::save()" << endl;
KConfigBase *config = KGlobal::config(); KConfigBase *config = KGlobal::config();
config->setGroup(TQString::tqfromLatin1("Locale")); config->setGroup(TQString::fromLatin1("Locale"));
config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true); config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true);
config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true); config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true);
config->sync(); config->sync();
// only make the system reload the language, if the selected one deferes from the old saved one. // 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(); kapp->dcopClient()->attach();
// ksycoca needs to be rebuilt // ksycoca needs to be rebuilt
KProcess proc; KProcess proc;
proc << TQString::tqfromLatin1("kbuildsycoca"); proc << TQString::fromLatin1("kbuildsycoca");
proc.start(KProcess::DontCare); proc.start(KProcess::DontCare);
kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl; kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
// inform kicker and kdeskop about the new language // 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) { void KCountryPage::setLangForCountry(const TQString &country) {
KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
ent.setGroup(TQString::tqfromLatin1("KCM Locale")); ent.setGroup(TQString::fromLatin1("KCM Locale"));
langs = ent.readListEntry(TQString::tqfromLatin1("Languages")); 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 // use the first INSTALLED langauge in the list, or default to C
for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
if (cb_language->contains(*it)) { if (cb_language->contains(*it)) {

8
kpersonalizer/kcountrypagedlg.ui
Unescape View File

@ -36,7 +36,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
@ -120,7 +120,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>0</height> <height>0</height>
@ -160,7 +160,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>170</width> <width>170</width>
<height>430</height> <height>430</height>
@ -189,7 +189,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>30</height> <height>30</height>

4
kpersonalizer/keyecandypagedlg.ui
Unescape View File

@ -28,7 +28,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>170</width> <width>170</width>
<height>430</height> <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> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>0</width>
<height>120</height> <height>120</height>

6
kpersonalizer/kfindlanguage.cpp
Unescape View File

@ -38,7 +38,7 @@ KFindLanguage::KFindLanguage() {
m_country = config->readEntry("Country", "C"); m_country = config->readEntry("Country", "C");
if (m_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 if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY
m_country = "no"; m_country = "no";
if(m_country.contains("_")) if(m_country.contains("_"))
@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() {
} }
// get the users primary Languages // 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"); ent.setGroup("KCM Locale");
TQStringList langs = ent.readListEntry("Languages"); TQStringList langs = ent.readListEntry("Languages");
if (langs.isEmpty()) if (langs.isEmpty())
@ -96,7 +96,7 @@ KFindLanguage::KFindLanguage() {
if (m_oldlang.isEmpty()) { if (m_oldlang.isEmpty()) {
compare = langs.first(); compare = langs.first();
for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) { 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; compare = *it;
} }
} }

6
kpersonalizer/kospagedlg.ui
Unescape View File

@ -33,7 +33,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>170</width> <width>170</width>
<height>430</height> <height>430</height>
@ -136,7 +136,7 @@ Trinity allows you to customize its behavior according to your needs.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>22</width> <width>22</width>
<height>10</height> <height>10</height>
@ -153,7 +153,7 @@ Trinity allows you to customize its behavior according to your needs.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>22</width> <width>22</width>
<height>16</height> <height>16</height>

10
kpersonalizer/kpersonalizer.cpp
Unescape View File

@ -232,11 +232,11 @@ void KPersonalizer::setBeforeSession(){
/** there seems to be a bug in TQWizard, that makes this evil hack necessary */ /** there seems to be a bug in TQWizard, that makes this evil hack necessary */
void KPersonalizer::setPosition() { void KPersonalizer::setPosition() {
TQSize hint = countrypage->tqsizeHint(); TQSize hint = countrypage->sizeHint();
TQSize os_size = ospage->tqsizeHint(); TQSize os_size = ospage->sizeHint();
TQSize candy_size = eyecandy->tqsizeHint(); TQSize candy_size = eyecandy->sizeHint();
TQSize style_size = stylepage->tqsizeHint(); TQSize style_size = stylepage->sizeHint();
TQSize refine_size = refinepage->tqsizeHint(); TQSize refine_size = refinepage->sizeHint();
// get the width of the broadest child-widget // get the width of the broadest child-widget
if ( hint.width() < os_size.width() ) if ( hint.width() < os_size.width() )

12
kpersonalizer/krefinepagedlg.ui
Unescape View File

@ -98,7 +98,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>170</width> <width>170</width>
<height>430</height> <height>430</height>
@ -146,7 +146,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>16</height> <height>16</height>
@ -163,7 +163,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -188,7 +188,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -213,7 +213,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -232,7 +232,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

16
kpersonalizer/kstylepage.cpp
Unescape View File

@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) {
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) { for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) {
if (groups[i] == 0L) if (groups[i] == 0L)
break; 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()->writeEntry("Size", icontheme.defaultSize(i));
} }
KGlobal::config()->sync(); KGlobal::config()->sync();
@ -428,12 +428,12 @@ void KStylePage::getAvailability() {
else if (*it == "Light, 3rd revision") kde_light_exist = true; else if (*it == "Light, 3rd revision") kde_light_exist = true;
} }
// and disable the ListItems, if they are not. // and disable the ListItems, if they are not.
if ( !(kde_plastik_exist || kde_light_exist) ) kde->tqsetVisible(false); if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false);
if ( !(kde_hc_exist || kde_def_exist) ) classic->tqsetVisible(false); if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false);
if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->tqsetVisible(false); if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false);
if (!cde_exist) cde->tqsetVisible(false); if (!cde_exist) cde->setVisible(false);
if (!win_exist) win->tqsetVisible(false); if (!win_exist) win->setVisible(false);
if (!platinum_exist) platinum->tqsetVisible(false); if (!platinum_exist) platinum->setVisible(false);
// test, wich KWin-styles are available // test, wich KWin-styles are available
twin_keramik_exist = twin_system_exist = twin_plastik_exist twin_keramik_exist = twin_system_exist = twin_plastik_exist
@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() {
// go ahead // go ahead
setStyleRecursive( stylePreview, palette, style ); setStyleRecursive( stylePreview, palette, style );
// this flickers, but reliably draws the widgets corretly. // this flickers, but reliably draws the widgets corretly.
stylePreview->resize( stylePreview->tqsizeHint() ); stylePreview->resize( stylePreview->sizeHint() );
delete appliedStyle; delete appliedStyle;
appliedStyle = style; appliedStyle = style;

2
kpersonalizer/kstylepagedlg.ui
Unescape View File

@ -49,7 +49,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>170</width> <width>170</width>
<height>430</height> <height>430</height>

2
kreadconfig/kwriteconfig.cpp
Unescape View File

@ -52,7 +52,7 @@ int main(int argc, char **argv)
KConfig *konfig; KConfig *konfig;
if (file.isEmpty()) if (file.isEmpty())
konfig = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
else else
konfig = new KConfig(file, false, false); konfig = new KConfig(file, false, false);

2
kscreensaver/blankscrn.cpp
Unescape View File

@ -69,7 +69,7 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name )
grid->setRowStretch( 2, 10 ); grid->setRowStretch( 2, 10 );
grid->setRowStretch( 3, 20 ); grid->setRowStretch( 3, 20 );
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
} }
// read settings from config file // read settings from config file

2
kscreensaver/random.cpp
Unescape View File

@ -271,7 +271,7 @@ KRandomSetup::KRandomSetup( TQWidget *parent, const char *name )
manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main);
grid->addWidget(manipulateScreen, 1, 0); grid->addWidget(manipulateScreen, 1, 0);
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
KConfig config("krandom.kssrc"); KConfig config("krandom.kssrc");
config.setGroup("Settings"); config.setGroup("Settings");

8
ksmserver/client.cpp
Unescape View File

@ -146,7 +146,7 @@ TQString KSMClient::program() const
SmProp* p = property( SmProgram ); SmProp* p = property( SmProgram );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
return TQString::null; 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 TQStringList KSMClient::restartCommand() const
@ -156,7 +156,7 @@ TQStringList KSMClient::restartCommand() const
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result; return result;
for ( int i = 0; i < p->num_vals; i++ ) 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; return result;
} }
@ -167,7 +167,7 @@ TQStringList KSMClient::discardCommand() const
if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1)
return result; return result;
for ( int i = 0; i < p->num_vals; i++ ) 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; return result;
} }
@ -184,7 +184,7 @@ TQString KSMClient::userId() const
SmProp* p = property( SmUserID ); SmProp* p = property( SmUserID );
if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1)
return TQString::null; return TQString::null;
return TQString::tqfromLatin1( (const char*) p->vals[0].value ); return TQString::fromLatin1( (const char*) p->vals[0].value );
} }

4
ksmserver/legacy.cpp
Unescape View File

@ -315,7 +315,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop)
if (!data) if (!data)
return result; return result;
for (int i=0; i<(int)nitems; i++) { 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++; while(data[i]) i++;
} }
XFree(data); XFree(data);
@ -363,7 +363,7 @@ TQString KSMServer::windowWmClientMachine(WId w)
} }
} }
} }
return TQString::tqfromLatin1(result); return TQString::fromLatin1(result);
} }
WId KSMServer::windowWmClientLeader(WId w) WId KSMServer::windowWmClientLeader(WId w)

4
ksmserver/main.cpp
Unescape View File

@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] )
qmsg.sprintf(msg.data(), path.data()); qmsg.sprintf(msg.data(), path.data());
qmsg = msg_pre+qmsg+msg_post; qmsg = msg_pre+qmsg+msg_post;
TQMessageBox::critical(0, "KDE Installation Problem!", TQMessageBox::critical(0, "KDE Installation Problem!",
TQString::tqfromLatin1(qmsg.data())); TQString::fromLatin1(qmsg.data()));
exit(255); exit(255);
} }
} }
@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
only_local = false; only_local = false;
#endif #endif
KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local); KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local);
kapp->dcopClient()->setDefaultObject( server->objId() ); kapp->dcopClient()->setDefaultObject( server->objId() );
IceSetIOErrorHandler( IoErrorHandler ); IceSetIOErrorHandler( IoErrorHandler );

20
ksmserver/shutdowndlg.cpp
Unescape View File

@ -650,7 +650,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
TQFrame* frame = new TQFrame( this ); TQFrame* frame = new TQFrame( this );
frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); 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 // we need to set the minimum size for the logout box, since it
// gets too small if there isn't all options available // gets too small if there isn't all options available
frame->setMinimumWidth(400); frame->setMinimumWidth(400);
@ -691,7 +691,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{ {
// first line of buttons // first line of buttons
hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() ); hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() );
hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); hbuttonbox->setAlignment( Qt::AlignHCenter );
// End session // End session
FlatButton* btnLogout = new FlatButton( frame ); FlatButton* btnLogout = new FlatButton( frame );
btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false ); btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false );
@ -711,12 +711,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
hbox->addWidget( lfrm, AlignCenter ); hbox->addWidget( lfrm, AlignCenter );
buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() ); buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() );
buttonlay->tqsetAlignment( Qt::AlignHCenter ); buttonlay->setAlignment( Qt::AlignHCenter );
TQLabel* icon = new TQLabel( lfrm ); TQLabel* icon = new TQLabel( lfrm );
icon->setPixmap( UserIcon( "shutdownkonq" ) ); icon->setPixmap( UserIcon( "shutdownkonq" ) );
lfrm->setFixedSize( icon->tqsizeHint()); lfrm->setFixedSize( icon->sizeHint());
icon->setFixedSize( icon->tqsizeHint()); icon->setFixedSize( icon->sizeHint());
buttonlay->addStretch( 1 ); buttonlay->addStretch( 1 );
// End session // End session
@ -832,7 +832,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// bottom buttons // bottom buttons
TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
hbuttonbox2->tqsetAlignment( Qt::AlignHCenter ); hbuttonbox2->setAlignment( Qt::AlignHCenter );
// Reboot // Reboot
FlatButton* btnReboot = new FlatButton( frame ); FlatButton* btnReboot = new FlatButton( frame );
@ -882,7 +882,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
// cancel buttonbox // cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
hbuttonbox3->tqsetAlignment( Qt::AlignRight ); hbuttonbox3->setAlignment( Qt::AlignRight );
// Back to Desktop // Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
@ -969,7 +969,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent,
{ {
// cancel buttonbox // cancel buttonbox
TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() );
hbuttonbox3->tqsetAlignment( Qt::AlignRight ); hbuttonbox3->setAlignment( Qt::AlignRight );
// Back to Desktop // Back to Desktop
KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame );
@ -1100,7 +1100,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd
maysd, sdtype ); maysd, sdtype );
// Show dialog (will save the background in showEvent) // Show dialog (will save the background in showEvent)
TQSize sh = l->tqsizeHint(); TQSize sh = l->sizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
l->move(rect.x() + (rect.width() - sh.width())/2, l->move(rect.x() + (rect.width() - sh.width())/2,
@ -1230,7 +1230,7 @@ bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const
{ {
kapp->enableStyles(); kapp->enableStyles();
KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay ); KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay );
TQSize sh = msg.tqsizeHint(); TQSize sh = msg.sizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
msg.move(rect.x() + (rect.width() - sh.width())/2, msg.move(rect.x() + (rect.width() - sh.width())/2,

14
ksmserver/timed.ui
Unescape View File

@ -110,7 +110,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>2</height> <height>2</height>
@ -129,7 +129,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>48</width> <width>48</width>
<height>48</height> <height>48</height>
@ -149,7 +149,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>2</height> <height>2</height>
@ -229,7 +229,7 @@ after X automatically.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Preferred</enum> <enum>Preferred</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>0</height> <height>0</height>
@ -258,7 +258,7 @@ after X automatically.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
@ -286,7 +286,7 @@ after X automatically.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>
@ -319,7 +319,7 @@ after X automatically.</string>
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>90</width> <width>90</width>
<height>20</height> <height>20</height>

10
ksplashml/kcmksplash/installer.cpp
Unescape View File

@ -99,7 +99,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
hbox->setStretchFactor( leftbox, 1 ); hbox->setStretchFactor( leftbox, 1 );
mThemesList = new ThemeListBox(this); 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(highlighted(int)), TQT_SLOT(slotSetTheme(int)));
connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&))); connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&)));
leftbox->addWidget(mThemesList); leftbox->addWidget(mThemesList);
@ -120,16 +120,16 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
hbox->setStretchFactor( rightbox, 3 ); hbox->setStretchFactor( rightbox, 3 );
mPreview = new TQLabel(this); mPreview = new TQLabel(this);
mPreview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
mPreview->setMinimumSize(TQSize(320,240)); mPreview->setMinimumSize(TQSize(320,240));
mPreview->tqsetAlignment(Qt::AlignHCenter|Qt::AlignVCenter); mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
rightbox->addWidget(mPreview); rightbox->addWidget(mPreview);
rightbox->setStretchFactor( mPreview, 3 ); rightbox->setStretchFactor( mPreview, 3 );
mText = new TQTextEdit(this); mText = new TQTextEdit(this);
mText->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred );
mText->setMinimumSize(mText->tqsizeHint()); mText->setMinimumSize(mText->sizeHint());
mText->setReadOnly(true); mText->setReadOnly(true);
rightbox->addWidget(mText); rightbox->addWidget(mText);
rightbox->setStretchFactor( mText, 1 ); rightbox->setStretchFactor( mText, 1 );

4
ksplashml/themeengine/default/themelegacy.cpp
Unescape View File

@ -164,7 +164,7 @@ void ThemeDefault::_initUi()
mProgressBar->setPaletteBackgroundPixmap( blimage ); mProgressBar->setPaletteBackgroundPixmap( blimage );
bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) ); 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. // 3 pixels of whitespace between the label and the progressbar.
mLabel->resize( bottom_label->width(), bottom_label->height() ); 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 ); p.drawPixmap(0, 0, *mInactivePixmap, 0, 0, tmp.width()-offs );
else else
#endif #endif
p.tqdrawPixmap(offs, 0, *mInactivePixmap, offs, 0); p.drawPixmap(offs, 0, *mInactivePixmap, offs, 0);
return tmp ; return tmp ;
} }

6
ksplashml/themeengine/redmond/themeredmond.cpp
Unescape View File

@ -199,11 +199,11 @@ void ThemeRedmond::_initUi()
kdmconfig->setGroup("X-*-Greeter"); kdmconfig->setGroup("X-*-Greeter");
TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
TQString fs = kdmconfig->readEntry( "FaceSource" ); TQString fs = kdmconfig->readEntry( "FaceSource" );
if (fs == TQString::tqfromLatin1("UserOnly")) if (fs == TQString::fromLatin1("UserOnly"))
faceSource = fUserOnly; faceSource = fUserOnly;
else if (fs == TQString::tqfromLatin1("PreferUser")) else if (fs == TQString::fromLatin1("PreferUser"))
faceSource = fUserFirst; faceSource = fUserFirst;
else if (fs == TQString::tqfromLatin1("PreferAdmin")) else if (fs == TQString::fromLatin1("PreferAdmin"))
faceSource = fAdminFirst; faceSource = fAdminFirst;
else else
faceSource = fAdminOnly; // Admin Only faceSource = fAdminOnly; // Admin Only

2
ksplashml/themeengine/unified/themeunified.cpp
Unescape View File

@ -80,7 +80,7 @@ void ThemeUnified::_initUi()
const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() ); const TQRect rect = kapp->desktop()->screenGeometry( mTheme->xineramaScreen() );
// Center the dialog // Center the dialog
TQSize sh = tqsizeHint(); TQSize sh = sizeHint();
TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos()); TQRect rect1 = KGlobalSettings::desktopGeometry(TQCursor::pos());
move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2); move(rect1.x() + (rect1.width() - sh.width())/2, rect1.y() + (rect1.height() - sh.height())/2);
} }

2
ksysguard/gui/KSGAppletSettings.cc
Unescape View File

@ -65,7 +65,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name )
topLayout->addWidget( mInterval, 2, 1 ); topLayout->addWidget( mInterval, 2, 1 );
label->setBuddy( mInterval ); label->setBuddy( mInterval );
resize( TQSize( 250, 130 ).expandedTo( tqminimumSizeHint() ) ); resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) );
KAcceleratorManager::manage( page ); KAcceleratorManager::manage( page );
} }

4
ksysguard/gui/SensorDisplayLib/BarGraph.cc
Unescape View File

@ -52,7 +52,7 @@ BarGraph::BarGraph( TQWidget *parent, const char *name )
// Anything smaller than this does not make sense. // Anything smaller than this does not make sense.
setMinimumSize( 16, 16 ); setMinimumSize( 16, 16 );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false ) ); TQSizePolicy::Expanding, false ) );
} }
@ -111,7 +111,7 @@ void BarGraph::paintEvent( TQPaintEvent* )
/* Draw white line along the bottom and the right side of the /* Draw white line along the bottom and the right side of the
* widget to create a 3D like look. */ * 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( 0, h - 1, w - 1, h - 1 );
p.drawLine( w - 1, 0, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 );

8
ksysguard/gui/SensorDisplayLib/DancingBars.cc
Unescape View File

@ -53,7 +53,7 @@ DancingBars::DancingBars( TQWidget *parent, const char *name, const TQString &ti
else else
mPlotter = new BarGraph( frame() ); mPlotter = new BarGraph( frame() );
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
/* All RMB clicks to the mPlotter widget will be handled by /* All RMB clicks to the mPlotter widget will be handled by
* SensorDisplay::eventFilter. */ * SensorDisplay::eventFilter. */
@ -231,12 +231,12 @@ void DancingBars::resizeEvent( TQResizeEvent* )
frame()->setGeometry( 0, 0, width(), height() ); frame()->setGeometry( 0, 0, width(), height() );
} }
TQSize DancingBars::tqsizeHint() TQSize DancingBars::sizeHint()
{ {
if ( noFrame() ) if ( noFrame() )
return ( mPlotter->tqsizeHint() ); return ( mPlotter->sizeHint() );
else else
return ( frame()->tqsizeHint() ); return ( frame()->sizeHint() );
} }
void DancingBars::answerReceived( int id, const TQString &answer ) void DancingBars::answerReceived( int id, const TQString &answer )

2
ksysguard/gui/SensorDisplayLib/DancingBars.h
Unescape View File

@ -54,7 +54,7 @@ class DancingBars : public KSGRD::SensorDisplay
void updateSamples( const TQMemArray<double> &samples ); void updateSamples( const TQMemArray<double> &samples );
virtual TQSize tqsizeHint(); virtual TQSize sizeHint();
virtual void answerReceived( int id, const TQString &answer ); virtual void answerReceived( int id, const TQString &answer );

8
ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
Unescape View File

@ -52,7 +52,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name,
mPlotter->setTitle( title ); 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 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 /* All RMB clicks to the mPlotter widget will be handled by
* SensorDisplay::eventFilter. */ * SensorDisplay::eventFilter. */
@ -281,12 +281,12 @@ void FancyPlotter::resizeEvent( TQResizeEvent* )
frame()->setGeometry( 0, 0, width(), height() ); frame()->setGeometry( 0, 0, width(), height() );
} }
TQSize FancyPlotter::tqsizeHint() TQSize FancyPlotter::sizeHint()
{ {
if ( noFrame() ) if ( noFrame() )
return mPlotter->tqsizeHint(); return mPlotter->sizeHint();
else else
return frame()->tqsizeHint(); return frame()->sizeHint();
} }
void FancyPlotter::answerReceived( int id, const TQString &answer ) void FancyPlotter::answerReceived( int id, const TQString &answer )

2
ksysguard/gui/SensorDisplayLib/FancyPlotter.h
Unescape View File

@ -66,7 +66,7 @@ class FancyPlotter : public KSGRD::SensorDisplay
bool removeSensor( uint pos ); bool removeSensor( uint pos );
virtual TQSize tqsizeHint(void); virtual TQSize sizeHint(void);
virtual void answerReceived( int id, const TQString &answer ); virtual void answerReceived( int id, const TQString &answer );

4
ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
Unescape View File

@ -90,7 +90,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
boxLayout->addWidget( label, 1, 0 ); boxLayout->addWidget( label, 1, 0 );
mMinValue = new KLineEdit( groupBox ); mMinValue = new KLineEdit( groupBox );
mMinValue->tqsetAlignment( AlignRight ); mMinValue->setAlignment( AlignRight );
mMinValue->setEnabled( false ); 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." ) ); 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 ); boxLayout->addWidget( mMinValue, 1, 1 );
@ -100,7 +100,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name )
boxLayout->addWidget( label, 1, 3 ); boxLayout->addWidget( label, 1, 3 );
mMaxValue = new KLineEdit( groupBox ); mMaxValue = new KLineEdit( groupBox );
mMaxValue->tqsetAlignment( AlignRight ); mMaxValue->setAlignment( AlignRight );
mMaxValue->setEnabled( false ); 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." ) ); 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 ); boxLayout->addWidget( mMaxValue, 1, 4 );

56
ksysguard/gui/SensorDisplayLib/ListView.cc
Unescape View File

@ -105,7 +105,7 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending
PrivateListView::PrivateListView(TQWidget *parent, const char *name) PrivateListView::PrivateListView(TQWidget *parent, const char *name)
: TQListView(parent, name) : TQListView(parent, name)
{ {
TQColorGroup cg = tqcolorGroup(); TQColorGroup cg = colorGroup();
cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
@ -116,8 +116,8 @@ PrivateListView::PrivateListView(TQWidget *parent, const char *name)
void PrivateListView::update(const TQString& answer) void PrivateListView::update(const TQString& answer)
{ {
tqsetUpdatesEnabled(false); setUpdatesEnabled(false);
viewport()->tqsetUpdatesEnabled(false); viewport()->setUpdatesEnabled(false);
int vpos = verticalScrollBar()->value(); int vpos = verticalScrollBar()->value();
int hpos = horizontalScrollBar()->value(); int hpos = horizontalScrollBar()->value();
@ -143,8 +143,8 @@ void PrivateListView::update(const TQString& answer)
verticalScrollBar()->setValue(vpos); verticalScrollBar()->setValue(vpos);
horizontalScrollBar()->setValue(hpos); horizontalScrollBar()->setValue(hpos);
viewport()->tqsetUpdatesEnabled(true); viewport()->setUpdatesEnabled(true);
tqsetUpdatesEnabled(true); setUpdatesEnabled(true);
triggerUpdate(); 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")); addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title"));
TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); TQColorGroup colorGroup = monitor->colorGroup();
tqcolorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor()));
tqcolorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor()));
tqcolorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); 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); SensorDisplay::restoreSettings(element);
@ -311,10 +311,10 @@ ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
element.setAttribute("sensorName", sensors().tqat(0)->name()); element.setAttribute("sensorName", sensors().tqat(0)->name());
element.setAttribute("sensorType", sensors().tqat(0)->type()); element.setAttribute("sensorType", sensors().tqat(0)->type());
TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); TQColorGroup colorGroup = monitor->colorGroup();
saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link)); saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link));
saveColor(element, "textColor", tqcolorGroup.color(TQColorGroup::Text)); saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text));
saveColor(element, "backgroundColor", tqcolorGroup.color(TQColorGroup::Base)); saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base));
SensorDisplay::saveSettings(doc, element); SensorDisplay::saveSettings(doc, element);
@ -331,10 +331,10 @@ ListView::configureSettings()
Q_CHECK_PTR(lvs); Q_CHECK_PTR(lvs);
connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings()));
TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); TQColorGroup colorGroup = monitor->colorGroup();
lvs->setGridColor(tqcolorGroup.color(TQColorGroup::Link)); lvs->setGridColor(colorGroup.color(TQColorGroup::Link));
lvs->setTextColor(tqcolorGroup.color(TQColorGroup::Text)); lvs->setTextColor(colorGroup.color(TQColorGroup::Text));
lvs->setBackgroundColor(tqcolorGroup.color(TQColorGroup::Base)); lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base));
lvs->setTitle(title()); lvs->setTitle(title());
if (lvs->exec()) if (lvs->exec())
@ -347,11 +347,11 @@ ListView::configureSettings()
void void
ListView::applySettings() ListView::applySettings()
{ {
TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); TQColorGroup colorGroup = monitor->colorGroup();
tqcolorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); colorGroup.setColor(TQColorGroup::Link, lvs->gridColor());
tqcolorGroup.setColor(TQColorGroup::Text, lvs->textColor()); colorGroup.setColor(TQColorGroup::Text, lvs->textColor());
tqcolorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor());
monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
setTitle(lvs->title()); setTitle(lvs->title());
@ -361,11 +361,11 @@ ListView::applySettings()
void void
ListView::applyStyle() ListView::applyStyle()
{ {
TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); TQColorGroup colorGroup = monitor->colorGroup();
tqcolorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor());
tqcolorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor());
tqcolorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup));
setModified(true); setModified(true);
} }

2
ksysguard/gui/SensorDisplayLib/ListView.h
Unescape View File

@ -58,7 +58,7 @@ public:
PrivateListViewItem(PrivateListView *parent = 0); PrivateListViewItem(PrivateListView *parent = 0);
void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) { 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); TQListViewItem::paintCell(p, cgroup, column, width, tqalignment);
p->setPen(cgroup.color(TQColorGroup::Link)); p->setPen(cgroup.color(TQColorGroup::Link));
p->drawLine(0, height() - 1, width - 1, height() - 1); p->drawLine(0, height() - 1, width - 1, height() - 1);

12
ksysguard/gui/SensorDisplayLib/LogFile.cc
Unescape View File

@ -79,7 +79,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T
void LogFile::configureSettings(void) void LogFile::configureSettings(void)
{ {
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
lfs = new LogFileSettings(this); lfs = new LogFileSettings(this);
Q_CHECK_PTR(lfs); Q_CHECK_PTR(lfs);
@ -147,7 +147,7 @@ void LogFile::settingsRuleListSelected(int index)
void LogFile::applySettings(void) void LogFile::applySettings(void)
{ {
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color()); cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color());
cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color()); cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color());
@ -166,7 +166,7 @@ void LogFile::applySettings(void)
void void
LogFile::applyStyle() LogFile::applyStyle()
{ {
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
@ -179,7 +179,7 @@ bool
LogFile::restoreSettings(TQDomElement& element) LogFile::restoreSettings(TQDomElement& element)
{ {
TQFont font; TQFont font;
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); 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()); element.setAttribute("font", monitor->font().toString());
saveColor(element, "textColor", monitor->tqcolorGroup().text()); saveColor(element, "textColor", monitor->colorGroup().text());
saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); saveColor(element, "backgroundColor", monitor->colorGroup().base());
for (TQStringList::Iterator it = filterRules.begin(); for (TQStringList::Iterator it = filterRules.begin();
it != filterRules.end(); it++) it != filterRules.end(); it++)

8
ksysguard/gui/SensorDisplayLib/LogFileSettings.ui
Unescape View File

@ -142,7 +142,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -172,7 +172,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -264,7 +264,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -313,7 +313,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

2
ksysguard/gui/SensorDisplayLib/MultiMeter.cc
Unescape View File

@ -53,7 +53,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name,
Q_CHECK_PTR(lcd); Q_CHECK_PTR(lcd);
lcd->setSegmentStyle(TQLCDNumber::Filled); lcd->setSegmentStyle(TQLCDNumber::Filled);
setDigitColor(KSGRD::Style->backgroundColor()); setDigitColor(KSGRD::Style->backgroundColor());
lcd->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false)); TQSizePolicy::Expanding, false));
setBackgroundColor(KSGRD::Style->backgroundColor()); setBackgroundColor(KSGRD::Style->backgroundColor());

12
ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui
Unescape View File

@ -96,7 +96,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -121,7 +121,7 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>0</height> <height>0</height>
@ -162,7 +162,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -187,7 +187,7 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>0</height> <height>0</height>
@ -377,8 +377,8 @@
<property type="Bool">enabled</property> <property type="Bool">enabled</property>
<property type="Rect">geometry</property> <property type="Rect">geometry</property>
<property type="SizePolicy">sizePolicy</property> <property type="SizePolicy">sizePolicy</property>
<property type="Size">tqminimumSize</property> <property type="Size">minimumSize</property>
<property type="Size">tqmaximumSize</property> <property type="Size">maximumSize</property>
<property type="Size">sizeIncrement</property> <property type="Size">sizeIncrement</property>
<property type="Size">baseSize</property> <property type="Size">baseSize</property>
<property type="Color">paletteForegroundColor</property> <property type="Color">paletteForegroundColor</property>

10
ksysguard/gui/SensorDisplayLib/ProcessController.cc
Unescape View File

@ -98,11 +98,11 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
cbFilter->insertItem(i18n("System Processes"), 1); cbFilter->insertItem(i18n("System Processes"), 1);
cbFilter->insertItem(i18n("User Processes"), 2); cbFilter->insertItem(i18n("User Processes"), 2);
cbFilter->insertItem(i18n("Own Processes"), 3); 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. // Create the check box to switch between tree view and list view.
xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView"); xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView");
Q_CHECK_PTR(xbTreeView); Q_CHECK_PTR(xbTreeView);
xbTreeView->setMinimumSize(xbTreeView->tqsizeHint()); xbTreeView->setMinimumSize(xbTreeView->sizeHint());
connect(xbTreeView, TQT_SIGNAL(toggled(bool)), connect(xbTreeView, TQT_SIGNAL(toggled(bool)),
this, TQT_SLOT(setTreeView(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" ), bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ),
this, "bRefresh" ); this, "bRefresh" );
Q_CHECK_PTR(bRefresh); Q_CHECK_PTR(bRefresh);
bRefresh->setMinimumSize(bRefresh->tqsizeHint()); bRefresh->setMinimumSize(bRefresh->sizeHint());
connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList()));
// Create the 'Kill' button. // Create the 'Kill' button.
bKill = new KPushButton(i18n("&Kill"), this, "bKill"); bKill = new KPushButton(i18n("&Kill"), this, "bKill");
Q_CHECK_PTR(bKill); Q_CHECK_PTR(bKill);
bKill->setMinimumSize(bKill->tqsizeHint()); bKill->setMinimumSize(bKill->sizeHint());
connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess()));
/* Disable the kill button until we know that the daemon supports the /* Disable the kill button until we know that the daemon supports the
* kill command. */ * kill command. */
@ -147,7 +147,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T
setPlotterWidget(pList); setPlotterWidget(pList);
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
fixTabOrder(); fixTabOrder();
} }

8
ksysguard/gui/SensorDisplayLib/ProcessList.cc
Unescape View File

@ -297,8 +297,8 @@ ProcessList::update(const TQString& list)
/* Disable painting to avoid flickering effects, /* Disable painting to avoid flickering effects,
* especially when in tree view mode. * especially when in tree view mode.
* Ditto for the scrollbar. */ * Ditto for the scrollbar. */
tqsetUpdatesEnabled(false); setUpdatesEnabled(false);
viewport()->tqsetUpdatesEnabled(false); viewport()->setUpdatesEnabled(false);
pl.clear(); pl.clear();
@ -349,8 +349,8 @@ ProcessList::update(const TQString& list)
horizontalScrollBar()->setValue(hpos); horizontalScrollBar()->setValue(hpos);
// Re-enable painting, and force an update. // Re-enable painting, and force an update.
tqsetUpdatesEnabled(true); setUpdatesEnabled(true);
viewport()->tqsetUpdatesEnabled(true); viewport()->setUpdatesEnabled(true);
triggerUpdate(); triggerUpdate();

2
ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
Unescape View File

@ -43,7 +43,7 @@ ReniceDlg::ReniceDlg(TQWidget* parent, const char* name, int currentPPrio,
"the number is the higher the priority.\n\n" "the number is the higher the priority.\n\n"
"Please enter the desired nice level:").arg(pid); "Please enter the desired nice level:").arg(pid);
message = new TQLabel(msg, page); message = new TQLabel(msg, page);
message->setMinimumSize(message->tqsizeHint()); message->setMinimumSize(message->sizeHint());
vLay->addWidget(message); vLay->addWidget(message);
/* /*

2
ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
Unescape View File

@ -66,7 +66,7 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name,
if(!nf) { if(!nf) {
mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame"); mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame");
mFrame->setFlat(true); mFrame->setFlat(true);
mFrame->tqsetAlignment(Qt::AlignHCenter); mFrame->setAlignment(Qt::AlignHCenter);
mFrame->setInsideMargin(2); mFrame->setInsideMargin(2);
setTitle( title ); setTitle( title );

28
ksysguard/gui/SensorDisplayLib/SensorLogger.cc
Unescape View File

@ -50,7 +50,7 @@ LogSensor::LogSensor(TQListView *parent)
pixmap_waiting = UserIcon( "waiting" ); pixmap_waiting = UserIcon( "waiting" );
lvi->setPixmap(0, pixmap_waiting); lvi->setPixmap(0, pixmap_waiting);
lvi->setTextColor(monitor->tqcolorGroup().text()); lvi->setTextColor(monitor->colorGroup().text());
monitor->insertItem(lvi); monitor->insertItem(lvi);
} }
@ -72,7 +72,7 @@ void
LogSensor::stopLogging(void) LogSensor::stopLogging(void)
{ {
lvi->setPixmap(0, pixmap_waiting); lvi->setPixmap(0, pixmap_waiting);
lvi->setTextColor(monitor->tqcolorGroup().text()); lvi->setTextColor(monitor->colorGroup().text());
lvi->tqrepaint(); lvi->tqrepaint();
timerOff(); timerOff();
} }
@ -104,7 +104,7 @@ LogSensor::answerReceived(int id, const TQString& answer)
{ {
timerOff(); timerOff();
lowerLimitActive = false; lowerLimitActive = false;
lvi->setTextColor(monitor->tqcolorGroup().foreground()); lvi->setTextColor(monitor->colorGroup().foreground());
lvi->tqrepaint(); lvi->tqrepaint();
KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName)); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName));
timerOn(); timerOn();
@ -112,13 +112,13 @@ LogSensor::answerReceived(int id, const TQString& answer)
{ {
timerOff(); timerOff();
upperLimitActive = false; upperLimitActive = false;
lvi->setTextColor(monitor->tqcolorGroup().foreground()); lvi->setTextColor(monitor->colorGroup().foreground());
lvi->tqrepaint(); lvi->tqrepaint();
KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName));
timerOn(); timerOn();
} }
TQDate date = TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().date()); TQDate date = TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().date());
TQTime time = TQT_TQTIME_OBJECT(TQDateTime::tqcurrentDateTime().time()); 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); 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("Host Name"));
monitor->addColumn(i18n("Log File")); monitor->addColumn(i18n("Log File"));
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor()); cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor());
@ -232,7 +232,7 @@ SensorLogger::editSensor(LogSensor* sensor)
void void
SensorLogger::configureSettings() SensorLogger::configureSettings()
{ {
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); sls = new SensorLoggerSettings(this, "SensorLoggerSettings");
Q_CHECK_PTR(sls); Q_CHECK_PTR(sls);
@ -254,7 +254,7 @@ SensorLogger::configureSettings()
void void
SensorLogger::applySettings() SensorLogger::applySettings()
{ {
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
setTitle(sls->title()); setTitle(sls->title());
@ -269,7 +269,7 @@ SensorLogger::applySettings()
void void
SensorLogger::applyStyle(void) SensorLogger::applyStyle(void)
{ {
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor());
cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor());
@ -282,7 +282,7 @@ SensorLogger::applyStyle(void)
bool bool
SensorLogger::restoreSettings(TQDomElement& element) SensorLogger::restoreSettings(TQDomElement& element)
{ {
TQColorGroup cgroup = monitor->tqcolorGroup(); TQColorGroup cgroup = monitor->colorGroup();
cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green));
cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black));
@ -319,9 +319,9 @@ SensorLogger::restoreSettings(TQDomElement& element)
bool bool
SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save)
{ {
saveColor(element, "textColor", monitor->tqcolorGroup().text()); saveColor(element, "textColor", monitor->colorGroup().text());
saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); saveColor(element, "backgroundColor", monitor->colorGroup().base());
saveColor(element, "alarmColor", monitor->tqcolorGroup().foreground()); saveColor(element, "alarmColor", monitor->colorGroup().foreground());
for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next()) for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next())
{ {

8
ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui
Unescape View File

@ -102,7 +102,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -127,7 +127,7 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>0</height> <height>0</height>
@ -168,7 +168,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>16</width> <width>16</width>
<height>20</height> <height>20</height>
@ -193,7 +193,7 @@
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>70</width> <width>70</width>
<height>0</height> <height>0</height>

4
ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
Unescape View File

@ -50,7 +50,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name )
// Anything smaller than this does not make sense. // Anything smaller than this does not make sense.
setMinimumSize( 16, 16 ); setMinimumSize( 16, 16 );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
TQSizePolicy::Expanding, false ) ); TQSizePolicy::Expanding, false ) );
mShowVerticalLines = true; mShowVerticalLines = true;
@ -401,7 +401,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* )
pm.fill( mBackgroundColor ); pm.fill( mBackgroundColor );
/* Draw white line along the bottom and the right side of the /* Draw white line along the bottom and the right side of the
* widget to create a 3D like look. */ * widget to create a 3D like look. */
p.setPen( TQColor( tqcolorGroup().light() ) ); p.setPen( TQColor( colorGroup().light() ) );
if(mShowThinFrame) { if(mShowThinFrame) {
p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( 0, h - 1, w - 1, h - 1 );
p.drawLine( w - 1, 0, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 );

4
ksysguard/gui/WorkSheet.cc
Unescape View File

@ -457,7 +457,7 @@ void WorkSheet::dropEvent( TQDropEvent *e )
} }
} }
TQSize WorkSheet::tqsizeHint() const TQSize WorkSheet::sizeHint() const
{ {
return TQSize( 200,150 ); return TQSize( 200,150 );
} }
@ -531,7 +531,7 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new
mDisplayList[ row ][ column ]->show(); mDisplayList[ row ][ column ]->show();
} }
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
setModified( true ); setModified( true );
} }

2
ksysguard/gui/WorkSheet.h
Unescape View File

@ -90,7 +90,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard
void titleChanged( TQWidget *sheet ); void titleChanged( TQWidget *sheet );
protected: protected:
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
void dragEnterEvent( TQDragEnterEvent* ); void dragEnterEvent( TQDragEnterEvent* );
void dropEvent( TQDropEvent* ); void dropEvent( TQDropEvent* );
void customEvent( TQCustomEvent* ); void customEvent( TQCustomEvent* );

6
ksysguard/gui/WorkSheetSettings.cc
Unescape View File

@ -50,7 +50,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
group->tqlayout()->setSpacing( spacingHint() ); group->tqlayout()->setSpacing( spacingHint() );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 ); TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 );
groupLayout->tqsetAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );
mSheetTitle = new KLineEdit( group ); mSheetTitle = new KLineEdit( group );
groupLayout->addWidget( mSheetTitle, 0, 0 ); groupLayout->addWidget( mSheetTitle, 0, 0 );
@ -62,7 +62,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
group->tqlayout()->setSpacing( spacingHint() ); group->tqlayout()->setSpacing( spacingHint() );
groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 ); groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 );
groupLayout->tqsetAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );
TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group );
groupLayout->addWidget( label, 0, 0 ); groupLayout->addWidget( label, 0, 0 );
@ -103,7 +103,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name )
mSheetTitle->setFocus(); mSheetTitle->setFocus();
resize( TQSize( 250, 230 ).expandedTo( tqminimumSizeHint() ) ); resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) );
} }
WorkSheetSettings::~WorkSheetSettings() WorkSheetSettings::~WorkSheetSettings()

2
ksysguard/gui/ksgrd/HostConnector.cc
Unescape View File

@ -61,7 +61,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name )
i18n( "Connection Type" ), page ); i18n( "Connection Type" ), page );
TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4, TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4,
spacingHint() ); spacingHint() );
groupLayout->tqsetAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );
mUseSsh = new TQRadioButton( i18n( "ssh" ), group ); mUseSsh = new TQRadioButton( i18n( "ssh" ), group );
mUseSsh->setEnabled( true ); mUseSsh->setEnabled( true );

2
ksystraycmd/ksystraycmd.cpp
Unescape View File

@ -25,7 +25,7 @@ KSysTrayCmd::KSysTrayCmd()
isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false),
win(0), client(0), twinmodule(0), top(0), left(0) win(0), client(0), twinmodule(0), top(0), left(0)
{ {
tqsetAlignment( AlignCenter ); setAlignment( AlignCenter );
twinmodule = new KWinModule( TQT_TQOBJECT(this) ); twinmodule = new KWinModule( TQT_TQOBJECT(this) );
refresh(); refresh();
} }

12
kxkb/kcmlayoutwidget.ui
Unescape View File

@ -20,7 +20,7 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>600</width> <width>600</width>
<height>510</height> <height>510</height>
@ -34,7 +34,7 @@
<property name="name"> <property name="name">
<cstring>tabWidget</cstring> <cstring>tabWidget</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>600</width> <width>600</width>
<height>500</height> <height>500</height>
@ -303,7 +303,7 @@
<property name="name"> <property name="name">
<cstring>listLayoutsSrc</cstring> <cstring>listLayoutsSrc</cstring>
</property> </property>
<property name="tqminimumSize"> <property name="minimumSize">
<size> <size>
<width>260</width> <width>260</width>
<height>0</height> <height>0</height>
@ -393,7 +393,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>210</width> <width>210</width>
<height>20</height> <height>20</height>
@ -410,7 +410,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>210</width> <width>210</width>
<height>20</height> <height>20</height>
@ -442,7 +442,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

4
libkonq/knewmenu.cc
Unescape View File

@ -545,7 +545,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin
TQLabel * label = new TQLabel( textFileName, fileNameBox ); TQLabel * label = new TQLabel( textFileName, fileNameBox );
m_leFileName = new KLineEdit( fileNameBox, 0L ); 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 label->setBuddy(m_leFileName); // please "scheck" style
m_leFileName->setText( defaultName ); m_leFileName->setText( defaultName );
m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect 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 = new KURLRequester( defaultUrl, urlBox, "urlRequester" );
m_urlRequester->setMode( KFile::File | KFile::Directory ); 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&)), connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),
TQT_SLOT(slotURLTextChanged(const TQString&)) ); TQT_SLOT(slotURLTextChanged(const TQString&)) );
label->setBuddy(m_urlRequester); // please "scheck" style label->setBuddy(m_urlRequester); // please "scheck" style

8
libkonq/konq_bgnddlg.cc
Unescape View File

@ -51,7 +51,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() ); m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() );
m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() );
TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() ); TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() );
groupLayout->tqsetAlignment( Qt::AlignTop ); groupLayout->setAlignment( Qt::AlignTop );
mainLayout->addWidget( m_buttonGroup ); mainLayout->addWidget( m_buttonGroup );
connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ), connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ),
@ -61,7 +61,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup ); m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup );
groupLayout->addWidget( m_radioColor, 0, 0 ); groupLayout->addWidget( m_radioColor, 0, 0 );
m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup ); m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup );
m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred, m_buttonColor->setSizePolicy( TQSizePolicy::Preferred,
TQSizePolicy::Minimum ); TQSizePolicy::Minimum );
groupLayout->addWidget( m_buttonColor, 0, 1 ); groupLayout->addWidget( m_buttonColor, 0, 1 );
@ -90,14 +90,14 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent,
TQLabel* lbl = new TQLabel( i18n("Preview"), page ); TQLabel* lbl = new TQLabel( i18n("Preview"), page );
hlay->addWidget( lbl ); hlay->addWidget( lbl );
TQFrame* frame = new TQFrame( page ); TQFrame* frame = new TQFrame( page );
frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum );
frame->setFrameShape( TQFrame::HLine ); frame->setFrameShape( TQFrame::HLine );
frame->setFrameShadow( TQFrame::Sunken ); frame->setFrameShadow( TQFrame::Sunken );
hlay->addWidget( frame ); hlay->addWidget( frame );
// preview frame // preview frame
m_preview = new TQFrame( page ); 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->setMinimumSize( 370, 180 );
m_preview->setFrameShape( TQFrame::Panel ); m_preview->setFrameShape( TQFrame::Panel );
m_preview->setFrameShadow( TQFrame::Raised ); m_preview->setFrameShadow( TQFrame::Raised );

14
libkonq/konq_drag.cc
Unescape View File

@ -47,12 +47,12 @@ const char* KonqIconDrag::format( int i ) const
else return 0; else return 0;
} }
TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const TQByteArray KonqIconDrag::encodedData( const char* mime ) const
{ {
TQByteArray a; TQByteArray a;
TQCString mimetype( mime ); TQCString mimetype( mime );
if ( mimetype == "application/x-qiconlist" ) if ( mimetype == "application/x-qiconlist" )
a = TQIconDrag::tqencodedData( mime ); a = TQIconDrag::encodedData( mime );
else if ( mimetype == "text/uri-list" ) { else if ( mimetype == "text/uri-list" ) {
TQCString s = urls.join( "\r\n" ).latin1(); TQCString s = urls.join( "\r\n" ).latin1();
if( urls.count() > 0 ) if( urls.count() > 0 )
@ -145,7 +145,7 @@ const char* KonqIconDrag2::format( int i ) const
return KonqIconDrag::format( i ); return KonqIconDrag::format( i );
} }
TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const TQByteArray KonqIconDrag2::encodedData( const char* mime ) const
{ {
TQCString mimetype( mime ); TQCString mimetype( mime );
if ( mimetype == "application/x-kde-urilist" ) if ( mimetype == "application/x-kde-urilist" )
@ -164,7 +164,7 @@ TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const
a[c] = 0; a[c] = 0;
return a; return a;
} }
return KonqIconDrag::tqencodedData( mime ); return KonqIconDrag::encodedData( mime );
} }
// //
@ -223,7 +223,7 @@ const char* KonqDrag::format( int i ) const
else return 0; else return 0;
} }
TQByteArray KonqDrag::tqencodedData( const char* mime ) const TQByteArray KonqDrag::encodedData( const char* mime ) const
{ {
TQByteArray a; TQByteArray a;
TQCString mimetype( mime ); TQCString mimetype( mime );
@ -243,7 +243,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const
} }
else if ( mimetype == "application/x-kde-urilist" ) 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" ) else if ( mimetype == "application/x-kde-cutselection" )
{ {
@ -271,7 +271,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const
bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e ) 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() ) if ( a.isEmpty() )
return false; return false;
else else

6
libkonq/konq_drag.h
Unescape View File

@ -44,7 +44,7 @@ public:
virtual ~KonqIconDrag() {} virtual ~KonqIconDrag() {}
const char* format( int i ) const; 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, void append( const TQIconDragItem &item, const TQRect &pr,
const TQRect &tr, const TQString &url ); const TQRect &tr, const TQString &url );
@ -72,7 +72,7 @@ public:
virtual ~KonqIconDrag2() {} virtual ~KonqIconDrag2() {}
virtual const char* format( int i ) const; 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, void append( const TQIconDragItem &item, const TQRect &pr,
const TQRect &tr, const TQString &url, const KURL &mostLocalURL ); const TQRect &tr, const TQString &url, const KURL &mostLocalURL );
@ -107,7 +107,7 @@ public:
virtual ~KonqDrag() {} virtual ~KonqDrag() {}
virtual const char* format( int i ) const; 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; } void setMoveSelection( bool move ) { m_bCutSelection = move; }

4
libkonq/konq_filetip.cc
Unescape View File

@ -49,7 +49,7 @@ KonqFileTip::KonqFileTip( TQScrollView* parent )
{ {
m_iconLabel = new TQLabel(this); m_iconLabel = new TQLabel(this);
m_textLabel = 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); TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0);
layout->addWidget(m_iconLabel, 0, 0); layout->addWidget(m_iconLabel, 0, 0);
@ -189,7 +189,7 @@ void KonqFileTip::drawContents( TQPainter *p )
} }
if ( m_corners[m_corner].isNull()) 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]; TQPixmap &pix = m_corners[m_corner];

10
libkonq/konq_historymgr.cc
Unescape View File

@ -48,7 +48,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name )
m_history.setAutoDelete( true ); m_history.setAutoDelete( true );
m_filename = locateLocal( "data", m_filename = locateLocal( "data",
TQString::tqfromLatin1("konqueror/konq_history" )); TQString::fromLatin1("konqueror/konq_history" ));
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
@ -295,7 +295,7 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url,
// konqueror's window caption). // konqueror's window caption).
if ( !pending && u != title ) if ( !pending && u != title )
entry.title = title; entry.title = title;
entry.firstVisited = TQDateTime::tqcurrentDateTime(); entry.firstVisited = TQDateTime::currentDateTime();
entry.lastVisited = entry.firstVisited; entry.lastVisited = entry.firstVisited;
// always remove from pending if available, otherwise the else branch leaks // 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 // Local URL -> add to history
KonqHistoryEntry entry; KonqHistoryEntry entry;
entry.url = u; entry.url = u;
entry.firstVisited = TQDateTime::tqcurrentDateTime(); entry.firstVisited = TQDateTime::currentDateTime();
entry.lastVisited = entry.firstVisited; entry.lastVisited = entry.firstVisited;
emitAddToHistory( entry ); emitAddToHistory( entry );
} }
@ -589,7 +589,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString )
// compatibility fallback, try to load the old completion history // compatibility fallback, try to load the old completion history
bool KonqHistoryManager::loadFallback() bool KonqHistoryManager::loadFallback()
{ {
TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history")); TQString file = locateLocal( "config", TQString::fromLatin1("konq_history"));
if ( file.isEmpty() ) if ( file.isEmpty() )
return false; return false;
@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item)
entry->url = u; entry->url = u;
entry->numberOfTimesVisited = weight; entry->numberOfTimesVisited = weight;
// to make it not expire immediately... // to make it not expire immediately...
entry->lastVisited = TQDateTime::tqcurrentDateTime(); entry->lastVisited = TQDateTime::currentDateTime();
} }
return entry; return entry;

14
libkonq/konq_iconviewwidget.cc
Unescape View File

@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF
m_LineupMode = LineupBoth; m_LineupMode = LineupBoth;
// emit our signals // emit our signals
slotSelectionChanged(); slotSelectionChanged();
m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" ); m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" );
KonqUndoManager::incRef(); KonqUndoManager::incRef();
} }
@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
if (!hasPixmap && backgroundMode() != NoBackground) if (!hasPixmap && backgroundMode() != NoBackground)
d->m_movie->setBackgroundColor( viewport()->backgroundColor() ); d->m_movie->setBackgroundColor( viewport()->backgroundColor() );
d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) ); 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->movieFileName = d->pActiveItem->mouseOverAnimation();
d->pActiveItem->setAnimated( true ); d->pActiveItem->setAnimated( true );
} }
@ -349,7 +349,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item )
d->pSoundPlayer->mimeTypes().contains( d->pSoundPlayer->mimeTypes().contains(
item->item()->mimetype()) item->item()->mimetype())
&& KGlobalSettings::showFilePreview(item->item()->url()) && KGlobalSettings::showFilePreview(item->item()->url())
&& tqtopLevelWidget() == kapp->activeWindow()) && topLevelWidget() == kapp->activeWindow())
{ {
d->pSoundItem = item; d->pSoundItem = item;
d->bSoundItemClicked = false; 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 // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint
// event that will be triggered in that case. // event that will be triggered in that case.
bool prevUpdatesState = viewport()->isUpdatesEnabled(); bool prevUpdatesState = viewport()->isUpdatesEnabled();
viewport()->tqsetUpdatesEnabled( false ); viewport()->setUpdatesEnabled( false );
// Do this even if size didn't change, since this is used by refreshMimeTypes... // Do this even if size didn't change, since this is used by refreshMimeTypes...
for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { 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 // Restore viewport update to previous state
viewport()->tqsetUpdatesEnabled( prevUpdatesState ); viewport()->setUpdatesEnabled( prevUpdatesState );
if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() || if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() ||
!stopImagePreviewFor.isEmpty() ) && autoArrange() ) !stopImagePreviewFor.isEmpty() ) && autoArrange() )
@ -995,7 +995,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e )
{ {
if ( e->provides( "text/uri-list" ) ) if ( e->provides( "text/uri-list" ) )
{ {
TQByteArray payload = e->tqencodedData( "text/uri-list" ); TQByteArray payload = e->encodedData( "text/uri-list" );
if ( !payload.size() ) if ( !payload.size() )
kdError() << "Empty data !" << endl; kdError() << "Empty data !" << endl;
// Cache the URLs, since we need them every time we move over a file // 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% // 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 // of the mouse move cpucycles!), so it's mandatory to place that function
// under strict checks, such as d->pSoundPlayer->isPlaying() // under strict checks, such as d->pSoundPlayer->isPlaying()
if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() ) if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() )
{ {
if (d->pSoundPlayer) if (d->pSoundPlayer)
d->pSoundPlayer->stop(); d->pSoundPlayer->stop();

2
libkonq/konq_operations.cc
Unescape View File

@ -76,7 +76,7 @@ KonqOperations::~KonqOperations()
void KonqOperations::editMimeType( const TQString & mimeType ) void KonqOperations::editMimeType( const TQString & mimeType )
{ {
TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); TQString keditfiletype = TQString::fromLatin1("keditfiletype");
KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType), KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType),
keditfiletype, keditfiletype /*unused*/); keditfiletype, keditfiletype /*unused*/);
} }

6
libkonq/konq_popupmenu.cc
Unescape View File

@ -355,7 +355,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
m_pluginList.setAutoDelete( true ); m_pluginList.setAutoDelete( true );
m_ownActions.setHighlightingEnabled( true ); m_ownActions.setHighlightingEnabled( true );
attrName = TQString::tqfromLatin1( "name" ); attrName = TQString::fromLatin1( "name" );
prepareXMLGUIStuff(); prepareXMLGUIStuff();
m_builder = new KonqPopupMenuGUIBuilder( this ); m_builder = new KonqPopupMenuGUIBuilder( this );
@ -1157,7 +1157,7 @@ void KonqPopupMenu::addPlugins()
//search for a plugin with the right protocol //search for a plugin with the right protocol
KTrader::OfferList plugin_offers; KTrader::OfferList plugin_offers;
unsigned int pluginCount = 0; 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() ) if ( plugin_offers.isEmpty() )
return; // no plugins installed do not bother about it return; // no plugins installed do not bother about it
@ -1176,7 +1176,7 @@ void KonqPopupMenu::addPlugins()
if ( !plugin ) if ( !plugin )
continue; continue;
// This make the kuick plugin insert its stuff above "Properties" // 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 ); addMerge( pluginClientName );
plugin->domDocument().documentElement().setAttribute( "name", pluginClientName ); plugin->domDocument().documentElement().setAttribute( "name", pluginClientName );
m_pluginList.append( plugin ); m_pluginList.append( plugin );

4
libkonq/konq_propsview.cc
Unescape View File

@ -474,7 +474,7 @@ void KonqPropsView::setBgColor( const TQColor & color )
const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const
{ {
if ( !m_bgColor.isValid() ) if ( !m_bgColor.isValid() )
return widget->tqcolorGroup().base(); return widget->colorGroup().base();
else else
return m_bgColor; return m_bgColor;
} }
@ -501,7 +501,7 @@ void KonqPropsView::setTextColor( const TQColor & color )
const TQColor & KonqPropsView::textColor( TQWidget * widget ) const const TQColor & KonqPropsView::textColor( TQWidget * widget ) const
{ {
if ( !m_textColor.isValid() ) if ( !m_textColor.isValid() )
return widget->tqcolorGroup().text(); return widget->colorGroup().text();
else else
return m_textColor; return m_textColor;
} }

2
libkonq/konq_propsview.h
Unescape View File

@ -133,7 +133,7 @@ protected:
TQString currentGroup() const { TQString currentGroup() const {
return isDefaultProperties() ? return isDefaultProperties() ?
TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties"); TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties");
} }
private: private:

4
libkonq/konq_settings.cc
Unescape View File

@ -146,10 +146,10 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl; kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl;
if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" ) if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" )
return true; //always embed mimetype inode/*, Browser/* and 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() ) { if ( it != m_embedMap.end() ) {
kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl; 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. // 3 - if no config found, use default.
// Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp ! // Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp !

2
libkonq/konqbookmarkmanager.h
Unescape View File

@ -11,7 +11,7 @@ public:
static KBookmarkManager * self() { static KBookmarkManager * self() {
if ( !s_bookmarkManager ) 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 ); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
} }
return s_bookmarkManager; return s_bookmarkManager;

2
nsplugins/plugin_part.cpp
Unescape View File

@ -307,7 +307,7 @@ bool PluginPart::openURL(const KURL &url)
_widget = inst; _widget = inst;
} else { } else {
TQLabel *label = new TQLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas ); 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; _widget = label;
} }

4
nsplugins/pluginscan.cpp
Unescape View File

@ -251,14 +251,14 @@ int tryCheck(int write_fd, const TQString &absFile)
NPError err = func_GetValue( 0, NPPVpluginNameString, NPError err = func_GetValue( 0, NPPVpluginNameString,
(void*)&buf ); (void*)&buf );
if ( err==NPERR_NO_ERROR ) if ( err==NPERR_NO_ERROR )
name = TQString::tqfromLatin1( buf ); name = TQString::fromLatin1( buf );
kdDebug() << "name = " << name << endl; kdDebug() << "name = " << name << endl;
// get name // get name
NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString, NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString,
(void*)&buf ); (void*)&buf );
if ( nperr==NPERR_NO_ERROR ) if ( nperr==NPERR_NO_ERROR )
description = TQString::tqfromLatin1( buf ); description = TQString::fromLatin1( buf );
kdDebug() << "description = " << description << endl; kdDebug() << "description = " << description << endl;
} }
else else

2
nsplugins/viewer/kxt.cpp
Unescape View File

@ -567,7 +567,7 @@ bool KXtWidget::isActiveWindow() const
TQWidget *w = find( (WId)win ); TQWidget *w = find( (WId)win );
if ( w ) { if ( w ) {
// We know that window // We know that window
return w->tqtopLevelWidget() == tqtopLevelWidget(); return w->topLevelWidget() == topLevelWidget();
} else { } else {
// Window still may be a parent (if top-level is foreign window) // Window still may be a parent (if top-level is foreign window)
Window root, parent; Window root, parent;

24
nsplugins/viewer/nsplugin.cpp
Unescape View File

@ -252,8 +252,8 @@ NPError g_NPN_GetURL(NPP instance, const char *url, const char *target)
NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
if (inst) { if (inst) {
inst->requestURL( TQString::tqfromLatin1(url), TQString::null, inst->requestURL( TQString::fromLatin1(url), TQString::null,
TQString::tqfromLatin1(target), 0 ); TQString::fromLatin1(target), 0 );
} }
return NPERR_NO_ERROR; 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); NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
if (inst) { if (inst) {
kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl; kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl;
inst->requestURL( TQString::tqfromLatin1(url), TQString::null, inst->requestURL( TQString::fromLatin1(url), TQString::null,
TQString::tqfromLatin1(target), notifyData, true ); TQString::fromLatin1(target), notifyData, true );
} }
return NPERR_NO_ERROR; return NPERR_NO_ERROR;
@ -318,7 +318,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
break; break;
} }
TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
previousStart = &buf[l]; previousStart = &buf[l];
previousCR = true; 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); NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
TQString::tqfromLatin1(target), notifyData, args, true ); TQString::fromLatin1(target), notifyData, args, true );
} else { } else {
// Unsupported / insecure // Unsupported / insecure
return NPERR_INVALID_URL; return NPERR_INVALID_URL;
@ -415,7 +415,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
break; break;
} }
TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
previousStart = &buf[l]; previousStart = &buf[l];
previousCR = true; 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); NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
TQString::tqfromLatin1(target), 0L, args, false ); TQString::fromLatin1(target), 0L, args, false );
} else { } else {
// Unsupported / insecure // Unsupported / insecure
return NPERR_INVALID_URL; return NPERR_INVALID_URL;

2
tdeprint/kprinter/printwrapper.cpp
Unescape View File

@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0)
void showmsgconsole(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; kdDebug() << errmsg << msg << endl;
} }

14
tdeprint/slave/kio_print.cpp
Unescape View File

@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
mimeType("text/html"); mimeType("text/html");
TQString content; 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")); error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template"));
return; return;
@ -676,7 +676,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
mimeType("text/html"); mimeType("text/html");
TQString content; 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")); error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template"));
return; return;
@ -686,7 +686,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
TQStringList members(printer->members()); TQStringList members(printer->members());
for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) 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"); memberContent.append("</ul>\n");
@ -719,7 +719,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
mimeType("text/html"); mimeType("text/html");
TQString content; 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")); error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return; return;
@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) 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)) if (f.exists() && f.open(IO_ReadOnly))
{ {
TQTextStream t(&f); TQTextStream t(&f);
@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
} }
TQString content; 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")); error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return; return;
@ -891,7 +891,7 @@ void KIO_Print::showDriver(KMPrinter *prt)
mimeType("text/html"); mimeType("text/html");
TQString content; 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")); error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
return; return;

8
tdeprint/tdeprintfax/faxctrl.cpp
Unescape View File

@ -291,7 +291,7 @@ static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFa
if (v.isEmpty()) if (v.isEmpty())
v = getenv("FAXSERVER"); v = getenv("FAXSERVER");
if (v.isEmpty()) if (v.isEmpty())
v = TQString::tqfromLatin1("localhost"); v = TQString::fromLatin1("localhost");
v = processTag( match, v ); v = processTag( match, v );
} }
else if (isTag( match, "%page" )) else if (isTag( match, "%page" ))
@ -491,7 +491,7 @@ void FaxCtrl::filter()
m_tempfiles.append(tmp); m_tempfiles.append(tmp);
m_process->clearArguments(); m_process->clearArguments();
*m_process << locate("data","tdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","tdeprintfax/faxfilters")) *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() << "-p" << pageSize()
<< KProcess::quote(m_files[0]) << KProcess::quote(tmp); << KProcess::quote(m_files[0]) << KProcess::quote(tmp);
if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog()
KPrinter printer; KPrinter printer;
printer.setDocName( i18n( "Fax log" ) ); printer.setDocName( i18n( "Fax log" ) );
printer.setDocFileName( "faxlog" ); printer.setDocFileName( "faxlog" );
if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) ) if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) )
{ {
TQPainter painter( &printer ); TQPainter painter( &printer );
TQPaintDeviceMetrics metric( &printer ); TQPaintDeviceMetrics metric( &printer );
@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog()
richText.setWidth( &painter, body.width() ); richText.setWidth( &painter, body.width() );
do 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() ); view.moveBy( 0, body.height() );
painter.translate( 0, -body.height() ); painter.translate( 0, -body.height() );
if ( view.top() >= richText.height() ) if ( view.top() >= richText.height() )

6
tdeprint/tdeprintfax/tdeprintfax.cpp
Unescape View File

@ -429,14 +429,14 @@ void KdeprintFax::updateState()
if ( !m_cover->isEnabled() ) if ( !m_cover->isEnabled() )
m_cover->setChecked(false); m_cover->setChecked(false);
m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked()); 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()) if (!m_comment->isEnabled())
{ {
m_comment->setText(""); m_comment->setText("");
m_comment->setPaper( tqcolorGroup().background() ); m_comment->setPaper( colorGroup().background() );
} }
else else
m_comment->setPaper( tqcolorGroup().base() ); m_comment->setPaper( colorGroup().base() );
/* /*
m_enterprise->setEnabled(cmd.find("%enterprise") != -1); m_enterprise->setEnabled(cmd.find("%enterprise") != -1);
if (!m_enterprise->isEnabled()) if (!m_enterprise->isEnabled())

2
tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp
Unescape View File

@ -56,7 +56,7 @@ static TQCString findLibrary()
static long parentToWinId( const TQWidget* w ) static long parentToWinId( const TQWidget* w )
{ {
if( w != NULL ) if( w != NULL )
return w->tqtopLevelWidget()->winId(); return w->topLevelWidget()->winId();
// try to find some usable parent // try to find some usable parent
if( tqApp->activeWindow() && w != tqApp->activeWindow()) if( tqApp->activeWindow() && w != tqApp->activeWindow())
return tqApp->activeWindow()->winId(); return tqApp->activeWindow()->winId();

16
twin/clients/b2/b2client.cpp
Unescape View File

@ -419,7 +419,7 @@ void B2Client::init()
titleLayout->addSpacing(3); titleLayout->addSpacing(3);
TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()). TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()).
color(TQColorGroup::Button); color(TQColorGroup::Button);
for (int i = 0; i < BtnCount; i++) { for (int i = 0; i < BtnCount; i++) {
@ -635,7 +635,7 @@ void B2Client::paintEvent(TQPaintEvent* e)
int bb = mustDrawHandle() ? 4 : 0; int bb = mustDrawHandle() ? 4 : 0;
int bDepth = thickness + bb; int bDepth = thickness + bb;
TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive()); TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive());
TQBrush fillBrush(options()->color(frameColorGroup, isActive())); TQBrush fillBrush(options()->color(frameColorGroup, isActive()));
// outer frame rect // outer frame rect
@ -859,7 +859,7 @@ void B2Client::activeChange()
widget()->tqrepaint(false); widget()->tqrepaint(false);
titlebar->tqrepaint(false); titlebar->tqrepaint(false);
TQColor c = options()->tqcolorGroup( TQColor c = options()->colorGroup(
KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button);
for (int i = 0; i < BtnCount; i++) 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; int left, right, top, bottom;
borders(left, right, top, bottom); borders(left, right, top, bottom);
@ -960,8 +960,8 @@ void B2Client::unobscureTitlebar()
static void redraw_pixmaps() static void redraw_pixmaps()
{ {
int i; int i;
TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true);
TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false);
// close // close
drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false); 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); return TQSize(buttonSize, buttonSize);
} }
@ -1363,7 +1363,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state)
// titlebar fill // titlebar fill
const TQColorGroup cg = const TQColorGroup cg =
options()->tqcolorGroup(KDecoration::ColorTitleBar, state); options()->colorGroup(KDecoration::ColorTitleBar, state);
TQBrush brush(cg.background()); TQBrush brush(cg.background());
if (gradient) brush.setPixmap(*gradient); if (gradient) brush.setPixmap(*gradient);
qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1, qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1,

4
twin/clients/b2/b2client.h
Unescape View File

@ -38,7 +38,7 @@ public:
void setToggle(){setToggleType(Toggle);} void setToggle(){setToggleType(Toggle);}
void setActive(bool on){setOn(on);} void setActive(bool on){setOn(on);}
void setUseMiniIcon(){useMiniIcon = true;} void setUseMiniIcon(){useMiniIcon = true;}
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
protected: protected:
virtual void drawButton(TQPainter *p); virtual void drawButton(TQPainter *p);
@ -119,7 +119,7 @@ protected:
Position mousePosition( const TQPoint& p ) const; Position mousePosition( const TQPoint& p ) const;
void resize(const TQSize&); void resize(const TQSize&);
void borders(int &, int &, int &, int &) const; void borders(int &, int &, int &, int &) const;
TQSize tqminimumSize() const; TQSize minimumSize() const;
bool eventFilter(TQObject *, TQEvent *); bool eventFilter(TQObject *, TQEvent *);
private slots: private slots:
void menuButtonPressed(); void menuButtonPressed();

16
twin/clients/default/kdedefault.cpp
Unescape View File

@ -328,7 +328,7 @@ void KDEDefaultHandler::createPixmaps()
TQPainter p; TQPainter p;
// Active pins // Active pins
g = options()->tqcolorGroup( ColorButtonBg, true ); g = options()->colorGroup( ColorButtonBg, true );
pinUpPix = new KPixmap(); pinUpPix = new KPixmap();
pinUpPix->resize(16, 16); pinUpPix->resize(16, 16);
p.begin( pinUpPix ); p.begin( pinUpPix );
@ -346,7 +346,7 @@ void KDEDefaultHandler::createPixmaps()
pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) );
// Inactive pins // Inactive pins
g = options()->tqcolorGroup( ColorButtonBg, false ); g = options()->colorGroup( ColorButtonBg, false );
ipinUpPix = new KPixmap(); ipinUpPix = new KPixmap();
ipinUpPix->resize(16, 16); ipinUpPix->resize(16, 16);
p.begin( ipinUpPix ); p.begin( ipinUpPix );
@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps()
irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight); irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight);
// Draw the button state pixmaps // Draw the button state pixmaps
g = options()->tqcolorGroup( ColorTitleBar, true ); g = options()->colorGroup( ColorTitleBar, true );
drawButtonBackground( leftBtnUpPix[true], g, false ); drawButtonBackground( leftBtnUpPix[true], g, false );
drawButtonBackground( leftBtnDownPix[true], g, true ); drawButtonBackground( leftBtnDownPix[true], g, true );
drawButtonBackground( leftBtnUpPix[false], g, false ); drawButtonBackground( leftBtnUpPix[false], g, false );
drawButtonBackground( leftBtnDownPix[false], g, true ); drawButtonBackground( leftBtnDownPix[false], g, true );
g = options()->tqcolorGroup( ColorButtonBg, true ); g = options()->colorGroup( ColorButtonBg, true );
drawButtonBackground( rightBtnUpPix[true], g, false ); drawButtonBackground( rightBtnUpPix[true], g, false );
drawButtonBackground( rightBtnDownPix[true], g, true ); drawButtonBackground( rightBtnDownPix[true], g, true );
drawButtonBackground( rightBtnUpPix[false], g, false ); drawButtonBackground( rightBtnUpPix[false], g, false );
drawButtonBackground( rightBtnDownPix[false], g, true ); drawButtonBackground( rightBtnDownPix[false], g, true );
g = options()->tqcolorGroup( ColorTitleBar, false ); g = options()->colorGroup( ColorTitleBar, false );
drawButtonBackground( ileftBtnUpPix[true], g, false ); drawButtonBackground( ileftBtnUpPix[true], g, false );
drawButtonBackground( ileftBtnDownPix[true], g, true ); drawButtonBackground( ileftBtnDownPix[true], g, true );
drawButtonBackground( ileftBtnUpPix[false], g, false ); drawButtonBackground( ileftBtnUpPix[false], g, false );
drawButtonBackground( ileftBtnDownPix[false], g, true ); drawButtonBackground( ileftBtnDownPix[false], g, true );
g = options()->tqcolorGroup( ColorButtonBg, false ); g = options()->colorGroup( ColorButtonBg, false );
drawButtonBackground( irightBtnUpPix[true], g, false ); drawButtonBackground( irightBtnUpPix[true], g, false );
drawButtonBackground( irightBtnDownPix[true], g, true ); drawButtonBackground( irightBtnDownPix[true], g, true );
drawButtonBackground( irightBtnUpPix[false], g, false ); drawButtonBackground( irightBtnUpPix[false], g, false );
@ -909,7 +909,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* )
p.drawRect(x,y,w,h); p.drawRect(x,y,w,h);
// Draw part of the frame that is the titlebar color // 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.setPen(g.light());
p.drawLine(x+1, y+1, rightOffset-1, y+1); p.drawLine(x+1, y+1, rightOffset-1, y+1);
p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4); 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); p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2);
// Fill out the border edges // Fill out the border edges
g = options()->tqcolorGroup(ColorFrame, isActive()); g = options()->colorGroup(ColorFrame, isActive());
p.setPen(g.light()); p.setPen(g.light());
p.drawLine(rightOffset, y+1, x2-1, y+1); p.drawLine(rightOffset, y+1, x2-1, y+1);
p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1); p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1);

2
twin/clients/keramik/embedtool.cpp
Unescape View File

@ -60,7 +60,7 @@ private:
KeramikEmbedder::KeramikEmbedder() KeramikEmbedder::KeramikEmbedder()
{ {
TQDateTime date( TQDateTime::tqcurrentDateTime() ); TQDateTime date( TQDateTime::currentDateTime() );
TQString datestring( date.toString() ); TQString datestring( date.toString() );
file = new TQFile( "tiles.h" ); file = new TQFile( "tiles.h" );

16
twin/clients/keramik/keramik.cpp
Unescape View File

@ -832,14 +832,14 @@ void KeramikButton::drawButton( TQPainter *p )
if ( isDown() ) { if ( isDown() ) {
// Pressed // 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 ); p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 );
} else if ( hover ) } else if ( hover )
// Mouse over // 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 else
// Normal // 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 // Draw the button deco on the bevel
@ -1280,7 +1280,7 @@ void KeramikClient::updateCaptionBuffer()
( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 );
int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); 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() ); captionRect.height() - 4), captionBuffer.rect() );
//p.setPen( Qt::red ); // debug //p.setPen( Qt::red ); // debug
@ -1289,7 +1289,7 @@ void KeramikClient::updateCaptionBuffer()
// Application icon // Application icon
if ( clientHandler->showAppIcons() ) 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 ); 1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr );
TQRect r( icon->rect() ); TQRect r( icon->rect() );
r.moveCenter( iconRect.center() ); r.moveCenter( iconRect.center() );
@ -1349,7 +1349,7 @@ void KeramikClient::calculateCaptionRect()
cw += 16 + 4; // icon width + space cw += 16 + 4; // icon width + space
cw = QMIN( cw, titlebar->geometry().width() ); 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) ), cw, clientHandler->titleBarHeight(largeCaption) ),
titlebar->geometry() ); 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();
} }

2
twin/clients/keramik/keramik.h
Unescape View File

@ -148,7 +148,7 @@ namespace Keramik {
virtual Position mousePosition( const TQPoint& p ) const; virtual Position mousePosition( const TQPoint& p ) const;
virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const;
virtual void resize( const TQSize& s ); virtual void resize( const TQSize& s );
virtual TQSize tqminimumSize() const; virtual TQSize minimumSize() const;
virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual bool eventFilter( TQObject* o, TQEvent* e );
virtual void activeChange(); virtual void activeChange();
virtual void captionChange(); virtual void captionChange();

12
twin/clients/kwmtheme/kwmthemeclient.cpp
Unescape View File

@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p)
int offset = (isDown() && ((pixmap()->width() >= width()) || int offset = (isDown() && ((pixmap()->width() >= width()) ||
(pixmap()->height() >= height()))) ? 1 : 0; (pixmap()->height() >= height()))) ? 1 : 0;
style().drawItem(p, TQRect( offset, offset, width(), height() ), style().drawItem(p, TQRect( offset, offset, width(), height() ),
AlignCenter, tqcolorGroup(), AlignCenter, colorGroup(),
true, pixmap(), TQString::null); true, pixmap(), TQString::null);
} }
} }
@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest)
p.begin(&buffer); p.begin(&buffer);
if(titleSunken){ if(titleSunken){
qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()),
true, 1, 0); true, 1, 0);
r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); 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); p.drawTiledPixmap(r, *fill);
} }
else{ else{
p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()). p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()).
brush(TQColorGroup::Button)); brush(TQColorGroup::Button));
} }
p.setFont(options()->font(isActive())); p.setFont(options()->font(isActive()));
@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *)
} }
drawTitle(p); drawTitle(p);
TQColor c = widget()->tqcolorGroup().background(); TQColor c = widget()->colorGroup().background();
// KWM evidently had a 1 pixel border around the client window. We // 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 // 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 ) void KWMThemeClient::resize( const TQSize& s )

2
twin/clients/kwmtheme/kwmthemeclient.h
Unescape View File

@ -30,7 +30,7 @@ public:
~KWMThemeClient(){;} ~KWMThemeClient(){;}
void init(); void init();
void resize( const TQSize& s ); void resize( const TQSize& s );
TQSize tqminimumSize() const; TQSize minimumSize() const;
void borders( int& left, int& right, int& top, int& bottom ) const; void borders( int& left, int& right, int& top, int& bottom ) const;
protected: protected:
void doShape(); void doShape();

22
twin/clients/laptop/laptopclient.cpp
Unescape View File

@ -157,7 +157,7 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient); KPixmapEffect::VerticalGradient);
} }
// buttons (active/inactive, sunken/unsunken, 2 sizes each) // 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(); TQColor c = g.background();
btnPix1 = new KPixmap; btnPix1 = new KPixmap;
btnPix1->resize(btnWidth1, titleHeight); btnPix1->resize(btnWidth1, titleHeight);
@ -184,7 +184,7 @@ static void create_pixmaps()
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120), KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); g = options()->colorGroup(KDecoration::ColorButtonBg, false);
c = g.background(); c = g.background();
KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130),
KPixmapEffect::DiagonalGradient); KPixmapEffect::DiagonalGradient);
@ -200,20 +200,20 @@ static void create_pixmaps()
btnDownPix1->fill(c.rgb()); btnDownPix1->fill(c.rgb());
btnPix2->fill(c.rgb()); btnPix2->fill(c.rgb());
btnDownPix2->fill(c.rgb()); btnDownPix2->fill(c.rgb());
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); g = options()->colorGroup(KDecoration::ColorButtonBg, false);
c = g.background(); c = g.background();
iBtnPix1->fill(c.rgb()); iBtnPix1->fill(c.rgb());
iBtnDownPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb());
iBtnPix2->fill(c.rgb()); iBtnPix2->fill(c.rgb());
iBtnDownPix2->fill(c.rgb()); iBtnDownPix2->fill(c.rgb());
} }
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); g = options()->colorGroup(KDecoration::ColorButtonBg, true);
c = g.background(); c = g.background();
drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnPix1, g, false);
drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnDownPix1, g, true);
drawButtonFrame(btnPix2, g, false); drawButtonFrame(btnPix2, g, false);
drawButtonFrame(btnDownPix2, g, true); drawButtonFrame(btnDownPix2, g, true);
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); g = options()->colorGroup(KDecoration::ColorButtonBg, false);
c = g.background(); c = g.background();
drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnPix1, g, false);
drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iBtnDownPix1, g, true);
@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p)
} }
} }
else{ else{
TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive());
int w = width(); int w = width();
int h = height(); int h = height();
p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button()); p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button());
@ -469,7 +469,7 @@ void LaptopClient::captionChange()
void LaptopClient::paintEvent( TQPaintEvent* ) void LaptopClient::paintEvent( TQPaintEvent* )
{ {
TQPainter p(widget()); TQPainter p(widget());
TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive());
TQRect r(widget()->rect()); TQRect r(widget()->rect());
p.setPen(Qt::black); p.setPen(Qt::black);
@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* )
p.setFont(options()->font(false, isToolWindow() )); p.setFont(options()->font(false, isToolWindow() ));
TQFontMetrics fm(options()->font(false)); TQFontMetrics fm(options()->font(false));
g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); g = options()->colorGroup(KDecoration::ColorTitleBar, false);
if(iUpperGradient) if(iUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
r.y(), fm.width(caption())+8, r.height()-1, 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.setPen(options()->color(KDecoration::ColorFont, false));
p.drawText(r.x(), r.y(), r.width(), r.height()-1, p.drawText(r.x(), r.y(), r.width(), r.height()-1,
AlignCenter, caption() ); AlignCenter, caption() );
g = options()->tqcolorGroup(KDecoration::ColorFrame, true); g = options()->colorGroup(KDecoration::ColorFrame, true);
p.setPen(g.background()); p.setPen(g.background());
p.drawPoint(r.x(), r.y()); p.drawPoint(r.x(), r.y());
p.drawPoint(r.right(), r.y()); p.drawPoint(r.right(), r.y());
@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( )
p.setFont(options()->font(true, isToolWindow() )); p.setFont(options()->font(true, isToolWindow() ));
TQFontMetrics fm(options()->font(true)); TQFontMetrics fm(options()->font(true));
TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true);
if(aUpperGradient) if(aUpperGradient)
p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4,
r.y(), fm.width(caption())+8, r.height()-1, r.y(), fm.width(caption())+8, r.height()-1,
@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( )
p.setPen(options()->color(KDecoration::ColorFont, true)); p.setPen(options()->color(KDecoration::ColorFont, true));
p.drawText(r.x(), r.y(), r.width(), r.height()-1, p.drawText(r.x(), r.y(), r.width(), r.height()-1,
AlignCenter, caption() ); AlignCenter, caption() );
g = options()->tqcolorGroup(KDecoration::ColorFrame, true); g = options()->colorGroup(KDecoration::ColorFrame, true);
p.setPen(g.background()); p.setPen(g.background());
p.drawPoint(r.x(), r.y()); p.drawPoint(r.x(), r.y());
p.drawPoint(r.right(), r.y()); p.drawPoint(r.right(), r.y());

6
twin/clients/modernsystem/config/config.cpp
Unescape View File

@ -59,11 +59,11 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par
bool rtl = kapp->reverseLayout(); bool rtl = kapp->reverseLayout();
label1 = new TQLabel(i18n("Small"), hbox); label1 = new TQLabel(i18n("Small"), hbox);
label1->tqsetAlignment(rtl ? AlignRight : AlignLeft); label1->setAlignment(rtl ? AlignRight : AlignLeft);
label2 = new TQLabel(i18n("Medium"), hbox); label2 = new TQLabel(i18n("Medium"), hbox);
label2->tqsetAlignment(AlignHCenter); label2->setAlignment(AlignHCenter);
label3 = new TQLabel(i18n("Large"), hbox); label3 = new TQLabel(i18n("Large"), hbox);
label3->tqsetAlignment(rtl ? AlignLeft : AlignRight); label3->setAlignment(rtl ? AlignLeft : AlignRight);
vbox->addWidget(handleBox); vbox->addWidget(handleBox);
vbox->addStretch(1); vbox->addStretch(1);

18
twin/clients/modernsystem/modernsys.cpp
Unescape View File

@ -171,13 +171,13 @@ static void create_pixmaps()
KPixmapEffect::VerticalGradient); KPixmapEffect::VerticalGradient);
} }
// buttons // buttons
TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true)); TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true));
buttonPix = new TQPixmap(14, 15); buttonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPix); make_button_fx(btnColor, buttonPix);
buttonPixDown = new TQPixmap(14, 15); buttonPixDown = new TQPixmap(14, 15);
make_button_fx(btnColor, buttonPixDown, true); make_button_fx(btnColor, buttonPixDown, true);
btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false);
iButtonPix = new TQPixmap(14, 15); iButtonPix = new TQPixmap(14, 15);
make_button_fx(btnColor, iButtonPix); make_button_fx(btnColor, iButtonPix);
iButtonPixDown = new TQPixmap(14, 15); iButtonPixDown = new TQPixmap(14, 15);
@ -515,7 +515,7 @@ void ModernSys::recalcTitleBuffer()
p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient); p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient);
else else
p.fillRect(0, 0, width(), title_height+2, p.fillRect(0, 0, width(), title_height+2,
options()->tqcolorGroup(ColorTitleBar, true). options()->colorGroup(ColorTitleBar, true).
brush(TQColorGroup::Button)); brush(TQColorGroup::Button));
TQRect t = titleRect(); // titlebar->geometry(); 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) void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h)
{ {
kDrawRoundButton(&p, x, y, w, 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() ); TQPainter p( widget() );
TQRect t = titleRect(); // titlebar->geometry(); TQRect t = titleRect(); // titlebar->geometry();
TQBrush fillBrush(widget()->tqcolorGroup().tqbrush(TQColorGroup::Background).pixmap() ? TQBrush fillBrush(widget()->colorGroup().tqbrush(TQColorGroup::Background).pixmap() ?
widget()->tqcolorGroup().brush(TQColorGroup::Background) : widget()->colorGroup().brush(TQColorGroup::Background) :
options()->tqcolorGroup(ColorFrame, isActive()). options()->colorGroup(ColorFrame, isActive()).
brush(TQColorGroup::Button)); brush(TQColorGroup::Button));
p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush); 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; int h = height() - hw;
// titlebar // titlebar
TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive()); TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive());
if(isActive()){ if(isActive()){
p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2); 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); p.drawLine(0, title_height+2, w-2, title_height+2);
// frame // frame
g = options()->tqcolorGroup(ColorFrame, isActive()); g = options()->colorGroup(ColorFrame, isActive());
p.setPen(g.light()); p.setPen(g.light());
p.drawLine(1, title_height+3, 1, h-2); p.drawLine(1, title_height+3, 1, h-2);
p.setPen(g.dark()); p.setPen(g.dark());

2
twin/clients/plastik/plastik.cpp
Unescape View File

@ -290,7 +290,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo
} else { } else {
pm = new TQPixmap(1, titleBarTileHeight); pm = new TQPixmap(1, titleBarTileHeight);
painter.begin(pm); painter.begin(pm);
painter.tqdrawPixmap(0, 0, gradient, 0,2); painter.drawPixmap(0, 0, gradient, 0,2);
if (m_coloredBorder) { if (m_coloredBorder) {
painter.setPen(getColor(TitleGradient3, active).dark(110) ); painter.setPen(getColor(TitleGradient3, active).dark(110) );
} else { } else {

20
twin/clients/quartz/quartz.cpp
Unescape View File

@ -291,18 +291,18 @@ void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const TQColor &c1, cons
void QuartzHandler::createPixmaps() void QuartzHandler::createPixmaps()
{ {
// Obtain titlebar blend colours, and create the block stuff on pixmaps. // 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(); TQColor c2 = g2.background();
g2 = options()->tqcolorGroup(ColorTitleBar, true ); g2 = options()->colorGroup(ColorTitleBar, true );
TQColor c = g2.background().light(130); TQColor c = g2.background().light(130);
titleBlocks = new KPixmap(); titleBlocks = new KPixmap();
titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight ); titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight );
drawBlocks( titleBlocks, *titleBlocks, c, c2 ); drawBlocks( titleBlocks, *titleBlocks, c, c2 );
g2 = options()->tqcolorGroup(ColorTitleBlend, false); g2 = options()->colorGroup(ColorTitleBlend, false);
c2 = g2.background(); c2 = g2.background();
g2 = options()->tqcolorGroup(ColorTitleBar, false ); g2 = options()->colorGroup(ColorTitleBar, false );
c = g2.background().light(130); c = g2.background().light(130);
ititleBlocks = new KPixmap(); ititleBlocks = new KPixmap();
@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps()
TQColorGroup g; TQColorGroup g;
TQPainter p; 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(); c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background();
g2 = options()->tqcolorGroup( ColorButtonBg, true ); g2 = options()->colorGroup( ColorButtonBg, true );
pinUpPix = new KPixmap(); pinUpPix = new KPixmap();
pinUpPix->resize(16, 16); pinUpPix->resize(16, 16);
@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps()
// Inactive pins // 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(); c = onAllDesktopsButtonOnLeft ? TQColor(g.background().light(130)) : g.background();
g2 = options()->tqcolorGroup( ColorButtonBg, false ); g2 = options()->colorGroup( ColorButtonBg, false );
ipinUpPix = new KPixmap(); ipinUpPix = new KPixmap();
ipinUpPix->resize(16, 16); ipinUpPix->resize(16, 16);
@ -675,9 +675,9 @@ void QuartzClient::paintEvent( TQPaintEvent* )
// Draw part of the frame that is the title color // Draw part of the frame that is the title color
if( coloredFrame ) if( coloredFrame )
g = options()->tqcolorGroup(ColorTitleBar, isActive()); g = options()->colorGroup(ColorTitleBar, isActive());
else else
g = options()->tqcolorGroup(ColorFrame, isActive()); g = options()->colorGroup(ColorFrame, isActive());
// Draw outer highlights and lowlights // Draw outer highlights and lowlights
p.setPen( g.light().light(120) ); p.setPen( g.light().light(120) );

12
twin/clients/redmond/redmond.cpp
Unescape View File

@ -149,7 +149,7 @@ static void create_pixmaps ()
defaultMenuPix = new TQPixmap(kdelogo); defaultMenuPix = new TQPixmap(kdelogo);
// buttons (active/inactive, sunken/unsunken) // buttons (active/inactive, sunken/unsunken)
TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true);
TQColor c = g.background(); TQColor c = g.background();
btnPix1->resize(normalTitleHeight, normalTitleHeight-2); btnPix1->resize(normalTitleHeight, normalTitleHeight-2);
btnDownPix1->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::gradient(*miniBtnDownPix1, c.dark(130), c.light(130),
KPixmapEffect::VerticalGradient); KPixmapEffect::VerticalGradient);
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); g = options()->colorGroup(KDecoration::ColorButtonBg, false);
c = g.background(); c = g.background();
KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130), KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130),
KPixmapEffect::VerticalGradient); KPixmapEffect::VerticalGradient);
@ -188,7 +188,7 @@ static void create_pixmaps ()
miniBtnPix1->fill(c.rgb()); miniBtnPix1->fill(c.rgb());
miniBtnDownPix1->fill(c.rgb()); miniBtnDownPix1->fill(c.rgb());
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); g = options()->colorGroup(KDecoration::ColorButtonBg, false);
c = g.background(); c = g.background();
iBtnPix1->fill(c.rgb()); iBtnPix1->fill(c.rgb());
iBtnDownPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb());
@ -196,13 +196,13 @@ static void create_pixmaps ()
iMiniBtnDownPix1->fill(c.rgb()); iMiniBtnDownPix1->fill(c.rgb());
} }
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); g = options()->colorGroup(KDecoration::ColorButtonBg, true);
drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnPix1, g, false);
drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnDownPix1, g, true);
drawButtonFrame(miniBtnPix1, g, false); drawButtonFrame(miniBtnPix1, g, false);
drawButtonFrame(miniBtnDownPix1, g, true); drawButtonFrame(miniBtnDownPix1, g, true);
g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); g = options()->colorGroup(KDecoration::ColorButtonBg, false);
drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnPix1, g, false);
drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iBtnDownPix1, g, true);
drawButtonFrame(iMiniBtnPix1, g, false); drawButtonFrame(iMiniBtnPix1, g, false);
@ -491,7 +491,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
// Draw part of the frame that is the frame color // 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.setPen( g.background() );
p.drawLine( x, y, x2-1, y ); p.drawLine( x, y, x2-1, y );
p.drawLine( x, y, x, y2-1 ); p.drawLine( x, y, x, y2-1 );

2
twin/clients/test/test.cpp
Unescape View File

@ -93,7 +93,7 @@ void Decoration::resize( const TQSize& s )
widget()->resize( s ); widget()->resize( s );
} }
TQSize Decoration::tqminimumSize() const TQSize Decoration::minimumSize() const
{ {
return TQSize( 100, 50 ); return TQSize( 100, 50 );
} }

2
twin/clients/test/test.h
Unescape View File

@ -22,7 +22,7 @@ class Decoration
virtual MousePosition mousePosition( const TQPoint& p ) const; virtual MousePosition mousePosition( const TQPoint& p ) const;
virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const;
virtual void resize( const TQSize& s ); virtual void resize( const TQSize& s );
virtual TQSize tqminimumSize() const; virtual TQSize minimumSize() const;
virtual void activeChange() {}; virtual void activeChange() {};
virtual void captionChange() {}; virtual void captionChange() {};
virtual void maximizeChange() {}; virtual void maximizeChange() {};

2
twin/clients/web/Web.cpp
Unescape View File

@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
TQPainter p(widget()); TQPainter p(widget());
p.setPen(Qt::black); p.setPen(Qt::black);
p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background()); p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
p.setClipRegion(pe->region() - titleRect); p.setClipRegion(pe->region() - titleRect);

6
twin/clients/web/WebButton.cpp
Unescape View File

@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p)
TQPen highlightPen; TQPen highlightPen;
if (isDown() ) if (isDown() )
highlightPen = TQPen(tqcolorGroup().light()); highlightPen = TQPen(colorGroup().light());
else else
{ {
if (mouseOver_) if (mouseOver_)
highlightPen = TQPen(tqcolorGroup().highlight()); highlightPen = TQPen(colorGroup().highlight());
else else
highlightPen = TQPen(NoPen); highlightPen = TQPen(NoPen);
} }
p->fillRect(rect(), tqcolorGroup().background()); p->fillRect(rect(), colorGroup().background());
Position position_; Position position_;
if (0 == mapToParent(rect().topLeft() ).x() ) if (0 == mapToParent(rect().topLeft() ).x() )

2
twin/geometry.cpp
Unescape View File

@ -1120,7 +1120,7 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra
TQSize max_size = maxSize(); TQSize max_size = maxSize();
if( decoration != NULL ) if( decoration != NULL )
{ {
TQSize decominsize = decoration->tqminimumSize(); TQSize decominsize = decoration->minimumSize();
TQSize border_size( border_left + border_right, border_top + border_bottom ); TQSize border_size( border_left + border_right, border_top + border_bottom );
if( border_size.width() > decominsize.width()) // just in case if( border_size.width() > decominsize.width()) // just in case
decominsize.setWidth( border_size.width()); decominsize.setWidth( border_size.width());

2
twin/geometrytip.cpp
Unescape View File

@ -20,7 +20,7 @@ GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ):
setIndent(0); setIndent(0);
setLineWidth(1); setLineWidth(1);
setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel );
tqsetAlignment( AlignCenter | AlignTop ); setAlignment( AlignCenter | AlignTop );
sizeHints = xSizeHints; sizeHints = xSizeHints;
if( save_under ) if( save_under )
{ {

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save