Browse Source

Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 73c08b592d.
tags/r14.0.0
Timothy Pearson 8 years ago
parent
commit
2c01fd64dd
100 changed files with 411 additions and 411 deletions
  1. +1
    -1
      drkonqi/backtrace.cpp
  2. +5
    -5
      drkonqi/debugger.cpp
  3. +12
    -12
      drkonqi/krashconf.cpp
  4. +4
    -4
      drkonqi/toplevel.cpp
  5. +2
    -2
      kappfinder/toplevel.cpp
  6. +1
    -1
      kate/app/kateapp.cpp
  7. +7
    -7
      kate/app/kateconfigdialog.cpp
  8. +2
    -2
      kate/app/kateconsole.cpp
  9. +8
    -8
      kate/app/katedocmanager.cpp
  10. +9
    -9
      kate/app/kateexternaltools.cpp
  11. +8
    -8
      kate/app/katefilelist.cpp
  12. +5
    -5
      kate/app/katefileselector.cpp
  13. +11
    -11
      kate/app/kategrepdialog.cpp
  14. +3
    -3
      kate/app/katemailfilesdialog.cpp
  15. +1
    -1
      kate/app/katemain.cpp
  16. +8
    -8
      kate/app/katemainwindow.cpp
  17. +6
    -6
      kate/app/katemdi.cpp
  18. +1
    -1
      kate/app/katemdi.h
  19. +1
    -1
      kate/app/katemwmodonhddialog.cpp
  20. +1
    -1
      kate/app/katesavemodifieddialog.cpp
  21. +1
    -1
      kate/app/katesession.cpp
  22. +3
    -3
      kate/app/katetabwidget.cpp
  23. +8
    -8
      kate/app/kateviewmanager.cpp
  24. +9
    -9
      kate/app/kateviewspace.cpp
  25. +10
    -10
      kate/app/kateviewspacecontainer.cpp
  26. +1
    -1
      kate/app/kbookmarkhandler.cpp
  27. +6
    -6
      kate/app/kwritemain.cpp
  28. +2
    -2
      kate/utils/dockviewbase.cpp
  29. +1
    -1
      kate/utils/messageview.cpp
  30. +2
    -2
      kcontrol/access/kaccess.cpp
  31. +12
    -12
      kcontrol/access/kcmaccess.cpp
  32. +15
    -15
      kcontrol/accessibility/accessibilityconfigwidget.ui
  33. +18
    -18
      kcontrol/arts/arts.cpp
  34. +5
    -5
      kcontrol/arts/generaltab.ui
  35. +4
    -4
      kcontrol/arts/hardwaretab.ui
  36. +6
    -6
      kcontrol/arts/krichtextlabel.cpp
  37. +2
    -2
      kcontrol/arts/krichtextlabel.h
  38. +2
    -2
      kcontrol/background/bgadvanced.cpp
  39. +5
    -5
      kcontrol/background/bgadvanced_ui.ui
  40. +7
    -7
      kcontrol/background/bgdialog.cpp
  41. +13
    -13
      kcontrol/background/bgdialog_ui.ui
  42. +1
    -1
      kcontrol/background/bghash.h
  43. +4
    -4
      kcontrol/background/bgmonitor.cpp
  44. +1
    -1
      kcontrol/background/bgrender.cpp
  45. +3
    -3
      kcontrol/background/bgsettings.cpp
  46. +3
    -3
      kcontrol/background/bgwallpaper_ui.ui
  47. +1
    -1
      kcontrol/background/main.cpp
  48. +2
    -2
      kcontrol/bell/bell.cpp
  49. +8
    -8
      kcontrol/clock/dtime.cpp
  50. +1
    -1
      kcontrol/clock/main.cpp
  51. +1
    -1
      kcontrol/clock/tzone.cpp
  52. +6
    -6
      kcontrol/colors/colorscm.cpp
  53. +7
    -7
      kcontrol/colors/widgetcanvas.cpp
  54. +2
    -2
      kcontrol/componentchooser/browserconfig_ui.ui
  55. +8
    -8
      kcontrol/componentchooser/componentchooser.cpp
  56. +1
    -1
      kcontrol/componentchooser/componentchooser_ui.ui
  57. +2
    -2
      kcontrol/componentchooser/componentconfig_ui.ui
  58. +4
    -4
      kcontrol/componentchooser/emailclientconfig_ui.ui
  59. +1
    -1
      kcontrol/componentchooser/kcm_componentchooser.cpp
  60. +3
    -3
      kcontrol/componentchooser/terminalemulatorconfig_ui.ui
  61. +1
    -1
      kcontrol/crypto/certexport.cpp
  62. +9
    -9
      kcontrol/crypto/crypto.cpp
  63. +1
    -1
      kcontrol/crypto/kdatetimedlg.cpp
  64. +4
    -4
      kcontrol/css/cssconfig.ui
  65. +7
    -7
      kcontrol/css/csscustom.ui
  66. +2
    -2
      kcontrol/css/kcmcss.cpp
  67. +1
    -1
      kcontrol/css/preview.ui
  68. +1
    -1
      kcontrol/display/display.cpp
  69. +6
    -6
      kcontrol/displayconfig/displayconfig.cpp
  70. +7
    -7
      kcontrol/displayconfig/displayconfigbase.ui
  71. +1
    -1
      kcontrol/displayconfig/monitorworkspace.cpp
  72. +5
    -5
      kcontrol/dnssd/configdialog.ui
  73. +3
    -3
      kcontrol/dnssd/kcmdnssd.cpp
  74. +1
    -1
      kcontrol/ebrowsing/filteropts.cpp
  75. +1
    -1
      kcontrol/ebrowsing/main.cpp
  76. +1
    -1
      kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
  77. +1
    -1
      kcontrol/ebrowsing/plugins/ikws/ikwsopts.h
  78. +1
    -1
      kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
  79. +1
    -1
      kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
  80. +1
    -1
      kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
  81. +3
    -3
      kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
  82. +7
    -7
      kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
  83. +1
    -1
      kcontrol/energy/energy.cpp
  84. +1
    -1
      kcontrol/filetypes/filegroupdetails.cpp
  85. +3
    -3
      kcontrol/filetypes/filetypedetails.cpp
  86. +2
    -2
      kcontrol/filetypes/filetypesview.cpp
  87. +1
    -1
      kcontrol/filetypes/kservicelistwidget.cpp
  88. +1
    -1
      kcontrol/filetypes/newtypedlg.cpp
  89. +5
    -5
      kcontrol/filetypes/typeslistitem.cpp
  90. +3
    -3
      kcontrol/fonts/fonts.cpp
  91. +1
    -1
      kcontrol/fonts/kxftconfig.cpp
  92. +3
    -3
      kcontrol/iccconfig/iccconfig.cpp
  93. +1
    -1
      kcontrol/iccconfig/iccconfigbase.ui
  94. +20
    -20
      kcontrol/icons/icons.cpp
  95. +1
    -1
      kcontrol/icons/iconthemes.cpp
  96. +1
    -1
      kcontrol/icons/main.cpp
  97. +9
    -9
      kcontrol/info/info.cpp
  98. +1
    -1
      kcontrol/info/info_fbsd.cpp
  99. +1
    -1
      kcontrol/info/info_hpux.cpp
  100. +4
    -4
      kcontrol/info/info_netbsd.cpp

