Rename old tq methods that no longer need a unique name

pull/2/head
Timothy Pearson 11 years ago
parent 2c01fd64dd
commit 628043be55

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -67,9 +67,9 @@ protected:
void paintEvent( TQPaintEvent *e )
{
TQPainter p( this );
p.setPen( tqcolorGroup().shadow() );
p.setPen( colorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
}
};
@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
{
m_lineColLabel = new TQLabel( this );
addWidget( m_lineColLabel, 0, false );
m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
m_lineColLabel->setAlignment( Qt::AlignCenter );
m_lineColLabel->installEventFilter( this );
m_modifiedLabel = new TQLabel( TQString(" "), this );
addWidget( m_modifiedLabel, 0, false );
m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
m_modifiedLabel->setAlignment( Qt::AlignCenter );
m_modifiedLabel->installEventFilter( this );
m_insertModeLabel = new TQLabel( i18n(" INS "), this );
addWidget( m_insertModeLabel, 0, false );
m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
m_insertModeLabel->setAlignment( Qt::AlignCenter );
m_insertModeLabel->installEventFilter( this );
m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
addWidget( m_selectModeLabel, 0, false );
m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
m_selectModeLabel->setAlignment( Qt::AlignCenter );
m_selectModeLabel->installEventFilter( this );
m_fileNameLabel=new KSqueezedTextLabel( this );
addWidget( m_fileNameLabel, 1, true );
m_fileNameLabel->setMinimumSize( 0, 0 );
m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
m_fileNameLabel->installEventFilter( this );
installEventFilter( this );
@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged()
void KateVSStatusBar::showMenu()
{
KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
if (menu)

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

@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
// init with more usefull size, stolen from konq :)
if (!initialGeometrySet())
resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
// call it as last thing, must be sure everything is already set up ;)
setAutoSaveSettings ();

@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title )
{
setSpacing( 4 );
d->header = new TQWidget( this );
d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
TQHBoxLayout *lo = new TQHBoxLayout( d->header );
lo->setSpacing( 6 );
lo->insertSpacing( 0, 6 );

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

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

@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>0</width>
<height>15</height>
@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>21</width>
<height>61</height>
@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>1</height>

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

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

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

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

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

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

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

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