TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Enable compilation with TQt for Qt4 3.4.0 TP2

Browse Source 
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 364641b8e0
commit 8155225c9b
1188 changed files with 9436 additions and 9372 deletions
Show Stats Download Patch File Download Diff File

14
drkonqi/backtrace.cpp
Unescape Escape View File

@ -71,7 +71,7 @@ void BackTrace::start()
TQString exec = m_krashconf->tryExec();
if ( !exec.isEmpty() && KStandardDirs::findExe(exec).isEmpty() )
{
TQObject * o = parent();
TQObject * o = tqparent();
if (o && !o->inherits("QWidget"))
{
@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace()
{
// remove crap
if( !m_krashconf->removeFromBacktraceRegExp().isEmpty())
m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString());
if( m_krashconf->disableChecks())
return true;
@ -146,16 +146,16 @@ bool BackTrace::usefulBacktrace()
// how many " ?? " in the bt ?
int unknown = 0;
if( !m_krashconf->invalidStackFrameRegExp().isEmpty())
unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
// how many stack frames in the bt ?
int frames = 0;
if( !m_krashconf->frameRegExp().isEmpty())
frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp()));
frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp()));
else
frames = strBt.contains('\n');
frames = strBt.tqcontains('\n');
bool tooShort = false;
if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty())
tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
tooShort = ( strBt.tqfind( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
return !m_strBt.isNull() && !tooShort && (unknown < frames);
}
@ -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" ));
}
}
}

2
drkonqi/backtrace.h
Unescape Escape View File

@ -34,7 +34,7 @@ class KTempFile;
#include <tqobject.h>
class BackTrace : public QObject
class BackTrace : public TQObject
{
Q_OBJECT

16
drkonqi/debugger.cpp
Unescape Escape View File

@ -54,15 +54,15 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
vbox->setAutoAdd(TRUE);
m_backtrace = new KTextBrowser(this);
m_backtrace->setTextFormat(Qt::PlainText);
m_backtrace->setTextFormat(TQt::PlainText);
m_backtrace->setFont(KGlobalSettings::fixedFont());
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,9 +109,9 @@ void KrashDebugger :: slotSave()
}
else
{
TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
if( defname.contains( '/' ))
defname = defname.mid( defname.findRev( '/' ) + 1 );
TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
if( defname.tqcontains( '/' ))
defname = defname.mid( defname.tqfindRev( '/' ) + 1 );
TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
if (!filename.isEmpty())
{
@ -193,7 +193,7 @@ void KrashDebugger :: startDebugger()
}
m_status->setText(i18n("Loading symbols..."));
m_proctrace = new BackTrace(m_krashconf, this);
m_proctrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
connect(m_proctrace, TQT_SIGNAL(append(const TQString &)),
TQT_SLOT(slotAppend(const TQString &)));
@ -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 ))
{

2
drkonqi/debugger.h
Unescape Escape View File

@ -36,7 +36,7 @@ class BackTrace;
#include <tqwidget.h>
class KrashDebugger : public QWidget
class KrashDebugger : public TQWidget
{
Q_OBJECT

24
drkonqi/krashconf.cpp
Unescape Escape 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("kdeinit") : 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("kdeinit") : 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

12
drkonqi/toplevel.cpp
Unescape Escape 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())
{
@ -151,10 +151,10 @@ void Toplevel :: slotUser1()
m_bugreport = new DrKBugReport(0, true, m_krashconf->aboutData());
if (i == KMessageBox::Yes) {
TQApplication::setOverrideCursor ( waitCursor );
TQApplication::setOverrideCursor ( tqwaitCursor );
// generate the backtrace
BackTrace *backtrace = new BackTrace(m_krashconf, this);
BackTrace *backtrace = new BackTrace(m_krashconf, TQT_TQOBJECT(this));
connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError()));
connect(backtrace, TQT_SIGNAL(done(const TQString &)),
TQT_SLOT(slotBacktraceDone(const TQString &)));
@ -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);

10
kappfinder/common.cpp
Unescape Escape View File

@ -61,13 +61,13 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
// find out the name of the file to store
destName = templ;
int pos = templ.find( "kappfinder/apps/" );
int pos = templ.tqfind( "kappfinder/apps/" );
if ( pos > 0 )
destName = destName.mid( pos + strlen( "kappfinder/apps/" ) );
// calculate real dir and filename
destName = destDir + destName;
pos = destName.findRev( '/' );
pos = destName.tqfindRev( '/' );
if ( pos > 0 ) {
destDir = destName.left( pos );
destName = destName.mid( pos + 1 );
@ -77,7 +77,7 @@ bool scanDesktopFile( TQPtrList<AppLnkCache> &appCache, const TQString &templ,
TQString exec = desktop.readPathEntry( "TryExec" );
if ( exec.isEmpty() )
exec = desktop.readPathEntry( "Exec" );
pos = exec.find( ' ' );
pos = exec.tqfind( ' ' );
if ( pos > 0 )
exec = exec.left( pos );
@ -117,7 +117,7 @@ void createDesktopFiles( TQPtrList<AppLnkCache> &appCache, int &added )
destDir += "/";
TQDir d;
int pos = -1;
while ( ( pos = destDir.find( '/', pos + 1 ) ) >= 0 ) {
while ( ( pos = destDir.tqfind( '/', pos + 1 ) ) >= 0 ) {
TQString path = destDir.left( pos + 1 );
d = path;
if ( !d.exists() )
@ -144,7 +144,7 @@ void decorateDirs( TQString destDir )
for ( it = dirs.begin(); it != dirs.end(); ++it ) {
// find out the name of the file to store
TQString destName = *it;
int pos = destName.find( "kappfinder/apps/" );
int pos = destName.tqfind( "kappfinder/apps/" );
if ( pos > 0 )
destName = destName.mid( pos + strlen( "kappfinder/apps/" ) );

22
kappfinder/toplevel.cpp
Unescape Escape View File

@ -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 );
@ -77,18 +77,18 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
layout->addWidget( mSummary );
KButtonBox* bbox = new KButtonBox( this );
mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) );
mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), TQT_TQOBJECT(this), TQT_SLOT( slotScan() ) );
bbox->addStretch( 5 );
mSelectButton = bbox->addButton( i18n( "Select All" ), this,
mSelectButton = bbox->addButton( i18n( "Select All" ), TQT_TQOBJECT(this),
TQT_SLOT( slotSelectAll() ) );
mSelectButton->setEnabled( false );
mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this,
mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this),
TQT_SLOT( slotUnselectAll() ) );
mUnSelectButton->setEnabled( false );
bbox->addStretch( 5 );
mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
mApplyButton = bbox->addButton( KStdGuiItem::apply(), TQT_TQOBJECT(this), TQT_SLOT( slotCreate() ) );
mApplyButton->setEnabled( false );
bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
bbox->addButton( KStdGuiItem::close(), TQT_TQOBJECT(kapp), TQT_SLOT( quit() ) );
bbox->layout();
layout->addWidget( bbox );
@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
adjustSize();
mDestDir = destDir;
mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
KStartupInfo::appStarted();
@ -183,9 +183,9 @@ void TopLevel::slotScan()
mProgress->setProgress( mProgress->progress() + 1 );
TQString desktopName = *it;
int i = desktopName.findRev('/');
int i = desktopName.tqfindRev('/');
desktopName = desktopName.mid(i+1);
i = desktopName.findRev('.');
i = desktopName.tqfindRev('.');
if (i != -1)
desktopName = desktopName.left(i);
@ -207,9 +207,9 @@ void TopLevel::slotScan()
// copy over the desktop file, if exists
if ( scanDesktopFile( mAppCache, *it, mDestDir ) ) {
TQString relPath = *it;
int pos = relPath.find( "kappfinder/apps/" );
int pos = relPath.tqfind( "kappfinder/apps/" );
relPath = relPath.mid( pos + strlen( "kappfinder/apps/" ) );
relPath = relPath.left( relPath.findRev( '/' ) + 1 );
relPath = relPath.left( relPath.tqfindRev( '/' ) + 1 );
TQStringList dirList = TQStringList::split( '/', relPath );
TQListViewItem *dirItem = 0;

10
kate/app/kateapp.cpp
Unescape Escape View File

@ -69,19 +69,19 @@ KateApp::KateApp (KCmdLineArgs *args)
m_application = new Kate::Application (this);
// doc + project man
m_docManager = new KateDocManager (this);
m_docManager = new KateDocManager (TQT_TQOBJECT(this));
// init all normal plugins
m_pluginManager = new KatePluginManager (this);
m_pluginManager = new KatePluginManager (TQT_TQOBJECT(this));
// session manager up
m_sessionManager = new KateSessionManager (this);
m_sessionManager = new KateSessionManager (TQT_TQOBJECT(this));
// application dcop interface
m_obj = new KateAppDCOPIface (this);
kdDebug()<<"Setting KATE_PID: '"<<getpid()<<"'"<<endl;
::setenv( "KATE_PID", TQString("%1").arg(getpid()).latin1(), 1 );
::setenv( "KATE_PID", TQString(TQString("%1").arg(getpid())).latin1(), 1 );
// handle restore different
if (isRestored())
@ -375,7 +375,7 @@ KateMainWindow *KateApp::activeMainWindow ()
if (m_mainWindows.isEmpty())
return 0;
int n = m_mainWindows.findIndex ((KateMainWindow *)activeWindow());
int n = m_mainWindows.tqfindIndex ((KateMainWindow *)activeWindow());
if (n < 0)
n=0;

6
kate/app/kateconfigdialog.cpp
Unescape Escape View File

@ -261,7 +261,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
/*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
BarIcon("connect_established",KIcon::SizeSmall));
KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
connect( configPluginPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );
// Tools->External Tools menu
path.clear();
@ -269,7 +269,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
page = addVBoxPage( path, i18n("External Tools"),
BarIcon("configure", KIcon::SizeSmall) );
configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
connect( configExternalToolsPage, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) );
connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );
// editor widgets from kwrite/kwdialog
path.clear();
@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
{
if ( pluginPages.at(i)->plugin == plugin )
{
TQWidget *w = pluginPages.at(i)->page->parentWidget();
TQWidget *w = pluginPages.at(i)->page->tqparentWidget();
delete pluginPages.at(i)->page;
delete w;
pluginPages.remove(pluginPages.at(i));

2
kate/app/kateconfigplugindialogpage.cpp
Unescape Escape View File

@ -33,7 +33,7 @@
#include <kiconloader.h>
#include <tqwhatsthis.h>
class KatePluginListItem : public QCheckListItem
class KatePluginListItem : public TQCheckListItem
{
public:
KatePluginListItem(bool checked, KatePluginInfo *info, TQListView *parent);

2
kate/app/kateconfigplugindialogpage.h
Unescape Escape View File

@ -45,7 +45,7 @@ class KatePluginListView : public KListView
void stateChanged(KatePluginListItem *, bool);
};
class KateConfigPluginPage: public QVBox
class KateConfigPluginPage: public TQVBox
{
Q_OBJECT

10
kate/app/kateconsole.cpp
Unescape Escape View File

@ -57,14 +57,14 @@ void KateConsole::loadConsoleIfNeeded()
{
if (m_part) return;
if (!topLevelWidget() || !parentWidget()) return;
if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;
if (!tqtopLevelWidget() || !tqparentWidget()) return;
if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");
if (!factory) return;
m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this,"libkonsolepart", "KParts::ReadOnlyPart"));
m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this),"libkonsolepart", "KParts::ReadOnlyPart"));
if (!m_part) return;
@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
m_part = 0;
// hide the dockwidget
if (parentWidget())
if (tqparentWidget())
{
m_mw->hideToolView (m_toolView);
m_mw->centralWidget()->setFocus ();
@ -115,7 +115,7 @@ void KateConsole::sendInput( const TQString& text )
if (!m_part) return;
TerminalInterface *t = static_cast<TerminalInterface*>( m_part->qt_cast( "TerminalInterface" ) );
TerminalInterface *t = static_cast<TerminalInterface*>( m_part->tqqt_cast( "TerminalInterface" ) );
if (!t) return;

2
kate/app/kateconsole.h
Unescape Escape View File

@ -42,7 +42,7 @@ class KateMainWindow;
* This class is used for the internal terminal emulator
* It uses internally the konsole part, thx to konsole devs :)
*/
class KateConsole : public QVBox
class KateConsole : public TQVBox
{
Q_OBJECT

10
kate/app/katedocmanager.cpp
Unescape Escape View File

@ -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;
@ -194,7 +194,7 @@ const KateDocumentInfo *KateDocManager::documentInfo (Kate::Document *doc)
int KateDocManager::findDocument (Kate::Document *doc)
{
return m_docList.find (doc);
return m_docList.tqfind (doc);
}
uint KateDocManager::documents ()
@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber);
}
if ( closeURL && m_tempFiles.contains( documentNumber ) )
if ( closeURL && m_tempFiles.tqcontains( documentNumber ) )
{
TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() );
if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*||
@ -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();
}
}
@ -596,7 +596,7 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
{
KMD5 md5;
if (!md5.update(f))
if (!md5.update(TQT_TQIODEVICE_OBJECT(f)))
return false;
md5.hexDigest(result);

2
kate/app/katedocmanager.h
Unescape Escape View File

@ -54,7 +54,7 @@ class KateDocumentInfo
typedef QPair<KURL,TQDateTime> TPair;
class KateDocManager : public QObject
class KateDocManager : public TQObject
{
Q_OBJECT

8
kate/app/katedocmanageriface.cpp
Unescape Escape View File

@ -35,7 +35,7 @@ DCOPRef KateDocManagerDCOPIface::document (uint n)
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();
@ -50,7 +50,7 @@ DCOPRef KateDocManagerDCOPIface::activeDocument ()
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();
@ -75,7 +75,7 @@ DCOPRef KateDocManagerDCOPIface::documentWithID (uint id)
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();
@ -90,7 +90,7 @@ DCOPRef KateDocManagerDCOPIface::openURL (KURL url, TQString encoding)
if (!doc)
return DCOPRef ();
DCOPObject *obj = static_cast<DCOPObject*>(doc->qt_cast("DCOPObject"));
DCOPObject *obj = static_cast<DCOPObject*>(doc->tqqt_cast("DCOPObject"));
if (!obj)
return DCOPRef ();

28
kate/app/kateexternaltools.cpp
Unescape Escape View File

@ -127,7 +127,7 @@ bool KateExternalTool::checkExec()
bool KateExternalTool::valid( const TQString &mt ) const
{
return mimetypes.isEmpty() || mimetypes.contains( mt );
return mimetypes.isEmpty() || mimetypes.tqcontains( mt );
}
//END KateExternalTool
@ -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=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
if (!dmw) {
// kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
return false;
@ -204,7 +204,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
dynamic_cast<KateExternalToolsMenuAction*>(dmw->action("tools_external"));
if (!a) return false;
// kdDebug(13001)<<"trying to find action"<<endl;
KAction *a1=a->actionCollection()->action(actionName.utf8());
KAction *a1=a->actionCollection()->action(static_cast<const char *>(actionName.utf8()));
if (!a1) return false;
// kdDebug(13001)<<"activating action"<<endl;
a1->activate();
@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload()
bool sepadded = false;
for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
{
if ( ! tools.contains( *itg ) &&
! removed.contains( *itg ) )
if ( ! tools.tqcontains( *itg ) &&
! removed.tqcontains( *itg ) )
{
if ( ! sepadded )
{
@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
if ( action )
{
l = action->tool->mimetypes;
b = ( ! l.count() || l.contains( mt ) );
b = ( ! l.count() || l.tqcontains( mt ) );
action->setEnabled( b );
}
}
@ -407,7 +407,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
* This is a TQListBoxItem, that has a KateExternalTool. The text is the Name
* of the tool.
*/
class ToolItem : public QListBoxPixmap
class ToolItem : public TQListBoxPixmap
{
public:
ToolItem( TQListBox *lb, const TQPixmap &icon, KateExternalTool *tool )
@ -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(
@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew()
// This is sticky, it does not change again, so that shortcuts sticks
// TODO check for dups
t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );
t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" );
new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );

24
kate/app/katefilelist.cpp
Unescape Escape View File

@ -51,7 +51,7 @@
//END Includes
//BEGIN ToolTip
class ToolTip : public QToolTip
class ToolTip : public TQToolTip
{
public:
ToolTip( TQWidget *parent, KateFileList *lv )
@ -69,7 +69,7 @@ class ToolTip : public QToolTip
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 ) );
}
@ -94,7 +94,7 @@ KateFileList::KateFileList (KateMainWindow *main,
m_editShade = TQColor( 255, 102, 153 );
m_enableBgShading = false;
setFocusPolicy ( TQWidget::NoFocus );
setFocusPolicy ( TQ_NoFocus );
viewManager = _viewManager;
@ -134,14 +134,14 @@ KateFileList::~KateFileList ()
void KateFileList::setupActions ()
{
windowNext = KStdAction::back(this, TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
windowPrev = KStdAction::forward(this, TQT_SLOT(slotNextDocument()), m_main->actionCollection());
windowNext = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(slotPrevDocument()), m_main->actionCollection());
windowPrev = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(slotNextDocument()), m_main->actionCollection());
sortAction = new KSelectAction( i18n("Sort &By"), 0,
m_main->actionCollection(), "filelist_sortby" );
TQStringList l;
l << i18n("Opening Order") << i18n("Document Name") << i18n("URL");
sortAction->setItems( l );
connect( sortAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setSortType(int)) );
connect( sortAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setSortType(int)) );
}
void KateFileList::updateActions ()
@ -273,11 +273,11 @@ 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 ) );
tqrepaintItem( m_editHistory.at( i ) );
}
}
else
repaintItem( item );
tqrepaintItem( item );
}
void KateFileList::slotModifiedOnDisc (Kate::Document *doc, bool, unsigned char)
@ -296,7 +296,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc)
if ( ((KateFileListItem*)item)->document() == doc )
{
item->setText( 0, doc->docName() );
repaintItem( item );
tqrepaintItem( item );
break;
}
item = item->nextSibling();
@ -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 );
@ -343,7 +343,7 @@ void KateFileList::slotViewChanged ()
for ( uint i=0; i < m_viewHistory.count(); i++ )
{
m_viewHistory.at( i )->setViewHistPos( i+1 );
repaintItem( m_viewHistory.at( i ) );
tqrepaintItem( m_viewHistory.at( 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();
}

2
kate/app/katefilelist.h
Unescape Escape View File

@ -38,7 +38,7 @@ class KateMainWindow;
class KAction;
class KSelectAction;
class KateFileListItem : public QListViewItem
class KateFileListItem : public TQListViewItem
{
public:
KateFileListItem( TQListView *lv,

22
kate/app/katefileselector.cpp
Unescape Escape View File

@ -67,7 +67,7 @@
//BEGIN Toolbar
// from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors)
static void silenceQToolBar(QtMsgType, const char *){}
static void silenceQToolBar(TQtMsgType, const char *){}
// helper classes to be able to have a toolbar without move handle
KateFileSelectorToolBar::KateFileSelectorToolBar(TQWidget *parent)
@ -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());
}
}
@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
{
mActionCollection = new KActionCollection( this );
QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );
TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this);
toolbar = new KateFileSelectorToolBar(tbp);
tbp->setToolBar(toolbar);
toolbar->setMovingEnabled(false);
toolbar->setFlat(true);
qInstallMsgHandler( oldHandler );
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() ) );
@ -168,7 +168,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
// kaction for the dir sync method
acSyncDir = new KAction( i18n("Current Document Folder"), "curfiledir", 0,
this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" );
toolbar->setIconText( KToolBar::IconOnly );
toolbar->setIconSize( 16 );
toolbar->setEnableContextMenu( false );
@ -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() );
@ -486,7 +486,7 @@ bool KateFileSelector::eventFilter( TQObject* o, TQEvent *e )
And the popup is rather useless, if the paths are only partly visible.
*/
TQListBox *lb = cmbPath->listBox();
if ( o == lb && e->type() == TQEvent::Show ) {
if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lb) && e->type() == TQEvent::Show ) {
int add = lb->height() < lb->contentsHeight() ? lb->verticalScrollBar()->width() : 0;
int w = QMIN( mainwin->width(), lb->contentsWidth() + add );
lb->resize( w, lb->height() );
@ -692,13 +692,13 @@ void KFSConfigPage::init()
KAction *ac;
TQListBox *lb;
for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) {
lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
if ( *it == "bookmarks" || *it == "sync_dir" )
ac = fileSelector->actionCollection()->action( (*it).latin1() );
else
ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() );
if ( ac )
new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it );
}
// sync