+ 1
- 1
drkonqi/backtrace.cpp View File

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

+ 5
- 5
drkonqi/debugger.cpp View File

@@ -25,7 +25,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************/

#include <layout.h>
#include <tqlayout.h>
#include <tqhbox.h>
#include <tqlabel.h>

@@ -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->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
//m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "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::fromLatin1( ".kcrash" );
TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".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::fromLatin1( "kdedrc" ), true );
KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
kdedcfg.setGroup( "General" );
if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
{


+ 12
- 12
drkonqi/krashconf.cpp View File

@@ -93,12 +93,12 @@ void KrashConfig :: readConfig()

// maybe we should check if it's relative?
TQString configname = config->readEntry("ConfigName",
TQString::fromLatin1("enduser"));
TQString::tqfromLatin1("enduser"));

TQString debuggername = config->readEntry("Debugger",
TQString::fromLatin1("gdb"));
TQString::tqfromLatin1("gdb"));

KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
KConfig debuggers(TQString::tqfromLatin1("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::fromLatin1("presets/%1rc").arg(configname),
KConfig preset(TQString::tqfromLatin1("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::fromLatin1("unknown");
str = TQString::tqfromLatin1("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::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;
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;
if (shell)
str = KMacroExpander::expandMacrosShellQuote( str, map );
else


+ 4
- 4
drkonqi/toplevel.cpp View File

@@ -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::fromLatin1("pics/konqi.png")));
TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png")));
lab->setPixmap(pix);
lab->setFixedSize( lab->sizeHint() );
lab->setFixedSize( lab->tqsizeHint() );

TQLabel * info = new TQLabel(generateText(), page);
info->setMinimumSize(info->sizeHint());
info->setMinimumSize(info->tqsizeHint());

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::fromLatin1
TQString buf = TQString::tqfromLatin1
("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;

m_bugreport->setText(buf);


+ 2
- 2
kappfinder/toplevel.cpp View File

@@ -37,7 +37,7 @@

#include <tqaccel.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqdir.h>
#include <tqregexp.h>
@@ -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->setAlignment( AlignAuto | WordBreak );
label->tqsetAlignment( AlignAuto | WordBreak );
layout->addWidget( label );

layout->addSpacing( 5 );


+ 1
- 1
kate/app/kateapp.cpp View File

@@ -45,7 +45,7 @@
#include <tqfile.h>
#include <tqtimer.h>
#include <tqdir.h>
#include <textcodec.h>
#include <tqtextcodec.h>

#include <stdlib.h>
#include <unistd.h>


+ 7
- 7
kate/app/kateconfigdialog.cpp View File

@@ -36,7 +36,7 @@
#include <tqcheckbox.h>
#include <tqhbox.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
@@ -332,12 +332,12 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)

for (uint i=0; i<pluginPages.count(); i++)
{
if ( pluginPages.at(i)->plugin == plugin )
if ( pluginPages.tqat(i)->plugin == plugin )
{
TQWidget *w = pluginPages.at(i)->page->parentWidget();
delete pluginPages.at(i)->page;
TQWidget *w = pluginPages.tqat(i)->page->parentWidget();
delete pluginPages.tqat(i)->page;
delete w;
pluginPages.remove(pluginPages.at(i));
pluginPages.remove(pluginPages.tqat(i));
i--;
}
}
@@ -415,7 +415,7 @@ void KateConfigDialog::slotApply()
//
for (uint i=0; i<editorPages.count(); i++)
{
editorPages.at(i)->apply();
editorPages.tqat(i)->apply();
}

v->getDoc()->writeConfig(config);
@@ -425,7 +425,7 @@ void KateConfigDialog::slotApply()
//
for (uint i=0; i<pluginPages.count(); i++)
{
pluginPages.at(i)->page->apply();
pluginPages.tqat(i)->page->apply();
}

config->sync();


+ 2
- 2
kate/app/kateconsole.cpp View File

@@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded()
{
if (m_part) return;

if (!topLevelWidget() || !parentWidget()) return;
if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
if (!tqtopLevelWidget() || !parentWidget()) return;
if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;

KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");



+ 8
- 8
kate/app/katedocmanager.cpp View File

@@ -43,7 +43,7 @@
#include <twin.h>

#include <tqdatetime.h>
#include <textcodec.h>
#include <tqtextcodec.h>
#include <tqprogressdialog.h>

KateDocManager::KateDocManager (TQObject *parent)
@@ -69,7 +69,7 @@ KateDocManager::~KateDocManager ()
{
// save config
if (!m_docList.isEmpty())
m_docList.at(0)->writeConfig(KateApp::self()->config());
m_docList.tqat(0)->writeConfig(KateApp::self()->config());

if (m_saveMetaInfos)
{
@@ -86,7 +86,7 @@ KateDocManager::~KateDocManager ()
{
m_metaInfos->setGroup(*it);
TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def);
if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos)
m_metaInfos->deleteGroup(*it);
}
delete def;
@@ -150,7 +150,7 @@ void KateDocManager::deleteDoc (Kate::Document *doc)

Kate::Document *KateDocManager::document (uint n)
{
return m_docList.at(n);
return m_docList.tqat(n);
}

Kate::Document *KateDocManager::activeDocument ()
@@ -234,7 +234,7 @@ bool KateDocManager::isOpen(KURL url)
Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encoding, uint *id, bool isTempFile)
{
// special handling if still only the first initial doc is there
if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().at(0)->isModified() && documentList().at(0)->url().isEmpty()))
if (!documentList().isEmpty() && (documentList().count() == 1) && (!documentList().tqat(0)->isModified() && documentList().tqat(0)->url().isEmpty()))
{
Kate::Document* doc = documentList().getFirst();

@@ -354,7 +354,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL)
}

while (!docs.isEmpty() && res)
if (! closeDocument(docs.at(0),closeURL) )
if (! closeDocument(docs.tqat(0),closeURL) )
res = false;
else
docs.remove ((uint)0);
@@ -364,7 +364,7 @@ bool KateDocManager::closeAllDocuments(bool closeURL)
KateApp::self()->mainWindow(i)->viewManager()->setViewActivationBlocked(false);

for (uint s=0; s < KateApp::self()->mainWindow(i)->viewManager()->containers()->count(); s++)
KateApp::self()->mainWindow(i)->viewManager()->containers()->at(s)->activateView (m_docList.at(0)->documentNumber());
KateApp::self()->mainWindow(i)->viewManager()->containers()->tqat(s)->activateView (m_docList.tqat(0)->documentNumber());
}

return res;
@@ -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::currentDateTime());
m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime());
m_metaInfos->sync();
}
}


+ 9
- 9
kate/app/kateexternaltools.cpp View File

@@ -49,12 +49,12 @@
#include <tqfile.h>
#include <tqpushbutton.h>
#include <tqlineedit.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlistbox.h>
#include <tqmap.h>
#include <tqregexp.h>
#include <textedit.h>
#include <tqtextedit.h>
#include <tqtoolbutton.h>
#include <tqwhatsthis.h>

@@ -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->topLevelWidget());
KateMDI::MainWindow *dmw=tqt_dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
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->setAlignment( l->alignment()|Qt::AlignRight );
l->tqsetAlignment( 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->setAlignment( Qt::AlignTop|Qt::AlignRight );
l->tqsetAlignment( 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->setAlignment( l->alignment()|Qt::AlignRight );
l->tqsetAlignment( 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->setAlignment( l->alignment()|Qt::AlignRight );
l->tqsetAlignment( 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->setAlignment( l->alignment()|Qt::AlignRight );
l->tqsetAlignment( 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->setAlignment( l->alignment()|Qt::AlignRight );
l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
lo->addWidget( l, 6, 1 );
if ( tool ) leCmdLine->setText( tool->cmdname );
TQWhatsThis::add( leCmdLine, i18n(


+ 8
- 8
kate/app/katefilelist.cpp View File

@@ -33,7 +33,7 @@
#include <tqcolor.h>
#include <tqcheckbox.h>
#include <tqhbox.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqwhatsthis.h>
@@ -69,7 +69,7 @@ class ToolTip : public TQToolTip
KateFileListItem *item = ((KateFileListItem*)i);
if ( ! item ) return;

tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );
tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) );

}

@@ -272,8 +272,8 @@ void KateFileList::slotModChanged (Kate::Document *doc)

for ( uint i=0; i < m_editHistory.count(); i++ )
{
m_editHistory.at( i )->setEditHistPos( i+1 );
repaintItem( m_editHistory.at( i ) );
m_editHistory.tqat( i )->setEditHistPos( i+1 );
repaintItem( m_editHistory.tqat( i ) );
}
}
else
@@ -334,7 +334,7 @@ void KateFileList::slotViewChanged ()
// int p = 0;
// if ( m_viewHistory.count() )
// {
// int p = m_viewHistory.findRef( item ); // only repaint items that needs it
// int p = m_viewHistory.findRef( item ); // only tqrepaint items that needs it
// }

m_viewHistory.removeRef( item );
@@ -342,8 +342,8 @@ void KateFileList::slotViewChanged ()

for ( uint i=0; i < m_viewHistory.count(); i++ )
{
m_viewHistory.at( i )->setViewHistPos( i+1 );
repaintItem( m_viewHistory.at( i ) );
m_viewHistory.tqat( i )->setViewHistPos( i+1 );
repaintItem( m_viewHistory.tqat( i ) );
}

}
@@ -616,7 +616,7 @@ void KFLConfigPage::apply()
m_filelist->m_editShade = kcbEditShade->color();
m_filelist->m_enableBgShading = cbEnableShading->isChecked();
m_filelist->setSortType( cmbSort->currentItem() );
// repaint the affected items
// tqrepaint the affected items
m_filelist->triggerUpdate();
}