4
kate/app/katefileselector.h
Unescape Escape View File

@ -56,7 +56,7 @@ public:
virtual void setMovingEnabled( bool b );
};
class KateFileSelectorToolBarParent: public QFrame
class KateFileSelectorToolBarParent: public TQFrame
{
Q_OBJECT
public:
@ -69,7 +69,7 @@ protected:
virtual void resizeEvent ( TQResizeEvent * );
};
class KateFileSelector : public QVBox
class KateFileSelector : public TQVBox
{
Q_OBJECT

44
kate/app/kategrepdialog.cpp
Unescape Escape View File

@ -100,8 +100,8 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
loInput->setColStretch(1, 20);
TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
lPattern->setFixedSize(lPattern->sizeHint());
loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter);
lPattern->setFixedSize(lPattern->tqsizeHint());
loInput->addWidget(lPattern, 0, 0, Qt::AlignRight | Qt::AlignVCenter);
TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
loInput->addLayout( loPattern, 0, 1 );
@ -112,23 +112,23 @@ 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());
loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter);
lTemplate->setFixedSize(lTemplate->tqsizeHint());
loInput->addWidget(lTemplate, 1, 0, Qt::AlignRight | Qt::AlignVCenter);
TQBoxLayout *loTemplate = new TQHBoxLayout(4);
loInput->addLayout(loTemplate, 1, 1);
@ -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,20 +146,20 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
loTemplate->addWidget(cmbTemplate);
TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
lFiles->setFixedSize(lFiles->sizeHint());
loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter);
lFiles->setFixedSize(lFiles->tqsizeHint());
loInput->addWidget(lFiles, 2, 0, Qt::AlignRight | Qt::AlignVCenter);
cmbFiles = new KComboBox(true, this);
lFiles->setBuddy(cmbFiles->focusProxy());
cmbFiles->setMinimumSize(cmbFiles->sizeHint());
lFiles->setBuddy(TQT_TQWIDGET(cmbFiles->focusProxy()));
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());
loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter);
lDir->setFixedSize(lDir->tqsizeHint());
loInput->addWidget(lDir, 3, 0, Qt::AlignRight | Qt::AlignVCenter);
TQBoxLayout *loDir = new TQHBoxLayout(3);
loInput->addLayout(loDir, 3, 1);
@ -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);
@ -286,11 +286,11 @@ void GrepTool::itemSelected(const TQString& item)
TQString filename, linenumber;
TQString str = item;
if ( (pos = str.find(':')) != -1)
if ( (pos = str.tqfind(':')) != -1)
{
filename = str.left(pos);
str = str.mid(pos+1);
if ( (pos = str.find(':')) != -1)
if ( (pos = str.tqfind(':')) != -1)
{
filename = m_workingDir + TQDir::separator() + filename;
linenumber = str.left(pos);
@ -302,7 +302,7 @@ void GrepTool::itemSelected(const TQString& item)
void GrepTool::processOutput()
{
int pos;
while ( (pos = buf.find('\n')) != -1)
while ( (pos = buf.tqfind('\n')) != -1)
{
TQString item = buf.mid(2,pos-2);
if (!item.isEmpty())
@ -329,7 +329,7 @@ void GrepTool::slotSearch()
return;
}
if ( ! leTemplate->text().contains("%s") )
if ( ! leTemplate->text().tqcontains("%s") )
{
leTemplate->setFocus();
return;
@ -347,9 +347,9 @@ void GrepTool::slotSearch()
TQString s = cmbPattern->currentText();
if ( ! cbRegex->isChecked() )
s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
TQString pattern = leTemplate->text();
pattern.replace( "%s", s );
pattern.tqreplace( "%s", s );
childproc = new KProcess();
childproc->setWorkingDirectory( m_workingDir );
@ -476,7 +476,7 @@ void GrepTool::childExited()
if ( ! errbuf.isEmpty() )
{
KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
KMessageBox::information( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
errbuf.truncate(0);
}
else

2
kate/app/kategrepdialog.h
Unescape Escape View File

@ -35,7 +35,7 @@ class KConfig;
class KURLRequester;
class TQEvent;
class GrepTool : public QWidget
class GrepTool : public TQWidget
{
Q_OBJECT

6
kate/app/katemailfilesdialog.cpp
Unescape Escape 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"

54
kate/app/katemainwindow.cpp
Unescape Escape View File

@ -87,7 +87,7 @@
uint KateMainWindow::uniqueID = 1;
KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
: KateMDI::MainWindow (0,(TQString("__KateMainWindow#%1").arg(uniqueID)).latin1())
: KateMDI::MainWindow (0,(TQString(TQString("__KateMainWindow#%1").arg(uniqueID))).latin1())
{
// first the very important id
myID = uniqueID;
@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
// here we go, set some usable default sizes
if (!initialGeometrySet())
{
int scnum = TQApplication::desktop()->screenNumber(parentWidget());
int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
TQSize size;
@ -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()));
@ -239,25 +239,25 @@ void KateMainWindow::setupActions()
{
KAction *a;
KStdAction::openNew( m_viewManager, TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
KStdAction::open( m_viewManager, TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
KStdAction::openNew( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document"));
KStdAction::open( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing"));
fileOpenRecent = KStdAction::openRecent (m_viewManager, TQT_SLOT(openURL (const KURL&)), actionCollection());
fileOpenRecent = KStdAction::openRecent (TQT_TQOBJECT(m_viewManager), TQT_SLOT(openURL (const KURL&)), actionCollection());
fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
a=new KAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" );
a->setWhatsThis(i18n("Save all open, modified documents to disk."));
KStdAction::close( m_viewManager, TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
KStdAction::close( TQT_TQOBJECT(m_viewManager), TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document."));
a=new KAction( i18n( "Clos&e All" ), 0, this, TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
a=new KAction( i18n( "Clos&e All" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" );
a->setWhatsThis(i18n("Close all open documents."));
KStdAction::mail( this, TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
KStdAction::mail( TQT_TQOBJECT(this), TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments."));
KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window"));
a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list)."));
if ( KateApp::self()->authorize("shell_access") )
@ -274,39 +274,39 @@ void KateMainWindow::setupActions()
connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu()));
connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int)));
a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection());
a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
a=KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
KAction* settingsConfigure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
KAction* settingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure");
settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component."));
// pipe to terminal action
if (KateApp::self()->authorize("shell_access"))
new KAction(i18n("&Pipe to Console"), "pipe", 0, console, TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
new KAction(i18n("&Pipe to Console"), "pipe", 0, TQT_TQOBJECT(console), TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal");
// tip of the day :-)
KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application."));
if (KatePluginManager::self()->pluginList().count() > 0)
{
a=new KAction(i18n("&Plugins Handbook"), 0, this, TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
a=new KAction(i18n("&Plugins Handbook"), 0, TQT_TQOBJECT(this), TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents");
a->setWhatsThis(i18n("This shows help files for various available plugins."));
}
connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotWindowActivated()));
connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotUpdateOpenWith()));
connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotWindowActivated()));
connect(m_viewManager,TQT_SIGNAL(viewChanged()),TQT_TQOBJECT(this),TQT_SLOT(slotUpdateOpenWith()));
slotWindowActivated ();
// session actions
new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, KateSessionManager::self(), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
new KAction(i18n("&Open..."), "fileopen", 0, KateSessionManager::self(), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
new KAction(i18n("&Save"), "filesave", 0, KateSessionManager::self(), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
new KAction(i18n("Save &As..."), "filesaveas", 0, KateSessionManager::self(), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
new KAction(i18n("&Manage..."), "view_choose", 0, KateSessionManager::self(), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
new KAction(i18n("Menu entry Session->New", "&New"), "filenew", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionNew()), actionCollection(), "sessions_new");
new KAction(i18n("&Open..."), "fileopen", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionOpen()), actionCollection(), "sessions_open");
new KAction(i18n("&Save"), "filesave", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSave()), actionCollection(), "sessions_save");
new KAction(i18n("Save &As..."), "filesaveas", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionSaveAs()), actionCollection(), "sessions_save_as");
new KAction(i18n("&Manage..."), "view_choose", 0, TQT_TQOBJECT(KateSessionManager::self()), TQT_SLOT(sessionManage()), actionCollection(), "sessions_manage");
// quick open menu ;)
new KateSessionsAction (i18n("&Quick Open"), actionCollection(), "sessions_list");

2
kate/app/katemainwindowiface.cpp
Unescape Escape View File

@ -22,6 +22,6 @@
#include <kdebug.h>
KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject ((TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w)
KateMainWindowDCOPIface::KateMainWindowDCOPIface (KateMainWindow *w) : DCOPObject (TQString(TQString("KateMainWindow#%1").arg(w->mainWindowNumber())).latin1()), m_w (w)
{
}

18
kate/app/katemdi.cpp
Unescape Escape 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*/ );
@ -176,7 +176,7 @@ void GUIClient::registerToolView (ToolView *tv)
KToggleAction *a = new ToggleToolViewAction(i18n("Show %1").arg(tv->text),
sc,tv, actionCollection(), aname.latin1() );
a->setCheckedState(i18n("Hide %1").arg(tv->text));
a->setCheckedState(TQString(i18n("Hide %1").arg(tv->text)));
m_toolViewActions.append(a);
m_toolMenu->insert(a);
@ -256,8 +256,8 @@ bool ToolView::visible () const
void ToolView::childEvent ( TQChildEvent *ev )
{
// set the widget to be focus proxy if possible
if (ev->inserted() && ev->child() && ev->child()->qt_cast("TQWidget"))
setFocusProxy ((TQWidget *)(ev->child()->qt_cast("TQWidget")));
if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget"))
setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqqt_cast("TQWidget")));
TQVBox::childEvent (ev);
}
@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
bool Sidebar::removeWidget (ToolView *widget)
{
if (!m_widgetToId.contains(widget))
if (!m_widgetToId.tqcontains(widget))
return false;
removeTab(m_widgetToId[widget]);
@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget)
bool Sidebar::showWidget (ToolView *widget)
{
if (!m_widgetToId.contains(widget))
if (!m_widgetToId.tqcontains(widget))
return false;
// hide other non-persistent views
@ -394,7 +394,7 @@ bool Sidebar::showWidget (ToolView *widget)
bool Sidebar::hideWidget (ToolView *widget)
{
if (!m_widgetToId.contains(widget))
if (!m_widgetToId.tqcontains(widget))
return false;
bool anyVis = false;
@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config)
//BEGIN MAIN WINDOW
MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
: KParts::MainWindow( parentWidget, name)
MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name)
: KParts::MainWindow( tqparentWidget, name)
, m_sidebarsVisible(true)
, m_restoreConfig (0)
, m_guiClient (new GUIClient (this))

6
kate/app/katemdi.h
Unescape Escape View File

@ -38,7 +38,7 @@ namespace KateMDI {
/** This class is needed because TQSplitter cant return an index for a widget. */
class Splitter : public QSplitter
class Splitter : public TQSplitter
{
Q_OBJECT
@ -99,7 +99,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
KActionMenu *m_toolMenu;
};
class ToolView : public QVBox
class ToolView : public TQVBox
{
Q_OBJECT
@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow
/**
* Constructor
*/
MainWindow (TQWidget* parentWidget = 0, const char* name = 0);
MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0);
/**
* Destructor

2
kate/app/katemwmodonhddialog.cpp
Unescape Escape View File

@ -40,7 +40,7 @@
#include <tqwhatsthis.h>
#include <tqvbox.h>
class KateDocItem : public QCheckListItem
class KateDocItem : public TQCheckListItem
{
public:
KateDocItem( Kate::Document *doc, const TQString &status, KListView *lv )

2
kate/app/katepluginmanager.h
Unescape Escape View File

@ -41,7 +41,7 @@ class KatePluginInfo
typedef TQValueList<KatePluginInfo> KatePluginList;
class KatePluginManager : public QObject
class KatePluginManager : public TQObject
{
Q_OBJECT

2
kate/app/katesession.cpp
Unescape Escape View File

@ -596,7 +596,7 @@ void KateSessionManager::sessionManage ()
//BEGIN CHOOSER DIALOG
class KateSessionChooserItem : public QListViewItem
class KateSessionChooserItem : public TQListViewItem
{
public:
KateSessionChooserItem (KListView *lv, KateSession::Ptr s)

2
kate/app/katesession.h
Unescape Escape View File

@ -160,7 +160,7 @@ class KateSession : public KShared
typedef TQValueList<KateSession::Ptr> KateSessionList;
class KateSessionManager : public QObject
class KateSessionManager : public TQObject
{
Q_OBJECT

18
kate/app/katetabwidget.cpp
Unescape Escape 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 )
@ -132,18 +132,18 @@ void KateTabWidget::setCornerWidgetVisibility(bool visible)
{
// there are two corner widgets: on TopLeft and on TopTight!
if (cornerWidget(Qt::TopLeft) ) {
if (cornerWidget(TQt::TopLeft) ) {
if (visible)
cornerWidget(Qt::TopLeft)->show();
cornerWidget(TQt::TopLeft)->show();
else
cornerWidget(Qt::TopLeft)->hide();
cornerWidget(TQt::TopLeft)->hide();
}
if (cornerWidget(Qt::TopRight) ) {
if (cornerWidget(TQt::TopRight) ) {
if (visible)
cornerWidget(Qt::TopRight)->show();
cornerWidget(TQt::TopRight)->show();
else
cornerWidget(Qt::TopRight)->hide();
cornerWidget(TQt::TopRight)->hide();
}
}

22
kate/app/kateviewmanager.cpp
Unescape Escape View File

@ -94,47 +94,47 @@ void KateViewManager::setupActions ()
/**
* tabbing
*/
a=new KAction ( i18n("New Tab"),"tab_new", 0, this, TQT_SLOT(slotNewTab()),
a=new KAction ( i18n("New Tab"),"tab_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewTab()),
m_mainWindow->actionCollection(), "view_new_tab" );
m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQT_SLOT(slotCloseTab()),
m_closeTab = new KAction ( i18n("Close Current Tab"),"tab_remove",0,TQT_TQOBJECT(this),TQT_SLOT(slotCloseTab()),
m_mainWindow->actionCollection(),"view_close_tab");
m_activateNextTab
= new KAction( i18n( "Activate Next Tab" ),
TQApplication::reverseLayout() ? KStdAccel::tabPrev() : KStdAccel::tabNext(),
this, TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
TQT_TQOBJECT(this), TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" );
m_activatePrevTab
= new KAction( i18n( "Activate Previous Tab" ),
TQApplication::reverseLayout() ? KStdAccel::tabNext() : KStdAccel::tabPrev(),
this, TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
TQT_TQOBJECT(this), TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" );
/**
* view splitting
*/
a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQT_SLOT(
a=new KAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(
slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert");
a->setWhatsThis(i18n("Split the currently active view vertically into two views."));
a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT(
a=new KAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(
slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz");
a->setWhatsThis(i18n("Split the currently active view horizontally into two views."));
m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this,
m_closeView = new KAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, TQT_TQOBJECT(this),
TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(),
"view_close_current_space" );
m_closeView->setWhatsThis(i18n("Close the currently active splitted view"));
goNext=new KAction(i18n("Next View"),Key_F8,this,
goNext=new KAction(i18n("Next View"),Key_F8,TQT_TQOBJECT(this),
TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next");
goNext->setWhatsThis(i18n("Make the next split view the active one."));
goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, this, TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
goPrev=new KAction(i18n("Previous View"),SHIFT+Key_F8, TQT_TQOBJECT(this), TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev");
goPrev->setWhatsThis(i18n("Make the previous split view the active one."));
@ -168,7 +168,7 @@ void KateViewManager::updateViewSpaceActions ()
}
void KateViewManager::tabChanged(TQWidget* widget) {
KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->qt_cast("KateViewSpaceContainer"));
KateViewSpaceContainer *container=static_cast<KateViewSpaceContainer*>(widget->tqqt_cast("KateViewSpaceContainer"));
Q_ASSERT(container);
m_currentContainer=container;
@ -215,7 +215,7 @@ void KateViewManager::slotCloseTab()
if (m_viewSpaceContainerList.count() <= 1) return;
if (!m_currentContainer) return;
int pos = m_viewSpaceContainerList.find (m_currentContainer);
int pos = m_viewSpaceContainerList.tqfind (m_currentContainer);
if (pos == -1)
return;

2
kate/app/kateviewmanager.h
Unescape Escape View File

@ -36,7 +36,7 @@ class KAction;
class TQToolButton;
class KateViewManager : public QObject
class KateViewManager : public TQObject
{
Q_OBJECT

22
kate/app/kateviewspace.cpp
Unescape Escape 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*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
}
};
@ -228,7 +228,7 @@ bool KateViewSpace::event( TQEvent *e )
void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
{
if ((TQWidgetStack *)view->parentWidget() != stack)
if ((TQWidgetStack *)view->tqparentWidget() != stack)
return;
mStatusBar->setStatus( r, c, ovr, block, mod, msg );
}
@ -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)
@ -410,7 +410,7 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
if ( m_viewSpace->currentView() )
m_viewSpace->currentView()->setFocus();
if ( ((TQMouseEvent*)e)->button()==RightButton)
if ( ((TQMouseEvent*)e)->button()==Qt::RightButton)
showMenu();
return true;

2
kate/app/kateviewspace.h
Unescape Escape View File

@ -68,7 +68,7 @@ class KateVSStatusBar : public KStatusBar
class KateViewSpace *m_viewSpace;
};
class KateViewSpace : public QVBox
class KateViewSpace : public TQVBox
{
friend class KateViewSpaceContainer;
friend class KateVSStatusBar;

50
kate/app/kateviewspacecontainer.cpp
Unescape Escape View File

@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace)
{
if (!view) return true;
KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();
KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget();
viewspace->removeView (view);
@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v)
{
if (!v) return;
KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();
KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget();
if (!vs->isActiveSpace()) {
setActiveSpace (vs);
@ -275,7 +275,7 @@ void KateViewSpaceContainer::activateView ( Kate::View *view )
}
setActiveView (view);
m_viewList.findRef (view);
m_viewList.tqfindRef (view);
mainWindow()->toolBar ()->setUpdatesEnabled (false);
@ -337,7 +337,7 @@ void KateViewSpaceContainer::slotViewChanged()
void KateViewSpaceContainer::activateNextView()
{
uint i = m_viewSpaceList.find (activeViewSpace())+1;
uint i = m_viewSpaceList.tqfind (activeViewSpace())+1;
if (i >= m_viewSpaceList.count())
i=0;
@ -348,7 +348,7 @@ void KateViewSpaceContainer::activateNextView()
void KateViewSpaceContainer::activatePrevView()
{
int i = m_viewSpaceList.find (activeViewSpace())-1;
int i = m_viewSpaceList.tqfind (activeViewSpace())-1;
if (i < 0)
i=m_viewSpaceList.count()-1;
@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
if (!activeView()) return;
if (!vs) vs = activeViewSpace();
bool isFirstTime = vs->parentWidget() == this;
bool isFirstTime = vs->tqparentWidget() == this;
TQValueList<int> psizes;
if ( ! isFirstTime )
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_cast("TQSplitter")) )
if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->tqqt_cast("TQSplitter")) )
psizes = ps->sizes();
Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget());
s->setOpaqueResize( KGlobalSettings::opaqueResize() );
if (! isFirstTime) {
// anders: make sure the split' viewspace is always
// correctly positioned.
// If viewSpace is the first child, the new splitter must be moveToFirst'd
if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) )
((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s );
}
vs->reparent( s, 0, TQPoint(), true );
KateViewSpace* vsNew = new KateViewSpace( this, s );
@ -471,13 +471,13 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
s->moveToFirst( vsNew );
if (!isFirstTime)
if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast("TQSplitter")) )
if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->tqqt_cast("TQSplitter")) )
ps->setSizes( psizes );
s->show();
TQValueList<int> sizes;
int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2;
int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2;
sizes << space << space;
s->setSizes( sizes );
@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// abort if this is the last viewspace
if (m_viewSpaceList.count() < 2) return;
KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget();
KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget();
// find out if it is the first child for repositioning
// see below
@ -512,16 +512,16 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
// save some size information
KateMDI::Splitter* pp=0L;
TQValueList<int> ppsizes;
if (m_viewSpaceList.count() > 2 && p->parentWidget() != this)
if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this)
{
pp = (KateMDI::Splitter*)p->parentWidget();
pp = (KateMDI::Splitter*)p->tqparentWidget();
ppsizes = pp->sizes();
pIsFirst = !pp->isLastChild( p ); // simple logic, right-
}
// Figure out where to put views that are still needed
KateViewSpace* next;
if (m_viewSpaceList.find(viewspace) == 0)
if (m_viewSpaceList.tqfind(viewspace) == 0)
next = m_viewSpaceList.next();
else
next = m_viewSpaceList.prev();
@ -550,14 +550,14 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
m_viewSpaceList.remove( viewspace );
// reparent the other sibling of the parent.
while (p->children ())
while (!p->childrenListObject().isEmpty())
{
TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)p->children())->first());
TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>)p->childrenListObject()).first());
other->reparent( p->parentWidget(), 0, TQPoint(), true );
other->reparent( p->tqparentWidget(), 0, TQPoint(), true );
// We also need to find the right viewspace to become active
if (pIsFirst)
((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other );
if ( other->isA("KateViewSpace") ) {
setActiveSpace( (KateViewSpace*)other );
}
@ -676,20 +676,20 @@ void KateViewSpaceContainer::saveSplitterConfig( KateMDI::Splitter* s, int idx,
TQStringList childList;
// a katesplitter has two children, of which one may be a KateSplitter.
const TQObjectList* l = s->children();
TQObjectListIt it( *l );
const TQObjectList l = s->childrenListObject();
TQObjectListIt it( l );
TQObject* obj;
for (; it.current(); ++it) {
obj = it.current();
TQString n; // name for child list, see below
// For KateViewSpaces, ask them to save the file list.
if ( obj->isA("KateViewSpace") ) {
n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.find((KateViewSpace*)obj) );
((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.find((KateViewSpace*)obj), viewConfGrp);
n = TQString(viewConfGrp+"-ViewSpace %1").arg( m_viewSpaceList.tqfind((KateViewSpace*)obj) );
((KateViewSpace*)obj)->saveConfig ( config, m_viewSpaceList.tqfind((KateViewSpace*)obj), viewConfGrp);
// save active viewspace
if ( ((KateViewSpace*)obj)->isActiveSpace() ) {
config->setGroup(viewConfGrp);
config->writeEntry("Active Viewspace", m_viewSpaceList.find((KateViewSpace*)obj) );
config->writeEntry("Active Viewspace", m_viewSpaceList.tqfind((KateViewSpace*)obj) );
}
}
// For KateSplitters, recurse

2
kate/app/kateviewspacecontainer.h
Unescape Escape View File

@ -32,7 +32,7 @@
class KConfig;
class KateMainWindow;
class KateViewSpaceContainer: public QVBox
class KateViewSpaceContainer: public TQVBox
{
Q_OBJECT

2
kate/app/kbookmarkhandler.cpp
Unescape Escape View File

@ -73,7 +73,7 @@ void KBookmarkHandler::slotNewBookmark( const TQString& /*text*/,
{
*m_importStream << "<bookmark icon=\"" << KMimeType::iconForURL( KURL( url ) );
*m_importStream << "\" href=\"" << TQString::fromUtf8(url) << "\">\n";
*m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString::fromUtf8(url) : additionalInfo) << "</title>\n</bookmark>\n";
*m_importStream << "<title>" << (additionalInfo.isEmpty() ? TQString(TQString::fromUtf8(url)) : additionalInfo) << "</title>\n</bookmark>\n";
}
void KBookmarkHandler::slotNewFolder( const TQString& text, bool /*open*/,

34
kate/app/kwritemain.cpp
Unescape Escape View File

@ -107,12 +107,12 @@ KWrite::KWrite (KTextEditor::Document *doc)
guiFactory()->addClient( m_view );
// install a working kate part popup dialog thingy
if (static_cast<Kate::View*>(m_view->qt_cast("Kate::View")))
static_cast<Kate::View*>(m_view->qt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
if (static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View")))
static_cast<Kate::View*>(m_view->tqqt_cast("Kate::View"))->installPopup ((TQPopupMenu*)(factory()->container("ktexteditor_popup", this)) );
// 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 ();
@ -139,41 +139,41 @@ KWrite::~KWrite()
void KWrite::setupActions()
{
KStdAction::close( this, TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document"));
// setup File menu
KStdAction::print(this, TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
KStdAction::openNew( this, TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
KStdAction::open( this, TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document"));
KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document"));
KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing"));
m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpen(const KURL&)),
m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpen(const KURL&)),
actionCollection());
m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again."));
KAction *a=new KAction(i18n("&New Window"), "window_new", 0, this, TQT_SLOT(newView()),
KAction *a=new KAction(i18n("&New Window"), "window_new", 0, TQT_TQOBJECT(this), TQT_SLOT(newView()),
actionCollection(), "view_new_view");
a->setWhatsThis(i18n("Create another view containing the current document"));
a=new KAction(i18n("Choose Editor..."),0,this,TQT_SLOT(changeEditor()),
a=new KAction(i18n("Choose Editor..."),0,TQT_TQOBJECT(this),TQT_SLOT(changeEditor()),
actionCollection(),"settings_choose_editor");
a->setWhatsThis(i18n("Override the system wide setting for the default editing component"));
KStdAction::quit(this, TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view"));
// setup Settings menu
setStandardToolBarMenuEnabled(true);
m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
m_paShowStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()),
m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, TQT_TQOBJECT(this), TQT_SLOT(newCaption()),
actionCollection(), "set_showPath");
m_paShowPath->setCheckedState(i18n("Hide Path"));
m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption"));
a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection());
a=KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editKeys()), actionCollection());
a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments."));
a=KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection());
a=KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection());
a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s)."));
}
@ -458,7 +458,7 @@ void KWrite::readProperties(KConfig *config)
void KWrite::saveProperties(KConfig *config)
{
writeConfig(config);
config->writeEntry("DocumentNumber",docList.find(m_view->document()) + 1);
config->writeEntry("DocumentNumber",docList.tqfind(m_view->document()) + 1);
if (KTextEditor::sessionConfigInterface(m_view))
KTextEditor::sessionConfigInterface(m_view)->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.tqfind(winList.at(z-1)->view()->document()) + 1);
}
}

2
kate/interfaces/application.h
Unescape Escape View File

@ -35,7 +35,7 @@ class MainWindow;
* other objects like document/projectmanager, ... no way goes around this
* central interface
*/
class KDE_EXPORT Application : public QObject
class KDE_EXPORT Application : public TQObject
{
friend class PrivateApplication;

2
kate/interfaces/documentmanager.h
Unescape Escape View File

@ -26,7 +26,7 @@ namespace Kate
{
/** This interface provides access to the Kate Document Manager.
*/
class KDE_EXPORT DocumentManager : public QObject
class KDE_EXPORT DocumentManager : public TQObject
{
friend class PrivateDocumentManager;

2
kate/interfaces/mainwindow.h
Unescape Escape View File

@ -29,7 +29,7 @@ namespace Kate
class ViewManager;
class KDE_EXPORT MainWindow : public QObject
class KDE_EXPORT MainWindow : public TQObject
{
friend class PrivateMainWindow;

2
kate/interfaces/plugin.cpp
Unescape Escape View File

@ -99,7 +99,7 @@ PluginViewInterface *pluginViewInterface (Plugin *plugin)
if (!plugin)
return 0;
return static_cast<PluginViewInterface*>(plugin->qt_cast("Kate::PluginViewInterface"));
return static_cast<PluginViewInterface*>(plugin->tqqt_cast("Kate::PluginViewInterface"));
}
}

2
kate/interfaces/plugin.h
Unescape Escape View File

@ -32,7 +32,7 @@ namespace Kate
class Application;
class MainWindow;
class KDE_EXPORT Plugin : public QObject
class KDE_EXPORT Plugin : public TQObject
{
friend class PrivatePlugin;

2
kate/interfaces/pluginconfiginterface.cpp
Unescape Escape View File

@ -59,5 +59,5 @@ PluginConfigInterface *Kate::pluginConfigInterface (Plugin *plugin)
if (!plugin)
return 0;
return static_cast<PluginConfigInterface*>(plugin->qt_cast("Kate::PluginConfigInterface"));
return static_cast<PluginConfigInterface*>(plugin->tqqt_cast("Kate::PluginConfigInterface"));
}

2
kate/interfaces/pluginconfiginterfaceextension.cpp
Unescape Escape View File

@ -64,5 +64,5 @@ PluginConfigInterfaceExtension *Kate::pluginConfigInterfaceExtension (Plugin *pl
if (!plugin)
return 0;
return static_cast<PluginConfigInterfaceExtension*>(plugin->qt_cast("Kate::PluginConfigInterfaceExtension"));
return static_cast<PluginConfigInterfaceExtension*>(plugin->tqqt_cast("Kate::PluginConfigInterfaceExtension"));
}

2
kate/interfaces/pluginconfiginterfaceextension.h
Unescape Escape View File

@ -26,7 +26,7 @@
namespace Kate
{
class KDE_EXPORT PluginConfigPage : public QWidget
class KDE_EXPORT PluginConfigPage : public TQWidget
{
Q_OBJECT

2
kate/interfaces/pluginmanager.h
Unescape Escape View File

@ -27,7 +27,7 @@ namespace Kate
{
/** This interface provides access to the Kate Plugin Manager.
*/
class KDE_EXPORT PluginManager : public QObject
class KDE_EXPORT PluginManager : public TQObject
{
friend class PrivatePluginManager;

6
kate/interfaces/toolviewmanager.cpp
Unescape Escape View File

@ -60,7 +60,7 @@ TQWidget *ToolViewManager::createToolView (const TQString &identifier, ToolViewM
bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position pos)
{
if (!widget || !widget->qt_cast("KateMDI::ToolView"))
if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
return false;
return d->toolViewMan->moveToolView (static_cast<KateMDI::ToolView*>(widget), (KMultiTabBar::KMultiTabBarPosition)pos);
@ -68,7 +68,7 @@ bool ToolViewManager::moveToolView (TQWidget *widget, ToolViewManager::Position
bool ToolViewManager::showToolView(TQWidget *widget)
{
if (!widget || !widget->qt_cast("KateMDI::ToolView"))
if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
return false;
return d->toolViewMan->showToolView (static_cast<KateMDI::ToolView*>(widget));
@ -76,7 +76,7 @@ bool ToolViewManager::showToolView(TQWidget *widget)
bool ToolViewManager::hideToolView(TQWidget *widget)
{
if (!widget || !widget->qt_cast("KateMDI::ToolView"))
if (!widget || !widget->tqqt_cast("KateMDI::ToolView"))
return false;
return d->toolViewMan->hideToolView (static_cast<KateMDI::ToolView*>(widget));

2
kate/interfaces/toolviewmanager.h
Unescape Escape View File

@ -29,7 +29,7 @@ namespace Kate
/**
Interface to the toolviewmanager
*/
class KDE_EXPORT ToolViewManager : public QObject
class KDE_EXPORT ToolViewManager : public TQObject
{
friend class PrivateToolViewManager;

2
kate/interfaces/viewmanager.h
Unescape Escape View File

@ -30,7 +30,7 @@ class View;
/**
* Interface to the viewmanager
*/
class KDE_EXPORT ViewManager : public QObject
class KDE_EXPORT ViewManager : public TQObject
{
friend class PrivateViewManager;

2
kate/utils/dockviewbase.cpp
Unescape Escape View File

@ -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 );

12
kcminit/main.cpp
Unescape Escape View File

@ -113,10 +113,10 @@ void KCMInit::runModules( int phase )
TQString libName = TQString("kcm_%1").arg(library);
// try to load the library
if (! alreadyInitialized.contains( libName.ascii() )) {
if (! alreadyInitialized.tqcontains( libName.ascii() )) {
if (!runModule(libName, service)) {
libName = TQString("libkcm_%1").arg(library);
if (! alreadyInitialized.contains( libName.ascii() )) {
if (! alreadyInitialized.tqcontains( libName.ascii() )) {
runModule(libName, service);
alreadyInitialized.append( libName.ascii() );
}
@ -159,7 +159,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
KService::Ptr serv = KService::serviceByStorageId( module );
if ( !serv || serv->library().isEmpty() ||
serv->init().isEmpty()) {
kdError(1208) << i18n("Module %1 not found!").arg(module) << endl;
kdError(1208) << TQString(i18n("Module %1 not found!").arg(module)) << endl;
return;
} else
list.append(serv);
@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args )
runModules( 0 );
kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit"));
sendReady();
TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
qApp->exec(); // wait for runPhase1() and runPhase2()
TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
tqApp->exec(); // wait for runPhase1() and runPhase2()
}
else
runModules( -1 ); // all phases
@ -215,7 +215,7 @@ void KCMInit::runPhase2()
{
runModules( 2 );
emitDCOPSignal( "phase2Done()", TQByteArray());
qApp->exit( 0 );
tqApp->exit( 0 );
}
extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])

2
kcontrol/access/kaccess.cpp
Unescape Escape View File

@ -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();

2
kcontrol/access/kaccess.h
Unescape Escape View File

@ -86,7 +86,7 @@ private:
};
class VisualBell : public QWidget
class VisualBell : public TQWidget
{
Q_OBJECT

22
kcontrol/access/kcmaccess.cpp
Unescape Escape View File

@ -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()));

30
kcontrol/accessibility/accessibilityconfigwidget.ui
Unescape Escape 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>

28
kcontrol/arts/arts.cpp
Unescape Escape View File

@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
if (item >= 0)
{
audioIO = audioIOList.at(item)->name;
bool jack = (audioIO == TQString::fromLatin1("jack"));
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;
}

40
kcontrol/arts/generaltab.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>generalTab</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>generalTab</cstring>
</property>
@ -12,7 +12,7 @@
<height>613</height>
</rect>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>0</width>
<height>450</height>
@ -22,7 +22,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>startServer</cstring>
</property>
@ -42,7 +42,7 @@
Recommended if you want sound.</string>
</property>
</widget>
<widget class="QFrame">
<widget class="TQFrame">
<property name="name">
<cstring>frame3</cstring>
</property>
@ -53,7 +53,7 @@ Recommended if you want sound.</string>
<enum>Sunken</enum>
</property>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>networkedSoundGroupBox</cstring>
</property>
@ -75,7 +75,7 @@ Recommended if you want sound.</string>
<string>&lt;i&gt;Enable this option if you want to play sound on a remote computer or you want to be able to control sound on this system from another computer.&lt;/i&gt;</string>
</property>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>networkTransparent</cstring>
</property>
@ -88,7 +88,7 @@ Recommended if you want sound.</string>
</widget>
</vbox>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>realtimeGroupBox</cstring>
</property>
@ -107,7 +107,7 @@ Recommended if you want sound.</string>
<string>&lt;i&gt;If your sound is skipping during playback, enable running with highest possible priority. Increasing your sound buffer might also help.&lt;/i&gt;</string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
<widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>startRealtime</cstring>
</property>
@ -121,7 +121,7 @@ Recommended if you want sound.</string>
<string>On systems which support realtime scheduling, if you have sufficient permissions, this option will enable a very high priority for processing sound requests.</string>
</property>
</widget>
<widget class="QSlider" row="2" column="1">
<widget class="TQSlider" row="2" column="1">
<property name="name">
<cstring>latencySlider</cstring>
</property>
@ -144,7 +144,7 @@ Recommended if you want sound.</string>
<number>50</number>
</property>
</widget>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel5</cstring>
</property>
@ -155,7 +155,7 @@ Recommended if you want sound.</string>
<cstring>latencySlider</cstring>
</property>
</widget>
<widget class="QLabel" row="3" column="1">
<widget class="TQLabel" row="3" column="1">
<property name="name">
<cstring>latencyLabel</cstring>
</property>
@ -165,7 +165,7 @@ Recommended if you want sound.</string>
</widget>
</grid>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>autoSuspendGroupBox</cstring>
</property>
@ -184,7 +184,7 @@ Recommended if you want sound.</string>
<string>&lt;i&gt;The KDE sound system takes exclusive control over your audio hardware, blocking programs that may wish to use it directly. If the KDE sound system sits idle it can give up this exclusive control.&lt;/i&gt;</string>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout7</cstring>
</property>
@ -192,7 +192,7 @@ Recommended if you want sound.</string>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>autoSuspend</cstring>
</property>
@ -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>
@ -238,7 +238,7 @@ Recommended if you want sound.</string>
</widget>
</vbox>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout3</cstring>
</property>
@ -256,14 +256,14 @@ 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>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>testSound</cstring>
</property>
@ -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>

50
kcontrol/arts/hardwaretab.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>hardwareTab</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>hardwareTab</cstring>
</property>
@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>groupBox4</cstring>
</property>
@ -33,7 +33,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout57</cstring>
</property>
@ -41,7 +41,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>textLabel3_2</cstring>
</property>
@ -60,7 +60,7 @@
<cstring>audioIO</cstring>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<property name="name">
<cstring>audioIO</cstring>
</property>
@ -75,7 +75,7 @@
</widget>
</hbox>
</widget>
<widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout31</cstring>
</property>
@ -83,7 +83,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>fullDuplex</cstring>
</property>
@ -99,7 +99,7 @@
</widget>
</hbox>
</widget>
<widget class="QCheckBox" row="5" column="0">
<widget class="TQCheckBox" row="5" column="0">
<property name="name">
<cstring>customOptions</cstring>
</property>
@ -107,7 +107,7 @@
<string>Use other custom &amp;options:</string>
</property>
</widget>
<widget class="QCheckBox" row="4" column="0">
<widget class="TQCheckBox" row="4" column="0">
<property name="name">
<cstring>customDevice</cstring>
</property>
@ -115,7 +115,7 @@
<string>Override &amp;device location:</string>
</property>
</widget>
<widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>layout4</cstring>
</property>
@ -133,14 +133,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@ -151,7 +151,7 @@
<cstring>soundQuality</cstring>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<item>
<property name="text">
<string>Default</string>
@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
@ -198,7 +198,7 @@
</spacer>
</hbox>
</widget>
<widget class="QCheckBox" row="2" column="0">
<widget class="TQCheckBox" row="2" column="0">
<property name="name">
<cstring>customRate</cstring>
</property>
@ -206,7 +206,7 @@
<string>Use &amp;custom sampling rate:</string>
</property>
</widget>
<widget class="QLayoutWidget" row="2" column="1">
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>layout6</cstring>
</property>
@ -214,7 +214,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QSpinBox">
<widget class="TQSpinBox">
<property name="name">
<cstring>samplingRate</cstring>
</property>
@ -252,7 +252,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
@ -261,7 +261,7 @@
</spacer>
</hbox>
</widget>
<widget class="QLineEdit" row="5" column="1">
<widget class="TQLineEdit" row="5" column="1">
<property name="name">
<cstring>addOptions</cstring>
</property>
@ -269,7 +269,7 @@
<bool>false</bool>
</property>
</widget>
<widget class="QLineEdit" row="4" column="1">
<widget class="TQLineEdit" row="4" column="1">
<property name="name">
<cstring>deviceName</cstring>
</property>
@ -282,7 +282,7 @@
</widget>
</grid>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@ -293,7 +293,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox" row="1" column="0">
<widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>midiUseMapper</cstring>
</property>
@ -301,7 +301,7 @@
<string>Use MIDI ma&amp;pper:</string>
</property>
</widget>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel4</cstring>
</property>
@ -312,7 +312,7 @@
<cstring>deviceName</cstring>
</property>
</widget>
<widget class="QComboBox" row="0" column="1">
<widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>midiDevice</cstring>
</property>
@ -345,7 +345,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>60</height>

14
kcontrol/arts/krichtextlabel.cpp
Unescape Escape View File

@ -40,15 +40,15 @@ static TQString qrichtextify( const TQString& text )
KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( Qt::WordBreak );
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
tqsetAlignment( TQt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
setAlignment( Qt::WordBreak );
m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
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 ) {

4
kcontrol/arts/krichtextlabel.h
Unescape Escape 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:

8
kcontrol/background/bgadvanced.cpp
Unescape Escape View File

@ -240,7 +240,7 @@ void BGAdvancedDialog::updateUI()
void BGAdvancedDialog::removeProgram(const TQString &name)
{
if (m_programItems.find(name))
if (m_programItems.tqfind(name))
{
delete m_programItems[name];
m_programItems.remove(name);
@ -265,7 +265,7 @@ void BGAdvancedDialog::addProgram(const TQString &name)
void BGAdvancedDialog::selectProgram(const TQString &name)
{
if (m_programItems.find(name))
if (m_programItems.tqfind(name))
{
TQListViewItem *item = m_programItems[name];
dlg->m_listPrograms->ensureItemVisible(item);
@ -432,9 +432,9 @@ 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, AlignLeft);
grid->addWidget(m_RefreshEdit, 5, 1, Qt::AlignLeft);
m_Program = program;
if (m_Program.isEmpty()) {

46
kcontrol/background/bgadvanced_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>BGAdvancedBase</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>BGAdvancedBase</cstring>
</property>
@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QButtonGroup">
<widget class="TQButtonGroup">
<property name="name">
<cstring>m_groupProgram</cstring>
</property>
@ -33,7 +33,7 @@
<property name="margin">
<number>11</number>
</property>
<widget class="QPushButton" row="1" column="1">
<widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>m_buttonAdd</cstring>
</property>
@ -50,7 +50,7 @@
&lt;/qt&gt;</string>
</property>
</widget>
<widget class="QPushButton" row="2" column="1">
<widget class="TQPushButton" row="2" column="1">
<property name="name">
<cstring>m_buttonRemove</cstring>
</property>
@ -64,7 +64,7 @@
<string>Click here to remove programs from this list. Please note that it does not remove the program from your system, it only removes it from the available options in the background drawing programs list.</string>
</property>
</widget>
<widget class="QPushButton" row="3" column="1">
<widget class="TQPushButton" row="3" column="1">
<property name="name">
<cstring>m_buttonModify</cstring>
</property>
@ -91,14 +91,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QListView" row="1" column="0" rowspan="4" colspan="1">
<widget class="TQListView" row="1" column="0" rowspan="4" colspan="1">
<column>
<property name="text">
<string>Program</string>
@ -138,7 +138,7 @@
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>400</width>
<height>0</height>
@ -156,7 +156,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
&lt;/qt&gt;</string>
</property>
</widget>
<widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
<widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>m_cbProgram</cstring>
</property>
@ -169,7 +169,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
</widget>
</grid>
</widget>
<widget class="QGroupBox">
<widget class="TQGroupBox">
<property name="name">
<cstring>m_groupIconText</cstring>
</property>
@ -199,7 +199,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>Click here to change the color of the desktop font.</string>
</property>
</widget>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>textLabel6</cstring>
</property>
@ -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>
@ -244,7 +244,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>Click here to select the solid background color. Choose a different color from the background text color to assure readability.</string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0">
<widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>m_cbSolidTextBackground</cstring>
</property>
@ -255,7 +255,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>Check here if you want to use a solid background color. This is useful to ensure that the desktop text will be identifiable against all background colors and wallpapers, or in other words, that a background or wallpaper will not make a desktop text of a similar color difficult to read.</string>
</property>
</widget>
<widget class="QCheckBox" row="2" column="0">
<widget class="TQCheckBox" row="2" column="0">
<property name="name">
<cstring>m_cbShadow</cstring>
</property>
@ -266,7 +266,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>Check here to enable a shadow outline around the desktop font. This also improves the readability of the desktop text against backgrounds of a similar color.</string>
</property>
</widget>
<widget class="QLabel" row="3" column="0">
<widget class="TQLabel" row="3" column="0">
<property name="name">
<cstring>textLabel6_2</cstring>
</property>
@ -280,7 +280,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>Choose here the maximum number of text lines below an icon on the desktop. Longer text will be truncated at the end of the last line.</string>
</property>
</widget>
<widget class="QSpinBox" row="3" column="1">
<widget class="TQSpinBox" row="3" column="1">
<property name="name">
<cstring>m_spinTextLines</cstring>
</property>
@ -294,7 +294,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>Choose here the maximum number of text lines below an icon on the desktop. Longer text will be truncated at the end of the last line.</string>
</property>
</widget>
<widget class="QSpinBox" row="4" column="1">
<widget class="TQSpinBox" row="4" column="1">
<property name="name">
<cstring>m_spinTextWidth</cstring>
</property>
@ -314,7 +314,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>Choose here the maximum width of text lines (in pixel) below an icon on the desktop. If set to 'Auto' a default width based on the current font is used.</string>
</property>
</widget>
<widget class="QLabel" row="4" column="0">
<widget class="TQLabel" row="4" column="0">
<property name="name">
<cstring>textLabel6_2_2</cstring>
</property>
@ -330,7 +330,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
</widget>
</grid>
</widget>
<widget class="QButtonGroup">
<widget class="TQButtonGroup">
<property name="name">
<cstring>m_groupCache</cstring>
</property>
@ -344,7 +344,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<property name="margin">
<number>11</number>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>m_lblCache</cstring>
</property>
@ -355,7 +355,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
<string>In this box you can enter how much memory KDE should use for caching the background(s). If you have different backgrounds for the different desktops caching can make switching desktops smoother at the expense of higher memory use.</string>
</property>
</widget>
<widget class="QSpinBox">
<widget class="TQSpinBox">
<property name="name">
<cstring>m_spinCache</cstring>
</property>
@ -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>

42
kcontrol/background/bgdialog.cpp
Unescape Escape View File

@ -75,7 +75,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
m_previewUpdates = true;
KWinModule *m_kwin;
m_kwin = new KWinModule(this);
m_kwin = new KWinModule(TQT_TQOBJECT(this));
m_curDesk = m_kwin->currentDesktop();
TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop()));
m_useViewports = s.width() * s.height() > 1;
@ -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 );
@ -257,7 +257,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
updateUI();
#if (QT_VERSION-0 >= 0x030200)
connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
#endif
}
@ -405,7 +405,7 @@ void BGDialog::slotIdentifyScreens()
// Taken from PositionTab::showIdentify in kdebase/kcontrol/kicker/positiontab_impl.cpp
for(unsigned s = 0; s < m_numScreens; s++)
{
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", WDestructiveClose | WStyle_Customize | WX11BypassWM);
TQLabel *screenLabel = new TQLabel(0,"Screen Identify", (WFlags)(WDestructiveClose | WStyle_Customize | WX11BypassWM));
TQFont identifyFont(KGlobalSettings::generalFont());
identifyFont.setPixelSize(100);
@ -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));
}
}
}
// Screens
for (unsigned i = 0; i < m_numScreens; ++i)
m_comboScreen->insertItem( i18n("Screen %1").arg(TQString::number(i+1)) );
m_comboScreen->insertItem( i18n("Screen %1").tqarg(TQString::number(i+1)) );
// Patterns
m_comboPattern->insertItem(i18n("Single Color"));
@ -510,7 +510,7 @@ void BGDialog::loadWallpaperFilesList() {
KSimpleConfig fileConfig(*it);
fileConfig.setGroup("Wallpaper");
int slash = (*it).findRev('/') + 1;
int slash = (*it).tqfindRev('/') + 1;
TQString directory = (*it).left(slash);
TQString imageCaption = fileConfig.readEntry("Name");
@ -524,14 +524,14 @@ void BGDialog::loadWallpaperFilesList() {
if (imageCaption.isEmpty())
{
imageCaption = fileName;
imageCaption.replace('_', ' ');
imageCaption.tqreplace('_', ' ');
imageCaption = KStringHandler::capwords(imageCaption);
}
// avoid name collisions
TQString rs = imageCaption;
TQString lrs = rs.lower();
for (int n = 1; papers.find(lrs) != papers.end(); ++n)
for (int n = 1; papers.tqfind(lrs) != papers.end(); ++n)
{
rs = imageCaption + " (" + TQString::number(n) + ')';
lrs = rs.lower();
@ -562,8 +562,8 @@ void BGDialog::loadWallpaperFilesList() {
if (imageCaption.isEmpty())
{
int slash = (*it).findRev('/') + 1;
int endDot = (*it).findRev('.');
int slash = (*it).tqfindRev('/') + 1;
int endDot = (*it).tqfindRev('.');
// strip the extension if it exists
if (endDot != -1 && endDot > slash)
@ -571,14 +571,14 @@ void BGDialog::loadWallpaperFilesList() {
else
imageCaption = (*it).mid(slash);
imageCaption.replace('_', ' ');
imageCaption.tqreplace('_', ' ');
imageCaption = KStringHandler::capwords(imageCaption);
}
// avoid name collisions
TQString rs = imageCaption;
TQString lrs = rs.lower();
for (int n = 1; papers.find(lrs) != papers.end(); ++n)
for (int n = 1; papers.tqfind(lrs) != papers.end(); ++n)
{
rs = imageCaption + " (" + TQString::number(n) + ')';
lrs = rs.lower();
@ -606,12 +606,12 @@ void BGDialog::setWallpaper(const TQString &s)
KComboBox *comboWallpaper = m_urlWallpaperBox;
comboWallpaper->blockSignals(true);
if (m_wallpaper.find(s) == m_wallpaper.end())
if (m_wallpaper.tqfind(s) == m_wallpaper.end())
{
int i = comboWallpaper->count();
TQString imageCaption;
int slash = s.findRev('/') + 1;
int endDot = s.findRev('.');
int slash = s.tqfindRev('/') + 1;
int endDot = s.tqfindRev('.');
// strip the extension if it exists
if (endDot != -1 && endDot > slash)
@ -750,7 +750,7 @@ void BGDialog::updateUI()
case KBackgroundSettings::Pattern:
{
int i = m_patterns.findIndex(r->KBackgroundPattern::name());
int i = m_patterns.tqfindIndex(r->KBackgroundPattern::name());
if (i >= 0)
m_comboPattern->setCurrentItem(NR_PREDEF_PATTERNS+i);
else
@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti()
{
KBackgroundRenderer *r = eRenderer();
BGMultiWallpaperDialog dlg(r, topLevelWidget());
BGMultiWallpaperDialog dlg(r, tqtopLevelWidget());
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, topLevelWidget(), m_multidesktop);
BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop);
if (!m_pMonitorArrangement->isEnabled()) {
dlg.makeReadOnly();

78
kcontrol/background/bgdialog_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>BGDialog_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>BGDialog_UI</cstring>
</property>
@ -20,7 +20,7 @@
<number>1</number>
</property>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_pDesktopLabel</cstring>
</property>
@ -105,14 +105,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
<widget class="QLayoutWidget" row="1" column="4" rowspan="2" colspan="1">
<widget class="TQLayoutWidget" row="1" column="4" rowspan="2" colspan="1">
<property name="name">
<cstring>layout36</cstring>
</property>
@ -120,7 +120,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>m_screenArrangement</cstring>
</property>
@ -132,14 +132,14 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout35</cstring>
</property>
@ -161,14 +161,14 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>m_buttonIdentifyScreens</cstring>
</property>
@ -197,7 +197,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
@ -219,14 +219,14 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>m_buttonAdvanced</cstring>
</property>
@ -255,7 +255,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
@ -277,14 +277,14 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>m_buttonGetNew</cstring>
</property>
@ -313,7 +313,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>4</width>
<height>20</height>
@ -333,7 +333,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@ -342,7 +342,7 @@
</spacer>
</vbox>
</widget>
<widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4">
<widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>groupBox3</cstring>
</property>
@ -353,7 +353,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>m_lblWallpaperPos</cstring>
</property>
@ -376,7 +376,7 @@
&lt;/ul&gt;&lt;/qt&gt;</string>
</property>
</widget>
<widget class="QComboBox" row="5" column="1">
<widget class="TQComboBox" row="5" column="1">
<property name="name">
<cstring>m_comboBlend</cstring>
</property>
@ -384,7 +384,7 @@
<string>If you have selected to use a background picture you can choose various methods of blending the background colors with the picture. The default option of "No Blending" means that the picture simply obscures the background colors below.</string>
</property>
</widget>
<widget class="QLayoutWidget" row="3" column="1">
<widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
<cstring>layout31</cstring>
</property>
@ -416,7 +416,7 @@
</widget>
</hbox>
</widget>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>m_lblColors</cstring>
</property>
@ -427,7 +427,7 @@
<cstring>m_comboPattern</cstring>
</property>
</widget>
<widget class="QLabel" row="5" column="0">
<widget class="TQLabel" row="5" column="0">
<property name="name">
<cstring>m_lblBlending</cstring>
</property>
@ -438,7 +438,7 @@
<cstring>m_comboBlend</cstring>
</property>
</widget>
<widget class="QLayoutWidget" row="6" column="1">
<widget class="TQLayoutWidget" row="6" column="1">
<property name="name">
<cstring>layout23</cstring>
</property>
@ -446,7 +446,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>m_lblBlendBalance</cstring>
</property>
@ -460,7 +460,7 @@
<string>You can use this slider to control the degree of blending. You can experiment by moving the slider and looking at the effects in the preview image.</string>
</property>
</widget>
<widget class="QSlider">
<widget class="TQSlider">
<property name="name">
<cstring>m_sliderBlend</cstring>
</property>
@ -488,7 +488,7 @@
</widget>
</hbox>
</widget>
<widget class="QCheckBox" row="7" column="1">
<widget class="TQCheckBox" row="7" column="1">
<property name="name">
<cstring>m_cbBlendReverse</cstring>
</property>
@ -499,7 +499,7 @@
<string>For some types of blending, you can reverse the role of the background and the picture by checking this option.</string>
</property>
</widget>
<widget class="QComboBox" row="2" column="1">
<widget class="TQComboBox" row="2" column="1">
<property name="name">
<cstring>m_comboPattern</cstring>
</property>
@ -522,7 +522,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>120</width>
<height>10</height>
@ -539,14 +539,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>130</width>
<height>10</height>
</size>
</property>
</spacer>
<widget class="QComboBox" row="0" column="1">
<widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>m_comboWallpaperPos</cstring>
</property>
@ -565,7 +565,7 @@
</widget>
</grid>
</widget>
<widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="4">
<widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="4">
<property name="name">
<cstring>m_buttonGroupBackground</cstring>
</property>
@ -576,7 +576,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QRadioButton" row="0" column="0">
<widget class="TQRadioButton" row="0" column="0">
<property name="name">
<cstring>m_radioNoPicture</cstring>
</property>
@ -584,7 +584,7 @@
<string>&amp;No picture</string>
</property>
</widget>
<widget class="QRadioButton" row="2" column="0">
<widget class="TQRadioButton" row="2" column="0">
<property name="name">
<cstring>m_radioSlideShow</cstring>
</property>
@ -592,7 +592,7 @@
<string>&amp;Slide show:</string>
</property>
</widget>
<widget class="QRadioButton" row="1" column="0">
<widget class="TQRadioButton" row="1" column="0">
<property name="name">
<cstring>m_radioPicture</cstring>
</property>
@ -613,14 +613,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>260</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton" row="2" column="1">
<widget class="TQPushButton" row="2" column="1">
<property name="name">
<cstring>m_buttonSetupWallpapers</cstring>
</property>
@ -641,14 +641,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>110</width>
<height>16</height>
</size>
</property>
</spacer>
<widget class="QPushButton" row="1" column="3">
<widget class="TQPushButton" row="1" column="3">
<property name="name">
<cstring>m_urlWallpaperButton</cstring>
</property>

4
kcontrol/background/bghash.h
Unescape Escape View File

@ -5,10 +5,10 @@
* TQString -> int hash. From Qt's TQGDict::hashKeyString().
*/
static int QHash(TQString key)
static int TQHash(TQString key)
{
int g, h = 0;
const TQChar *p = key.unicode();
const TQChar *p = key.tqunicode();
for (unsigned i=0; i < key.length(); i++) {
h = (h << 4) + p[i].cell();
if ((g = (h & 0xf0000000)))

8
kcontrol/background/bgmonitor.cpp
Unescape Escape View File

@ -157,7 +157,7 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm )
BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
: TQLabel(parent, name)
{
setAlignment(AlignCenter);
tqsetAlignment(AlignCenter);
setScaledContents(true);
setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) );
m_pBGMonitor = new BGMonitor(this);
@ -168,8 +168,8 @@ BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
void BGMonitorLabel::updateMonitorGeometry()
{
double scaleX = double(width()) / double(sizeHint().width());
double scaleY = double(height()) / double(sizeHint().height());
double scaleX = double(width()) / double(tqsizeHint().width());
double scaleY = double(height()) / double(tqsizeHint().height());
kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) );
@ -189,7 +189,7 @@ void BGMonitorLabel::resizeEvent( TQResizeEvent * e )
BGMonitor::BGMonitor(TQWidget *parent, const char *name)
: TQLabel(parent, name)
{
setAlignment(AlignCenter);
tqsetAlignment(AlignCenter);
setScaledContents(true);
setAcceptDrops(true);
}

6
kcontrol/background/bgmonitor.h
Unescape Escape View File

@ -37,7 +37,7 @@ class KPixmap;
* This class arranges and resizes a set of monitor images according to the
* monitor geometries.
*/
class BGMonitorArrangement : public QWidget
class BGMonitorArrangement : public TQWidget
{
Q_OBJECT
public:
@ -72,7 +72,7 @@ protected:
/**
* Contains a BGMonitor.
*/
class BGMonitorLabel : public QLabel
class BGMonitorLabel : public TQLabel
{
public:
BGMonitorLabel(TQWidget *parent, const char *name=0L);
@ -93,7 +93,7 @@ protected:
/**
* This class handles drops on the preview monitor.
*/
class BGMonitor : public QLabel
class BGMonitor : public TQLabel
{
Q_OBJECT
public:

48
kcontrol/background/bgrender.cpp
Unescape Escape View File

@ -124,32 +124,32 @@ TQString KBackgroundRenderer::buildCommand()
if (cmd.isEmpty())
return TQString();
while ((pos = cmd.find('%', pos)) != -1) {
while ((pos = cmd.tqfind('%', pos)) != -1) {
if (pos == (int) (cmd.length() - 1))
break;
switch (cmd.at(pos+1).latin1()) {
switch (cmd.tqat(pos+1).latin1()) {
case 'f':
createTempFile();
cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
cmd.tqreplace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
pos += m_Tempfile->name().length() - 2;
break;
case 'x':
num.setNum(m_Size.width());
cmd.replace(pos, 2, num);
cmd.tqreplace(pos, 2, num);
pos += num.length() - 2;
break;
case 'y':
num.setNum(m_Size.height());
cmd.replace(pos, 2, num);
cmd.tqreplace(pos, 2, num);
pos += num.length() - 2;
break;
case '%':
cmd.replace(pos, 2, "%");
cmd.tqreplace(pos, 2, "%");
pos--;
break;
default:
@ -191,7 +191,7 @@ int KBackgroundRenderer::doBackground(bool quit)
int tile_val = TQPixmap::defaultDepth() >= 24 ? 1 : 2;
// some dithering may be needed even with bpb==15/16, so don't use tileWidth==1
// for them
// with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 )
// with tileWidth>2, tqrepainting the desktop causes nasty effect (XFree86 4.1.0 )
if( XQueryBestTile( qt_xdisplay(), qt_xrootwin(), tile_val, tile_val,
&tileWidth, &tileHeight ) != Success )
tileWidth = tileHeight = tile_val; // some defaults
@ -383,7 +383,7 @@ wp_load:
wpmode = NoWallpaper;
goto wp_out;
}
m_Wallpaper = m_Wallpaper.convertDepth(32, DiffuseAlphaDither);
m_Wallpaper = m_Wallpaper.convertDepth(32, Qt::DiffuseAlphaDither);
// If we're previewing, scale the wallpaper down to make the preview
// look more like the real desktop.
@ -584,7 +584,7 @@ void KBackgroundRenderer::fastWallpaperBlend()
m_Pixmap.convertFromImage( m_Wallpaper );
return;
}
else if( m_WallpaperRect.contains( TQRect( TQPoint( 0, 0 ), m_Size ))
else if( m_WallpaperRect.tqcontains( TQRect( TQPoint( 0, 0 ), m_Size ))
&& !m_Wallpaper.hasAlphaBuffer()) // wallpaper covers all and no blending
m_Pixmap = TQPixmap( m_Size );
else if (m_Background.size() == m_Size)
@ -627,7 +627,7 @@ void KBackgroundRenderer::fullWallpaperBlend()
m_Image = m_Background.copy();
if (m_Image.depth() < 32)
m_Image = m_Image.convertDepth(32, DiffuseAlphaDither);
m_Image = m_Image.convertDepth(32, Qt::DiffuseAlphaDither);
} else {
m_Image.create(w, h, 32);
@ -724,16 +724,16 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP
for (y = 0; y < dr.height(); y++) {
if (dst.scanLine(dr.y() + y) && src.scanLine(soffs.y() + y)) {
QRgb *b, *d;
TQRgb *b, *d;
for (x = 0; x < dr.width(); x++) {
b = reinterpret_cast<QRgb*>(dst.scanLine(dr.y() + y)
+ (dr.x() + x) * sizeof(QRgb));
d = reinterpret_cast<QRgb*>(src.scanLine(soffs.y() + y)
+ (soffs.x() + x) * sizeof(QRgb));
a = (qAlpha(*d) * blendFactor) / 100;
*b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8),
qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8),
qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8));
b = reinterpret_cast<TQRgb*>(dst.scanLine(dr.y() + y)
+ (dr.x() + x) * sizeof(TQRgb));
d = reinterpret_cast<TQRgb*>(const_cast<TQImage&>(src).scanLine(soffs.y() + y)
+ (soffs.x() + x) * sizeof(TQRgb));
a = (tqAlpha(*d) * blendFactor) / 100;
*b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8));
}
}
}
@ -996,13 +996,13 @@ void KBackgroundRenderer::saveCacheFile()
m_Image.save( f, "PNG" );
// remove old entries from the cache
TQDir dir( locateLocal( "cache", "background/" ));
if( const QFileInfoList* list = dir.entryInfoList( "*.png", TQDir::Files, TQDir::Time | TQDir::Reversed )) {
if( const TQFileInfoList* list = dir.entryInfoList( "*.png", TQDir::Files, TQDir::Time | TQDir::Reversed )) {
int size = 0;
for( QFileInfoListIterator it( *list );
for( TQFileInfoListIterator it( *list );
TQFileInfo* info = it.current();
++it )
size += info->size();
for( QFileInfoListIterator it( *list );
for( TQFileInfoListIterator it( *list );
TQFileInfo* info = it.current();
++it ) {
if( size < 8 * 1024 * 1024 )
@ -1129,7 +1129,7 @@ int KVirtualBGRenderer::hash()
fp += m_renderer[i]->fingerprint();
}
//kdDebug() << k_funcinfo << " fp=\""<<fp<<"\" h="<<QHash(fp)<<endl;
return QHash(fp);
return TQHash(fp);
}
@ -1251,7 +1251,7 @@ void KVirtualBGRenderer::screenDone(int _desk, int _screen)
Q_UNUSED(_screen);
const KBackgroundRenderer * sender = dynamic_cast<const KBackgroundRenderer*>(this->sender());
int screen = m_renderer.find(sender);
int screen = m_renderer.tqfind(sender);
if (screen == -1)
//??
return;

30
kcontrol/background/bgsettings.cpp
Unescape Escape View File

@ -122,7 +122,7 @@ void KBackgroundPattern::readSettings()
m_Pattern = m_pConfig->readPathEntry("File");
m_Comment = m_pConfig->readEntry("Comment");
if (m_Comment.isEmpty())
m_Comment = m_File.mid(m_File.findRev('/')+1);
m_Comment = m_File.mid(m_File.tqfindRev('/')+1);
}
@ -172,7 +172,7 @@ TQString KBackgroundPattern::fingerprint()
int KBackgroundPattern::hash()
{
if (hashdirty) {
m_Hash = QHash(fingerprint());
m_Hash = TQHash(fingerprint());
hashdirty = false;
}
return m_Hash;
@ -190,10 +190,10 @@ TQStringList KBackgroundPattern::list()
TQStringList::Iterator it;
for (it=lst.begin(); it!=lst.end(); ++it) {
// Strip path and suffix
int pos = (*it).findRev('/');
int pos = (*it).tqfindRev('/');
if (pos != -1)
(*it) = (*it).mid(pos+1);
pos = (*it).findRev('.');
pos = (*it).tqfindRev('.');
if (pos != -1)
(*it) = (*it).left(pos);
}
@ -383,7 +383,7 @@ TQString KBackgroundProgram::fingerprint()
int KBackgroundProgram::hash()
{
if (hashdirty) {
m_Hash = QHash(fingerprint());
m_Hash = TQHash(fingerprint());
hashdirty = false;
}
return m_Hash;
@ -401,10 +401,10 @@ TQStringList KBackgroundProgram::list()
TQStringList::Iterator it;
for (it=lst.begin(); it!=lst.end(); ++it) {
// Strip path and suffix
int pos = (*it).findRev('/');
int pos = (*it).tqfindRev('/');
if (pos != -1)
(*it) = (*it).mid(pos+1);
pos = (*it).findRev('.');
pos = (*it).tqfindRev('.');
if (pos != -1)
(*it) = (*it).left(pos);
}
@ -665,7 +665,7 @@ void KBackgroundSettings::setWallpaperList(TQStringList list)
}
updateWallpaperFiles();
// Try to keep the current wallpaper (-1 to set position to one before it)
m_CurrentWallpaper = m_WallpaperFiles.findIndex(m_CurrentWallpaperName) - 1;
m_CurrentWallpaper = m_WallpaperFiles.tqfindIndex(m_CurrentWallpaperName) - 1;
changeWallpaper(m_CurrentWallpaper < 0);
}
@ -751,7 +751,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_BackgroundMode = defBackgroundMode;
s = m_pConfig->readEntry("BackgroundMode", "invalid");
if (m_BMMap.contains(s)) {
if (m_BMMap.tqcontains(s)) {
int mode = m_BMMap[s];
// consistency check
if ( ((mode != Pattern) && (mode != Program)) ||
@ -763,7 +763,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_BlendMode = defBlendMode;
s = m_pConfig->readEntry("BlendMode", "invalid");
if (m_BlMMap.contains(s)) {
if (m_BlMMap.tqcontains(s)) {
m_BlendMode = m_BlMMap[s];
}
@ -784,14 +784,14 @@ void KBackgroundSettings::readSettings(bool reparse)
m_MultiMode = defMultiMode;
s = m_pConfig->readEntry("MultiWallpaperMode");
if (m_MMMap.contains(s)) {
if (m_MMMap.tqcontains(s)) {
int mode = m_MMMap[s];
m_MultiMode = mode;
}
updateWallpaperFiles();
if( !m_CurrentWallpaperName.isEmpty())
m_CurrentWallpaper = m_WallpaperFiles.findIndex(m_CurrentWallpaperName);
m_CurrentWallpaper = m_WallpaperFiles.tqfindIndex(m_CurrentWallpaperName);
if(m_CurrentWallpaper < 0)
m_CurrentWallpaper = 0;
@ -799,7 +799,7 @@ void KBackgroundSettings::readSettings(bool reparse)
m_WallpaperMode = defWallpaperMode;
m_Wallpaper = m_pConfig->readPathEntry("Wallpaper");
s = m_pConfig->readEntry("WallpaperMode", "invalid");
if (m_WMMap.contains(s)) {
if (m_WMMap.tqcontains(s)) {
int mode = m_WMMap[s];
// consistency check.
if ((mode == NoWallpaper) || !m_Wallpaper.isEmpty() || (m_MultiMode == InOrder || m_MultiMode == Random))
@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
s += TQString("wm:%1;").arg(m_WallpaperMode);
if (m_WallpaperMode != NoWallpaper)
{
Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
}
@ -1048,7 +1048,7 @@ TQString KBackgroundSettings::fingerprint()
int KBackgroundSettings::hash()
{
if (hashdirty) {
m_Hash = QHash(fingerprint());
m_Hash = TQHash(fingerprint());
hashdirty = false;
}
return m_Hash;

2
kcontrol/background/bgwallpaper.h
Unescape Escape View File

@ -31,7 +31,7 @@
class BGMultiWallpaperBase;
class KBackgroundSettings;
class BGMultiWallpaperList : public QListBox
class BGMultiWallpaperList : public TQListBox
{
public:
BGMultiWallpaperList(TQWidget *parent, const char *name);

28
kcontrol/background/bgwallpaper_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>BGMultiWallpaperBase</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>BGMultiWallPaperBase</cstring>
</property>
@ -19,7 +19,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QLabel" row="2" column="0">
<widget class="TQLabel" row="2" column="0">
<property name="name">
<cstring>textLabel2</cstring>
</property>
@ -27,7 +27,7 @@
<string>Show the following pictures:</string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0">
<widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>m_cbRandom</cstring>
</property>
@ -35,7 +35,7 @@
<string>&amp;Show pictures in random order</string>
</property>
</widget>
<widget class="QLayoutWidget" row="0" column="0">
<widget class="TQLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout3</cstring>
</property>
@ -43,7 +43,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>textLabel1</cstring>
</property>
@ -54,7 +54,7 @@
<cstring>m_spinInterval</cstring>
</property>
</widget>
<widget class="QSpinBox">
<widget class="TQSpinBox">
<property name="name">
<cstring>m_spinInterval</cstring>
</property>
@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@ -78,7 +78,7 @@
</spacer>
</hbox>
</widget>
<widget class="QLayoutWidget" row="3" column="0">
<widget class="TQLayoutWidget" row="3" column="0">
<property name="name">
<cstring>layout4</cstring>
</property>
@ -98,14 +98,14 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>300</width>
<height>100</height>
</size>
</property>
</widget>
<widget class="QPushButton" row="0" column="1">
<widget class="TQPushButton" row="0" column="1">
<property name="name">
<cstring>m_buttonAdd</cstring>
</property>
@ -123,14 +123,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton" row="1" column="1">
<widget class="TQPushButton" row="1" column="1">
<property name="name">
<cstring>m_buttonRemove</cstring>
</property>
@ -138,7 +138,7 @@
<string>&amp;Remove</string>
</property>
</widget>
<widget class="QPushButton" row="3" column="1">
<widget class="TQPushButton" row="3" column="1">
<property name="name">
<cstring>m_buttonMoveDown</cstring>
</property>
@ -146,7 +146,7 @@
<string>Move &amp;Down</string>
</property>
</widget>
<widget class="QPushButton" row="2" column="1">
<widget class="TQPushButton" row="2" column="1">
<property name="name">
<cstring>m_buttonMoveUp</cstring>
</property>

2
kcontrol/background/main.cpp
Unescape Escape View File

@ -113,7 +113,7 @@ void KBackground::save()
else
appname.sprintf("kdesktop-screen-%d", screen_number);
client->send(appname, "KBackgroundIface", "configure()", "");
client->send(appname, "KBackgroundIface", "configure()", TQString(""));
}
void KBackground::defaults()

22
kcontrol/clock/dtime.cpp
Unescape Escape View File

@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() );
cal = new KDatePicker( dateBox );
cal->setMinimumSize(cal->sizeHint());
cal->setMinimumSize(cal->tqsizeHint());
l1->addWidget( cal );
TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") );
@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQLabel *dots1 = new TQLabel(":", timeBox);
dots1->setMinimumWidth( 7 );
dots1->setAlignment( TQLabel::AlignCenter );
dots1->tqsetAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots1, 0, 1, 3, 3 );
minute = new HMSTimeWidget( timeBox );
@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
TQLabel *dots2 = new TQLabel(":", timeBox);
dots2->setMinimumWidth( 7 );
dots2->setAlignment( TQLabel::AlignCenter );
dots2->tqsetAlignment( TQLabel::AlignCenter );
v3->addMultiCellWidget(dots2, 0, 1, 5, 5 );
second = new HMSTimeWidget( timeBox );
@ -272,7 +272,7 @@ void Dtime::save()
list.append(timeServerList->currentText());
for ( int i=0; i<timeServerList->count();i++ ) {
TQString text = timeServerList->text(i);
if( list.find(text) == list.end())
if( list.tqfind(text) == list.end())
list.append(text);
// Limit so errors can go away and not stored forever
if( list.count() == 10)
@ -284,16 +284,16 @@ void Dtime::save()
if(setDateTimeAuto->isChecked() && !ntpUtility.isEmpty()){
// NTP Time setting
TQString timeServer = timeServerList->currentText();
if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) {
timeServer.replace( TQRegExp(".*\\("), "" );
timeServer.replace( TQRegExp("\\).*"), "" );
if( timeServer.tqfind( TQRegExp(".*\\(.*\\)$") ) != -1 ) {
timeServer.tqreplace( TQRegExp(".*\\("), "" );
timeServer.tqreplace( TQRegExp("\\).*"), "" );
// Would this be better?: s/^.*\(([^)]*)\).*$/\1/
}
KProcess proc;
proc << ntpUtility << timeServer;
proc.start( KProcess::Block );
if( proc.exitStatus() != 0 ){
KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").arg(timeServer).latin1()));
KMessageBox::error( this, i18n(TQString("Unable to contact time server: %1.").tqarg(timeServer).latin1()));
setDateTimeAuto->setChecked( false );
}
else {
@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const
void Kclock::setTime(const TQTime &time)
{
this->time = time;
repaint();
tqrepaint();
}
void Kclock::paintEvent( TQPaintEvent * )
@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * )
TQPointArray pts;
TQPoint cp = rect().center();
int d = QMIN(width(),height());
TQColor hands = colorGroup().dark();
TQColor shadow = colorGroup().text();
TQColor hands = tqcolorGroup().dark();
TQColor shadow = tqcolorGroup().text();
paint.setPen( shadow );
paint.setBrush( shadow );
paint.setViewport(4,4,width(),height());

26
kcontrol/clock/dtime.h
Unescape Escape View File

@ -45,7 +45,7 @@ class HMSTimeWidget : public KIntSpinBox
TQString mapValueToText(int);
};
class Dtime : public QWidget
class Dtime : public TQWidget
{
Q_OBJECT
public:
@ -68,15 +68,15 @@ signals:
private:
void findNTPutility();
QString ntpUtility;
TQString ntpUtility;
TQWidget* privateLayoutWidget;
QCheckBox *setDateTimeAuto;
QComboBox *timeServerList;
TQCheckBox *setDateTimeAuto;
TQComboBox *timeServerList;
KDatePicker *cal;
QComboBox *month;
QSpinBox *year;
TQComboBox *month;
TQSpinBox *year;
HMSTimeWidget *hour;
HMSTimeWidget *minute;
@ -84,17 +84,17 @@ private:
Kclock *kclock;
QTime time;
QDate date;
QTimer internalTimer;
TQTime time;
TQDate date;
TQTimer internalTimer;
QString BufS;
TQString BufS;
int BufI;
bool refresh;
bool ontimeout;
};
class Kclock : public QWidget
class Kclock : public TQWidget
{
Q_OBJECT
@ -109,7 +109,7 @@ protected:
private:
QTime time;
TQTime time;
};
class KStrictIntValidator : public TQIntValidator
@ -117,7 +117,7 @@ class KStrictIntValidator : public TQIntValidator
public:
KStrictIntValidator(int bottom, int top, TQWidget * parent,
const char * name = 0 )
: TQIntValidator(bottom, top, parent, name) {};
: TQIntValidator(bottom, top, TQT_TQOBJECT(parent), name) {};
TQValidator::State validate( TQString & input, int & d ) const;
};

4
kcontrol/clock/tzone.cpp
Unescape Escape View File

@ -77,7 +77,7 @@ void Tzone::currentZone()
time_t now = time(0);
tzset();
strftime(result.data(), result.size(), "%Z", localtime(&now));
m_local->setText(localZone.arg(KTimezoneWidget::displayName(m_zoneDb.local())).arg(result));
m_local->setText(localZone.tqarg(KTimezoneWidget::displayName(m_zoneDb.local())).tqarg(static_cast<const char *>(result)));
}
// FIXME: Does the logic in this routine actually work correctly? For example,
@ -113,7 +113,7 @@ void Tzone::save()
for (TQString line = is.readLine(); !line.isNull();
line = is.readLine())
{
if (line.find("TZ=") == 0)
if (line.tqfind("TZ=") == 0)
{
*ts << "TZ=" << selectedzone << endl;
found = true;

2
kcontrol/clock/tzone.h
Unescape Escape View File

@ -29,7 +29,7 @@
class TQComboBox;
class TQLabel;
class Tzone : public QVGroupBox
class Tzone : public TQVGroupBox
{
Q_OBJECT

12
kcontrol/colors/colorscm.cpp
Unescape Escape View File

@ -254,9 +254,9 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
groupLayout = new TQHBoxLayout;
groupLayout2->addLayout(groupLayout);
sb = new TQSlider( TQSlider::Horizontal,group,"Slider" );
sb = new TQSlider( Qt::Horizontal,group,"Slider" );
sb->setRange( 0, 10 );
sb->setFocusPolicy( TQWidget::StrongFocus );
sb->setFocusPolicy( TQ_StrongFocus );
connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int)));
TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level"
@ -444,7 +444,7 @@ void KColorScheme::slotSave( )
if (!entry) return;
sCurrentScheme = entry->path;
KSimpleConfig *config = new KSimpleConfig(sCurrentScheme );
int i = sCurrentScheme.findRev('/');
int i = sCurrentScheme.tqfindRev('/');
if (i >= 0)
sCurrentScheme = sCurrentScheme.mid(i+1);
@ -800,7 +800,7 @@ void KColorScheme::readScheme( int index )
sCurrentScheme = entry->path;
config = new KSimpleConfig(sCurrentScheme, true);
config->setGroup("Color Scheme");
int i = sCurrentScheme.findRev('/');
int i = sCurrentScheme.tqfindRev('/');
if (i >= 0)
sCurrentScheme = sCurrentScheme.mid(i+1);
}
@ -905,7 +905,7 @@ int KColorScheme::findSchemeByName(const TQString &scheme)
return 1;
TQString search = scheme;
int i = search.findRev('/');
int i = search.tqfindRev('/');
if (i >= 0)
search = search.mid(i+1);
@ -972,7 +972,7 @@ void KColorScheme::insertEntry(const TQString &sFile, const TQString &sName)
{
KColorSchemeEntry *newEntry = new KColorSchemeEntry(sFile, sName, true);
mSchemeList->inSort(newEntry);
int newIndex = mSchemeList->findRef(newEntry)+nSysSchemes;
int newIndex = mSchemeList->tqfindRef(newEntry)+nSysSchemes;
sList->insertItem(sName, newIndex);
sList->setCurrentItem(newIndex);
}

30
kcontrol/colors/widgetcanvas.cpp
Unescape Escape View File

@ -64,7 +64,7 @@ void WidgetCanvas::paintEvent(TQPaintEvent *)
void WidgetCanvas::mousePressEvent( TQMouseEvent *me )
{
for ( int i = 0; i < MAX_HOTSPOTS; i++ )
if ( hotspots[i].rect.contains( me->pos() ) ) {
if ( hotspots[i].rect.tqcontains( me->pos() ) ) {
emit widgetSelected( hotspots[i].number );
return;
}
@ -73,7 +73,7 @@ void WidgetCanvas::mousePressEvent( TQMouseEvent *me )
void WidgetCanvas::mouseMoveEvent( TQMouseEvent *me )
{
for ( int i = 0; i < MAX_HOTSPOTS; i++ )
if ( hotspots[i].rect.contains( me->pos() ) ) {
if ( hotspots[i].rect.tqcontains( me->pos() ) ) {
if ( i != currentHotspot ) {
TQString tip = tips[hotspots[i].number];
TQToolTip::remove( this );
@ -91,7 +91,7 @@ void WidgetCanvas::dropEvent( TQDropEvent *e)
TQColor c;
if (KColorDrag::decode( e, c)) {
for ( int i = 0; i < MAX_HOTSPOTS; i++ )
if ( hotspots[i].rect.contains( e->pos() ) ) {
if ( hotspots[i].rect.tqcontains( e->pos() ) ) {
emit colorDropped( hotspots[i].number, c);
return;
}
@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets()
// Create a scrollbar and redirect drawing into a temp. pixmap to save a
// lot of fiddly drawing later.
TQScrollBar *vertScrollBar = new TQScrollBar( TQScrollBar::Vertical, this );
TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this );
// TODO: vertScrollBar->setStyle( new TQMotifStyle() );
vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height());
vertScrollBar->setRange( 0, 0 );
@ -327,7 +327,7 @@ void WidgetCanvas::drawSampleWidgets()
#ifndef __osf__
TQPainter::redirect( vertScrollBar, &pm );
#endif
vertScrollBar->repaint();
vertScrollBar->tqrepaint();
TQPainter::redirect( vertScrollBar, 0 );
vertScrollBar->hide();
@ -337,8 +337,8 @@ void WidgetCanvas::drawSampleWidgets()
// Initialize the pixmap which we draw sample widgets into.
smplw.resize(width(), height());
//smplw.fill( parentWidget()->back() );
smplw.fill( parentWidget()->colorGroup().mid() );
//smplw.fill( tqparentWidget()->back() );
smplw.fill( tqparentWidget()->tqcolorGroup().mid() );
// Actually start painting in
@ -435,7 +435,7 @@ void WidgetCanvas::drawSampleWidgets()
// Menu bar
//qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush);
kapp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint,
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint,
TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg);
paint.setFont( menuFont );
@ -443,7 +443,7 @@ void WidgetCanvas::drawSampleWidgets()
TQString file = i18n("File");
textLen = paint.fontMetrics().width( file );
//qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush);
kapp->style().drawPrimitive(TQStyle::PE_Panel, &paint,
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, &paint,
TQRect(30, 59, textLen + 10, 21), cg);
paint.drawText( 35, 74, file );
@ -528,7 +528,7 @@ void WidgetCanvas::drawSampleWidgets()
cg2.setColor(TQColorGroup::Button, button);
cg2.setColor(TQColorGroup::Background, window);
//qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush);
kapp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint,
kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint,
TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised);
paint.setPen(buttonTxt);
paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter,
@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets()
popup->setItemEnabled( id, false );
// HACK: Force Layouting
//Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible
//popup->sizeHint(); // Breaks with Qt 3.3
popup->resize(popup->sizeHint());
//Sad Eagle: tqsizeHint() forces layouting too, and it's a lot less visible
//popup->tqsizeHint(); // Breaks with Qt 3.3
popup->resize(popup->tqsizeHint());
pm = TQPixmap::grabWidget( popup );
delete popup;
@ -585,12 +585,12 @@ void WidgetCanvas::drawSampleWidgets()
// Valance
qDrawWinPanel ( &paint, 0, 0, width(), height(),
parentWidget()->colorGroup(), TRUE, 0);
tqparentWidget()->tqcolorGroup(), TRUE, 0);
// Stop the painting
hotspots[ spot++ ] =
HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ?
repaint( FALSE );
tqrepaint( FALSE );
}

2
kcontrol/colors/widgetcanvas.h
Unescape Escape View File

@ -58,7 +58,7 @@ public:
int number;
};
class WidgetCanvas : public QWidget
class WidgetCanvas : public TQWidget
{
Q_OBJECT

20
kcontrol/componentchooser/browserconfig_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>BrowserConfig_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>BrowserConfig_UI</cstring>
</property>
@ -27,7 +27,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QButtonGroup">
<widget class="TQButtonGroup">
<property name="name">
<cstring>buttonGroup1</cstring>
</property>
@ -41,7 +41,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>label</cstring>
</property>
@ -49,7 +49,7 @@
<string>&lt;qt&gt;Open &lt;b&gt;http&lt;/b&gt; and &lt;b&gt;https&lt;/b&gt; URLs&lt;/qt&gt;</string>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>radioKIO</cstring>
</property>
@ -60,7 +60,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>radioExec</cstring>
</property>
@ -68,7 +68,7 @@
<string>in the following browser:</string>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout3</cstring>
</property>
@ -86,14 +86,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>lineExec</cstring>
</property>
@ -101,7 +101,7 @@
<bool>false</bool>
</property>
</widget>
<widget class="QToolButton">
<widget class="TQToolButton">
<property name="name">
<cstring>btnSelectBrowser</cstring>
</property>
@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>

32
kcontrol/componentchooser/componentchooser.cpp
Unescape Escape View File

@ -38,7 +38,7 @@
#include <ktrader.h>
#include <kurlrequester.h>
class MyListBoxItem: public QListBoxText
class MyListBoxItem: public TQListBoxText
{
public:
MyListBoxItem(const TQString& text, const TQString &file):TQListBoxText(text),File(file){}
@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *)
kmailCB->setChecked(useKMail);
otherCB->setChecked(!useKMail);
txtEMailClient->setText(emailClient);
txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height());
txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height());
chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true"));
emit changed(false);
@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient()
TQString client = dlg.text();
// get the preferred Terminal Application
KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
preferredTerminal += TQString::fromLatin1(" -e ");
KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
preferredTerminal += TQString::tqfromLatin1(" -e ");
int len = preferredTerminal.length();
bool b = client.left(len) == preferredTerminal;
@ -393,7 +393,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
}
ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width());
ServiceChooser->sort();
connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
ServiceChooser->setSelected(0,true);
@ -410,14 +410,14 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint());
TQString cfgType=cfg.readEntry("configurationType");
TQWidget *newConfigWidget = 0;
if (cfgType.isEmpty() || (cfgType=="component"))
{
if (!(configWidget && configWidget->qt_cast("CfgComponent")))
if (!(configWidget && configWidget->tqqt_cast("CfgComponent")))
{
CfgComponent* cfgcomp = new CfgComponent(configContainer);
cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.").arg(it->text()));
@ -430,7 +430,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_email")
{
if (!(configWidget && configWidget->qt_cast("CfgEmailClient")))
if (!(configWidget && configWidget->tqqt_cast("CfgEmailClient")))
{
newConfigWidget = new CfgEmailClient(configContainer);
}
@ -438,7 +438,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_terminal")
{
if (!(configWidget && configWidget->qt_cast("CfgTerminalEmulator")))
if (!(configWidget && configWidget->tqqt_cast("CfgTerminalEmulator")))
{
newConfigWidget = new CfgTerminalEmulator(configContainer);
}
@ -446,7 +446,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
}
else if (cfgType=="internal_browser")
{
if (!(configWidget && configWidget->qt_cast("CfgBrowser")))
if (!(configWidget && configWidget->tqqt_cast("CfgBrowser")))
{
newConfigWidget = new CfgBrowser(configContainer);
}
@ -461,11 +461,11 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
delete configWidget;
configWidget=newConfigWidget;
connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
configContainer->setMinimumSize(configWidget->sizeHint());
configContainer->setMinimumSize(configWidget->tqsizeHint());
}
if (configWidget)
static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->load(&cfg);
static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->load(&cfg);
emitChanged(false);
latestEditedService=static_cast<MyListBoxItem*>(it)->File;
@ -487,7 +487,7 @@ void ComponentChooser::load() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
configWidget->qt_cast( "CfgPlugin" ) );
configWidget->tqqt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@ -500,7 +500,7 @@ void ComponentChooser::save() {
if( configWidget )
{
CfgPlugin * plugin = static_cast<CfgPlugin*>(
configWidget->qt_cast( "CfgPlugin" ) );
configWidget->tqqt_cast( "CfgPlugin" ) );
if( plugin )
{
KSimpleConfig cfg(latestEditedService);
@ -512,7 +512,7 @@ void ComponentChooser::save() {
void ComponentChooser::restoreDefault() {
if (configWidget)
{
static_cast<CfgPlugin*>(configWidget->qt_cast("CfgPlugin"))->defaults();
static_cast<CfgPlugin*>(configWidget->tqqt_cast("CfgPlugin"))->defaults();
emitChanged(true);
}

12
kcontrol/componentchooser/componentchooser_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>ComponentChooser_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>ComponentChooser_UI</cstring>
</property>
@ -27,7 +27,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QGroupBox" row="1" column="1">
<widget class="TQGroupBox" row="1" column="1">
<property name="name">
<cstring>GroupBox1</cstring>
</property>
@ -52,14 +52,14 @@
<property name="margin">
<number>11</number>
</property>
<widget class="QWidgetStack">
<widget class="TQWidgetStack">
<property name="name">
<cstring>configContainer</cstring>
</property>
</widget>
</vbox>
</widget>
<widget class="QGroupBox" row="0" column="1">
<widget class="TQGroupBox" row="0" column="1">
<property name="name">
<cstring>GroupBox2</cstring>
</property>
@ -84,14 +84,14 @@
<property name="margin">
<number>11</number>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>ComponentDescription</cstring>
</property>
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

8
kcontrol/componentchooser/componentconfig_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>ComponentConfig_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>ComponentConfig_UI</cstring>
</property>
@ -19,14 +19,14 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>ChooserDocu</cstring>
</property>
<property name="text">
<string></string>
</property>
<property name="alignment">
<property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -45,7 +45,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>91</height>

24
kcontrol/componentchooser/emailclientconfig_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>EmailClientConfig_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>EmailClientConfig_UI</cstring>
</property>
@ -30,7 +30,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QButtonGroup">
<widget class="TQButtonGroup">
<property name="name">
<cstring>ButtonGroup2</cstring>
</property>
@ -50,7 +50,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QLayoutWidget" row="2" column="1">
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>Layout4</cstring>
</property>
@ -58,7 +58,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>txtEMailClient</cstring>
</property>
@ -73,7 +73,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@ -86,7 +86,7 @@
<string>Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; You can also use several placeholders which will be replaced with the actual values when the email client is called:&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
</property>
</widget>
<widget class="QToolButton">
<widget class="TQToolButton">
<property name="name">
<cstring>btnSelectEmail</cstring>
</property>
@ -102,7 +102,7 @@
</widget>
</hbox>
</widget>
<widget class="QCheckBox" row="3" column="1">
<widget class="TQCheckBox" row="3" column="1">
<property name="name">
<cstring>chkRunTerminal</cstring>
</property>
@ -126,14 +126,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>16</height>
</size>
</property>
</spacer>
<widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
<widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>kmailCB</cstring>
</property>
@ -144,7 +144,7 @@
<string>Kmail is the standard Mail program for the KDE desktop.</string>
</property>
</widget>
<widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
<widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>otherCB</cstring>
</property>
@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>30</width>
<height>16</height>
@ -182,7 +182,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>30</width>
<height>16</height>

20
kcontrol/componentchooser/terminalemulatorconfig_ui.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
<class>TerminalEmulatorConfig_UI</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>TerminalEmulatorConfig_UI</cstring>
</property>
@ -27,7 +27,7 @@
<property name="margin">
<number>0</number>
</property>
<widget class="QButtonGroup">
<widget class="TQButtonGroup">
<property name="name">
<cstring>ButtonGroup1</cstring>
</property>
@ -57,14 +57,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>87</height>
</size>
</property>
</spacer>
<widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
<widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>otherCB</cstring>
</property>
@ -82,14 +82,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>31</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2">
<widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>terminalCB</cstring>
</property>
@ -97,7 +97,7 @@
<string>&amp;Use Konsole as terminal application</string>
</property>
</widget>
<widget class="QLayoutWidget" row="2" column="1">
<widget class="TQLayoutWidget" row="2" column="1">
<property name="name">
<cstring>Layout4</cstring>
</property>
@ -105,7 +105,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>terminalLE</cstring>
</property>
@ -120,7 +120,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<property name="tqminimumSize">
<size>
<width>0</width>
<height>0</height>
@ -130,7 +130,7 @@
<string>Press this button to select your favorite terminal client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; Also note that some programs that utilize Terminal Emulator will not work if you add command line arguments (Example: konsole -ls).</string>
</property>
</widget>
<widget class="QToolButton">
<widget class="TQToolButton">
<property name="name">
<cstring>btnSelectTerminal</cstring>
</property>

62
kcontrol/crypto/certgen.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>D_GenCert</class>
<widget class="QDialog">
<widget class="TQDialog">
<property name="name">
<cstring>D_GenCert</cstring>
</property>
@ -15,7 +15,7 @@
<property name="caption">
<string>Certificate Creation Wizard</string>
</property>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel2</cstring>
</property>
@ -37,7 +37,7 @@
<string>Passphrase:</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel3</cstring>
</property>
@ -53,7 +53,7 @@
<string>Country code:</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel4</cstring>
</property>
@ -69,7 +69,7 @@
<string>State or province (in full):</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>T_CertType</cstring>
</property>
@ -85,7 +85,7 @@
<string>Certificate type:</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel2_2</cstring>
</property>
@ -101,7 +101,7 @@
<string>Passphrase (verify):</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel5</cstring>
</property>
@ -117,7 +117,7 @@
<string>City:</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel6</cstring>
</property>
@ -133,7 +133,7 @@
<string>Organization name:</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel7</cstring>
</property>
@ -149,7 +149,7 @@
<string>Organizational unit/group:</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel8</cstring>
</property>
@ -165,7 +165,7 @@
<string>Full hostname of the server:</string>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<property name="name">
<cstring>L_CertType</cstring>
</property>
@ -178,7 +178,7 @@
</rect>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit3</cstring>
</property>
@ -194,7 +194,7 @@
<number>2</number>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel9</cstring>
</property>
@ -210,7 +210,7 @@
<string>Email address:</string>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit4_2_2_2</cstring>
</property>
@ -226,7 +226,7 @@
<number>200</number>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit4_2_2_2_2</cstring>
</property>
@ -242,7 +242,7 @@
<number>200</number>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit4_2_2_2_3</cstring>
</property>
@ -258,7 +258,7 @@
<number>200</number>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>E_Passphrase</cstring>
</property>
@ -277,7 +277,7 @@
<enum>Password</enum>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>E_Passphrase_2</cstring>
</property>
@ -296,7 +296,7 @@
<enum>Password</enum>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel10</cstring>
</property>
@ -312,7 +312,7 @@
<string>Days valid:</string>
</property>
</widget>
<widget class="QSpinBox">
<widget class="TQSpinBox">
<property name="name">
<cstring>SpinBox1</cstring>
</property>
@ -334,7 +334,7 @@
<number>365</number>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel11</cstring>
</property>
@ -350,7 +350,7 @@
<string>Digest:</string>
</property>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>CheckBox1</cstring>
</property>
@ -369,7 +369,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel12</cstring>
</property>
@ -385,7 +385,7 @@
<string>Alias:</string>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit19</cstring>
</property>
@ -398,7 +398,7 @@
</rect>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit4_2_2</cstring>
</property>
@ -414,7 +414,7 @@
<number>200</number>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit4_2</cstring>
</property>
@ -430,7 +430,7 @@
<number>200</number>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<property name="name">
<cstring>ComboBox2</cstring>
</property>
@ -443,7 +443,7 @@
</rect>
</property>
</widget>
<widget class="QCheckBox">
<widget class="TQCheckBox">
<property name="name">
<cstring>CheckBox2</cstring>
</property>
@ -459,7 +459,7 @@
<string>Use DSA instead of RSA</string>
</property>
</widget>
<widget class="QLabel">
<widget class="TQLabel">
<property name="name">
<cstring>TextLabel13</cstring>
</property>
@ -475,7 +475,7 @@
<string>Bit strength:</string>
</property>
</widget>
<widget class="QComboBox">
<widget class="TQComboBox">
<property name="name">
<cstring>ComboBox5</cstring>
</property>
@ -488,7 +488,7 @@
</rect>
</property>
</widget>
<widget class="QLineEdit">
<widget class="TQLineEdit">
<property name="name">
<cstring>LineEdit4</cstring>
</property>

120
kcontrol/crypto/crypto.cpp
Unescape Escape View File

@ -98,7 +98,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_crypto, KryptoFactory("kcmcrypto") )
CipherItem::CipherItem( TQListView *view, const TQString& cipher, int bits,
int maxBits, KCryptoConfig *module )
: TQCheckListItem( view, TQString::null, CheckBox )
: TQCheckListItem( view, TQString(), CheckBox )
{
m_cipher = cipher;
m_bits = bits;
@ -122,13 +122,13 @@ TQString CipherItem::configName() const
OtherCertItem::OtherCertItem( TQListView *view, const TQString& sub, const TQString& md5, bool perm, int policy, TQDateTime exp, KCryptoConfig *module )
: TQListViewItem( view, TQString::null ), _sub(sub), _md5(md5), _exp(exp), _perm(perm), _policy(policy)
: TQListViewItem( view, TQString() ), _sub(sub), _md5(md5), _exp(exp), _perm(perm), _policy(policy)
{
m_module = module;
KSSLX509Map cert(sub);
setText(0, cert.getValue("O"));
setText(1, cert.getValue("CN").replace("\n", ", "));
setText(1, cert.getValue("CN").tqreplace("\n", ", "));
if (_exp.date().year() > 3000 || _exp.date().year() < 1900)
_exp.setDate(TQDate(3000,1,1));
@ -146,12 +146,12 @@ TQString OtherCertItem::configName() const
YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module )
: TQListViewItem( view, TQString::null )
: TQListViewItem( view, TQString() )
{
m_module = module;
KSSLX509Map cert(name);
TQString tmp = cert.getValue("CN").replace("\n", ", ");
TQString tmp = cert.getValue("CN").tqreplace("\n", ", ");
setText(0, tmp);
setText(1, cert.getValue("Email"));
_pkcs = pkcs;
@ -172,7 +172,7 @@ TQString YourCertItem::configName() const
CAItem::CAItem( TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module )
: TQListViewItem( view, TQString::null )
: TQListViewItem( view, TQString() )
{
m_module = module;
@ -180,10 +180,10 @@ KSSLX509Map mcert(name);
TQString tmp;
setText(0, mcert.getValue("O"));
tmp = mcert.getValue("OU");
tmp.replace("\n", ", ");
tmp.tqreplace("\n", ", ");
setText(1, tmp);
tmp = mcert.getValue("CN");
tmp.replace("\n", ", ");
tmp.tqreplace("\n", ", ");
setText(2, tmp);
_name = name;
_cert = cert;
@ -334,7 +334,7 @@ TQString whatstr;
grid->addMultiCellWidget(cwbg, 3, 3, 0, 1);
TQString whatStr = i18n("<qt>Use these preconfigurations to more easily configure the SSL encryption settings. You can choose among the following modes: <ul>");
cwcb->insertItem(TQString::null);
cwcb->insertItem(TQString());
cwcb->insertItem(i18n("Most Compatible"));
whatStr += i18n("<li><b>Most Compatible:</b> Select the settings found to be most compatible.</li>");
cwcb->insertItem(i18n("US Ciphers Only"));
@ -486,8 +486,8 @@ TQString whatstr;
grid->addWidget(yourSSLPass, 5, 5);
grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5);
ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null));
yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString::null));
ySubject = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString()));
yIssuer = KSSLInfoDlg::certInfoWidget(tabYourSSLCert, TQString(TQString()));
grid->addMultiCellWidget(ySubject, 7, 11, 0, 2);
grid->addMultiCellWidget(yIssuer, 7, 11, 3, 5);
whatstr = i18n("This is the information known about the owner of the certificate.");
@ -641,8 +641,8 @@ TQString whatstr;
otherSSLRemove->setEnabled(false);
grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabOtherSSLCert), 8, 8, 0, 5);
oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null));
oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString::null));
oSubject = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString()));
oIssuer = KSSLInfoDlg::certInfoWidget(tabOtherSSLCert, TQString(TQString()));
grid->addMultiCellWidget(oSubject, 9, 13, 0, 2);
grid->addMultiCellWidget(oIssuer, 9, 13, 3, 5);
whatstr = i18n("This is the information known about the owner of the certificate.");
@ -668,7 +668,7 @@ TQString whatstr;
cacheGroup = new TQVButtonGroup(i18n("Cache"), tabOtherSSLCert);
cachePerm = new TQRadioButton(i18n("Permanentl&y"), cacheGroup);
cacheUntil = new TQRadioButton(i18n("&Until"), cacheGroup);
untilDate = new KURLLabel(TQString::null, TQString::null, cacheGroup);
untilDate = new KURLLabel(TQString(), TQString(), cacheGroup);
cacheGroup->setEnabled(false);
grid->addMultiCellWidget(cacheGroup, 16, 19, 0, 2);
@ -744,8 +744,8 @@ TQString whatstr;
connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore()));
grid->addWidget(caSSLRestore, 2, 7);
caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null));
caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString::null));
caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString()));
caIssuer = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString()));
grid->addMultiCellWidget(caSubject, 4, 6, 0, 3);
grid->addMultiCellWidget(caIssuer, 4, 6, 4, 7);
@ -842,7 +842,7 @@ TQString whatstr;
tabs->addTab(tabSSLCOpts, i18n("Validation Options"));
#endif
tabs->resize(tabs->sizeHint());
tabs->resize(tabs->tqsizeHint());
load();
}
@ -938,7 +938,7 @@ void KCryptoConfig::load( bool useDefaults )
for (TQStringList::Iterator i = groups.begin(); i != groups.end(); ++i) {
if ((*i).isEmpty() || *i == "<default>" || *i == "General") continue;
policies->setGroup(*i);
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit());
if (cert) {
new OtherCertItem(otherSSLBox, cert->getSubject(), *i,
policies->readBoolEntry("Permanent", true),
@ -958,7 +958,7 @@ void KCryptoConfig::load( bool useDefaults )
pcerts->readEntry("PKCS12Base64"),
pcerts->readEntry("Password"),
*i, this );
j->setPassCache(TQString::null);
j->setPassCache(TQString());
}
setAuthCertLists();
@ -1181,7 +1181,7 @@ void KCryptoConfig::save()
config->writeEntry("AuthMethod", "none");
if (defCertBox->currentItem() == 0)
config->writeEntry("DefaultCert", TQString::null);
config->writeEntry("DefaultCert", TQString());
else config->writeEntry("DefaultCert", defCertBox->currentText());
for (HostAuthItem *x = authDelList.first(); x != 0; x = authDelList.next()) {
@ -1331,7 +1331,7 @@ void KCryptoConfig::slotExportCert() {
OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
if (x) {
policies->setGroup(x->getMD5());
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit());
if (cert) {
KCertExport kce;
kce.setCertificate(cert);
@ -1364,7 +1364,7 @@ OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
if (!x) return;
policies->setGroup(x->getMD5());
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit());
if (!cert) {
KMessageBox::error(this, i18n("Error obtaining the certificate."), i18n("SSL"));
@ -1460,7 +1460,7 @@ TQDateTime qdt = x->getExpires();
void KCryptoConfig::slotOtherCertSelect() {
OtherCertItem *x = static_cast<OtherCertItem *>(otherSSLBox->selectedItem());
TQString iss = TQString::null;
TQString iss = TQString();
if (x) {
otherSSLExport->setEnabled(true);
otherSSLVerify->setEnabled(true);
@ -1474,13 +1474,13 @@ TQString iss = TQString::null;
cacheUntil->setEnabled(true);
policies->setGroup(x->getMD5());
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString::null).local8Bit());
KSSLCertificate *cert = KSSLCertificate::fromString(policies->readEntry("Certificate", TQString()).local8Bit());
if (cert) {
TQPalette cspl;
iss = cert->getIssuer();
cspl = validFrom->palette();
if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1488,7 +1488,7 @@ TQString iss = TQString::null;
validFrom->setPalette(cspl);
cspl = validUntil->palette();
if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1498,13 +1498,13 @@ TQString iss = TQString::null;
validFrom->setText(cert->getNotBefore());
validUntil->setText(cert->getNotAfter());
untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
: KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
: KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC)));
untilDate->setEnabled(x && !x->isPermanent());
pHash->setText(cert->getMD5DigestText());
delete cert;
} else {
validFrom->setText(TQString::null);
validUntil->setText(TQString::null);
validFrom->setText(TQString());
validUntil->setText(TQString());
pHash->clear();
}
@ -1538,15 +1538,15 @@ TQString iss = TQString::null;
policyPrompt->setChecked(false);
cachePerm->setEnabled(false);
cacheUntil->setEnabled(false);
validFrom->setText(TQString::null);
validUntil->setText(TQString::null);
untilDate->setText(TQString::null);
validFrom->setText(TQString());
validUntil->setText(TQString());
untilDate->setText(TQString());
untilDate->setEnabled(false);
pHash->clear();
}
oSubject->setValues(x ? x->getSub() : TQString(TQString::null));
oSubject->setValues(x ? x->getSub() : TQString(TQString()));
oIssuer->setValues(iss);
}
@ -1554,7 +1554,7 @@ TQString iss = TQString::null;
void KCryptoConfig::slotYourImport() {
TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-pkcs12");
TQString certFile = KFileDialog::getOpenFileName(TQString(), "application/x-pkcs12");
if (certFile.isEmpty())
return;
@ -1599,7 +1599,7 @@ TryImportPassAgain:
new YourCertItem(yourSSLBox,
cert->toString(),
TQString::null, // the password - don't store it yet!
TQString(), // the password - don't store it yet!
name,
this );
@ -1633,7 +1633,7 @@ YourCertItem *x = static_cast<YourCertItem *>(yourSSLBox->selectedItem());
}
// For now, we will only export to PKCS#12
TQString certFile = KFileDialog::getSaveFileName(TQString::null,
TQString certFile = KFileDialog::getSaveFileName(TQString(),
"application/x-pkcs12");
if (certFile.isEmpty())
return;
@ -1713,12 +1713,12 @@ TQString iss;
// update the info
iss = pkcs->getCertificate()->getIssuer();
ySubject->setValues(x ? x->getName() : TQString(TQString::null));
ySubject->setValues(x ? x->getName() : TQString(TQString()));
yIssuer->setValues(iss);
TQPalette cspl;
KSSLCertificate *cert = pkcs->getCertificate();
cspl = yValidFrom->palette();
if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1726,7 +1726,7 @@ TQString iss;
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1758,7 +1758,7 @@ TQString iss;
KSSLCertificate *cert = pkcs->getCertificate();
iss = cert->getIssuer();
cspl = yValidFrom->palette();
if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1766,7 +1766,7 @@ TQString iss;
yValidFrom->setPalette(cspl);
cspl = yValidUntil->palette();
if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
} else {
cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@ -1785,7 +1785,7 @@ TQString iss;
yHash->clear();
}
ySubject->setValues(x ? x->getName() : TQString(TQString::null));
ySubject->setValues(x ? x->getName() : TQString(TQString()));
yIssuer->setValues(iss);
}
@ -1830,7 +1830,7 @@ TQCString oldpass = "";
void KCryptoConfig::slotCAImport() {
TQString certFile = KFileDialog::getOpenFileName(TQString::null, "application/x-x509-ca-cert");
TQString certFile = KFileDialog::getOpenFileName(TQString(), "application/x-x509-ca-cert");
if (certFile.isEmpty())
return;
@ -1921,18 +1921,18 @@ void KCryptoConfig::slotCAImport() {
if (certStore) { KOSSL::self()->X509_STORE_free(certStore);
certStore = NULL; }
if (certtext.contains("-----BEGIN CERTIFICATE-----")) {
if (certtext.tqcontains("-----BEGIN CERTIFICATE-----")) {
qf.reset();
certtext = TQString::null;
certtext = TQString();
while (!qf.atEnd()) {
TQString xx;
qf.readLine(xx, qf.size());
certtext += xx;
}
certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null);
certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null);
certtext = certtext.tqreplace("-----BEGIN CERTIFICATE-----", TQString());
certtext = certtext.tqreplace("-----END CERTIFICATE-----", TQString());
certtext = certtext.stripWhiteSpace();
certtext = certtext.replace("\n", TQString::null);
certtext = certtext.tqreplace("\n", TQString());
} else {
// Must [could?] be DER
qf.close();
@ -2003,7 +2003,7 @@ void KCryptoConfig::slotCAImport() {
void KCryptoConfig::offerImportToKMail( const TQString& certFile )
{
if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString::null, i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) {
if ( KMessageBox::questionYesNo( this, i18n( "Do you want to make this certificate available to KMail as well?" ), TQString(), i18n("Make Available"), i18n("Do Not Make Available") ) == KMessageBox::Yes ) {
KProcess proc;
proc << "kleopatra";
proc << "--import-certificate";
@ -2057,7 +2057,7 @@ void KCryptoConfig::slotCARestore() {
if (!sigcfg.hasKey("x509")) continue;
new CAItem(caList,
(*i),
sigcfg.readEntry("x509", TQString::null),
sigcfg.readEntry("x509", TQString()),
sigcfg.readBoolEntry("site", false),
sigcfg.readBoolEntry("email", false),
sigcfg.readBoolEntry("code", false),
@ -2073,10 +2073,10 @@ void KCryptoConfig::slotCAItemChanged() {
CAItem *x = static_cast<CAItem *>(caList->selectedItem());
if (x) {
caSSLRemove->setEnabled(true);
caSubject->setValues(x ? x->getName() : TQString(TQString::null));
caSubject->setValues(x ? x->getName() : TQString(TQString()));
KSSLCertificate *cert = KSSLCertificate::fromString(x->getCert().local8Bit());
if (!cert) {
caIssuer->setValues(TQString(TQString::null));
caIssuer->setValues(TQString(TQString()));
caSite->setEnabled(false);
caEmail->setEnabled(false);
caCode->setEnabled(false);
@ -2100,8 +2100,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem());
caSite->setEnabled(false);
caEmail->setEnabled(false);
caCode->setEnabled(false);
caSubject->setValues(TQString(TQString::null));
caIssuer->setValues(TQString(TQString::null));
caSubject->setValues(TQString(TQString()));
caIssuer->setValues(TQString(TQString()));
cHash->clear();
}
}
@ -2122,8 +2122,8 @@ CAItem *x = static_cast<CAItem *>(caList->selectedItem());
void KCryptoConfig::slotNewHostAuth() {
HostAuthItem *j = new HostAuthItem(hostAuthList,
TQString::null,
TQString::null,
TQString(),
TQString(),
this );
j->setAction(KSSLCertificateHome::AuthSend);
hostAuthList->setSelected(j, true);
@ -2241,7 +2241,7 @@ HostAuthItem *x = static_cast<HostAuthItem *>(hostAuthList->selectedItem());
if (x) {
if (hostCertBox->currentItem() == 0)
x->setCertName(TQString::null);
x->setCertName(TQString());
else x->setCertName(hostCertBox->currentText());
configChanged();
}
@ -2350,7 +2350,7 @@ SSL_CONST SSL_METHOD *meth;
break;
// Leak of sc*?
TQString scn(sc->name);
if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) {
continue;
}
k = SSL_CIPHER_get_bits(sc, &j);
@ -2378,7 +2378,7 @@ SSL_CONST SSL_METHOD *meth;
break;
// Leak of sc*?
TQString scn(sc->name);
if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) {
continue;
}
k = SSL_CIPHER_get_bits(sc, &j);
@ -2448,7 +2448,7 @@ bool noneDef, noneHost;
static_cast<HostAuthItem *>(hostAuthList->firstChild());
x;
x = static_cast<HostAuthItem *>(x->nextSibling())) {
TQString newValue = TQString::null;
TQString newValue = TQString();
for (int i = 1; i < hostCertBox->count(); i++) {
if (hostCertBox->text(i) == x->getCertName()) {
newValue = x->getCertName();

10
kcontrol/crypto/crypto.h
Unescape Escape View File

@ -47,7 +47,7 @@ class KSSLSigners;
class KURLLabel;
class KURLRequester;
class CipherItem : public QCheckListItem
class CipherItem : public TQCheckListItem
{
public:
CipherItem( TQListView *view, const TQString& cipher, int bits, int maxBits,
@ -72,7 +72,7 @@ private:
class OtherCertItem : public QListViewItem
class OtherCertItem : public TQListViewItem
{
public:
OtherCertItem(TQListView *view, const TQString& sub, const TQString& md5, bool perm, int policy, TQDateTime exp, KCryptoConfig *module );
@ -102,7 +102,7 @@ private:
class YourCertItem : public QListViewItem
class YourCertItem : public TQListViewItem
{
public:
YourCertItem(TQListView *view, TQString pkcs, TQString pass, TQString name, KCryptoConfig *module );
@ -132,7 +132,7 @@ private:
class CAItem : public QListViewItem
class CAItem : public TQListViewItem
{
public:
CAItem(TQListView *view, TQString name, TQString cert, bool site, bool email, bool code, KCryptoConfig *module );
@ -166,7 +166,7 @@ private:
class HostAuthItem : public QListViewItem
class HostAuthItem : public TQListViewItem
{
public:
HostAuthItem(TQListView *view, TQString host, TQString name, KCryptoConfig *module ) : TQListViewItem(view, TQString::null ) {

2
kcontrol/crypto/kdatetimedlg.cpp
Unescape Escape View File

@ -107,7 +107,7 @@ void KDateTimeDlg::setTime(const TQTime& qtime) {
void KDateTimeDlg::setDateTime(const TQDateTime& qdatetime) {
_date->setDate(qdatetime.date());
_date->setDate(TQT_TQDATE_OBJECT(qdatetime.date()));
_hours->setValue(qdatetime.time().hour());
_mins->setValue(qdatetime.time().minute());
_secs->setValue(qdatetime.time().second());

24
kcontrol/css/cssconfig.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CSSConfigDialog</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>CSSConfigDialog</cstring>
</property>
@ -29,7 +29,7 @@
<property name="spacing">
<number>0</number>
</property>
<widget class="QButtonGroup">
<widget class="TQButtonGroup">
<property name="name">
<cstring>ButtonGroup1</cstring>
</property>
@ -60,7 +60,7 @@
<property name="spacing">
<number>6</number>
</property>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>useDefault</cstring>
</property>
@ -74,7 +74,7 @@
<string>&lt;b&gt;Use default stylesheet&lt;/b&gt;&lt;p&gt;Select this option to use the default stylesheet.&lt;/p&gt;</string>
</property>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>useUser</cstring>
</property>
@ -85,7 +85,7 @@
<string>&lt;b&gt;Use user-defined stylesheet&lt;/b&gt;&lt;p&gt;If this box is checked, Konqueror will try to load a user-defined style sheet as specified in the location below. The style sheet allows you to completely override the way web pages are rendered in your browser. The file specified should contain a valid style sheet (see http://www.w3.org/Style/CSS for further information on cascading style sheets).&lt;/p&gt;</string>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout3</cstring>
</property>
@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@ -120,7 +120,7 @@
</widget>
</hbox>
</widget>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>useAccess</cstring>
</property>
@ -139,7 +139,7 @@
<string>&lt;b&gt;Use accessibility stylesheet&lt;/b&gt;&lt;p&gt;Selecting this option will allow you to define a default font, font size, and font color with a few simple clicks of the mouse. Simply wander over to the Customize... dialog and pick out your desired options.&lt;/p&gt;</string>
</property>
</widget>
<widget class="QLayoutWidget">
<widget class="TQLayoutWidget">
<property name="name">
<cstring>layout2</cstring>
</property>
@ -157,14 +157,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>customize</cstring>
</property>
@ -185,7 +185,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>451</width>
<height>20</height>
@ -206,7 +206,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>50</height>

58
kcontrol/css/csscustom.ui
Unescape Escape View File

@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>CSSCustomDialog</class>
<widget class="QWidget">
<widget class="TQWidget">
<property name="name">
<cstring>CSSCustomDialog</cstring>
</property>
@ -19,7 +19,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QGroupBox" row="0" column="1">
<widget class="TQGroupBox" row="0" column="1">
<property name="name">
<cstring>GroupBox3</cstring>
</property>
@ -38,7 +38,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QComboBox" row="0" column="1">
<widget class="TQComboBox" row="0" column="1">
<item>
<property name="text">
<string>7</string>
@ -119,7 +119,7 @@
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>txtFontsize</cstring>
</property>
@ -130,7 +130,7 @@
<cstring>basefontsize</cstring>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2">
<widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>dontScale</cstring>
</property>
@ -151,7 +151,7 @@
</widget>
</grid>
</widget>
<widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2">
<widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>GroupBox3_2</cstring>
</property>
@ -165,7 +165,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QCheckBox" row="0" column="0">
<widget class="TQCheckBox" row="0" column="0">
<property name="name">
<cstring>hideImages</cstring>
</property>
@ -176,7 +176,7 @@
<string>&lt;b&gt;Suppress images&lt;/b&gt;&lt;p&gt;Selecting this will prevent Konqueror from loading images.&lt;/p&gt;</string>
</property>
</widget>
<widget class="QCheckBox" row="1" column="0">
<widget class="TQCheckBox" row="1" column="0">
<property name="name">
<cstring>hideBackground</cstring>
</property>
@ -192,7 +192,7 @@
</widget>
</grid>
</widget>
<widget class="QGroupBox" row="0" column="0">
<widget class="TQGroupBox" row="0" column="0">
<property name="name">
<cstring>GroupBox7</cstring>
</property>
@ -206,7 +206,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel" row="0" column="0">
<widget class="TQLabel" row="0" column="0">
<property name="name">
<cstring>txtBaseFontFamily</cstring>
</property>
@ -217,7 +217,7 @@
<cstring>fontFamily</cstring>
</property>
</widget>
<widget class="QComboBox" row="0" column="1">
<widget class="TQComboBox" row="0" column="1">
<property name="name">
<cstring>fontFamily</cstring>
</property>
@ -243,14 +243,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
<widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
<widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3">
<property name="name">
<cstring>sameFamily</cstring>
</property>
@ -273,14 +273,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
<widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>Layout1</cstring>
</property>
@ -294,7 +294,7 @@
<property name="spacing">
<number>6</number>
</property>
<widget class="QPushButton">
<widget class="TQPushButton">
<property name="name">
<cstring>preview</cstring>
</property>
@ -315,7 +315,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="sizeHint">
<property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
@ -324,7 +324,7 @@
</spacer>
</hbox>
</widget>
<widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2">
<widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2">
<property name="name">
<cstring>ButtonGroup2</cstring>
</property>
@ -341,7 +341,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QRadioButton">
<widget class="TQRadioButton">
<property name="name">
<cstring>blackOnWhite</cstring>
</property>