+ 5
- 5
kate/app/katefileselector.cpp View File

@@ -28,7 +28,7 @@

#include "kactionselector.h"

#include <layout.h>
#include <tqlayout.h>
#include <tqtoolbutton.h>
#include <tqhbox.h>
#include <tqvbox.h>
@@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
{
if (m_tb)
{
setMinimumHeight(m_tb->sizeHint().height());
setMinimumHeight(m_tb->tqsizeHint().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->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
cmbPath->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
filter->tqsetSizePolicy( 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::fromLatin1(".."));
newurl.cd(TQString::tqfromLatin1(".."));

if ( !kateFileSelectorIsReadable (newurl) )
newurl.setPath( TQDir::homeDirPath() );


+ 11
- 11
kate/app/kategrepdialog.cpp View File

@@ -22,7 +22,7 @@
#include "katemainwindow.h"

#include <tqobject.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqevent.h>
@@ -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->sizeHint());
lPattern->setFixedSize(lPattern->tqsizeHint());
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->sizeHint());
cmbPattern->setMinimumSize(cmbPattern->tqsizeHint());
loPattern->addWidget( cmbPattern );

cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
loPattern->addWidget(cbCasesensitive);

cbRegex = new TQCheckBox( i18n("Regular expression"), this );
cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() );
cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
loPattern->addWidget( cbRegex );
loPattern->setStretchFactor( cmbPattern, 100 );

TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
lTemplate->setFixedSize(lTemplate->sizeHint());
lTemplate->setFixedSize(lTemplate->tqsizeHint());
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->sizeHint());
leTemplate->setMinimumSize(leTemplate->tqsizeHint());
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->sizeHint());
lFiles->setFixedSize(lFiles->tqsizeHint());
loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);

cmbFiles = new KComboBox(true, this);
lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
cmbFiles->setMinimumSize(cmbFiles->sizeHint());
cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
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->sizeHint());
lDir->setFixedSize(lDir->tqsizeHint());
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->sizeHint().width());
cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width());
cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
loDir->addWidget(cbRecursive);



+ 3
- 3
kate/app/katemailfilesdialog.cpp View File

@@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin )
}
list->hide();
connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
mw->setMinimumSize( lInfo->sizeHint() );
mw->setMinimumSize( lInfo->tqsizeHint() );
}

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->sizeHint().width(), mw->sizeHint().height()) );
setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) );
setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
resize( width(), minimumHeight() );
}
#include "katemailfilesdialog.moc"

+ 1
- 1
kate/app/katemain.cpp View File

@@ -31,7 +31,7 @@
#include <dcopref.h>
#include <kdebug.h>

#include <textcodec.h>
#include <tqtextcodec.h>

#include <stdlib.h>



+ 8
- 8
kate/app/katemainwindow.cpp View File

@@ -77,7 +77,7 @@
#include <ktip.h>
#include <kmenubar.h>
#include <kstringhandler.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqptrvector.h>

#include <assert.h>
@@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
if (sconfig)
{
sconfig->setGroup (sgroup);
size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("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::fromLatin1("Width %1").arg(desk.width()), 0 ));
size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
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 ));

if (size.isEmpty())
size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
@@ -544,10 +544,10 @@ void KateMainWindow::editKeys()
TQPtrList<Kate::Document> l=KateDocManager::self()->documentList();
for (uint i=0;i<l.count();i++) {
// kdDebug(13001)<<"reloading Keysettings for document "<<i<<endl;
l.at(i)->reloadXML();
TQPtrList<class KTextEditor::View> l1=l.at(i)->views ();//KTextEditor::Document
l.tqat(i)->reloadXML();
TQPtrList<class KTextEditor::View> l1=l.tqat(i)->views ();//KTextEditor::Document
for (uint i1=0;i1<l1.count();i1++) {
l1.at(i1)->reloadXML();
l1.tqat(i1)->reloadXML();
// kdDebug(13001)<<"reloading Keysettings for view "<<i<<"/"<<i1<<endl;
}
}


+ 6
- 6
kate/app/katemdi.cpp View File

@@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw )

if ( domDocument().documentElement().isNull() )
{
TQString completeDescription = TQString::fromLatin1( guiDescription )
TQString completeDescription = TQString::tqfromLatin1( guiDescription )
.arg( actionListName );

setXML( completeDescription, false /*merge*/ );
@@ -239,7 +239,7 @@ ToolView::~ToolView ()
m_mainWin->toolViewDeleted (this);
}

void ToolView::setVisible (bool vis)
void ToolView::tqsetVisible (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()->setVisible(false);
it.current()->tqsetVisible(false);
}

setTab (m_widgetToId[widget], true);
@@ -388,7 +388,7 @@ bool Sidebar::showWidget (ToolView *widget)
m_ownSplit->show ();
widget->show ();

widget->setVisible (true);
widget->tqsetVisible (true);

return true;
}
@@ -420,7 +420,7 @@ bool Sidebar::hideWidget (ToolView *widget)
if (!anyVis)
m_ownSplit->hide ();

widget->setVisible (false);
widget->tqsetVisible (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->setVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));
tv->tqsetVisible (config->readBoolEntry (TQString ("Kate-MDI-ToolView-%1-Visible").arg(tv->id), false));

if (!anyVis)
anyVis = tv->visible();


+ 1
- 1
kate/app/katemdi.h View File

@@ -146,7 +146,7 @@ class ToolView : public TQVBox

Sidebar *sidebar () { return m_sidebar; }

void setVisible (bool vis);
void tqsetVisible (bool vis);

public:
bool visible () const;


+ 1
- 1
kate/app/katemwmodonhddialog.cpp View File

@@ -35,7 +35,7 @@

#include <tqlabel.h>
#include <tqlistview.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqvbox.h>


+ 1
- 1
kate/app/katesavemodifieddialog.cpp View File

@@ -152,7 +152,7 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate:
m_documentRoot=new TQListViewItem(m_list,i18n("Documents"));
const uint docCnt=documents.count();
for (uint i=0;i<docCnt;i++) {
new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.at(i));
new KateSaveModifiedDocumentCheckListItem(m_documentRoot,documents.tqat(i));
}
m_documentRoot->setOpen(true);
} else m_documentRoot=0;


+ 1
- 1
kate/app/katesession.cpp View File

@@ -38,7 +38,7 @@

#include <tqdir.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqvbox.h>
#include <tqhbox.h>
#include <tqcheckbox.h>


+ 3
- 3
kate/app/katetabwidget.cpp View File

@@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in
KTabWidget::insertTab(child,label,index);
showPage(child);
maybeShow();
tabBar()->repaint();
tabBar()->tqrepaint();
}

void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con
KTabWidget::insertTab(child,iconset,label,index);
showPage(child);
maybeShow();
tabBar()->repaint();
tabBar()->tqrepaint();
}

void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
KTabWidget::insertTab(child,tab,index);
showPage(child);
maybeShow();
tabBar()->repaint();
tabBar()->tqrepaint();
}

void KateTabWidget::removePage ( TQWidget * w )


+ 8
- 8
kate/app/kateviewmanager.cpp View File

@@ -316,7 +316,7 @@ uint KateViewManager::viewCount ()
{
uint viewCount=0;
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
viewCount+=m_viewSpaceContainerList.at(i)->viewCount();
viewCount+=m_viewSpaceContainerList.tqat(i)->viewCount();
}
return viewCount;

@@ -326,7 +326,7 @@ uint KateViewManager::viewSpaceCount ()
{
uint viewSpaceCount=0;
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
viewSpaceCount+=m_viewSpaceContainerList.at(i)->viewSpaceCount();
viewSpaceCount+=m_viewSpaceContainerList.tqat(i)->viewSpaceCount();
}
return viewSpaceCount;
}
@@ -334,7 +334,7 @@ uint KateViewManager::viewSpaceCount ()
void KateViewManager::setViewActivationBlocked (bool block)
{
for (uint i=0;i<m_viewSpaceContainerList.count();i++)
m_viewSpaceContainerList.at(i)->m_blockViewCreationAndActivation=block;
m_viewSpaceContainerList.tqat(i)->m_blockViewCreationAndActivation=block;
}

void KateViewManager::activateNextView()
@@ -354,7 +354,7 @@ void KateViewManager::activatePrevView()
void KateViewManager::closeViews(uint documentNumber)
{
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
m_viewSpaceContainerList.at(i)->closeViews(documentNumber);
m_viewSpaceContainerList.tqat(i)->closeViews(documentNumber);
}
tabChanged(m_currentContainer);
}
@@ -454,7 +454,7 @@ void KateViewManager::setShowFullPath( bool enable )
{
showFullPath=enable;
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
m_viewSpaceContainerList.at(i)->setShowFullPath(enable);
m_viewSpaceContainerList.tqat(i)->setShowFullPath(enable);
}
m_mainWindow->slotWindowActivated ();
}
@@ -477,7 +477,7 @@ void KateViewManager::saveViewConfiguration(KConfig *config,const TQString& grp)
config->writeEntry("ViewSpaceContainers",m_viewSpaceContainerList.count());
config->writeEntry("Active ViewSpaceContainer", m_mainWindow->tabWidget()->currentPageIndex());
for (uint i=0;i<m_viewSpaceContainerList.count();i++) {
m_viewSpaceContainerList.at(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
m_viewSpaceContainerList.tqat(i)->saveViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
}
}

@@ -495,10 +495,10 @@ void KateViewManager::restoreViewConfiguration (KConfig *config, const TQString&
uint tabCount=config->readNumEntry("ViewSpaceContainers",0);
int activeOne=config->readNumEntry("Active ViewSpaceContainer",0);
if (tabCount==0) return;
m_viewSpaceContainerList.at(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
m_viewSpaceContainerList.tqat(0)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-0:"));
for (uint i=1;i<tabCount;i++) {
slotNewTab();
m_viewSpaceContainerList.at(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
m_viewSpaceContainerList.tqat(i)->restoreViewConfiguration(config,group+TQString(":ViewSpaceContainer-%1:").arg(i));
}

if (activeOne != m_mainWindow->tabWidget()->currentPageIndex())


+ 9
- 9
kate/app/kateviewspace.cpp View File

@@ -67,9 +67,9 @@ protected:
void paintEvent( TQPaintEvent *e )
{
TQPainter p( this );
p.setPen( colorGroup().shadow() );
p.setPen( tqcolorGroup().shadow() );
p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().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->setAlignment( Qt::AlignCenter );
m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
m_lineColLabel->installEventFilter( this );

m_modifiedLabel = new TQLabel( TQString(" "), this );
addWidget( m_modifiedLabel, 0, false );
m_modifiedLabel->setAlignment( Qt::AlignCenter );
m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
m_modifiedLabel->installEventFilter( this );

m_insertModeLabel = new TQLabel( i18n(" INS "), this );
addWidget( m_insertModeLabel, 0, false );
m_insertModeLabel->setAlignment( Qt::AlignCenter );
m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
m_insertModeLabel->installEventFilter( this );

m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
addWidget( m_selectModeLabel, 0, false );
m_selectModeLabel->setAlignment( Qt::AlignCenter );
m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
m_selectModeLabel->installEventFilter( this );

m_fileNameLabel=new KSqueezedTextLabel( this );
addWidget( m_fileNameLabel, 1, true );
m_fileNameLabel->setMinimumSize( 0, 0 );
m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
m_fileNameLabel->tqsetAlignment( /*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*>( topLevelWidget() );
KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );

if (menu)


+ 10
- 10
kate/app/kateviewspacecontainer.cpp View File

@@ -48,7 +48,7 @@

#include <ktexteditor/encodinginterface.h>

#include <layout.h>
#include <tqlayout.h>
#include <tqobjectlist.h>
#include <tqstringlist.h>
#include <tqvbox.h>
@@ -277,7 +277,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
setActiveView (view);
m_viewList.findRef (view);

mainWindow()->toolBar ()->setUpdatesEnabled (false);
mainWindow()->toolBar ()->tqsetUpdatesEnabled (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 ()->setUpdatesEnabled (true);
mainWindow()->toolBar ()->tqsetUpdatesEnabled (true);

statusMsg();

@@ -342,8 +342,8 @@ void KateViewSpaceContainer::activateNextView()
if (i >= m_viewSpaceList.count())
i=0;

setActiveSpace (m_viewSpaceList.at(i));
activateView(m_viewSpaceList.at(i)->currentView());
setActiveSpace (m_viewSpaceList.tqat(i));
activateView(m_viewSpaceList.tqat(i)->currentView());
}

void KateViewSpaceContainer::activatePrevView()
@@ -353,8 +353,8 @@ void KateViewSpaceContainer::activatePrevView()
if (i < 0)
i=m_viewSpaceList.count()-1;

setActiveSpace (m_viewSpaceList.at(i));
activateView(m_viewSpaceList.at(i)->currentView());
setActiveSpace (m_viewSpaceList.tqat(i));
activateView(m_viewSpaceList.tqat(i)->currentView());
}

void KateViewSpaceContainer::closeViews(uint documentNumber)
@@ -363,7 +363,7 @@ void KateViewSpaceContainer::closeViews(uint documentNumber)

for (uint z=0 ; z < m_viewList.count(); z++)
{
Kate::View* current = m_viewList.at(z);
Kate::View* current = m_viewList.tqat(z);
if ( current->getDoc()->documentNumber() == documentNumber )
{
closeList.append (current);
@@ -644,7 +644,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
{
// send all views + their gui to **** ;)
for (uint i=0; i < m_viewList.count(); i++)
mainWindow()->guiFactory ()->removeClient (m_viewList.at(i));
mainWindow()->guiFactory ()->removeClient (m_viewList.tqat(i));

m_viewList.clear ();

@@ -658,7 +658,7 @@ void KateViewSpaceContainer::restoreViewConfiguration (KConfig *config, const TQ
// finally, make the correct view active.
config->setGroup (group);
/*
KateViewSpace *vs = m_viewSpaceList.at( config->readNumEntry("Active ViewSpace") );
KateViewSpace *vs = m_viewSpaceList.tqat( config->readNumEntry("Active ViewSpace") );
if ( vs )
activateSpace( vs->currentView() );
*/


+ 1
- 1
kate/app/kbookmarkhandler.cpp View File

@@ -22,7 +22,7 @@
#include <stdio.h>
#include <stdlib.h>

#include <textstream.h>
#include <tqtextstream.h>

#include <kbookmarkimporter.h>
#include <kpopupmenu.h>


+ 6
- 6
kate/app/kwritemain.cpp View File

@@ -60,8 +60,8 @@
#include <tqdropsite.h>
#include <tqdragobject.h>
#include <tqvbox.h>
#include <textcodec.h>
#include <layout.h>
#include <tqtextcodec.h>
#include <tqlayout.h>

// StatusBar field IDs
#define KWRITE_ID_GEN 1
@@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)

// init with more usefull size, stolen from konq :)
if (!initialGeometrySet())
resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));

// call it as last thing, must be sure everything is already set up ;)
setAutoSaveSettings ();
@@ -474,7 +474,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
TQString buf = TQString("Document %1").arg(z);
config->setGroup(buf);

KTextEditor::Document *doc = docList.at(z - 1);
KTextEditor::Document *doc = docList.tqat(z - 1);

if (KTextEditor::configInterface(doc))
KTextEditor::configInterface(doc)->writeSessionConfig(config);
@@ -485,7 +485,7 @@ void KWrite::saveGlobalProperties(KConfig *config) //save documents
TQString buf = TQString("Window %1").arg(z);
config->setGroup(buf);

config->writeEntry("DocumentNumber",docList.find(winList.at(z-1)->view()->document()) + 1);
config->writeEntry("DocumentNumber",docList.find(winList.tqat(z-1)->view()->document()) + 1);
}
}

@@ -521,7 +521,7 @@ void KWrite::restore()
{
buf = TQString("Window %1").arg(z);
config->setGroup(buf);
t = new KWrite(docList.at(config->readNumEntry("DocumentNumber") - 1));
t = new KWrite(docList.tqat(config->readNumEntry("DocumentNumber") - 1));
t->restore(config,z);
}
}


+ 2
- 2
kate/utils/dockviewbase.cpp View File

@@ -20,7 +20,7 @@
#include "dockviewbase.moc"

#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>

//#include <kdebug.h>

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


+ 1
- 1
kate/utils/messageview.cpp View File

@@ -19,7 +19,7 @@
#include "messageview.h"
#include "messageview.moc"

#include <textbrowser.h>
#include <tqtextbrowser.h>

Kate::MessageView::MessageView( TQWidget *parent, const char *name )
: Kate::DockViewBase( parent, name )


+ 2
- 2
kcontrol/access/kaccess.cpp View File

@@ -4,7 +4,7 @@
#include <tqtimer.h>
#include <tqpainter.h>
#include <tqvbox.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqlabel.h>

#include <kdialogbase.h>
@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
TQVBoxLayout * vlay = new TQVBoxLayout(lay);

featuresLabel = new TQLabel( "", contents );
featuresLabel->setAlignment( WordBreak|AlignVCenter );
featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
vlay->addWidget( featuresLabel );
vlay->addStretch();



+ 12
- 12
kcontrol/access/kcmaccess.cpp View File

@@ -12,7 +12,7 @@
#include <dcopref.h>

#include <tqtabwidget.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
@@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
KDialogBase::spacingHint());

systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());

visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
vvbox->addWidget(visibleBell);
@@ -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->sizeHint().height()*2);
colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2);
hbox->addWidget(colorButton);
hbox->addStretch();
TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") );
@@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());

stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
vvbox->addWidget(stickyKeys);
@@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());

toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
vvbox->addWidget(toggleKeysBeep);
@@ -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->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyModifiersButton);

connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
@@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());

slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
vvbox->addWidget(slowKeys);
@@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());

bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
vvbox->addWidget(bounceKeys);
@@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());

gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
vvbox->addWidget(gestures);
@@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
grp->setColumnLayout( 0, Qt::Horizontal );
vbox->addWidget(grp);

vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());

accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
vvbox->addWidget(accessxBeep);
@@ -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->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
hbox->addWidget(kNotifyAccessXButton);

connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));


+ 15
- 15
kcontrol/accessibility/accessibilityconfigwidget.ui View File

@@ -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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<size>
<width>21</width>
<height>61</height>
@@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>Ma&amp;ximum speed:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>Acceleration &amp;time:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -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="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>&amp;Repeat interval:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>Acceleration &amp;profile:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
<property name="text">
<string>&amp;Acceleration delay:</string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="buddy" stdset="0">
@@ -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="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>1</height>


+ 18
- 18
kcontrol/arts/arts.cpp View File

@@ -27,7 +27,7 @@

#include <tqcombobox.h>
#include <tqdir.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
#include <tqslider.h>
@@ -297,7 +297,7 @@ void KArtsModule::load( bool useDefaults )
{
if(a->name == audioIO) // first item: "autodetect"
{
hardware->audioIO->setCurrentItem(audioIOList.at() + 1);
hardware->audioIO->setCurrentItem(audioIOList.tqat() + 1);
break;
}

@@ -334,7 +334,7 @@ void KArtsModule::saveParams( void )
int item = hardware->audioIO->currentItem() - 1; // first item: "default"

if (item >= 0) {
audioIO = audioIOList.at(item)->name;
audioIO = audioIOList.tqat(item)->name;
}

TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null;
@@ -498,8 +498,8 @@ void KArtsModule::updateWidgets()
int item = hardware->audioIO->currentItem() - 1; // first item: "default"
if (item >= 0)
{
audioIO = audioIOList.at(item)->name;
bool jack = (audioIO == TQString::fromLatin1("jack"));
audioIO = audioIOList.tqat(item)->name;
bool jack = (audioIO == TQString::tqfromLatin1("jack"));
if(jack)
{
customRate->setChecked(false);
@@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans,
TQString args;

if(fragmentCount)
args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount);

if(fragmentSize)
args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize);

if (!audioIO.isEmpty())
args += TQString::fromLatin1(" -a %1").arg(audioIO);
args += TQString::tqfromLatin1(" -a %1").arg(audioIO);

if (duplex)
args += TQString::fromLatin1(" -d");
args += TQString::tqfromLatin1(" -d");

if (netTrans)
args += TQString::fromLatin1(" -n");
args += TQString::tqfromLatin1(" -n");

if (!deviceName.isEmpty())
args += TQString::fromLatin1(" -D ") + deviceName;
args += TQString::tqfromLatin1(" -D ") + deviceName;

if (rate)
args += TQString::fromLatin1(" -r %1").arg(rate);
args += TQString::tqfromLatin1(" -r %1").arg(rate);

if (bits)
args += TQString::fromLatin1(" -b %1").arg(bits);
args += TQString::tqfromLatin1(" -b %1").arg(bits);

if (autoSuspend && suspendTime)
args += TQString::fromLatin1(" -s %1").arg(suspendTime);
args += TQString::tqfromLatin1(" -s %1").arg(suspendTime);

if (!addOptions.isEmpty())
args += TQChar(' ') + addOptions;

args += TQString::fromLatin1(" -m artsmessage");
args += TQString::fromLatin1(" -c drkonqi");
args += TQString::fromLatin1(" -l 3");
args += TQString::fromLatin1(" -f");
args += TQString::tqfromLatin1(" -m artsmessage");
args += TQString::tqfromLatin1(" -c drkonqi");
args += TQString::tqfromLatin1(" -l 3");
args += TQString::tqfromLatin1(" -f");

return args;
}


+ 5
- 5
kcontrol/arts/generaltab.ui View File

@@ -12,7 +12,7 @@
<height>613</height>
</rect>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>


+ 4
- 4
kcontrol/arts/hardwaretab.ui View File

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


+ 6
- 6
kcontrol/arts/krichtextlabel.cpp View File

@@ -19,7 +19,7 @@
#include "krichtextlabel.h"

#include <tqtooltip.h>
#include <stylesheet.h>
#include <tqstylesheet.h>
#include <tqsimplerichtext.h>

#include <kglobalsettings.h>
@@ -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);
setAlignment( TQt::WordBreak );
tqsetAlignment( TQt::WordBreak );
setText(text);
}

KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( TQt::WordBreak );
tqsetAlignment( TQt::WordBreak );
}

void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
}

TQSize KRichTextLabel::minimumSizeHint() const
TQSize KRichTextLabel::tqminimumSizeHint() const
{
TQString qt_text = qrichtextify( text() );
int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const
return TQSize(pref_width, rt.height());
}

TQSize KRichTextLabel::sizeHint() const
TQSize KRichTextLabel::tqsizeHint() const
{
return minimumSizeHint();
return tqminimumSizeHint();
}

void KRichTextLabel::setText( const TQString &text ) {


+ 2
- 2
kcontrol/arts/krichtextlabel.h View File

@@ -45,8 +45,8 @@ public:
int defaultWidth() const { return m_defaultWidth; }
void setDefaultWidth(int defaultWidth);

virtual TQSize minimumSizeHint() const;
virtual TQSize sizeHint() const;
virtual TQSize tqminimumSizeHint() const;
virtual TQSize tqsizeHint() const;
TQSizePolicy sizePolicy() const;

public slots:


+ 2
- 2
kcontrol/background/bgadvanced.cpp View File

@@ -24,7 +24,7 @@
#include <tqcheckbox.h>
#include <tqheader.h>
#include <tqlabel.h>
#include <layout.h>
#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqcombobox.h>
#include <tqpushbutton.h>
@@ -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->sizeHint());
m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint());
lbl->setBuddy(m_RefreshEdit);
grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);



+ 5
- 5
kcontrol/background/bgadvanced_ui.ui View File

@@ -91,7 +91,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -138,7 +138,7 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<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="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>


+ 7
- 7
kcontrol/background/bgdialog.cpp View File

@@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
}

// background image settings
TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("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->setAlignment(Qt::AlignCenter);
screenLabel->tqsetAlignment(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->sizeHint());
TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
targetGeometry.moveCenter(screenCenter);

screenLabel->setGeometry(targetGeometry);
@@ -441,14 +441,14 @@ void BGDialog::initUI()
else {
for (unsigned i = 0; i < (m_numDesks/m_numViewports); ++i) {
for (unsigned j = 0; j < m_numViewports; ++j) {
m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").arg(i+1).arg(j+1));
m_comboDesktop->insertItem(i18n("Desktop %1 Viewport %2").tqarg(i+1).tqarg(j+1));
}
}
}