diff options
1248 files changed, 8583 insertions, 8583 deletions
diff --git a/applnk/kde-utilities-xutils.directory b/applnk/kde-utilities-xutils.directory index 807cbafa9..ca0e44eef 100644 --- a/applnk/kde-utilities-xutils.directory +++ b/applnk/kde-utilities-xutils.directory @@ -29,7 +29,7 @@ Name[gl]=Utilidades das X Name[he]=כלי X Name[hi]=à¤à¤•à¥à¤¸-यूटिलिटीज़ Name[hr]=X-alati -Name[hsb]=Potqmocniki za X +Name[hsb]=Pomocniki za X Name[hu]=X segédprogramok Name[is]=X Tól Name[it]=Programmi di X @@ -112,7 +112,7 @@ Comment[gl]=Utilidades das X Window Comment[he]=×›×œ×™× ×©×œ X Window Comment[hi]=à¤à¤•à¥à¤¸ विंडो यूटिलिटीज़ Comment[hr]=Alati X prozora -Comment[hsb]=Potqmocne programy za X11 +Comment[hsb]=Pomocne programy za X11 Comment[hu]=X Window segédprogramok Comment[is]=X gluggatól Comment[it]=Programmi di X Window diff --git a/applnk/kde-utilities.directory b/applnk/kde-utilities.directory index ce2821ec8..edb9d8757 100644 --- a/applnk/kde-utilities.directory +++ b/applnk/kde-utilities.directory @@ -31,7 +31,7 @@ Name[gl]=Utilidades Name[he]=×›×œ×™× Name[hi]=यूटिलिटीज़ Name[hr]=Alati -Name[hsb]=Potqmocniki +Name[hsb]=Pomocniki Name[hu]=Segédprogramok Name[is]=Nytjatól Name[it]=Accessori @@ -115,7 +115,7 @@ Comment[gl]=Utilidades Comment[he]=×›×œ×™× Comment[hi]=यूटिलिटीज़ Comment[hr]=Alati -Comment[hsb]=Potqmocne programy +Comment[hsb]=Pomocne programy Comment[hu]=Segédprogramok Comment[is]=Ãmis nytsamleg áhöld Comment[it]=Accessori diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index f2f4688fa..c60d6a41c 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace() { // remove crap if( !m_krashconf->removeFromBacktraceRegExp().isEmpty()) - m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null); + m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null); if( m_krashconf->disableChecks()) return true; @@ -146,13 +146,13 @@ bool BackTrace::usefulBacktrace() // how many " ?? " in the bt ? int unknown = 0; if( !m_krashconf->invalidStackFrameRegExp().isEmpty()) - unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp())); + unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp())); // how many stack frames in the bt ? int frames = 0; if( !m_krashconf->frameRegExp().isEmpty()) - frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp())); + frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp())); else - frames = strBt.tqcontains('\n'); + frames = strBt.contains('\n'); bool tooShort = false; if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty()) tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 ); @@ -175,7 +175,7 @@ void BackTrace::processBacktrace() --len; } m_strBt.remove( pos, len ); - m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" )); + m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" )); } } } diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h index 70c3a0994..b6779f3eb 100644 --- a/drkonqi/backtrace.h +++ b/drkonqi/backtrace.h @@ -49,7 +49,7 @@ signals: void append(const TQString &str); // Just the new text void someError(); - void done(const TQString &); // tqreplaces whole text + void done(const TQString &); // replaces whole text protected slots: void slotProcessExited(KProcess * proc); diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index b54a0f9ba..c6b073e4f 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, TQWidget *w = new TQWidget( this ); ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true ); m_status = new TQLabel( w ); - m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); + m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) ); //m_copyButton = new KPushButton( KStdGuiItem::copy(), w ); - KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) ); + KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) ); m_copyButton = new KPushButton( item, w ); connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); m_copyButton->setEnabled( false ); @@ -82,7 +82,7 @@ void KrashDebugger :: slotDone(const TQString& str) m_status->setText(i18n("Done.")); m_copyButton->setEnabled( true ); m_saveButton->setEnabled( true ); - m_backtrace->setText( m_prependText + str ); // tqreplace with possibly post-processed backtrace + m_backtrace->setText( m_prependText + str ); // replace with possibly post-processed backtrace } void KrashDebugger :: slotCopy() @@ -109,8 +109,8 @@ void KrashDebugger :: slotSave() } else { - TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" ); - if( defname.tqcontains( '/' )) + TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" ); + if( defname.contains( '/' )) defname = defname.mid( defname.findRev( '/' ) + 1 ); TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename")); if (!filename.isEmpty()) @@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger() bool KrashDebugger::performChecks( TQString* msg ) { bool ret = true; - KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true ); + KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true ); kdedcfg.setGroup( "General" ); if( kdedcfg.readBoolEntry( "DelayedCheck", false )) { diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index ae22606f4..4faccc956 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -93,12 +93,12 @@ void KrashConfig :: readConfig() // maybe we should check if it's relative? TQString configname = config->readEntry("ConfigName", - TQString::tqfromLatin1("enduser")); + TQString::fromLatin1("enduser")); TQString debuggername = config->readEntry("Debugger", - TQString::tqfromLatin1("gdb")); + TQString::fromLatin1("gdb")); - KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername), + KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername), true, false, "appdata"); debuggers.setGroup("General"); @@ -112,7 +112,7 @@ void KrashConfig :: readConfig() m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp"); m_kcrashRegExp = debuggers.readEntry("KCrashRegExp"); - KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname), + KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname), true, false, "appdata"); preset.setGroup("ErrorDescription"); @@ -138,24 +138,24 @@ void KrashConfig :: readConfig() TQString str = TQString::number(m_signalnum); // use group unknown if signal not found if (!preset.hasGroup(str)) - str = TQString::tqfromLatin1("unknown"); + str = TQString::fromLatin1("unknown"); preset.setGroup(str); m_signalName = preset.readEntry("Name"); if (b) m_signalText = preset.readEntry("Comment"); } -// tqreplace some of the strings +// replace some of the strings void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const { TQMap<TQString,TQString> map; - map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName()); - map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("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; + 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; if (shell) str = KMacroExpander::expandMacrosShellQuote( str, map ); else diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index ff18d2488..488edaebd 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name) // picture of konqi TQLabel *lab = new TQLabel(page); lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png"))); + TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png"))); lab->setPixmap(pix); - lab->setFixedSize( lab->tqsizeHint() ); + lab->setFixedSize( lab->sizeHint() ); TQLabel * info = new TQLabel(generateText(), page); - info->setMinimumSize(info->tqsizeHint()); + info->setMinimumSize(info->sizeHint()); if (m_krashconf->showBacktrace()) { @@ -196,7 +196,7 @@ void Toplevel :: slotUser3() void Toplevel :: slotBacktraceDone(const TQString &str) { // Do not translate.. This will be included in the _MAIL_. - TQString buf = TQString::tqfromLatin1 + TQString buf = TQString::fromLatin1 ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str; m_bugreport->setText(buf); diff --git a/kappfinder/README.apps b/kappfinder/README.apps index f293582ce..b0010b473 100644 --- a/kappfinder/README.apps +++ b/kappfinder/README.apps @@ -1,4 +1,4 @@ -The apps directory tqcontains .desktop files for commonly used non-KDE +The apps directory contains .desktop files for commonly used non-KDE programs which kappfinder installs into the applnk directory of KDE. kappfinder used to install .directory files as well because in the past the diff --git a/kappfinder/apps/Games/Toys/xpinguin.desktop b/kappfinder/apps/Games/Toys/xpinguin.desktop index 175a47331..057b3a37d 100644 --- a/kappfinder/apps/Games/Toys/xpinguin.desktop +++ b/kappfinder/apps/Games/Toys/xpinguin.desktop @@ -18,26 +18,26 @@ GenericName[az]=Linuks Maskotu GenericName[be]=ТаліÑман Linux GenericName[bg]=ТалиÑманът на Linux GenericName[bn]=লিনাকà§à¦¸ মà§à¦¯à¦¾à¦¸à§à¦•à¦Ÿ -GenericName[bs]=Linux tqmaskota +GenericName[bs]=Linux maskota GenericName[ca]=Mascota de Linux GenericName[cs]=Maskot Linuxu GenericName[csb]=Glingòtka Linuksa GenericName[cy]=Masgot Linux -GenericName[da]=Linux-tqmaskot +GenericName[da]=Linux-maskot GenericName[de]=Linux-Maskottchen GenericName[el]=Η μασκότ του Linux GenericName[eo]=La linuksa simbolbesto GenericName[es]=Mascota de Linux -GenericName[et]=Linuxi tqmaskott -GenericName[eu]=Linuxen tqmaskota -GenericName[fi]=Linux-tqmaskotti +GenericName[et]=Linuxi maskott +GenericName[eu]=Linuxen maskota +GenericName[fi]=Linux-maskotti GenericName[fr]=La mascotte de Linux -GenericName[fy]=Linux-tqmaskotte +GenericName[fy]=Linux-maskotte GenericName[ga]=Sonóg Linux GenericName[gl]=Mascota Linux GenericName[he]=הקמע של ×œ×™× ×•×§×¡ GenericName[hi]=लिनकà¥à¤¸ शà¥à¤à¤‚कर -GenericName[hr]=Linux tqmaskota +GenericName[hr]=Linux maskota GenericName[hu]=Linux-kabalaállatka GenericName[is]=Linux lukkudýrið GenericName[it]=Mascotte di Linux @@ -51,11 +51,11 @@ GenericName[mk]=МаÑкотата на Ð›Ð¸Ð½ÑƒÐºÑ GenericName[mn]=ЛинукÑ-азын Ñ‚ÑнгÑÑ€ GenericName[ms]=Maskot Linux GenericName[mt]=Maskott tal-Linux -GenericName[nb]=Linux-tqmaskot +GenericName[nb]=Linux-maskot GenericName[nds]=Dat Maskottje vun Linux GenericName[ne]=लिनकà¥à¤¸ मासकोट GenericName[nl]=Linux-mascotte -GenericName[nn]=Linux-tqmaskot +GenericName[nn]=Linux-maskot GenericName[nso]=Mascot wa Linux GenericName[pa]=ਲੀਨਕਸ ਮਾਸਕੋਟ GenericName[pl]=Maskotka Linuksa @@ -66,8 +66,8 @@ GenericName[ru]=Ðмблема Linux GenericName[sk]=Maskot Linuxu GenericName[sl]=Maskota Linuxa GenericName[sr]=Linux-ова маÑкота -GenericName[sr@Latn]=Linux-ova tqmaskota -GenericName[sv]=Linux-tqmaskot +GenericName[sr@Latn]=Linux-ova maskota +GenericName[sv]=Linux-maskot GenericName[ta]=Linux சினà¯à®©à®®à¯ GenericName[te]=లినకà±à°¸à± మాసà±à°•à°¾à°Ÿà± GenericName[tg]=Таъвизи Linux diff --git a/kappfinder/apps/Utilities/Editors/emacs.desktop b/kappfinder/apps/Utilities/Editors/emacs.desktop index b84918ae9..6b8d315ff 100644 --- a/kappfinder/apps/Utilities/Editors/emacs.desktop +++ b/kappfinder/apps/Utilities/Editors/emacs.desktop @@ -86,7 +86,7 @@ GenericName[xh]=Umhleli Wombhalo GenericName[zh_CN]=文本编辑器 GenericName[zh_TW]=æ–‡å—編輯器 GenericName[zu]=Umlungisi wombhalo -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Exec=emacs %f Icon=emacs Path= diff --git a/kappfinder/apps/Utilities/Editors/gvim.desktop b/kappfinder/apps/Utilities/Editors/gvim.desktop index d23f40538..f2b694347 100644 --- a/kappfinder/apps/Utilities/Editors/gvim.desktop +++ b/kappfinder/apps/Utilities/Editors/gvim.desktop @@ -115,7 +115,7 @@ GenericName[xh]=Umhleli Wombhalo GenericName[zh_CN]=文本编辑器 GenericName[zh_TW]=æ–‡å—編輯器 GenericName[zu]=Umlungisi wombhalo -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Exec=gvim -f %f Icon=gvim Type=Application diff --git a/kappfinder/apps/Utilities/Editors/lemacs.desktop b/kappfinder/apps/Utilities/Editors/lemacs.desktop index 203c056a8..fb8f0b620 100644 --- a/kappfinder/apps/Utilities/Editors/lemacs.desktop +++ b/kappfinder/apps/Utilities/Editors/lemacs.desktop @@ -90,7 +90,7 @@ GenericName[xh]=Umhleli Wombhalo GenericName[zh_CN]=文本编辑器 GenericName[zh_TW]=æ–‡å—編輯器 GenericName[zu]=Umlungisi wombhalo -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Exec=lemacs %f Icon=emacs Path= diff --git a/kappfinder/apps/Utilities/Editors/nedit.desktop b/kappfinder/apps/Utilities/Editors/nedit.desktop index 99364eb58..998d3d117 100644 --- a/kappfinder/apps/Utilities/Editors/nedit.desktop +++ b/kappfinder/apps/Utilities/Editors/nedit.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Name=Nedit Name[hi]=नेडिट Name[ka]=NEdit diff --git a/kappfinder/apps/Utilities/Editors/xemacs.desktop b/kappfinder/apps/Utilities/Editors/xemacs.desktop index 7c1b57723..46b773bd9 100644 --- a/kappfinder/apps/Utilities/Editors/xemacs.desktop +++ b/kappfinder/apps/Utilities/Editors/xemacs.desktop @@ -95,7 +95,7 @@ GenericName[xh]=Umhleli Wombhalo GenericName[zh_CN]=文本编辑器 GenericName[zh_TW]=æ–‡å—編輯器 GenericName[zu]=Umlungisi wombhalo -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; Exec=xemacs %f Icon=emacs Type=Application diff --git a/kappfinder/apps/Utilities/calctool.desktop b/kappfinder/apps/Utilities/calctool.desktop index 2a03a0869..af82e0e2e 100644 --- a/kappfinder/apps/Utilities/calctool.desktop +++ b/kappfinder/apps/Utilities/calctool.desktop @@ -37,7 +37,7 @@ GenericName[ca]=Calculadora GenericName[cs]=Kalkulátor GenericName[csb]=Kalkùlator GenericName[cy]=Cyfrifiannell -GenericName[da]=Regnetqmaskine +GenericName[da]=Regnemaskine GenericName[de]=Rechner GenericName[el]=ΑÏιθμομηχανή GenericName[eo]=Kalkulilo @@ -46,7 +46,7 @@ GenericName[et]=Kalkulaator GenericName[eu]=Kalkulagailua GenericName[fa]=ماشین Øساب GenericName[fi]=Laskin -GenericName[fo]=Roknitqmaskina +GenericName[fo]=Roknimaskina GenericName[fr]=Calculatrice GenericName[fy]=Rekkenmasine GenericName[ga]=Ãireamhán diff --git a/kappfinder/apps/Utilities/xutils/xcalc.desktop b/kappfinder/apps/Utilities/xutils/xcalc.desktop index fddb8f86f..6dc3c4953 100644 --- a/kappfinder/apps/Utilities/xutils/xcalc.desktop +++ b/kappfinder/apps/Utilities/xutils/xcalc.desktop @@ -50,7 +50,7 @@ GenericName[ca]=Calculadora GenericName[cs]=Kalkulátor GenericName[csb]=Kalkùlator GenericName[cy]=Cyfrifiannell -GenericName[da]=Regnetqmaskine +GenericName[da]=Regnemaskine GenericName[de]=Rechner GenericName[el]=ΑÏιθμομηχανή GenericName[eo]=Kalkulilo @@ -59,7 +59,7 @@ GenericName[et]=Kalkulaator GenericName[eu]=Kalkulagailua GenericName[fa]=ماشین Øساب GenericName[fi]=Laskin -GenericName[fo]=Roknitqmaskina +GenericName[fo]=Roknimaskina GenericName[fr]=Calculatrice GenericName[fy]=Rekkenmasine GenericName[ga]=Ãireamhán diff --git a/kappfinder/apps/Utilities/xutils/xload.desktop b/kappfinder/apps/Utilities/xutils/xload.desktop index be21fdcce..a6dd72a0a 100644 --- a/kappfinder/apps/Utilities/xutils/xload.desktop +++ b/kappfinder/apps/Utilities/xutils/xload.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=xload -SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -tqgeometry 25x25 +SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -geometry 25x25 SwallowTitle=xload SwallowTitle[no]=xload SwallowTitle[es]=xload diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index 121b05c4a..660c5b498 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -48,16 +48,16 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name : KDialog( parent, name, true ) { setCaption( i18n( "KAppfinder" ) ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, marginHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, marginHint() ); TQLabel *label = new TQLabel( i18n( "The application finder looks for non-KDE " "applications on your system and adds " "them to the KDE menu system. " "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this); - label->tqsetAlignment( AlignAuto | WordBreak ); - tqlayout->addWidget( label ); + label->setAlignment( AlignAuto | WordBreak ); + layout->addWidget( label ); - tqlayout->addSpacing( 5 ); + layout->addSpacing( 5 ); mListView = new TQListView( this ); mListView->addColumn( i18n( "Application" ) ); @@ -67,14 +67,14 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name mListView->setRootIsDecorated( true ); mListView->setAllColumnsShowFocus( true ); mListView->setSelectionMode(TQListView::NoSelection); - tqlayout->addWidget( mListView ); + layout->addWidget( mListView ); mProgress = new KProgress( this ); mProgress->setPercentageVisible( false ); - tqlayout->addWidget( mProgress ); + layout->addWidget( mProgress ); mSummary = new TQLabel( i18n( "Summary:" ), this ); - tqlayout->addWidget( mSummary ); + layout->addWidget( mSummary ); KButtonBox* bbox = new KButtonBox( this ); mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) ); @@ -89,9 +89,9 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) ); mApplyButton->setEnabled( false ); bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) ); - bbox->tqlayout(); + bbox->layout(); - tqlayout->addWidget( bbox ); + layout->addWidget( bbox ); connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) ); @@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name adjustSize(); mDestDir = destDir; - mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" ); + mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" ); KStartupInfo::appStarted(); diff --git a/kate/COPYING.LIB b/kate/COPYING.LIB index 61359d115..789c31eee 100644 --- a/kate/COPYING.LIB +++ b/kate/COPYING.LIB @@ -94,7 +94,7 @@ will lead to faster development of free libraries. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The -former tqcontains code derived from the library, while the latter only +former contains code derived from the library, while the latter only works together with the library. Note that it is possible for a library to be covered by the ordinary @@ -104,7 +104,7 @@ General Public License rather than by this special one. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library which -tqcontains a notice placed by the copyright holder or other authorized +contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Library General Public License (also called "this License"). Each licensee is addressed as "you". @@ -123,7 +123,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it tqcontains, plus any associated +all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -225,7 +225,7 @@ source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. - 5. A program that tqcontains no derivative of any portion of the + 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and @@ -233,7 +233,7 @@ therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it -tqcontains portions of the Library), rather than a "work that uses the +contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. @@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure tqlayouts and accessors, and small macros and small inline +structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/kate/ChangeLog b/kate/ChangeLog index d3ca5da32..68dc0da01 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -1,5 +1,5 @@ 2004-04-22 Christoph Cullmann <cullmann@kde.org> - * kate switched over to katemdi, even smaller tqreplacement for kmdi2 :) + * kate switched over to katemdi, even smaller replacement for kmdi2 :) 2004-10-06 Christoph Cullmann <cullmann@kde.org> * kate switched over to kmdi2, a slim version of old kmdi @@ -133,7 +133,7 @@ * now the pluginconfig pages work ;) 2001-04-24 Joseph Wenninger <jowenn@kde.org> - * now <keywords> and <types> is tqreplaced by <list name="XXXX"> + * now <keywords> and <types> is replaced by <list name="XXXX"> 2001-04-20 Christoph Cullmann <cullmann@kde.org> * new configdialog @@ -268,7 +268,7 @@ * Filter - select text, hit <Ctrl+Backslash>, and enter an OS command. we pipe the selected text thru that command, such as "sort", and then - tqreplace the selection with the result. Impress your friends. + replace the selection with the result. Impress your friends. 2001-02-21 Joseph Wenninger <jowenn@kde.org> * Makefile.am's : correction for linking diff --git a/kate/README b/kate/README index f1a42b24b..67eb04be6 100644 --- a/kate/README +++ b/kate/README @@ -2,7 +2,7 @@ Kate is a fast texteditor for the KDE destop with an Emacs-style document interface. I hope it works well and improves workspeed on many little textfiles. ;-) Our new buffer managment will allow it to open 50MB files ++ in less than 5 seconds -(at least on my 400Mhz P2 ;) It is thought as a more powerful tqreplacement for the old +(at least on my 400Mhz P2 ;) It is thought as a more powerful replacement for the old KWrite app, which will still keep alive for the existing userbase and because it is just a lot smaller and therefor faster on launch than kate. For Kate Plugins, Kate provides the Kate Interfaces, which allow deeper access diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 084b6f313..70c81d465 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -127,7 +127,7 @@ Kate::Application *KateApp::application () /** * Has always been the Kate Versioning Scheme: - * KDE X.Y.Z tqcontains Kate X-1.Y.Z + * KDE X.Y.Z contains Kate X-1.Y.Z */ TQString KateApp::kateVersion (bool fullVersion) { @@ -396,4 +396,4 @@ KateMainWindow *KateApp::mainWindow (uint n) return 0; } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kateappIface.cpp b/kate/app/kateappIface.cpp index eb8b58a4f..259e48b89 100644 --- a/kate/app/kateappIface.cpp +++ b/kate/app/kateappIface.cpp @@ -101,4 +101,4 @@ const TQString & KateAppDCOPIface::session() const return m_app->sessionManager()->activeSession()->sessionName(); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index 370abe97e..47a7de19c 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin) { if ( pluginPages.at(i)->plugin == plugin ) { - TQWidget *w = pluginPages.at(i)->page->tqparentWidget(); + TQWidget *w = pluginPages.at(i)->page->parentWidget(); delete pluginPages.at(i)->page; delete w; pluginPages.remove(pluginPages.at(i)); diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index b599ab202..a160162db 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded() { if (m_part) return; - if (!tqtopLevelWidget() || !tqparentWidget()) return; - if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return; + if (!topLevelWidget() || !parentWidget()) return; + if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return; KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); @@ -86,7 +86,7 @@ void KateConsole::slotDestroyed () m_part = 0; // hide the dockwidget - if (tqparentWidget()) + if (parentWidget()) { m_mw->hideToolView (m_toolView); m_mw->centralWidget()->setFocus (); diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index a8a13ab98..f60c09783 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -86,7 +86,7 @@ KateDocManager::~KateDocManager () { m_metaInfos->setGroup(*it); TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def); - if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos) + if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos) m_metaInfos->deleteGroup(*it); } delete def; @@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL) KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber); } - if ( closeURL && m_tempFiles.tqcontains( documentNumber ) ) + if ( closeURL && m_tempFiles.contains( 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::tqcurrentDateTime()); + m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime()); m_metaInfos->sync(); } } @@ -608,4 +608,4 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result) return true; } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h index 56f006ea8..b35d0a65f 100644 --- a/kate/app/katedocmanager.h +++ b/kate/app/katedocmanager.h @@ -154,4 +154,4 @@ class KateDocManager : public QObject }; #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index a3482f2b5..6680e26a4 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -127,7 +127,7 @@ bool KateExternalTool::checkExec() bool KateExternalTool::valid( const TQString &mt ) const { - return mimetypes.isEmpty() || mimetypes.tqcontains( mt ); + return mimetypes.isEmpty() || mimetypes.contains( 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->tqtopLevelWidget()); + KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget()); if (!dmw) { // kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl; return false; @@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload() bool sepadded = false; for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg ) { - if ( ! tools.tqcontains( *itg ) && - ! removed.tqcontains( *itg ) ) + if ( ! tools.contains( *itg ) && + ! removed.contains( *itg ) ) { if ( ! sepadded ) { @@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged() if ( action ) { l = action->tool->mimetypes; - b = ( ! l.count() || l.tqcontains( mt ) ); + b = ( ! l.count() || l.contains( mt ) ); action->setEnabled( b ); } } @@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leName = new TQLineEdit( w ); lo->addWidget( leName, 1, 2 ); l = new TQLabel( leName, i18n("&Label:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 1, 1 ); if ( tool ) leName->setText( tool->name ); TQWhatsThis::add( leName, i18n( @@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * teCommand = new TQTextEdit( w ); lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 ); l = new TQLabel( teCommand, i18n("S&cript:"), w ); - l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight ); + l->setAlignment( Qt::AlignTop|Qt::AlignRight ); lo->addWidget( l, 2, 1 ); if ( tool ) teCommand->setText( tool->command ); TQWhatsThis::add( teCommand, i18n( @@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leExecutable = new TQLineEdit( w ); lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 ); l = new TQLabel( leExecutable, i18n("&Executable:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 3, 1 ); if ( tool ) leExecutable->setText( tool->tryexec ); TQWhatsThis::add( leExecutable, i18n( @@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leMimetypes = new TQLineEdit( w ); lo->addWidget( leMimetypes, 4, 2 ); l = new TQLabel( leMimetypes, i18n("&Mime types:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 4, 1 ); if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") ); TQWhatsThis::add( leMimetypes, i18n( @@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * cmbSave = new TQComboBox(w); lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 ); l = new TQLabel( cmbSave, i18n("&Save:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|Qt::AlignRight ); lo->addWidget( l, 5, 1 ); TQStringList sl; sl << i18n("None") << i18n("Current Document") << i18n("All Documents"); @@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * leCmdLine = new TQLineEdit( w ); lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 ); l = new TQLabel( leCmdLine, i18n("&Command line name:"), w ); - l->tqsetAlignment( l->tqalignment()|Qt::AlignRight ); + l->setAlignment( l->alignment()|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).tqreplace( TQRegExp("\\W+"), "" ); + t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" ); new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t ); @@ -870,4 +870,4 @@ void KateExternalToolsConfigWidget::slotMoveDown() m_changed = true; } //END KateExternalToolsConfigWidget -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h index 71cc5eaf0..507e1cfca 100644 --- a/kate/app/kateexternaltools.h +++ b/kate/app/kateexternaltools.h @@ -76,7 +76,7 @@ class KateExternalToolsMenuAction : public KActionMenu }; /** - * This Action tqcontains a KateExternalTool + * This Action contains a KateExternalTool */ class KateExternalToolAction : public KAction, public KWordMacroExpander { diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 343f66a9a..47c8aa75b 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -69,7 +69,7 @@ class ToolTip : public QToolTip KateFileListItem *item = ((KateFileListItem*)i); if ( ! item ) return; - tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) ); + tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) ); } @@ -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 ); - tqrepaintItem( m_editHistory.at( i ) ); + repaintItem( m_editHistory.at( i ) ); } } else - tqrepaintItem( item ); + repaintItem( 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() ); - tqrepaintItem( item ); + repaintItem( 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 tqrepaint items that needs it +// int p = m_viewHistory.findRef( item ); // only repaint 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 ); - tqrepaintItem( m_viewHistory.at( i ) ); + repaintItem( m_viewHistory.at( i ) ); } } @@ -475,7 +475,7 @@ void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, i { TQColorGroup cgNew = cg; - // tqreplace the base color with a different shading if necessary... + // replace the base color with a different shading if necessary... if ( fl->shadingEnabled() && m_viewhistpos > 1 ) { TQColor b( cg.base() ); @@ -616,7 +616,7 @@ void KFLConfigPage::apply() m_filelist->m_editShade = kcbEditShade->color(); m_filelist->m_enableBgShading = cbEnableShading->isChecked(); m_filelist->setSortType( cmbSort->currentItem() ); - // tqrepaint the affected items + // repaint the affected items m_filelist->triggerUpdate(); } @@ -649,4 +649,4 @@ void KFLConfigPage::slotMyChanged() //END KFLConfigPage -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h index 837761780..e90281558 100644 --- a/kate/app/katefilelist.h +++ b/kate/app/katefilelist.h @@ -188,4 +188,4 @@ class KFLConfigPage : public Kate::ConfigPage { #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 789b6f735..5ab42a289 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { - setMinimumHeight(m_tb->tqsizeHint().height()); + setMinimumHeight(m_tb->sizeHint().height()); m_tb->resize(width(),height()); } } @@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, { mActionCollection = new KActionCollection( this ); - QtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar ); + QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this); toolbar = new KateFileSelectorToolBar(tbp); tbp->setToolBar(toolbar); toolbar->setMovingEnabled(false); toolbar->setFlat(true); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion); cmbPath->setCompletionObject( cmpl ); cmbPath->setAutoDeleteCompletionObject( true ); @@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, btnFilter->setIconSet( SmallIconSet("filter" ) ); btnFilter->setToggleButton( true ); filter = new KHistoryCombo( true, filterBox, "filter"); - filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); @@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u ) newurl.setPath(pathstr); if ( !kateFileSelectorIsReadable ( newurl ) ) - newurl.cd(TQString::tqfromLatin1("..")); + newurl.cd(TQString::fromLatin1("..")); if ( !kateFileSelectorIsReadable (newurl) ) newurl.setPath( TQDir::homeDirPath() ); @@ -692,13 +692,13 @@ void KFSConfigPage::init() KAction *ac; TQListBox *lb; for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { - lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox(); + lb = l.contains( *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().tqreplace( re, "" ), *it ); + new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it ); } // sync @@ -719,4 +719,4 @@ void KFSConfigPage::slotMyChanged() slotChanged(); } //END KFSConfigPage -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h index 4a52a6ea1..442d3101e 100644 --- a/kate/app/katefileselector.h +++ b/kate/app/katefileselector.h @@ -169,4 +169,4 @@ class KFSConfigPage : public Kate::ConfigPage { #endif //__KATE_FILESELECTOR_H__ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index 99d0b7501..409bfd0a1 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -85,22 +85,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) << "*"; } - TQGridLayout *tqlayout = new TQGridLayout(this, 6, 3, 4, 4); - tqlayout->setColStretch(0, 10); - tqlayout->addColSpacing(1, 10); - tqlayout->setColStretch(1, 0); - tqlayout->setColStretch(2, 1); - tqlayout->setRowStretch(1, 0); - tqlayout->setRowStretch(2, 10); - tqlayout->setRowStretch(4, 0); + TQGridLayout *layout = new TQGridLayout(this, 6, 3, 4, 4); + layout->setColStretch(0, 10); + layout->addColSpacing(1, 10); + layout->setColStretch(1, 0); + layout->setColStretch(2, 1); + layout->setRowStretch(1, 0); + layout->setRowStretch(2, 10); + layout->setRowStretch(4, 0); TQGridLayout *loInput = new TQGridLayout(4, 2, 4); - tqlayout->addLayout(loInput, 0, 0); + layout->addLayout(loInput, 0, 0); loInput->setColStretch(0, 0); loInput->setColStretch(1, 20); TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this); - lPattern->setFixedSize(lPattern->tqsizeHint()); + lPattern->setFixedSize(lPattern->sizeHint()); loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter); TQBoxLayout *loPattern = new TQHBoxLayout( 4 ); @@ -112,22 +112,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion); lPattern->setBuddy(cmbPattern); cmbPattern->setFocus(); - cmbPattern->setMinimumSize(cmbPattern->tqsizeHint()); + cmbPattern->setMinimumSize(cmbPattern->sizeHint()); loPattern->addWidget( cmbPattern ); cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this); - cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width()); + cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width()); cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true)); loPattern->addWidget(cbCasesensitive); cbRegex = new TQCheckBox( i18n("Regular expression"), this ); - cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() ); + cbRegex->setMinimumWidth( cbRegex->sizeHint().width() ); cbRegex->setChecked( config->readBoolEntry( "Regex", true ) ); loPattern->addWidget( cbRegex ); loPattern->setStretchFactor( cmbPattern, 100 ); TQLabel *lTemplate = new TQLabel(i18n("Template:"), this); - lTemplate->setFixedSize(lTemplate->tqsizeHint()); + lTemplate->setFixedSize(lTemplate->sizeHint()); loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter); TQBoxLayout *loTemplate = new TQHBoxLayout(4); @@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) leTemplate = new KLineEdit(this); lTemplate->setBuddy(leTemplate); leTemplate->setText(strTemplate[0]); - leTemplate->setMinimumSize(leTemplate->tqsizeHint()); + leTemplate->setMinimumSize(leTemplate->sizeHint()); loTemplate->addWidget(leTemplate); KComboBox *cmbTemplate = new KComboBox(false, this); @@ -146,19 +146,19 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) loTemplate->addWidget(cmbTemplate); TQLabel *lFiles = new TQLabel(i18n("Files:"), this); - lFiles->setFixedSize(lFiles->tqsizeHint()); + lFiles->setFixedSize(lFiles->sizeHint()); loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter); cmbFiles = new KComboBox(true, this); lFiles->setBuddy(cmbFiles->focusProxy()); - cmbFiles->setMinimumSize(cmbFiles->tqsizeHint()); + cmbFiles->setMinimumSize(cmbFiles->sizeHint()); cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion); cmbFiles->setDuplicatesEnabled(false); cmbFiles->insertStringList(lastSearchFiles); loInput->addWidget(cmbFiles, 2, 1); TQLabel *lDir = new TQLabel(i18n("Folder:"), this); - lDir->setFixedSize(lDir->tqsizeHint()); + lDir->setFixedSize(lDir->sizeHint()); loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter); TQBoxLayout *loDir = new TQHBoxLayout(3); @@ -176,24 +176,24 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) lDir->setBuddy(cmbDir); cbRecursive = new TQCheckBox(i18n("Recursive"), this); - cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width()); + cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width()); cbRecursive->setChecked(config->readBoolEntry("Recursive", true)); loDir->addWidget(cbRecursive); KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical); - tqlayout->addWidget(actionbox, 0, 2); + layout->addWidget(actionbox, 0, 2); actionbox->addStretch(); btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"find"))); btnSearch->setDefault(true); btnClear = static_cast<KPushButton*>(actionbox->addButton( KStdGuiItem::clear() )); actionbox->addStretch(); - actionbox->tqlayout(); + actionbox->layout(); lbResult = new TQListBox(this); TQFontMetrics rb_fm(lbResult->fontMetrics()); - tqlayout->addMultiCellWidget(lbResult, 2, 2, 0, 2); + layout->addMultiCellWidget(lbResult, 2, 2, 0, 2); - tqlayout->activate(); + layout->activate(); KAcceleratorManager::manage( this ); @@ -225,11 +225,11 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) "You may give several patterns separated by commas.")); TQWhatsThis::add(lTemplate, i18n("You can choose a template for the pattern from the combo box\n" - "and edit it here. The string %s in the template is tqreplaced\n" + "and edit it here. The string %s in the template is replaced\n" "by the pattern input field, resulting in the regular expression\n" "to search for.")); TQWhatsThis::add(lDir, - i18n("Enter the folder which tqcontains the files in which you want to search.")); + i18n("Enter the folder which contains the files in which you want to search.")); TQWhatsThis::add(cbRecursive, i18n("Check this box to search in all subfolders.")); TQWhatsThis::add(cbCasesensitive, @@ -329,7 +329,7 @@ void GrepTool::slotSearch() return; } - if ( ! leTemplate->text().tqcontains("%s") ) + if ( ! leTemplate->text().contains("%s") ) { leTemplate->setFocus(); return; @@ -347,9 +347,9 @@ void GrepTool::slotSearch() TQString s = cmbPattern->currentText(); if ( ! cbRegex->isChecked() ) - s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" ); + s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" ); TQString pattern = leTemplate->text(); - pattern.tqreplace( "%s", s ); + pattern.replace( "%s", s ); childproc = new KProcess(); childproc->setWorkingDirectory( m_workingDir ); @@ -476,7 +476,7 @@ void GrepTool::childExited() if ( ! errbuf.isEmpty() ) { - KMessageBox::information( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") ); + KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") ); errbuf.truncate(0); } else diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 52bf1f243..79a1e19c6 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) } list->hide(); connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) ); - mw->setMinimumSize( lInfo->tqsizeHint() ); + mw->setMinimumSize( lInfo->sizeHint() ); } TQPtrList<Kate::Document> KateMailDialog::selectedDocs() @@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton() lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") ); } - mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) ); - setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) ); + mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) ); + setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) ); resize( width(), minimumHeight() ); } #include "katemailfilesdialog.moc" diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 9ba62782a..371161de0 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -253,4 +253,4 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) return app.exec(); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 331194159..dea2b0fae 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -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(tqparentWidget()); + int scnum = TQApplication::desktop()->screenNumber(parentWidget()); 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::tqfromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); } // if thats fails, try to reuse size @@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup) { // first try global app config KateApp::self()->config()->setGroup ("MainWindow"); - size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 )); - size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 )); + size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 )); + size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 )); if (size.isEmpty()) size = TQSize (kMin (700, desk.width()), kMin(480, desk.height())); @@ -851,4 +851,4 @@ void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig ) sessionConfig->writeEntry ("Last Session", KateApp::self()->sessionManager()->activeSession()->sessionFileRelative()); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h index e0859bcbd..77db9999c 100644 --- a/kate/app/katemainwindow.h +++ b/kate/app/katemainwindow.h @@ -213,4 +213,4 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 64aef77bc..9d73e762c 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw ) if ( domDocument().documentElement().isNull() ) { - TQString completeDescription = TQString::tqfromLatin1( guiDescription ) + TQString completeDescription = TQString::fromLatin1( guiDescription ) .arg( actionListName ); setXML( completeDescription, false /*merge*/ ); @@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi bool Sidebar::removeWidget (ToolView *widget) { - if (!m_widgetToId.tqcontains(widget)) + if (!m_widgetToId.contains(widget)) return false; removeTab(m_widgetToId[widget]); @@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget) bool Sidebar::showWidget (ToolView *widget) { - if (!m_widgetToId.tqcontains(widget)) + if (!m_widgetToId.contains(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.tqcontains(widget)) + if (!m_widgetToId.contains(widget)) return false; bool anyVis = false; @@ -579,7 +579,7 @@ void Sidebar::restoreSession (KConfig *config) } // then: remove this items from the button bar - // do this backwards, to minimize the retqlayout efforts + // do this backwards, to minimize the relayout efforts for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i) { removeTab (m_widgetToId[m_toolviews[i]]); @@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config) //BEGIN MAIN WINDOW -MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name) - : KParts::MainWindow( tqparentWidget, name) +MainWindow::MainWindow (TQWidget* parentWidget, const char* name) + : KParts::MainWindow( parentWidget, name) , m_sidebarsVisible(true) , m_restoreConfig (0) , m_guiClient (new GUIClient (this)) diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h index 915589d77..1b13c30a8 100644 --- a/kate/app/katemdi.h +++ b/kate/app/katemdi.h @@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow /** * Constructor */ - MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0); + MainWindow (TQWidget* parentWidget = 0, const char* name = 0); /** * Destructor diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index 263d06c7e..5199a6925 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -91,7 +91,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons // document list lvDocuments = new KListView( w ); lvDocuments->addColumn( i18n("Filename") ); - lvDocuments->addColumn( i18n("tqStatus on Disk") ); + lvDocuments->addColumn( i18n("Status on Disk") ); lvDocuments->setSelectionMode( TQListView::Single ); TQStringList l; @@ -278,4 +278,4 @@ void KateMwModOnHdDialog::slotPDone( KProcess *p ) m_tmpfile = 0; } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h index 121761f38..7a5d8f7ca 100644 --- a/kate/app/katemwmodonhddialog.h +++ b/kate/app/katemwmodonhddialog.h @@ -58,4 +58,4 @@ class KateMwModOnHdDialog : public KDialogBase }; #endif // _KATE_MW_MODONHD_DIALOG_H_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index 70c844804..fd0e059f9 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -917,4 +917,4 @@ void KateSessionsAction::openSession (int i) KateSessionManager::self()->activateSession(slist[(uint)i]); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp index cd9df55d1..4b278e327 100644 --- a/kate/app/katetabwidget.cpp +++ b/kate/app/katetabwidget.cpp @@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in KTabWidget::insertTab(child,label,index); showPage(child); maybeShow(); - tabBar()->tqrepaint(); + tabBar()->repaint(); } 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()->tqrepaint(); + tabBar()->repaint(); } 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()->tqrepaint(); + tabBar()->repaint(); } void KateTabWidget::removePage ( TQWidget * w ) diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 08f080fec..c62e6e082 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -511,4 +511,4 @@ KateMainWindow *KateViewManager::mainWindow() { return m_mainWindow; } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index de7090215..43a73a2b6 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -67,9 +67,9 @@ protected: void paintEvent( TQPaintEvent *e ) { TQPainter p( this ); - p.setPen( tqcolorGroup().shadow() ); + p.setPen( colorGroup().shadow() ); p.drawLine( e->rect().left(), 0, e->rect().right(), 0 ); - p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() ); + p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() ); p.drawLine( e->rect().left(), 1, e->rect().right(), 1 ); } }; @@ -226,9 +226,9 @@ bool KateViewSpace::event( TQEvent *e ) return TQVBox::event( e ); } -void KateViewSpace::slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg) +void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg) { - if ((TQWidgetStack *)view->tqparentWidget() != stack) + if ((TQWidgetStack *)view->parentWidget() != 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->tqsetAlignment( Qt::AlignCenter ); + m_lineColLabel->setAlignment( Qt::AlignCenter ); m_lineColLabel->installEventFilter( this ); m_modifiedLabel = new TQLabel( TQString(" "), this ); addWidget( m_modifiedLabel, 0, false ); - m_modifiedLabel->tqsetAlignment( Qt::AlignCenter ); + m_modifiedLabel->setAlignment( Qt::AlignCenter ); m_modifiedLabel->installEventFilter( this ); m_insertModeLabel = new TQLabel( i18n(" INS "), this ); addWidget( m_insertModeLabel, 0, false ); - m_insertModeLabel->tqsetAlignment( Qt::AlignCenter ); + m_insertModeLabel->setAlignment( Qt::AlignCenter ); m_insertModeLabel->installEventFilter( this ); m_selectModeLabel = new TQLabel( i18n(" NORM "), this ); addWidget( m_selectModeLabel, 0, false ); - m_selectModeLabel->tqsetAlignment( Qt::AlignCenter ); + m_selectModeLabel->setAlignment( Qt::AlignCenter ); m_selectModeLabel->installEventFilter( this ); m_fileNameLabel=new KSqueezedTextLabel( this ); addWidget( m_fileNameLabel, 1, true ); m_fileNameLabel->setMinimumSize( 0, 0 ); - m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); - m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); + m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft ); m_fileNameLabel->installEventFilter( this ); installEventFilter( this ); @@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged() void KateVSStatusBar::showMenu() { - KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() ); + KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() ); TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) ); if (menu) @@ -419,4 +419,4 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e) return false; } //END KateVSStatusBar -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h index 9f1106aab..b6a5a185e 100644 --- a/kate/app/kateviewspace.h +++ b/kate/app/kateviewspace.h @@ -110,7 +110,7 @@ class KateViewSpace : public QVBox TQString m_group; private slots: - void slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg); + void slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg); public slots: void polish(); @@ -118,4 +118,4 @@ class KateViewSpace : public QVBox }; #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index a441e3adb..1e05e8b5a 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -69,7 +69,7 @@ KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManage m_viewSpaceList.setAutoDelete(true); KateViewSpace* vs = new KateViewSpace( this, this ); - connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&))); + connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&))); vs->setActive( true ); m_viewSpaceList.append(vs); connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) ); @@ -124,7 +124,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc ) connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg())); connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg())); - connect(view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(statusMsg())); + connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg())); connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg())); connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *))); connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *))); @@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace) { if (!view) return true; - KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget(); + KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget(); viewspace->removeView (view); @@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v) { if (!v) return; - KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget(); + KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget(); if (!vs->isActiveSpace()) { setActiveSpace (vs); @@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, if (!activeView()) return; if (!vs) vs = activeViewSpace(); - bool isFirstTime = vs->tqparentWidget() == this; + bool isFirstTime = vs->parentWidget() == this; TQValueList<int> psizes; if ( ! isFirstTime ) - if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) ) + if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_cast("TQSplitter")) ) psizes = ps->sizes(); Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal; - KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget()); + KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget()); 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->tqparentWidget())->isLastChild( vs ) ) - ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s ); + if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) ) + ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s ); } vs->reparent( s, 0, TQPoint(), true ); KateViewSpace* vsNew = new KateViewSpace( this, s ); @@ -471,17 +471,17 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, s->moveToFirst( vsNew ); if (!isFirstTime) - if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) ) + if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast("TQSplitter")) ) ps->setSizes( psizes ); s->show(); TQValueList<int> sizes; - int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2; + int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2; sizes << space << space; s->setSizes( sizes ); - connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &))); + connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &))); m_viewSpaceList.append( vsNew ); activeViewSpace()->setActive( false ); vsNew->setActive( true, true ); @@ -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->tqparentWidget(); + KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget(); // find out if it is the first child for repositioning // see below @@ -512,9 +512,9 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) // save some size information KateMDI::Splitter* pp=0L; TQValueList<int> ppsizes; - if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this) + if (m_viewSpaceList.count() > 2 && p->parentWidget() != this) { - pp = (KateMDI::Splitter*)p->tqparentWidget(); + pp = (KateMDI::Splitter*)p->parentWidget(); ppsizes = pp->sizes(); pIsFirst = !pp->isLastChild( p ); // simple logic, right- } @@ -554,10 +554,10 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace) { TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)p->children())->first()); - other->reparent( p->tqparentWidget(), 0, TQPoint(), true ); + other->reparent( p->parentWidget(), 0, TQPoint(), true ); // We also need to find the right viewspace to become active if (pIsFirst) - ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other ); + ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other ); if ( other->isA("KateViewSpace") ) { setActiveSpace( (KateViewSpace*)other ); } @@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &g { KateViewSpace* vs = new KateViewSpace( this, s ); - connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &))); + connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &))); if (m_viewSpaceList.isEmpty()) vs->setActive (true); @@ -755,4 +755,4 @@ KateMainWindow *KateViewSpaceContainer::mainWindow() { return m_viewManager->mainWindow(); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 2ac1e5d9e..efb71b767 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -96,8 +96,8 @@ KWrite::KWrite (KTextEditor::Document *doc) setAcceptDrops(true); - connect(m_view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(newCaption())); - connect(m_view,TQT_SIGNAL(viewtqStatusMsg(const TQString &)),this,TQT_SLOT(newtqStatus(const TQString &))); + connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption())); + connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &))); connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption())); connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged())); connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *))); @@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc) // init with more usefull size, stolen from konq :) if (!initialGeometrySet()) - resize( TQSize(700, 480).expandedTo(tqminimumSizeHint())); + resize( TQSize(700, 480).expandedTo(minimumSizeHint())); // call it as last thing, must be sure everything is already set up ;) setAutoSaveSettings (); @@ -163,7 +163,7 @@ void KWrite::setupActions() // setup Settings menu setStandardToolBarMenuEnabled(true); - m_paShowStatusBar = KStdAction::showtqStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); + m_paShowStatusBar = KStdAction::showStatusbar(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()), @@ -320,7 +320,7 @@ void KWrite::printDlg() KTextEditor::printInterface(m_view->document())->printDialog (); } -void KWrite::newtqStatus(const TQString &msg) +void KWrite::newStatus(const TQString &msg) { newCaption(); @@ -709,4 +709,4 @@ void KWriteEditorChooser::slotOk() { m_chooser->writeAppSetting(); KDialogBase::slotOk(); } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h index 91c4240ff..6a3565a6c 100644 --- a/kate/app/kwritemain.h +++ b/kate/app/kwritemain.h @@ -76,7 +76,7 @@ class KWrite : public KParts::MainWindow void printNow(); void printDlg(); - void newtqStatus(const TQString &msg); + void newStatus(const TQString &msg); void newCaption(); void slotDropEvent(TQDropEvent *); @@ -135,4 +135,4 @@ class KWriteEditorChooser: public KDialogBase }; #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; diff --git a/kate/data/tips b/kate/data/tips index 5d74a1202..aaee34424 100644 --- a/kate/data/tips +++ b/kate/data/tips @@ -83,9 +83,9 @@ in the active frame.</p> </tip> <tip category="Kate|part"> <html> -<p>You can do cool sed-like regular expression tqreplacements using <em>Command Line</em>.</p> +<p>You can do cool sed-like regular expression replacements using <em>Command Line</em>.</p> <p>For example, press <strong>F7</strong> and enter <code>s /oldtext/newtext/g</code> -to tqreplace "oldtext" with "newtext" throughout the current +to replace "oldtext" with "newtext" throughout the current line.</p> </html> </tip> diff --git a/kate/interfaces/mainwindow.cpp b/kate/interfaces/mainwindow.cpp index 26dbe913d..4596cacb5 100644 --- a/kate/interfaces/mainwindow.cpp +++ b/kate/interfaces/mainwindow.cpp @@ -79,4 +79,4 @@ ToolViewManager *MainWindow::toolViewManager () const } -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h index b0874458a..5c8449b62 100644 --- a/kate/interfaces/mainwindow.h +++ b/kate/interfaces/mainwindow.h @@ -62,4 +62,4 @@ class KDE_EXPORT MainWindow : public QObject #endif -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kate/utils/dockviewbase.cpp b/kate/utils/dockviewbase.cpp index 6048f9b70..76e5844ed 100644 --- a/kate/utils/dockviewbase.cpp +++ b/kate/utils/dockviewbase.cpp @@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title ) { setSpacing( 4 ); d->header = new TQWidget( this ); - d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); + d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) ); TQHBoxLayout *lo = new TQHBoxLayout( d->header ); lo->setSpacing( 6 ); lo->insertSpacing( 0, 6 ); diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 757c751de..507d648c9 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -113,10 +113,10 @@ void KCMInit::runModules( int phase ) TQString libName = TQString("kcm_%1").arg(library); // try to load the library - if (! alreadyInitialized.tqcontains( libName.ascii() )) { + if (! alreadyInitialized.contains( libName.ascii() )) { if (!runModule(libName, service)) { libName = TQString("libkcm_%1").arg(library); - if (! alreadyInitialized.tqcontains( libName.ascii() )) { + if (! alreadyInitialized.contains( libName.ascii() )) { runModule(libName, service); alreadyInitialized.append( libName.ascii() ); } @@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args ) runModules( 0 ); kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit")); sendReady(); - TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case - tqApp->exec(); // wait for runPhase1() and runPhase2() + TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case + qApp->exec(); // wait for runPhase1() and runPhase2() } else runModules( -1 ); // all phases @@ -215,7 +215,7 @@ void KCMInit::runPhase2() { runModules( 2 ); emitDCOPSignal( "phase2Done()", TQByteArray()); - tqApp->exit( 0 ); + qApp->exit( 0 ); } extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) diff --git a/kcontrol/TODO b/kcontrol/TODO index 48d8587b4..b3b8d2971 100644 --- a/kcontrol/TODO +++ b/kcontrol/TODO @@ -88,11 +88,11 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-KDE-s // Not sure where these next three are is this OLD and from KDE2 and has already been done? -* Remove "Internet & Network/Email". It is tqreplaced by the new kcm_useraccount +* Remove "Internet & Network/Email". It is replaced by the new kcm_useraccount -* Remove "System Administration/User Info". It is tqreplaced by the new kcm_useraccount +* Remove "System Administration/User Info". It is replaced by the new kcm_useraccount -* Remove "Privacy & Crypto/Passwords". It is tqreplaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron) +* Remove "Privacy & Crypto/Passwords". It is replaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron) * Tell Konqi to go burn the 11 tabs of keyboard options(5 KCMs). Because it is.. bizarre. Two KCMs with two tabs each is absolute maximum. One KCM with three tabs is quite ok too. @@ -151,9 +151,9 @@ The current dialog should appear as an advanced tab behind the "Theme"-tab. Network -> Talk Configuration ----------------------------- Answering Machine: A groupbox around "Address:, Subject:, First Line:" would be nice. That way one wouldn't need to mention "Mail" each time. The Groupbox could be named something like "Anwering Mail". -That way one would have a much cleaner tqlayout and it would be much easier to see at once what the dialog is about. +That way one would have a much cleaner layout and it would be much easier to see at once what the dialog is about. Forward: Way too much text here. I see the point of having a direct explanation in the dialog. But this could look much friendlier using the following solution: -There should be a Textbox below the "Forward method"-Combobox. This Textbox only tqcontains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected). +There should be a Textbox below the "Forward method"-Combobox. This Textbox only contains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected). Sound -> Sound Server --------------------- @@ -164,5 +164,5 @@ Web Browsing -> User Agent The Dialog suffers from the cockpit-dilemma. All the new "Add"-checkboxes are only there for finetuning. Most of the time the useragent-strings should work w/o the need to tune them this way. Better Solution: Remove the Customize-Group-box and simply add a Button "Customize ..." below the Text: "Current User Agent String: Mozilla/5.0 (comp.; Konq.orwhateveritis)". -After pressing the "Customize"-Button a dialog should pop up which tqcontains all the nice +After pressing the "Customize"-Button a dialog should pop up which contains all the nice "Add"-checkboxes which have been added recently. diff --git a/kcontrol/access/eventsrc b/kcontrol/access/eventsrc index f8ac0d207..185460ec4 100644 --- a/kcontrol/access/eventsrc +++ b/kcontrol/access/eventsrc @@ -130,7 +130,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar Comment[cs]=ModifikaÄnà kláves (napÅ™. Shift nebo Control) zmÄ›nila svůj stav a je nynà aktivnÃ. Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniÅ‚a stón ë je terô aktiwnô Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu aktiv -Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt aktiv +Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt aktiv Comment[el]=Άλλαξε η κατάσταση ενός πλήκτÏου Ï„Ïοποποιητή (Ï€.χ. Shift ή Control) και Ï„ÏŽÏα είναι ενεÏγό Comment[eo]=Modifa klavo (ekz. majuskliga klavo aÅ stirklavo) ÅanÄis sian staton kaj nun estas aktiva Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y está activa ahora @@ -242,7 +242,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar Comment[cs]=ModifikaÄnà kláves (napÅ™. Shift nebo Control) zmÄ›nila svůj stav a je nynà neaktivnÃ. Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniÅ‚a stón ë je terô aktiwnô Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu inaktiv -Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt inaktiv +Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt inaktiv Comment[el]=Άλλαξε η κατάσταση ενός πλήκτÏου Ï„Ïοποποιητή (Ï€.χ. Shift ή Control) και Ï„ÏŽÏα είναι ανενεÏγό Comment[eo]=Modifa klavo (ekz. majuskliga klavo aÅ stirklavo) ÅanÄis sian staton kaj nun estas malaktiva Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y ahora está inactiva @@ -466,7 +466,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta Comment[cs]=Klávesa zámku (napÅ™. Caps Lock nebo Num Lock) zmÄ›nila svůj stav a je nynà aktivnà Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniÅ‚Ä… stón ë nie je terô aktiwnô Comment[da]=En lÃ¥setast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu aktiv -Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun aktiv +Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun aktiv Comment[el]=Ένα πλήκτÏο κλειδώματος (Ï€.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι Ï„ÏŽÏα ανενεÏγό Comment[eo]=Åœlosa klavo (ekz. majuskla baskulo aÅ Cifera baskulo) ÅanÄis sian staton kaj nun estas aktiva Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva @@ -579,7 +579,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta Comment[cs]=Klávesa zámku (napÅ™. Caps Lock nebo Num Lock) zmÄ›nila svůj stav a je nynà aktivnà Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniÅ‚a stón ë nie je terô aktiwnô Comment[da]=En lÃ¥setast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu inaktiv -Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun inaktiv +Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun inaktiv Comment[el]=Ένα πλήκτÏο κλειδώματος (Ï€.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι Ï„ÏŽÏα ανενεÏγό Comment[eo]=baskula klavo (ekz. majuskla baskulo aÅ nombra baskulo) ÅanÄis staton, kaj jam ne estas aktiva Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 5dca89695..10c593ed7 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -31,7 +31,7 @@ #include "kaccess.moc" struct ModifierKey { - const unsigned int tqmask; + const unsigned int mask; const KeySym keysym; const char *name; const char *lockedText; @@ -303,9 +303,9 @@ void KAccessApp::readSettings() overlay = 0; } -static int tqmaskToBit (int tqmask) { +static int maskToBit (int mask) { for (int i = 0; i < 8; i++) - if (tqmask & (1 << i)) + if (mask & (1 << i)) return i; return -1; } @@ -316,19 +316,19 @@ void KAccessApp::initMasks() { state = 0; for (int i = 0; strcmp (modifierKeys[i].name, "") != 0; i++) { - int tqmask = modifierKeys[i].tqmask; - if (tqmask == 0) + int mask = modifierKeys[i].mask; + if (mask == 0) if (modifierKeys[i].keysym != 0) - tqmask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym); + mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym); else if (!strcmp(modifierKeys[i].name, "Win")) - tqmask = KKeyNative::modX(KKey::WIN); + mask = KKeyNative::modX(KKey::WIN); else - tqmask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch) + mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch) | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Shift) | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Latch) | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Lock); - int bit = tqmaskToBit (tqmask); + int bit = maskToBit (mask); if (bit != -1 && keys[bit] == -1) keys[bit] = i; } @@ -496,7 +496,7 @@ TQString mouseKeysShortcut (Display *display) { { if (type->map[i].active && (type->map[i].level == level)) { - modifiers = type->map[i].mods.tqmask; + modifiers = type->map[i].mods.mask; found = true; } } @@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() { TQVBoxLayout * vlay = new TQVBoxLayout(lay); featuresLabel = new TQLabel( "", contents ); - featuresLabel->tqsetAlignment( WordBreak|AlignVCenter ); + featuresLabel->setAlignment( WordBreak|AlignVCenter ); vlay->addWidget( featuresLabel ); vlay->addStretch(); diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index ecd55e02b..d7e114c55 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -142,7 +142,7 @@ TQString mouseKeysShortcut (Display *display) { { if (type->map[i].active && (type->map[i].level == level)) { - modifiers = type->map[i].mods.tqmask; + modifiers = type->map[i].mods.mask; found = true; } } @@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(), + TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), 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->tqsizeHint().height()*2); + colorButton->setFixedWidth(colorButton->sizeHint().height()*2); hbox->addWidget(colorButton); hbox->addStretch(); TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") ); @@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) grp->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(grp); - vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), 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->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyModifiersButton->setSizePolicy(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->tqlayout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), 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->tqlayout(), KDialog::spacingHint()); + vvbox = new TQVBoxLayout(grp->layout(), 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->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyAccessXButton); connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui index f18758eac..5d0069a09 100644 --- a/kcontrol/accessibility/accessibilityconfigwidget.ui +++ b/kcontrol/accessibility/accessibilityconfigwidget.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>AccessibilityConfigWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -152,7 +152,7 @@ Please note that on slow machines this may cause a "lag" between the event causi </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>15</height> @@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>61</height> @@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi <property name="text"> <string>Ma&ximum speed:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <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 &time:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <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="tqsizeHint"> + <property name="sizeHint"> <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>&Repeat interval:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <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 &profile:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <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>&Acceleration delay:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>1</height> @@ -1610,8 +1610,8 @@ Please note that on slow machines this may cause a "lag" between the event causi <slots> <slot access="private" specifier="non virtual">updateFlashScreenColor()</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcmodule.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 68ca85932..792951aec 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -116,7 +116,7 @@ void KArtsModule::initAudioIOList() void KArtsModule::slotArtsdExited(KProcess* proc) { - latestProcesstqStatus = proc->exitStatus(); + latestProcessStatus = proc->exitStatus(); delete proc; } @@ -151,17 +151,17 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) initAudioIOList(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQTabWidget *tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); general = new generalTab(tab); hardware = new hardwareTab(tab); //mixer = KCModuleLoader::loadModule("kmixcfg", tab); //midi = new KMidConfig(tab, "kmidconfig"); - general->tqlayout()->setMargin( KDialog::marginHint() ); - hardware->tqlayout()->setMargin( KDialog::marginHint() ); + general->layout()->setMargin( KDialog::marginHint() ); + hardware->layout()->setMargin( KDialog::marginHint() ); general->latencyLabel->setFixedHeight(general->latencyLabel->fontMetrics().lineSpacing()); tab->addTab(general, i18n("&General")); @@ -499,7 +499,7 @@ void KArtsModule::updateWidgets() if (item >= 0) { audioIO = audioIOList.at(item)->name; - bool jack = (audioIO == TQString::tqfromLatin1("jack")); + bool jack = (audioIO == TQString::fromLatin1("jack")); if(jack) { customRate->setChecked(false); @@ -549,7 +549,7 @@ bool KArtsModule::realtimeIsPossible() delete checkProcess; realtimePossible = false; } - else if (latestProcesstqStatus == 0) + else if (latestProcessStatus == 0) { realtimePossible = true; } @@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans, TQString args; if(fragmentCount) - args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount); + args += TQString::fromLatin1(" -F %1").arg(fragmentCount); if(fragmentSize) - args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize); + args += TQString::fromLatin1(" -S %1").arg(fragmentSize); if (!audioIO.isEmpty()) - args += TQString::tqfromLatin1(" -a %1").arg(audioIO); + args += TQString::fromLatin1(" -a %1").arg(audioIO); if (duplex) - args += TQString::tqfromLatin1(" -d"); + args += TQString::fromLatin1(" -d"); if (netTrans) - args += TQString::tqfromLatin1(" -n"); + args += TQString::fromLatin1(" -n"); if (!deviceName.isEmpty()) - args += TQString::tqfromLatin1(" -D ") + deviceName; + args += TQString::fromLatin1(" -D ") + deviceName; if (rate) - args += TQString::tqfromLatin1(" -r %1").arg(rate); + args += TQString::fromLatin1(" -r %1").arg(rate); if (bits) - args += TQString::tqfromLatin1(" -b %1").arg(bits); + args += TQString::fromLatin1(" -b %1").arg(bits); if (autoSuspend && suspendTime) - args += TQString::tqfromLatin1(" -s %1").arg(suspendTime); + args += TQString::fromLatin1(" -s %1").arg(suspendTime); if (!addOptions.isEmpty()) args += TQChar(' ') + addOptions; - args += TQString::tqfromLatin1(" -m artsmessage"); - args += TQString::tqfromLatin1(" -c drkonqi"); - args += TQString::tqfromLatin1(" -l 3"); - args += TQString::tqfromLatin1(" -f"); + args += TQString::fromLatin1(" -m artsmessage"); + args += TQString::fromLatin1(" -c drkonqi"); + args += TQString::fromLatin1(" -l 3"); + args += TQString::fromLatin1(" -f"); return args; } diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index 2e033286d..80df5bd8e 100644 --- a/kcontrol/arts/arts.h +++ b/kcontrol/arts/arts.h @@ -92,7 +92,7 @@ private: hardwareTab *hardware; KConfig *config; DeviceManager *deviceManager; - int latestProcesstqStatus; + int latestProcessStatus; int fragmentCount; int fragmentSize; bool configChanged; diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui index 19aa6444a..5b7ba7f79 100644 --- a/kcontrol/arts/generaltab.ui +++ b/kcontrol/arts/generaltab.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>generalTab</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -12,7 +12,7 @@ <height>613</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>450</height> @@ -186,7 +186,7 @@ Recommended if you want sound.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -227,7 +227,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>173</width> <height>20</height> @@ -240,7 +240,7 @@ Recommended if you want sound.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -256,7 +256,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -289,7 +289,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -308,7 +308,7 @@ Recommended if you want sound.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -322,7 +322,7 @@ Recommended if you want sound.</string> <includes> <include location="local" impldecl="in implementation">krichtextlabel.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui index 977cb6440..c11f19962 100644 --- a/kcontrol/arts/hardwaretab.ui +++ b/kcontrol/arts/hardwaretab.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>hardwareTab</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -35,7 +35,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout57</cstring> + <cstring>layout57</cstring> </property> <hbox> <property name="name"> @@ -77,7 +77,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -208,7 +208,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -354,5 +354,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 0d20965c7..5c7618a1b 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - tqsetAlignment( Qt::WordBreak ); + setAlignment( Qt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - tqsetAlignment( Qt::WordBreak ); + setAlignment( Qt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::tqminimumSizeHint() const +TQSize KRichTextLabel::minimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::tqsizeHint() const +TQSize KRichTextLabel::sizeHint() const { - return tqminimumSizeHint(); + return minimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 178630bc2..40ead0375 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -24,7 +24,7 @@ #include <kdelibs_export.h> /** - * @short A tqreplacement for TQLabel that supports richtext and proper tqlayout management + * @short A replacement for TQLabel that supports richtext and proper layout management * * @author Waldo Bastian <bastian@kde.org> */ @@ -45,8 +45,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize tqminimumSizeHint() const; - virtual TQSize tqsizeHint() const; + virtual TQSize minimumSizeHint() const; + virtual TQSize sizeHint() const; TQSizePolicy sizePolicy() const; public slots: diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index c6b21c38a..e1f9ece96 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -432,7 +432,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent m_RefreshEdit->setRange(5, 60); m_RefreshEdit->setSteps(5, 10); m_RefreshEdit->setSuffix(i18n(" min")); - m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint()); + m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint()); lbl->setBuddy(m_RefreshEdit); grid->addWidget(m_RefreshEdit, 5, 1, AlignLeft); diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui index 4048c820f..6aa3d436a 100644 --- a/kcontrol/background/bgadvanced_ui.ui +++ b/kcontrol/background/bgadvanced_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>BGAdvancedBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>400</width> <height>0</height> @@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>220</width> <height>20</height> @@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the <b>Remove</ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -453,8 +453,8 @@ You can also remove programs from this list clicking on the <b>Remove</ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 309d19d08..8294f53a3 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) } // background image settings - TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen")); + TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_urlWallpaperButton->setIconSet( iconSet ); m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -257,7 +257,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) updateUI(); #if (QT_VERSION-0 >= 0x030200) - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support + connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support #endif } @@ -395,7 +395,7 @@ TQString BGDialog::quickHelp() const " wallpaper can be overlaid opaquely, or blended in different ways with" " the background colors and patterns.<p>" " KDE allows you to have the wallpaper change automatically at specified" - " intervals of time. You can also tqreplace the background with a program" + " intervals of time. You can also replace the background with a program" " that updates the desktop dynamically. For example, the \"kdeworld\"" " program shows a day/night map of the world which is updated periodically."); } @@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->tqsetAlignment(Qt::AlignCenter); + screenLabel->setAlignment(Qt::AlignCenter); screenLabel->setNum(int(s + 1)); // BUGLET: we should not allow the identification to be entered again // until the timer fires. TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); - TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); @@ -524,7 +524,7 @@ void BGDialog::loadWallpaperFilesList() { if (imageCaption.isEmpty()) { imageCaption = fileName; - imageCaption.tqreplace('_', ' '); + imageCaption.replace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } @@ -571,7 +571,7 @@ void BGDialog::loadWallpaperFilesList() { else imageCaption = (*it).mid(slash); - imageCaption.tqreplace('_', ' '); + imageCaption.replace('_', ' '); imageCaption = KStringHandler::capwords(imageCaption); } @@ -943,7 +943,7 @@ void BGDialog::slotWallpaperTypeChanged(int i) else m_wallpaperPos = KBackgroundSettings::Tiled; } - else if (KMimeType::tqfindByPath(path)->is("image/svg+xml")) + else if (KMimeType::findByPath(path)->is("image/svg+xml")) { m_wallpaperPos = KBackgroundSettings::Scaled; } @@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti() { KBackgroundRenderer *r = eRenderer(); - BGMultiWallpaperDialog dlg(r, tqtopLevelWidget()); + BGMultiWallpaperDialog dlg(r, topLevelWidget()); if (dlg.exec() == TQDialog::Accepted) { r->stop(); m_slideShowRandom = r->multiWallpaperMode(); @@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced() KBackgroundRenderer *r = eRenderer(); m_previewUpdates = false; - BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop); + BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop); if (!m_pMonitorArrangement->isEnabled()) { dlg.makeReadOnly(); diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui index 93df51428..7cc6571d5 100644 --- a/kcontrol/background/bgdialog_ui.ui +++ b/kcontrol/background/bgdialog_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>BGDialog_UI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>0</height> @@ -114,7 +114,7 @@ </spacer> <widget class="QLayoutWidget" row="1" column="4" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <vbox> <property name="name"> @@ -132,7 +132,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -141,7 +141,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <vbox> <property name="name"> @@ -161,7 +161,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -277,7 +277,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>4</width> <height>20</height> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -386,7 +386,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout31</cstring> + <cstring>layout31</cstring> </property> <hbox> <property name="name"> @@ -440,7 +440,7 @@ </widget> <widget class="QLayoutWidget" row="6" column="1"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>10</height> @@ -539,7 +539,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>10</height> @@ -613,7 +613,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>260</width> <height>20</height> @@ -641,7 +641,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>16</height> @@ -711,8 +711,8 @@ <include location="global" impldecl="in implementation">kurlrequester.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h index b59a46f96..ab13daf90 100644 --- a/kcontrol/background/bghash.h +++ b/kcontrol/background/bghash.h @@ -8,7 +8,7 @@ static int QHash(TQString key) { int g, h = 0; - const TQChar *p = key.tqunicode(); + const TQChar *p = key.unicode(); for (unsigned i=0; i < key.length(); i++) { h = (h << 4) + p[i].cell(); if ((g = (h & 0xf0000000))) diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index 3c2278722..f78a7b616 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -91,7 +91,7 @@ void BGMonitorArrangement::updateArrangement() { // In this function, sizes, etc have a normal value, and their "expanded" // value. The expanded value is used for setting the size of the monitor - // image that tqcontains the preview of the background. The monitor image + // image that contains the preview of the background. The monitor image // will set the background preview back to the normal value. TQRect overallGeometry; @@ -157,21 +157,21 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm ) BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name) : TQLabel(parent, name) { - tqsetAlignment(AlignCenter); + setAlignment(AlignCenter); setScaledContents(true); setPixmap( TQPixmap( locate("data", "kcontrol/pics/monitor.png") ) ); m_pBGMonitor = new BGMonitor(this); - TQWhatsThis::add( this, i18n("This picture of a monitor tqcontains a preview of what the current settings will look like on your desktop.") ); + TQWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") ); } void BGMonitorLabel::updateMonitorGeometry() { - double scaleX = double(width()) / double(tqsizeHint().width()); - double scaleY = double(height()) / double(tqsizeHint().height()); + double scaleX = double(width()) / double(sizeHint().width()); + double scaleY = double(height()) / double(sizeHint().height()); - kdDebug() << k_funcinfo << " Setting tqgeometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; + kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl; m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ); } @@ -189,7 +189,7 @@ void BGMonitorLabel::resizeEvent( TQResizeEvent * e ) BGMonitor::BGMonitor(TQWidget *parent, const char *name) : TQLabel(parent, name) { - tqsetAlignment(AlignCenter); + setAlignment(AlignCenter); setScaledContents(true); setAcceptDrops(true); } diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index 288a06aa3..f11363982 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_isBusyCursor = false; m_enableBusyCursor = false; m_pDirs = KGlobal::dirs(); - m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size(); + m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size(); m_pProc = 0L; m_Tempfile = 0L; m_bPreview = false; @@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size) void KBackgroundRenderer::desktopResized() { m_State = 0; - m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->tqgeometry().size(); + m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->geometry().size(); if( !m_bPreview ) m_Size = m_rSize; } @@ -132,24 +132,24 @@ TQString KBackgroundRenderer::buildCommand() switch (cmd.at(pos+1).latin1()) { case 'f': createTempFile(); - cmd.tqreplace(pos, 2, KShellProcess::quote(m_Tempfile->name())); + cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name())); pos += m_Tempfile->name().length() - 2; break; case 'x': num.setNum(m_Size.width()); - cmd.tqreplace(pos, 2, num); + cmd.replace(pos, 2, num); pos += num.length() - 2; break; case 'y': num.setNum(m_Size.height()); - cmd.tqreplace(pos, 2, num); + cmd.replace(pos, 2, num); pos += num.length() - 2; break; case '%': - cmd.tqreplace(pos, 2, "%"); + cmd.replace(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, tqrepainting the desktop causes nasty effect (XFree86 4.1.0 ) + // with tileWidth>2, repainting 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 @@ -584,7 +584,7 @@ void KBackgroundRenderer::fastWallpaperBlend() m_Pixmap.convertFromImage( m_Wallpaper ); return; } - else if( m_WallpaperRect.tqcontains( TQRect( TQPoint( 0, 0 ), m_Size )) + else if( m_WallpaperRect.contains( 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) @@ -730,10 +730,10 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP + (dr.x() + x) * sizeof(QRgb)); d = reinterpret_cast<QRgb*>(src.scanLine(soffs.y() + y) + (soffs.x() + x) * sizeof(QRgb)); - 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)); + 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)); } } } @@ -946,8 +946,8 @@ void KBackgroundRenderer::createTempFile() TQString KBackgroundRenderer::cacheFileName() { TQString f = fingerprint(); - f.tqreplace ( ':', '_' ); // avoid characters that shouldn't be in filenames - f.tqreplace ( '/', '#' ); + f.replace ( ':', '_' ); // avoid characters that shouldn't be in filenames + f.replace ( '/', '#' ); f = locateLocal( "cache", TQString( "background/%1x%2_%3.png" ) .arg( m_Size.width()).arg( m_Size.height()).arg( f )); return f; @@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config ) } initRenderers(); - m_size = KApplication::desktop()->tqgeometry().size(); + m_size = KApplication::desktop()->geometry().size(); } KVirtualBGRenderer::~KVirtualBGRenderer() @@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable) void KVirtualBGRenderer::desktopResized() { - m_size = KApplication::desktop()->tqgeometry().size(); + m_size = KApplication::desktop()->geometry().size(); if (m_pPixmap) { @@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size) TQSize KVirtualBGRenderer::renderSize(int screen) { - return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size(); + return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size(); } diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index 90d028e22..8d3bdac0f 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/kcontrol/background/bgsettings.cpp @@ -751,7 +751,7 @@ void KBackgroundSettings::readSettings(bool reparse) m_BackgroundMode = defBackgroundMode; s = m_pConfig->readEntry("BackgroundMode", "invalid"); - if (m_BMMap.tqcontains(s)) { + if (m_BMMap.contains(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.tqcontains(s)) { + if (m_BlMMap.contains(s)) { m_BlendMode = m_BlMMap[s]; } @@ -784,7 +784,7 @@ void KBackgroundSettings::readSettings(bool reparse) m_MultiMode = defMultiMode; s = m_pConfig->readEntry("MultiWallpaperMode"); - if (m_MMMap.tqcontains(s)) { + if (m_MMMap.contains(s)) { int mode = m_MMMap[s]; m_MultiMode = mode; } @@ -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.tqcontains(s)) { + if (m_WMMap.contains(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) { - TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); + Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false); s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper()); } diff --git a/kcontrol/background/bgwallpaper_ui.ui b/kcontrol/background/bgwallpaper_ui.ui index a0a4a2a96..c3d9a9a40 100644 --- a/kcontrol/background/bgwallpaper_ui.ui +++ b/kcontrol/background/bgwallpaper_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>BGMultiWallPaperBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -37,7 +37,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -80,7 +80,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>100</height> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -162,6 +162,6 @@ <include location="local" impldecl="in declaration">bgwallpaper.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index e6e7bce35..da77d7cda 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -54,11 +54,11 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList configname.sprintf("kdesktop-screen-%drc", screen_number); m_pConfig = new KConfig(configname, false, false); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_base = new BGDialog(this, m_pConfig); setQuickHelp( m_base->quickHelp()); - tqlayout->add(m_base); - tqlayout->addStretch(); + layout->add(m_base); + layout->addStretch(); KImageIO::registerFormats(); diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index c0b9c20fc..10d774da7 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -67,14 +67,14 @@ extern "C" KBellConfig::KBellConfig(TQWidget *parent, const char *name): KCModule(parent, name) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); int row = 0; TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this ); box->setColumnLayout( 0, Qt::Horizontal ); - tqlayout->addWidget(box); - tqlayout->addStretch(); - TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint()); + layout->addWidget(box); + layout->addStretch(); + TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint()); grid->setColStretch(0, 0); grid->setColStretch(1, 1); grid->addColSpacing(0, 30); diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index cc83f6306..109e436c4 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -65,14 +65,14 @@ Dtime::Dtime(TQWidget * parent, const char *name) // Time Server - privateLayoutWidget = new TQWidget( this, "tqlayout1" ); - TQHBoxLayout *tqlayout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntptqlayout"); + privateLayoutWidget = new TQWidget( this, "layout1" ); + TQHBoxLayout *layout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout"); setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" ); setDateTimeAuto->setText(i18n("Set date and time &automatically:")); connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck())); connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); - tqlayout1->addWidget( setDateTimeAuto ); + layout1->addWidget( setDateTimeAuto ); timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" ); connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged())); @@ -80,7 +80,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool))); timeServerList->setEnabled(false); timeServerList->setEditable(true); - tqlayout1->addWidget( timeServerList ); + layout1->addWidget( timeServerList ); findNTPutility(); // Date box @@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() ); cal = new KDatePicker( dateBox ); - cal->setMinimumSize(cal->tqsizeHint()); + cal->setMinimumSize(cal->sizeHint()); l1->addWidget( cal ); TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") ); @@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots1 = new TQLabel(":", timeBox); dots1->setMinimumWidth( 7 ); - dots1->tqsetAlignment( TQLabel::AlignCenter ); + dots1->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots1, 0, 1, 3, 3 ); minute = new HMSTimeWidget( timeBox ); @@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name) TQLabel *dots2 = new TQLabel(":", timeBox); dots2->setMinimumWidth( 7 ); - dots2->tqsetAlignment( TQLabel::AlignCenter ); + dots2->setAlignment( TQLabel::AlignCenter ); v3->addMultiCellWidget(dots2, 0, 1, 5, 5 ); second = new HMSTimeWidget( timeBox ); @@ -252,7 +252,7 @@ oceania.pool.ntp.org")))); // Reset to the current date and time time = TQTime::currentTime(); - date = TQDate::tqcurrentDate(); + date = TQDate::currentDate(); cal->setDate(date); // start internal timer @@ -285,8 +285,8 @@ void Dtime::save() // NTP Time setting TQString timeServer = timeServerList->currentText(); if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) { - timeServer.tqreplace( TQRegExp(".*\\("), "" ); - timeServer.tqreplace( TQRegExp("\\).*"), "" ); + timeServer.replace( TQRegExp(".*\\("), "" ); + timeServer.replace( TQRegExp("\\).*"), "" ); // Would this be better?: s/^.*\(([^)]*)\).*$/\1/ } KProcess proc; @@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const void Kclock::setTime(const TQTime &time) { this->time = time; - tqrepaint(); + repaint(); } 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 = tqcolorGroup().dark(); - TQColor shadow = tqcolorGroup().text(); + TQColor hands = colorGroup().dark(); + TQColor shadow = colorGroup().text(); paint.setPen( shadow ); paint.setBrush( shadow ); paint.setViewport(4,4,width(),height()); diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index d6a52456c..86e47e7ad 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -59,17 +59,17 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); dtime = new Dtime(this); - tqlayout->addWidget(dtime); + layout->addWidget(dtime); connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool))); tzone = new Tzone(this); - tqlayout->addWidget(tzone); + layout->addWidget(tzone); connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool))); - tqlayout->addStretch(); + layout->addStretch(); if(getuid() == 0) setButtons(Help|Apply); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index bfb32c557..6161198c0 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -154,7 +154,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes," " including any that you may have created. You can preview an existing" " color scheme by selecting it from the list. The current scheme will" - " be tqreplaced by the selected color scheme.<p>" + " be replaced by the selected color scheme.<p>" " Warning: if you have not yet applied any changes you may have made" " to the current scheme, those changes will be lost if you select" " another color scheme.") ); diff --git a/kcontrol/colors/stdclient_bitmaps.h b/kcontrol/colors/stdclient_bitmaps.h index 6b93e8481..912040fe2 100644 --- a/kcontrol/colors/stdclient_bitmaps.h +++ b/kcontrol/colors/stdclient_bitmaps.h @@ -18,7 +18,7 @@ static unsigned char close_dgray_bits[] = { 0xc0, 0x06, 0x80, 0x03, 0x80, 0x03, 0xc0, 0x06, 0x60, 0x0c, 0x30, 0x18, 0x18, 0x30, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00}; -static unsigned char close_tqmask_bits[] = { +static unsigned char close_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x1c, 0x38, 0x38, 0x1c, 0x70, 0x0e, 0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0x70, 0x0e, 0x38, 0x1c, 0x1c, 0x38, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00}; @@ -34,7 +34,7 @@ static unsigned char iconify_dgray_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static unsigned char iconify_tqmask_bits[] = { +static unsigned char iconify_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x80, 0x02, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -49,7 +49,7 @@ static unsigned char maximize_dgray_bits[] = { 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0xf8, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static unsigned char maximize_tqmask_bits[] = { +static unsigned char maximize_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0xfc, 0x1f, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -64,7 +64,7 @@ static unsigned char maximizedown_dgray_bits[] = { 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0xf4, 0x0f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}; -static unsigned char maximizedown_tqmask_bits[] = { +static unsigned char maximizedown_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0xfc, 0x1f, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00}; @@ -79,7 +79,7 @@ static unsigned char menu_dgray_bits[] = { 0x00, 0x00, 0x00, 0x20, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static unsigned char menu_tqmask_bits[] = { +static unsigned char menu_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -99,7 +99,7 @@ static unsigned char pindown_dgray_bits[] = { 0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static unsigned char pindown_tqmask_bits[] = { +static unsigned char pindown_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -119,7 +119,7 @@ static unsigned char pinup_dgray_bits[] = { 0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static unsigned char pinup_tqmask_bits[] = { +static unsigned char pinup_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 3013321b8..67e68b3a3 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -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.tqcontains( me->pos() ) ) { + if ( hotspots[i].rect.contains( 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.tqcontains( me->pos() ) ) { + if ( hotspots[i].rect.contains( 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.tqcontains( e->pos() ) ) { + if ( hotspots[i].rect.contains( e->pos() ) ) { emit colorDropped( hotspots[i].number, c); return; } @@ -162,7 +162,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = TQBitmap(16, 16, close_tqmask_bits, true); + bitmap = TQBitmap(16, 16, close_mask_bits, true); close_pix->setMask(bitmap); dis_close_pix->setMask(bitmap); minimize_pix = new TQPixmap(16, 16); @@ -178,7 +178,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = TQBitmap(16, 16, iconify_tqmask_bits, true); + bitmap = TQBitmap(16, 16, iconify_mask_bits, true); minimize_pix->setMask(bitmap); dis_minimize_pix->setMask(bitmap); maximize_pix = new TQPixmap(16, 16); @@ -194,7 +194,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = TQBitmap(16, 16, maximize_tqmask_bits, true); + bitmap = TQBitmap(16, 16, maximize_mask_bits, true); maximize_pix->setMask(bitmap); dis_maximize_pix->setMask(bitmap); normalize_pix = new TQPixmap(16, 16); @@ -210,7 +210,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = TQBitmap(16, 16, maximizedown_tqmask_bits, true); + bitmap = TQBitmap(16, 16, maximizedown_mask_bits, true); normalize_pix->setMask(bitmap); dis_normalize_pix->setMask(bitmap); menu_pix = new TQPixmap(16, 16); @@ -226,7 +226,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = TQBitmap(16, 16, menu_tqmask_bits, true); + bitmap = TQBitmap(16, 16, menu_mask_bits, true); menu_pix->setMask(bitmap); dis_menu_pix->setMask(bitmap); pinup_pix = new TQPixmap(16, 16); @@ -247,7 +247,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = TQBitmap(16, 16, pinup_tqmask_bits, true); + bitmap = TQBitmap(16, 16, pinup_mask_bits, true); pinup_pix->setMask(bitmap); dis_pinup_pix->setMask(bitmap); pindown_pix = new TQPixmap(16, 16); @@ -268,7 +268,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed, pact.drawPixmap(0, 0, bitmap); pdis.drawPixmap(0, 0, bitmap); pact.end(); pdis.end(); - bitmap = TQBitmap(16, 16, pindown_tqmask_bits, true); + bitmap = TQBitmap(16, 16, pindown_mask_bits, true); pindown_pix->setMask(bitmap); dis_pindown_pix->setMask(bitmap); } @@ -327,7 +327,7 @@ void WidgetCanvas::drawSampleWidgets() #ifndef __osf__ TQPainter::redirect( vertScrollBar, &pm ); #endif - vertScrollBar->tqrepaint(); + vertScrollBar->repaint(); 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( tqparentWidget()->back() ); - smplw.fill( tqparentWidget()->tqcolorGroup().mid() ); + //smplw.fill( parentWidget()->back() ); + smplw.fill( parentWidget()->colorGroup().mid() ); // Actually start painting in @@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets() popup->setItemEnabled( id, false ); // HACK: Force Layouting - //Sad Eagle: tqsizeHint() forces tqlayouting too, and it's a lot less visible - //popup->tqsizeHint(); // Breaks with Qt 3.3 - popup->resize(popup->tqsizeHint()); + //Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible + //popup->sizeHint(); // Breaks with Qt 3.3 + popup->resize(popup->sizeHint()); pm = TQPixmap::grabWidget( popup ); delete popup; @@ -585,12 +585,12 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - tqparentWidget()->tqcolorGroup(), TRUE, 0); + parentWidget()->colorGroup(), TRUE, 0); // Stop the painting hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - tqrepaint( FALSE ); + repaint( FALSE ); } diff --git a/kcontrol/componentchooser/EXAMPLE.desktop b/kcontrol/componentchooser/EXAMPLE.desktop index 699601588..f5501162b 100644 --- a/kcontrol/componentchooser/EXAMPLE.desktop +++ b/kcontrol/componentchooser/EXAMPLE.desktop @@ -123,14 +123,14 @@ Comment[nl]=Een behulpzame omschrijving van de interface, bedoelt voor het infor Comment[nn]=Ei hjelpsam skildring av grensesnittet for infoboksen oppe til høgre Comment[nso]=Thlaloso yeo e tletsego thuso ya interface ya lepokisi la tshedimoso la godimo kago lagoja Comment[pa]=ਸੱਜੇ ਜਾਣਕਾਰੀ ਬਕਸੇ ਲਈ ਇੰਟਰਫੇਸ ਲ਼ਈ ਸਹਾਇਤਾ ਵੇਰਵਾ -Comment[pl]=Potqmocny opis programu (dla informacji w okienku w prawym, górnym rogu) +Comment[pl]=Pomocny opis programu (dla informacji w okienku w prawym, górnym rogu) Comment[pt]=Uma descrição útil da interface para a zona de informação do canto superior direito Comment[pt_BR]=Uma descrição útil da interface para a caixa de informação superior direita Comment[ro]=Aici trebuie să fie descrierea interfeÈ›ei pentru căsuÈ›a din dreapta-sus Comment[ru]=Полезное опиÑание интерфейÑа в верхнем правом информационном окне Comment[rw]=Umwirondoro ngirakamaro w'imigaragarire ujyanye n'agasanduku k'ibisobanuro hejuru iburyo Comment[se]=Laktaválddahus maid infoboksa badjin olgeÅ¡bealde geavaha. -Comment[sk]=Potqmocný popis rozhrania pre informaÄný box v pravom hornom rohu +Comment[sk]=Pomocný popis rozhrania pre informaÄný box v pravom hornom rohu Comment[sl]=Primeren opis vmesnika za gornjo desno okno z informacijami Comment[sr]=ÐžÐ¿Ð¸Ñ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÑ˜Ñа који Ñте изабрали за горњу деÑну инфо коцкицу Comment[sr@Latn]=Opis interfejsa koji ste izabrali za gornju desnu info kockicu diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui index 6dd93e404..886724970 100644 --- a/kcontrol/componentchooser/browserconfig_ui.ui +++ b/kcontrol/componentchooser/browserconfig_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>BrowserConfig_UI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -70,7 +70,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -169,6 +169,6 @@ <slots> <slot access="protected">selectBrowser()</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index 2da13b52a..88fdeb165 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *) kmailCB->setChecked(useKMail); otherCB->setChecked(!useKMail); txtEMailClient->setText(emailClient); - txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height()); + txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height()); chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true")); emit changed(false); @@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient() TQString client = dlg.text(); // get the preferred Terminal Application - KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") ); - TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole")); - preferredTerminal += TQString::tqfromLatin1(" -e "); + KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") ); + TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole")); + preferredTerminal += TQString::fromLatin1(" -e "); int len = preferredTerminal.length(); bool b = client.left(len) == preferredTerminal; @@ -197,7 +197,7 @@ void CfgEmailClient::save(KConfig *) pSettings->setSetting(KEMailSettings::ClientTerminal, (chkRunTerminal->isChecked()) ? "true" : "false"); } - // insure proper permissions -- tqcontains sensitive data + // insure proper permissions -- contains sensitive data TQString cfgName(KGlobal::dirs()->findResource("config", "emails")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); @@ -393,7 +393,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it))); } - ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width()); + ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width()); ServiceChooser->sort(); connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); ServiceChooser->setSelected(0,true); @@ -410,7 +410,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File); ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available"))); - ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint()); + ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); TQString cfgType=cfg.readEntry("configurationType"); @@ -461,7 +461,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { delete configWidget; configWidget=newConfigWidget; connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); - configContainer->setMinimumSize(configWidget->tqsizeHint()); + configContainer->setMinimumSize(configWidget->sizeHint()); } if (configWidget) diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui index d872d774a..ed1ed7f7b 100644 --- a/kcontrol/componentchooser/componentchooser_ui.ui +++ b/kcontrol/componentchooser/componentchooser_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ComponentChooser_UI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -91,7 +91,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -125,8 +125,8 @@ <include location="global" impldecl="in declaration">klistbox.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui index fd5160ba4..d6a7bba87 100644 --- a/kcontrol/componentchooser/componentconfig_ui.ui +++ b/kcontrol/componentchooser/componentconfig_ui.ui @@ -26,7 +26,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>91</height> @@ -58,6 +58,6 @@ <include location="global" impldecl="in declaration">kcombobox.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui index 79b204781..d4cb44085 100644 --- a/kcontrol/componentchooser/emailclientconfig_ui.ui +++ b/kcontrol/componentchooser/emailclientconfig_ui.ui @@ -7,7 +7,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -73,7 +73,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -83,7 +83,7 @@ <string><ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul></string> </property> <property name="whatsThis" stdset="0"> - <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.<br> You can also use several placeholders which will be tqreplaced with the actual values when the email client is called:<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul></string> + <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.<br> You can also use several placeholders which will be replaced with the actual values when the email client is called:<ul> <li>%t: Recipient's address</li> <li>%s: Subject</li> <li>%c: Carbon Copy (CC)</li> <li>%b: Blind Carbon Copy (BCC)</li> <li>%B: Template body text</li> <li>%A: Attachment </li> </ul></string> </property> </widget> <widget class="QToolButton"> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>16</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>16</height> @@ -231,6 +231,6 @@ <slots> <slot access="protected">selectEmailClient()</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui index abebae591..7d355fdd8 100644 --- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui +++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TerminalEmulatorConfig_UI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>87</height> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -120,7 +120,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -189,6 +189,6 @@ <slots> <slot access="protected">selectTerminalApp()</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/crypto/certgen.ui b/kcontrol/crypto/certgen.ui index cbffdf872..19ee05535 100644 --- a/kcontrol/crypto/certgen.ui +++ b/kcontrol/crypto/certgen.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>D_GenCert</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>40</y> @@ -41,7 +41,7 @@ <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>100</y> @@ -57,7 +57,7 @@ <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>130</y> @@ -73,7 +73,7 @@ <property name="name"> <cstring>T_CertType</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>10</y> @@ -89,7 +89,7 @@ <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>70</y> @@ -105,7 +105,7 @@ <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>160</y> @@ -121,7 +121,7 @@ <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>190</y> @@ -137,7 +137,7 @@ <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>220</y> @@ -153,7 +153,7 @@ <property name="name"> <cstring>TextLabel8</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>250</y> @@ -169,7 +169,7 @@ <property name="name"> <cstring>L_CertType</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>10</y> @@ -182,7 +182,7 @@ <property name="name"> <cstring>LineEdit3</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>100</y> @@ -198,7 +198,7 @@ <property name="name"> <cstring>TextLabel9</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>280</y> @@ -214,7 +214,7 @@ <property name="name"> <cstring>LineEdit4_2_2_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>220</y> @@ -230,7 +230,7 @@ <property name="name"> <cstring>LineEdit4_2_2_2_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>250</y> @@ -246,7 +246,7 @@ <property name="name"> <cstring>LineEdit4_2_2_2_3</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>280</y> @@ -262,7 +262,7 @@ <property name="name"> <cstring>E_Passphrase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>40</y> @@ -281,7 +281,7 @@ <property name="name"> <cstring>E_Passphrase_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>70</y> @@ -300,7 +300,7 @@ <property name="name"> <cstring>TextLabel10</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>310</y> @@ -316,7 +316,7 @@ <property name="name"> <cstring>SpinBox1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>310</y> @@ -338,7 +338,7 @@ <property name="name"> <cstring>TextLabel11</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>320</x> <y>40</y> @@ -354,7 +354,7 @@ <property name="name"> <cstring>CheckBox1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>320</x> <y>10</y> @@ -373,7 +373,7 @@ <property name="name"> <cstring>TextLabel12</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>320</x> <y>70</y> @@ -389,7 +389,7 @@ <property name="name"> <cstring>LineEdit19</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>380</x> <y>70</y> @@ -402,7 +402,7 @@ <property name="name"> <cstring>LineEdit4_2_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>190</y> @@ -418,7 +418,7 @@ <property name="name"> <cstring>LineEdit4_2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>160</y> @@ -434,7 +434,7 @@ <property name="name"> <cstring>ComboBox2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>380</x> <y>40</y> @@ -447,7 +447,7 @@ <property name="name"> <cstring>CheckBox2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>320</x> <y>100</y> @@ -463,7 +463,7 @@ <property name="name"> <cstring>TextLabel13</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>320</x> <y>130</y> @@ -479,7 +479,7 @@ <property name="name"> <cstring>ComboBox5</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>400</x> <y>130</y> @@ -492,7 +492,7 @@ <property name="name"> <cstring>LineEdit4</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>180</x> <y>130</y> @@ -508,6 +508,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 4194fdaec..d39c09752 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -128,7 +128,7 @@ OtherCertItem::OtherCertItem( TQListView *view, const TQString& sub, const TQStr m_module = module; KSSLX509Map cert(sub); setText(0, cert.getValue("O")); - setText(1, cert.getValue("CN").tqreplace("\n", ", ")); + setText(1, cert.getValue("CN").replace("\n", ", ")); if (_exp.date().year() > 3000 || _exp.date().year() < 1900) _exp.setDate(TQDate(3000,1,1)); @@ -151,7 +151,7 @@ YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQSt { m_module = module; KSSLX509Map cert(name); - TQString tmp = cert.getValue("CN").tqreplace("\n", ", "); + TQString tmp = cert.getValue("CN").replace("\n", ", "); setText(0, tmp); setText(1, cert.getValue("Email")); _pkcs = pkcs; @@ -180,10 +180,10 @@ KSSLX509Map mcert(name); TQString tmp; setText(0, mcert.getValue("O")); tmp = mcert.getValue("OU"); - tmp.tqreplace("\n", ", "); + tmp.replace("\n", ", "); setText(1, tmp); tmp = mcert.getValue("CN"); - tmp.tqreplace("\n", ", "); + tmp.replace("\n", ", "); setText(2, tmp); _name = name; _cert = cert; @@ -269,7 +269,7 @@ TQString whatstr; grid->addWidget(mUseTLS, 0, 0); whatstr = i18n("TLS is the newest revision of the SSL protocol." " It integrates better with other protocols and has" - " tqreplaced SSL in protocols such as POP3 and SMTP."); + " replaced SSL in protocols such as POP3 and SMTP."); TQWhatsThis::add(mUseTLS, whatstr); mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL); @@ -842,7 +842,7 @@ TQString whatstr; tabs->addTab(tabSSLCOpts, i18n("Validation Options")); #endif - tabs->resize(tabs->tqsizeHint()); + tabs->resize(tabs->sizeHint()); load(); } @@ -1214,7 +1214,7 @@ void KCryptoConfig::save() pcerts->sync(); authcfg->sync(); - // insure proper permissions -- tqcontains sensitive data + // insure proper permissions -- contains sensitive data TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults")); if (!cfgName.isEmpty()) ::chmod(TQFile::encodeName(cfgName), 0600); @@ -1480,7 +1480,7 @@ TQString iss = TQString::null; TQPalette cspl; iss = cert->getIssuer(); cspl = validFrom->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1488,7 +1488,7 @@ TQString iss = TQString::null; validFrom->setPalette(cspl); cspl = validUntil->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1498,7 +1498,7 @@ TQString iss = TQString::null; validFrom->setText(cert->getNotBefore()); validUntil->setText(cert->getNotAfter()); untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires()) - : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC))); + : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC))); untilDate->setEnabled(x && !x->isPermanent()); pHash->setText(cert->getMD5DigestText()); delete cert; @@ -1587,7 +1587,7 @@ TryImportPassAgain: i; i = static_cast<YourCertItem *>(i->nextSibling())) { if (i->configName() == name) { - rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to tqreplace it?"), i18n("SSL"), i18n("Replace")); + rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to replace it?"), i18n("SSL"), i18n("Replace")); if (rc == KMessageBox::Cancel) { delete cert; return; @@ -1718,7 +1718,7 @@ TQString iss; TQPalette cspl; KSSLCertificate *cert = pkcs->getCertificate(); cspl = yValidFrom->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1726,7 +1726,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1758,7 +1758,7 @@ TQString iss; KSSLCertificate *cert = pkcs->getCertificate(); iss = cert->getIssuer(); cspl = yValidFrom->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { + if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1766,7 +1766,7 @@ TQString iss; yValidFrom->setPalette(cspl); cspl = yValidUntil->palette(); - if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { + if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) { cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21)); } else { cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59)); @@ -1921,7 +1921,7 @@ void KCryptoConfig::slotCAImport() { if (certStore) { KOSSL::self()->X509_STORE_free(certStore); certStore = NULL; } - if (certtext.tqcontains("-----BEGIN CERTIFICATE-----")) { + if (certtext.contains("-----BEGIN CERTIFICATE-----")) { qf.reset(); certtext = TQString::null; while (!qf.atEnd()) { @@ -1929,10 +1929,10 @@ void KCryptoConfig::slotCAImport() { qf.readLine(xx, qf.size()); certtext += xx; } - certtext = certtext.tqreplace("-----BEGIN CERTIFICATE-----", TQString::null); - certtext = certtext.tqreplace("-----END CERTIFICATE-----", TQString::null); + certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null); + certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null); certtext = certtext.stripWhiteSpace(); - certtext = certtext.tqreplace("\n", TQString::null); + certtext = certtext.replace("\n", TQString::null); } else { // Must [could?] be DER qf.close(); @@ -2350,7 +2350,7 @@ SSL_CONST SSL_METHOD *meth; break; // Leak of sc*? TQString scn(sc->name); - if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) { + if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("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.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) { + if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) { continue; } k = SSL_CIPHER_get_bits(sc, &j); diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui index dfcf7768e..c3d064b48 100644 --- a/kcontrol/css/cssconfig.ui +++ b/kcontrol/css/cssconfig.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CSSConfigDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -12,9 +12,9 @@ <height>195</height> </rect> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <property name="whatsThis" stdset="0"> <string><b>Stylesheets</b><p>See http://www.w3.org/Style/CSS for further information on cascading style sheets.</p></string> @@ -87,7 +87,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -141,7 +141,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -185,7 +185,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>451</width> <height>20</height> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -232,8 +232,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui index da47ec849..b19e08baf 100644 --- a/kcontrol/css/csscustom.ui +++ b/kcontrol/css/csscustom.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CSSCustomDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -412,7 +412,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -429,7 +429,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -446,7 +446,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -463,7 +463,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -545,8 +545,8 @@ <include location="global" impldecl="in declaration">kcolorbutton.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui index bf1b95fd1..438d40d37 100644 --- a/kcontrol/css/preview.ui +++ b/kcontrol/css/preview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PreviewDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -87,8 +87,8 @@ people.</p> <include location="global" impldecl="in declaration">kseparator.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kseparator.h</includehint> </includehints> diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp index 02bcf69ed..e237ed796 100644 --- a/kcontrol/css/template.cpp +++ b/kcontrol/css/template.cpp @@ -32,7 +32,7 @@ bool CSSTemplate::expand(TQString destname, const TQMap<TQString,TQString> &dict TQString expr = line.mid(start+1, end-start-1); TQString res = dict[expr]; - line.tqreplace(start, end-start+1, res); + line.replace(start, end-start+1, res); } } os << line << endl; diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui index 611629fad..848457a44 100644 --- a/kcontrol/dnssd/configdialog.ui +++ b/kcontrol/dnssd/configdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -73,7 +73,7 @@ <property name="enabled"> <bool>true</bool> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>11</x> <y>51</y> @@ -95,7 +95,7 @@ <property name="name"> <cstring>LANButtor</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>11</x> <y>23</y> @@ -180,7 +180,7 @@ is configured with 'Browse local network' option above.</string> </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>21</height> @@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -281,7 +281,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>21</height> @@ -300,7 +300,7 @@ is configured with 'Browse local network' option above.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>110</height> @@ -318,7 +318,7 @@ is configured with 'Browse local network' option above.</string> <includes> <include location="global" impldecl="in declaration">kcmodule.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcmodule.h</includehint> <includehint>keditlistbox.h</includehint> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index f2d9907dc..97b532b54 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) else if (getenv("KDESU_USER")!=0) tabs->removePage(tab); addConfig(DNSSD::Configuration::self(),this); // it is host-wide setting so it has to be in global config file - domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" )); + domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" )); domain->setGroup("publishing"); load(); connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); @@ -119,12 +119,12 @@ void KCMDnssd::load() { if (geteuid()==0) loadMdnsd(); enableZeroconf->setChecked(false); - TQProcess avahitqStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahitqStatus"); - avahitqStatus.start(); - while (avahitqStatus.isRunning()) { + TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus"); + avahiStatus.start(); + while (avahiStatus.isRunning()) { kapp->processEvents(); } - int exitStatus = avahitqStatus.exitStatus(); + int exitStatus = avahiStatus.exitStatus(); if (exitStatus == 0) { // disabled enableZeroconf->setChecked(false); } else if (exitStatus == 1) { // enabled diff --git a/kcontrol/ebrowsing/ebrowsing.desktop b/kcontrol/ebrowsing/ebrowsing.desktop index 52ebe69b1..a0bf4593b 100644 --- a/kcontrol/ebrowsing/ebrowsing.desktop +++ b/kcontrol/ebrowsing/ebrowsing.desktop @@ -177,7 +177,7 @@ Keywords[ca]=Navegació millorada,Navegació,WWW,Internet,Paraules clau d'Intern Keywords[cs]=RozÅ¡ÃÅ™ené procházenÃ,ProcházenÃ,WWW,Internet,KlÃÄová slova internetu,Internetové filtry,SÃÅ¥,Zkratky,Vyhledávacà stroje Keywords[csb]=Rozszérzoné przezéranié,przezéranié,WWW,Internet,kluczowé sÅ‚owa w Internece,filtrë w Internece,séc,szëkôrze,skrodzënë Keywords[cy]=Pori Uchel,Pori,WWW,Rhyngrwyd,Allweddair Rhyngrwyd,Hidl Rhyngrwyd,Rhwydwaith,Peiriannau Chwilio,Llwybrau Byr -Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgetqmaskiner,Genveje +Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgemaskiner,Genveje Keywords[de]=Browsen,Erweitertes Browsen,WWW,Internet,Stichwörter,Filter,Netz,Internetfilter,Suchmaschinen,Kurzbefehle,Netzwerk Keywords[el]=ΕμπλουτισμÎνη πεÏιήγηση,ΠεÏιήγηση,WWW,Διαδίκτυο,ΛÎξεις κλειδιά διαδικτÏου,ΦίλτÏα διαδικτÏου,Δίκτυο,ΜηχανÎÏ‚ αναζήτησης,ΣυντομεÏσεις Keywords[eo]=progresintoj,TTT,krozado,WWW,Interreto,filtrilo,reto,serĉiloj,mallongigoj diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp index f6e5efc49..a41ab92e3 100644 --- a/kcontrol/ebrowsing/main.cpp +++ b/kcontrol/ebrowsing/main.cpp @@ -56,7 +56,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS " Even easier: just press Alt+F2 (if you have not" " changed this shortcut) and enter the shortcut in the KDE Run Command dialog.")); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); #if 0 opts = new FilterOptions(this); @@ -95,10 +95,10 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS else if (modules.count() == 1) { widget = modules.first(); - tqlayout->setMargin(-KDialog::marginHint()); + layout->setMargin(-KDialog::marginHint()); } - tqlayout->addWidget(widget); + layout->addWidget(widget); } void KURIFilterModule::load() diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui index 302bdf21b..fdeeb27ca 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FilterOptionsUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -34,7 +34,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>170</height> @@ -254,5 +254,5 @@ Select the search engine to use for input boxes that provide automatic lookup se <tabstop>cmbDefaultEngine</tabstop> <tabstop>cmbDelimiter</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index 3f96f90e2..9f3a245fc 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp @@ -149,11 +149,11 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, TQString s = userquery.mid (pos, qsexpr.matchedLength()); while ((i = s.find(" ")) != -1) { - s = s.tqreplace (i, 1, "%20"); + s = s.replace (i, 1, "%20"); n++; } start = pos + qsexpr.matchedLength() + 2*n; // Move after last quote - userquery = userquery.tqreplace (pos, qsexpr.matchedLength(), s); + userquery = userquery.replace (pos, qsexpr.matchedLength(), s); } } @@ -164,10 +164,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, { int i = 0; while ((i = userquery.find("%20")) != -1) - userquery = userquery.tqreplace(i, 3, " "); + userquery = userquery.replace(i, 3, " "); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) - *it = (*it).tqreplace("%20", " "); + *it = (*it).replace("%20", " "); } PIDDBG << "Generating substitution map:\n"; @@ -188,10 +188,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, // Back-substitute quoted strings (%20 -> " "): while ((j = v.find("%20")) != -1) - v = v.tqreplace(j, 3, " "); + v = v.replace(j, 3, " "); // Insert partial queries (referenced by \1 ... \n) to map: - map.tqreplace(TQString::number(i), v); + map.replace(TQString::number(i), v); PDVAR (" map['" + nr + "']", map[nr]); // Insert named references (referenced by \name) to map: @@ -202,8 +202,8 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map, TQString k = v.left(pos); // Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0') - while ((j = s.find("%5C")) != -1) s = s.tqreplace(j, 3, "\\"); - map.tqreplace(k, s); + while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\"); + map.replace(k, s); PDVAR (" map['" + k + "']", map[k]); } } @@ -228,15 +228,15 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & TQStringList ql = modifySubstitutionMap (map, userquery); int count = ql.count(); - // Check, if old style '\1' is found and tqreplace it with \{@} (compatibility mode): + // Check, if old style '\1' is found and replace it with \{@} (compatibility mode): { int pos = -1; if ((pos = newurl.find("\\1")) >= 0) { PIDDBG << "WARNING: Using compatibility mode for newurl='" << newurl - << "'. Please tqreplace old style '\\1' with new style '\\{0}' " + << "'. Please replace old style '\\1' with new style '\\{0}' " "in the query definition.\n"; - newurl = newurl.tqreplace(pos, 2, "\\{@}"); + newurl = newurl.replace(pos, 2, "\\{@}"); } } @@ -307,7 +307,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & v = encodeString(s, encodingMib); PDVAR (" default", s); } - else if (map.tqcontains(rlitem)) + else if (map.contains(rlitem)) { // Use value from substitution map: found = true; @@ -341,7 +341,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & // Encode '+', otherwise it would be interpreted as space in the resulting url: int vpos = 0; while ((vpos = v.find('+')) != -1) - v = v.tqreplace (vpos, 1, "%2B"); + v = v.replace (vpos, 1, "%2B"); } else if (rlitem == "@") @@ -353,7 +353,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & i++; } - newurl = newurl.tqreplace(pos, reflist.matchedLength(), v); + newurl = newurl.replace(pos, reflist.matchedLength(), v); } // Special handling for \{@}; @@ -371,7 +371,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap & // Substitute \{@} with list of unmatched query strings int vpos = 0; while ((vpos = newurl.find("\\@")) != -1) - newurl = newurl.tqreplace (vpos, 2, v); + newurl = newurl.replace (vpos, 2, v); } } @@ -395,7 +395,7 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url, bool /* isMalformed */, SubstMap& map ) const { - // Return nothing if userquery is empty and it tqcontains + // Return nothing if userquery is empty and it contains // substitution strings... if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0) return TQString::null; @@ -427,13 +427,13 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url, PDVAR ("query definition", url); // Add charset indicator for the query to substitution map: - map.tqreplace("ikw_charset", cseta); + map.replace("ikw_charset", cseta); // Add charset indicator for the fallback query to substitution map: TQString csetb = cset2; if (csetb.isEmpty()) csetb = "iso-8859-1"; - map.tqreplace("wsc_charset", csetb); + map.replace("wsc_charset", csetb); TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum()); @@ -446,7 +446,7 @@ void KURISearchFilterEngine::loadConfig() { // Migrate from the old format, this block should remain until // we can assume "every" user has upgraded to a KDE version that - // tqcontains the sycoca based search provider configuration (malte). + // contains the sycoca based search provider configuration (malte). // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time... { KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc"); diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop index b9c60f2aa..35bb3242a 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop +++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop @@ -13,7 +13,7 @@ Comment[ca]=Motor de recerca Comment[cs]=Vyhledávacà stroj Comment[csb]=Szëkôrz Comment[cy]=Peiriant Chwilio -Comment[da]=Søgetqmaskine +Comment[da]=Søgemaskine Comment[de]=Suchmaschine Comment[el]=Μηχανή αναζήτησης Comment[eo]=Serĉilo diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui index ab28f7e30..1a507c0ff 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SearchProviderDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -127,7 +127,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the <tabstop>leShortcut</tabstop> <tabstop>cbCharset</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop index cdc3590f1..2e104f15b 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop @@ -11,7 +11,7 @@ Name[ca]=Mamma - La mare de tots els motors de recerca Name[cs]=Mamma Name[csb]=Mamma - mëmka wszëstczich szëkôrzów Name[cy]=Mamma - Mam holl Beiriannau Chwilio -Name[da]=Mamma - moderen til alle søgetqmaskiner +Name[da]=Mamma - moderen til alle søgemaskiner Name[de]=Mamma - Die Mutter aller Suchmaschinen Name[el]=Mamma - Η μητÎÏα όλων των μηχανών αναζήτησης Name[eo]=Mamma - Patrino de ĉiuj retserĉiloj diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop index 761a20954..7abbad0e1 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop @@ -26,7 +26,7 @@ Name[he]=חיפוש ספר של ספר ×˜×œ×¤×•× ×™× Name[hi]=टेलिफोनबà¥à¤• खोज पà¥à¤°à¤¦à¤¾à¤¯à¤• Name[hr]=Davatelj usluge pretraživanja imenika Name[hu]=Telefonkönyv (NL) -Name[is]=Leitarvél fyrir sÃtqmaskrár +Name[is]=Leitarvél fyrir sÃmaskrár Name[it]=Motore di ricerca Elencotelefonico Name[ja]=Telephonebook 検索プãƒãƒã‚¤ãƒ€ Name[km]=អ្នក​ផ្ដល់​សáŸážœáž¶â€‹ážŸáŸ’វែងរក​សៀវភៅ​លáŸážâ€‹áž‘ូរសáŸáž–្ទ diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index 94565719c..f0986c188 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -41,7 +41,7 @@ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name, : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ), DCOPObject( "LocalDomainURIFilterIface" ), last_time( 0 ), - m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) ) + m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) ) { configure(); } @@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const if( m_hostPortPattern.exactMatch( cmd ) && isLocalDomainHost( cmd ) ) { - cmd.prepend( TQString::tqfromLatin1("http://") ); + cmd.prepend( TQString::fromLatin1("http://") ); setFilteredURI( data, KURL( cmd ) ); setURIType( data, KURIFilterData::NET_PROTOCOL ); @@ -76,7 +76,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const if( !(host == last_host && last_time > time( NULL ) - 5 ) ) { - TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "klocaldomainurifilterhelper" )); + TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" )); if( helper.isEmpty()) return last_result = false; @@ -95,7 +95,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const last_result = proc.wait( 1 ) && proc.normalExit() && !proc.exitStatus(); if( !m_fullname.isEmpty() ) - cmd.tqreplace( 0, host.length(), m_fullname ); + cmd.replace( 0, host.length(), m_fullname ); } return last_result; diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp index 4f6464097..9d15802f1 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp +++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp @@ -43,7 +43,7 @@ #define IPv6_PATTERN "^\\[.*\\]" #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*" -#define QFL1(x) TQString::tqfromLatin1(x) +#define QFL1(x) TQString::fromLatin1(x) /** * IMPORTANT: @@ -66,7 +66,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) // Match FQDN_PATTERN exp.setPattern( QFL1(FQDN_PATTERN) ); - if ( cmd.tqcontains( exp ) ) + if ( cmd.contains( exp ) ) { if (verbose) kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd @@ -85,7 +85,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) // Match IPv4 addresses exp.setPattern( QFL1(IPv4_PATTERN) ); - if ( cmd.tqcontains( exp ) ) + if ( cmd.contains( exp ) ) { if (verbose) kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd @@ -95,7 +95,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false ) // Match IPv6 addresses exp.setPattern( QFL1(IPv6_PATTERN) ); - if ( cmd.tqcontains( exp ) ) + if ( cmd.contains( exp ) ) { if (verbose) kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd @@ -164,13 +164,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const if (!isMalformed && (url.protocol().length() == 4) && - (url.protocol() != TQString::tqfromLatin1("http")) && + (url.protocol() != TQString::fromLatin1("http")) && (url.protocol()[0]=='h') && (url.protocol()[1]==url.protocol()[2]) && (url.protocol()[3]=='p')) { // Handle "encrypted" URLs like: h++p://www.kde.org - url.setProtocol( TQString::tqfromLatin1("http")); + url.setProtocol( TQString::fromLatin1("http")); setFilteredURI( data, url); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const } // Detect UNC style (aka windows SMB) URLs - if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) ) + if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) ) { // make sure path is unix style - cmd.tqreplace('\\', '/'); - cmd.prepend( TQString::tqfromLatin1( "smb:" ) ); + cmd.replace('\\', '/'); + cmd.prepend( TQString::fromLatin1( "smb:" ) ); setFilteredURI( data, KURL( cmd )); setURIType( data, KURIFilterData::NET_PROTOCOL ); return true; @@ -262,7 +262,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const slashPos = path.length(); if( slashPos == 1 ) // ~/ { - path.tqreplace ( 0, 1, TQDir::homeDirPath() ); + path.replace ( 0, 1, TQDir::homeDirPath() ); } else // ~username/ { @@ -270,7 +270,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const struct passwd *dir = getpwnam(user.local8Bit().data()); if( dir && strlen(dir->pw_dir) ) { - path.tqreplace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir)); + path.replace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir)); } else { @@ -293,7 +293,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const const char* exp = getenv( path.mid( 1, r.matchedLength() - 1 ).local8Bit().data() ); if(exp) { - path.tqreplace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) ); + path.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) ); expanded = true; } } @@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setRef(ref); u.setQuery(query); - if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it's a file will get // an access denied error later on. @@ -453,7 +453,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const // Okay this is the code that allows users to supply custom matches for // specific URLs using Qt's regexp class. This is hard-coded for now. // TODO: Make configurable at some point... - if ( !cmd.tqcontains( ' ' ) ) + if ( !cmd.contains( ' ' ) ) { TQValueList<URLHint>::ConstIterator it; for( it = m_urlHints.begin(); it != m_urlHints.end(); ++it ) @@ -492,7 +492,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const u.setPath(path); u.setRef(ref); - if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u)) + if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u)) { // No authorisation, we pretend it exists and will get // an access denied error later on. diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 1ca4b48ae..1d0241914 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -50,7 +50,7 @@ #include <X11/Xmd.h> extern "C" { #include <X11/extensions/dpms.h> -tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); +Status DPMSInfo ( Display *, CARD16 *, BOOL * ); Bool DPMSCapable( Display * ); int __kde_do_not_unload = 1; @@ -59,7 +59,7 @@ Bool DPMSCapable ( Display * ); #endif #ifndef HAVE_DPMSINFO_PROTO -tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); +Status DPMSInfo ( Display *, CARD16 *, BOOL * ); #endif } @@ -67,8 +67,8 @@ tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); extern "C" { #endif Bool DPMSQueryExtension(Display *, int *, int *); - tqStatus DPMSEnable(Display *); - tqStatus DPMSDisable(Display *); + Status DPMSEnable(Display *); + Status DPMSDisable(Display *); Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *); Bool DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16); #if defined(XIMStringConversionRetrival) || defined (__sun) || defined(__hpux) diff --git a/kcontrol/energy/energy.desktop b/kcontrol/energy/energy.desktop index 2293bf6c8..bf856866a 100644 --- a/kcontrol/energy/energy.desktop +++ b/kcontrol/energy/energy.desktop @@ -143,7 +143,7 @@ Comment[nl]=Instellingen voor energiebesparing voor monitors/displays Comment[nn]=Innstillingar for straumkontroll av skjerm Comment[nso]=Dipeakanyo tsa taolo ya matla a pontsho Comment[pa]=ਊਰਜਾ ਪਰਬੰਧਨ à¨à¨²à¨• ਲਈ ਸੈਟਿੰਗ -Comment[pl]=Ustawienia zarzÄ…dzania tqmocÄ… +Comment[pl]=Ustawienia zarzÄ…dzania mocÄ… Comment[pt]=Configurações para a gestão de energia do ecrã Comment[pt_BR]= Configurações para o gerenciamento de energia do monitor Comment[ro]=Setări pentru controlul energiei consumate de monitor diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp index 1c5127fca..eb57f50ac 100644 --- a/kcontrol/filetypes/filegroupdetails.cpp +++ b/kcontrol/filetypes/filegroupdetails.cpp @@ -27,12 +27,12 @@ FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQWidget * tqparentWidget = this; - TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget, + TQWidget * parentWidget = this; + TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget, 0, KDialog::spacingHint()); - m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), tqparentWidget ); - m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() ); + m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget ); + m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed ); // The order of those two items is very important. If you change it, fix typeslistitem.cpp ! new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h index c5724186e..bb4d15bd7 100644 --- a/kcontrol/filetypes/filegroupdetails.h +++ b/kcontrol/filetypes/filegroupdetails.h @@ -23,7 +23,7 @@ class TypesListItem; class TQButtonGroup; /** - * This widget tqcontains the details for a filetype group. + * This widget contains the details for a filetype group. * Currently this only involves the embedding configuration. */ class FileGroupDetails : public QWidget diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index ffa6ff010..a678e0eb2 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -52,7 +52,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) grid->setRowStretch(1, 1); grid->setRowStretch(2, 0); - TQWhatsThis::add( extensionLB, i18n("This box tqcontains a list of patterns that can be" + TQWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be" " used to identify files of the selected type. For example, the pattern *.txt is" " associated with the file type 'text/plain'; all files ending in '.txt' are recognized" " as plain text files.") ); @@ -97,10 +97,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) KDialog::spacingHint()); m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), secondWidget ); - m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() ); + m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() ); secondLayout->addWidget( m_autoEmbed, 1 ); - m_autoEmbed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); + m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) ); // The order of those three items is very important. If you change it, fix typeslistitem.cpp ! new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); @@ -120,7 +120,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) secondLayout->addSpacing(10); embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget ); - embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().height() ); + embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() ); connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); secondLayout->addWidget(embedServiceListWidget, 3); @@ -241,8 +241,8 @@ void FileTypeDetails::updateAskSave() mime->is( "text/xml" ) || mime->is( "inode/directory" ) || mimeType.startsWith( "image" ) || - mime->is( "multipart/x-mixed-tqreplace" ) || - mime->is( "multipart/tqreplace" ) || + mime->is( "multipart/x-mixed-replace" ) || + mime->is( "multipart/replace" ) || mimeType.startsWith( "print" ) ) { neverAsk = true; diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h index c774d677f..b364d919d 100644 --- a/kcontrol/filetypes/filetypedetails.h +++ b/kcontrol/filetypes/filetypedetails.h @@ -13,7 +13,7 @@ class TQPushButton; class KServiceListWidget; /** - * This widget tqcontains the right part of the file type configuration + * This widget contains the right part of the file type configuration * dialog, that shows the details for a file type. * It is implemented as a separate class so that it can be used by * the keditfiletype program to show the details of a single mimetype. diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index d9d1f8138..ad60fc3de 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -126,7 +126,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) // Widget shown on startup m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack); - m_emptyWidget->tqsetAlignment(AlignCenter); + m_emptyWidget->setAlignment(AlignCenter); m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ ); diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp index e2429e661..8ff08d157 100644 --- a/kcontrol/filetypes/typeslistitem.cpp +++ b/kcontrol/filetypes/typeslistitem.cpp @@ -69,7 +69,7 @@ void TypesListItem::initMeta( const TQString & major ) KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting( major ); - m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; } bool TypesListItem::defaultEmbeddingSetting( const TQString& major ) @@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); bool defaultValue = defaultEmbeddingSetting(m_major); - unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; + unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1; if ( m_autoEmbed != oldAutoEmbed ) return true; } @@ -249,7 +249,7 @@ void TypesListItem::sync() { KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false); config->setGroup("EmbedSettings"); - config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 ); + config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 ); return; } @@ -286,9 +286,9 @@ void TypesListItem::sync() config.writeEntry("Hidden", false); if ( m_autoEmbed == 2 ) - config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false ); + config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false ); else - config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); + config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 ); m_bNewItem = false; } @@ -343,18 +343,18 @@ void TypesListItem::sync() continue; // Only those which were added in init() // Look in the correct list... - if ( (isApplication && ! m_appServices.tqcontains( pService->desktopEntryPath() )) - || (!isApplication && !m_embedServices.tqcontains( pService->desktopEntryPath() )) + if ( (isApplication && ! m_appServices.contains( pService->desktopEntryPath() )) + || (!isApplication && !m_embedServices.contains( pService->desktopEntryPath() )) ) { // The service was in m_appServices but has been removed // create a new .desktop file without this mimetype if( s_changedServices == NULL ) deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); - TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); - if ( mimeTypeList.tqcontains( name() ) ) { + if ( mimeTypeList.contains( name() ) ) { // The mimetype is listed explicitly in the .desktop files, so // just remove it and we're done KConfig *desktop; @@ -370,7 +370,7 @@ void TypesListItem::sync() } desktop->setDesktopGroup(); - mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) + mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';'); // Remove entry and the number that might follow. @@ -438,7 +438,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop) if( s_changedServices == NULL ) deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); - TQStringList mimeTypeList = s_changedServices->tqcontains( s->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath()) ? (*s_changedServices)[ s->desktopEntryPath() ] : s->serviceTypes(); for(TQStringList::ConstIterator it = mimeTypeList.begin(); @@ -477,10 +477,10 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons // merge new mimetype if( s_changedServices == NULL ) deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > ); - TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) + TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes(); - if (!mimeTypeList.tqcontains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList)) + if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList)) { KConfig *desktop; if ( pService->type() == TQString("Service") ) @@ -495,7 +495,7 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons } desktop->setDesktopGroup(); - mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath()) + mimeTypeList = s_changedServices->contains( pService->desktopEntryPath()) ? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';'); mimeTypeList.append(name()); diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index ab70526a3..b082cf1fa 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -220,21 +220,21 @@ FontAASettings::FontAASettings(TQWidget *parent) changesMade(false) { TQWidget *mw=new TQWidget(this); - TQGridLayout *tqlayout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint()); + TQGridLayout *layout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint()); excludeRange=new TQCheckBox(i18n("E&xclude range:"), mw), - tqlayout->addWidget(excludeRange, 0, 0); + layout->addWidget(excludeRange, 0, 0); excludeFrom=new KDoubleNumInput(0, 72, 8.0, 1, 1, mw), excludeFrom->setSuffix(i18n(" pt")); - tqlayout->addWidget(excludeFrom, 0, 1); + layout->addWidget(excludeFrom, 0, 1); excludeToLabel=new TQLabel(i18n(" to "), mw); - tqlayout->addWidget(excludeToLabel, 0, 2); + layout->addWidget(excludeToLabel, 0, 2); excludeTo=new KDoubleNumInput(0, 72, 15.0, 1, 1, mw); excludeTo->setSuffix(i18n(" pt")); - tqlayout->addWidget(excludeTo, 0, 3); + layout->addWidget(excludeTo, 0, 3); useSubPixel=new TQCheckBox(i18n("&Use sub-pixel hinting:"), mw); - tqlayout->addWidget(useSubPixel, 1, 0); + layout->addWidget(useSubPixel, 1, 0); TQWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you" " can further improve the quality of displayed fonts by selecting" @@ -242,7 +242,7 @@ FontAASettings::FontAASettings(TQWidget *parent) "<br><b>This will not work with CRT monitors.</b>")); subPixelType=new TQComboBox(false, mw); - tqlayout->addMultiCellWidget(subPixelType, 1, 1, 1, 3); + layout->addMultiCellWidget(subPixelType, 1, 1, 1, 3); TQWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to" " work correctly you need to know how the sub-pixels of your display" @@ -256,9 +256,9 @@ FontAASettings::FontAASettings(TQWidget *parent) #ifdef HAVE_FONTCONFIG TQLabel *hintingLabel=new TQLabel(i18n("Hinting style: "), mw); - tqlayout->addWidget(hintingLabel, 2, 0); + layout->addWidget(hintingLabel, 2, 0); hintingStyle=new TQComboBox(false, mw); - tqlayout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3); + layout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3); for(int s=KXftConfig::Hint::NotSet+1; s<=KXftConfig::Hint::Full; ++s) hintingStyle->insertItem(KXftConfig::description((KXftConfig::Hint::Style)s)); @@ -560,11 +560,11 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) << i18n("Used by the taskbar.") << i18n("Used for desktop icons."); - TQVBoxLayout * tqlayout = + TQVBoxLayout * layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGridLayout * fontUseLayout = - new TQGridLayout(tqlayout, nameGroupKeyRc.count() / 4, 3); + new TQGridLayout(layout, nameGroupKeyRc.count() / 4, 3); fontUseLayout->setColStretch(0, 0); fontUseLayout->setColStretch(1, 1); @@ -607,16 +607,16 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) ++count; } - TQHBoxLayout *hblay = new TQHBoxLayout(tqlayout, KDialog::spacingHint()); + TQHBoxLayout *hblay = new TQHBoxLayout(layout, KDialog::spacingHint()); hblay->addStretch(); TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this); TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts")); hblay->addWidget( fontAdjustButton ); connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff())); - tqlayout->addSpacing(KDialog::spacingHint()); + layout->addSpacing(KDialog::spacingHint()); - TQGridLayout* lay = new TQGridLayout(tqlayout, 2, 4, KDialog::spacingHint()); + TQGridLayout* lay = new TQGridLayout(layout, 2, 4, KDialog::spacingHint()); lay->setColStretch( 3, 10 ); TQLabel* label = new TQLabel( i18n( "Use a&nti-aliasing:" ), this ); lay->addWidget( label, 0, 0 ); @@ -655,7 +655,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &) connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed())); lay->addWidget( comboForceDpi, 1, 1 ); - tqlayout->addStretch(1); + layout->addStretch(1); aaSettings=new FontAASettings(this); diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp index 4718e8fd7..682672a7a 100644 --- a/kcontrol/fonts/kxftconfig.cpp +++ b/kcontrol/fonts/kxftconfig.cpp @@ -52,7 +52,7 @@ TQString KXftConfig::contractHome(TQString path) unsigned int len = home.length(); if(path.length() == len || path[len] == '/') - return path.tqreplace(0, len, TQString::tqfromLatin1("~")); + return path.replace(0, len, TQString::fromLatin1("~")); } } @@ -62,7 +62,7 @@ TQString KXftConfig::contractHome(TQString path) TQString KXftConfig::expandHome(TQString path) { if(!path.isEmpty() && '~'==path[0]) - return 1==path.length() ? TQDir::homeDirPath() : path.tqreplace(0, 1, TQDir::homeDirPath()); + return 1==path.length() ? TQDir::homeDirPath() : path.replace(0, 1, TQDir::homeDirPath()); return path; } @@ -88,7 +88,7 @@ static TQString dirSyntax(const TQString &d) { TQString ds(d); - ds.tqreplace("//", "/"); + ds.replace("//", "/"); int slashPos=ds.findRev('/'); @@ -648,10 +648,10 @@ bool KXftConfig::apply() if(0!=str.find("<?xml")) str.insert(0, xmlHeader); else if(0==str.find(qtXmlHeader)) - str.tqreplace(0, strlen(qtXmlHeader), xmlHeader); + str.replace(0, strlen(qtXmlHeader), xmlHeader); if(-1!=(idx=str.find(qtDocTypeLine))) - str.tqreplace(idx, strlen(qtDocTypeLine), docTypeLine); + str.replace(idx, strlen(qtDocTypeLine), docTypeLine); // // Write to file... @@ -1291,7 +1291,7 @@ void KXftConfig::applySubPixelType() if(m_subPixel.node.isNull()) m_doc.documentElement().appendChild(matchNode); else - m_doc.documentElement().tqreplaceChild(matchNode, m_subPixel.node); + m_doc.documentElement().replaceChild(matchNode, m_subPixel.node); m_subPixel.node=matchNode; } @@ -1323,7 +1323,7 @@ void KXftConfig::applyHintStyle() if(m_hint.node.isNull()) m_doc.documentElement().appendChild(matchNode); else - m_doc.documentElement().tqreplaceChild(matchNode, m_hint.node); + m_doc.documentElement().replaceChild(matchNode, m_hint.node); m_hint.node=matchNode; } } @@ -1344,7 +1344,7 @@ void KXftConfig::applyHinting() if(m_hinting.node.isNull()) m_doc.documentElement().appendChild(matchNode); else - m_doc.documentElement().tqreplaceChild(matchNode, m_hinting.node); + m_doc.documentElement().replaceChild(matchNode, m_hinting.node); m_hinting.node=matchNode; } diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h index e78358eba..cb5cd71f5 100644 --- a/kcontrol/fonts/kxftconfig.h +++ b/kcontrol/fonts/kxftconfig.h @@ -175,7 +175,7 @@ class KXftConfig // // Constructor - // required - This should be a bittqmask of 'RequiredData', and indicates the data to be + // required - This should be a bitmask of 'RequiredData', and indicates the data to be // read/written to the config file. It is intended that the 'fonts' KControl // module will use KXftConfig::SubPixelType|KXftConfig::ExcludeRange, and the // font installer will use KXftConfig::Dirs|KXftConfig::SymbolFamilies. diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 30445b0d9..41ddfe8e3 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -64,9 +64,9 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) : KCModule(KICCCFactory::instance(), parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" )); - systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" )); + systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" )); KAboutData *about = new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"), @@ -77,7 +77,7 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) setAboutData( about ); base = new ICCConfigBase(this); - tqlayout->add(base); + layout->add(base); setRootOnlyMsg(i18n("<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below.")); setUseRootOnlyMsg(true); diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui index 4823fab37..c9be0818f 100644 --- a/kcontrol/iccconfig/iccconfigbase.ui +++ b/kcontrol/iccconfig/iccconfigbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ICCConfigBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -197,6 +197,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index a12bbed36..d1454171e 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -80,7 +80,7 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name) // Size TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); grid->addWidget(lbl, 0, 0, Qt::AlignLeft); mpSizeBox = new TQComboBox(m_pTab1); connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int))); @@ -105,8 +105,8 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name) top->activate(); - mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" )); - mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); + mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" )); + mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); init(); read(); @@ -125,7 +125,7 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget * TQLabel *lab = new TQLabel(str, parent); lay->addWidget(lab, 1, i, AlignCenter); mpPreview[i] = new TQLabel(parent); - mpPreview[i]->tqsetAlignment(AlignCenter); + mpPreview[i]->setAlignment(AlignCenter); mpPreview[i]->setMinimumSize(105, 105); lay->addWidget(mpPreview[i], 2, i); TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent); @@ -688,7 +688,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, top->setRowStretch(1,1); lbl = new TQLabel(i18n("&Effect:"), page); - lbl->setFixedSize(lbl->tqsizeHint()); + lbl->setFixedSize(lbl->sizeHint()); top->addWidget(lbl, 0, 0, Qt::AlignLeft); mpEffectBox = new TQListBox(page); mpEffectBox->insertItem(i18n("No Effect")); @@ -713,7 +713,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect, grid->setRowStretch(1, 1); mpPreview = new TQLabel(frame); - mpPreview->tqsetAlignment(AlignCenter); + mpPreview->setAlignment(AlignCenter); mpPreview->setMinimumSize(105, 105); grid->addWidget(mpPreview, 1, 0); diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index ad84e9e10..5d7f924a9 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -158,7 +158,7 @@ void IconThemesConfig::installNewTheme() if (themeURL.url().isEmpty()) return; TQString themeTmpFile; - // themeTmpFile tqcontains the name of the downloaded file + // themeTmpFile contains the name of the downloaded file if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) { TQString sorryText; diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp index c16a8db0b..396a6ee4f 100644 --- a/kcontrol/icons/main.cpp +++ b/kcontrol/icons/main.cpp @@ -39,9 +39,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") ) IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &) : KCModule(IconsFactory::instance(), parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); tab1 = new IconThemesConfig(this, "themes"); tab->addTab(tab1, i18n("&Theme")); diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index d5cc677d3..770b2cdf3 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits ) { TQString hexstr; int i; - hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); + hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/); for (i=hexstr.length()-1; i>0; --i) if (hexstr[i]==' ') hexstr[i] = '0'; @@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie for (i = 0; i < ndepths; i++) { txt = txt + Value(depths[i]); if (i < ndepths - 1) - txt = txt + TQString::tqfromLatin1(", "); + txt = txt + TQString::fromLatin1(", "); } last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt); @@ -200,11 +200,11 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie ((DoesBackingStore(s) == Always) ? YES : i18n("When mapped")) ) .arg( DoesSaveUnders(s) ? YES : NO )); - XQueryBestSize (dpy, tqCursorShape, RootWindow(dpy,scr), 65535, 65535, + XQueryBestSize (dpy, CursorShape, RootWindow(dpy,scr), 65535, 65535, &width, &height); last = new TQListViewItem(item, last, i18n("Largest Cursor"), (width == 65535 && height == 65535) - ? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height)); + ? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height)); last = new TQListViewItem(item, last, i18n("Current Input Event Mask"), HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS)); @@ -272,12 +272,12 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) last = new TQListViewItem(next, i18n("Name of the Display"), DisplayString(dpy)); - last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy))); + last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy))); last = new TQListViewItem(next, last, i18n("Vendor Release Number"), Value((int)VendorRelease(dpy))); last = new TQListViewItem(next, last, i18n("Version Number"), - TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) + TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy)) .arg((int)ProtocolRevision(dpy))); last = item = new TQListViewItem(next, last, i18n("Available Screens")); @@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox ) int extCount; char **extensions = XListExtensions( dpy, &extCount ); for ( i = 0; i < extCount; i++ ) { - item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) ); + item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) ); } XFreeExtensionList( extensions ); @@ -356,7 +356,7 @@ void KInfoListWidget::load() retrieve-function. If the function wants the widget to show another string, then it change *GetInfo_ErrorString ! */ ErrorString = i18n("No information available about %1.").arg(title) - + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING; + + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING; GetInfo_ErrorString = &ErrorString; /* save the address of ErrorString */ sorting_allowed = true; /* the functions may set that */ @@ -414,9 +414,9 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const setButtons(KCModule::Help); getlistbox = _getlistbox; GetInfo_ErrorString = 0; - TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); widgetStack = new TQWidgetStack(this); - tqlayout->addWidget(widgetStack); + layout->addWidget(widgetStack); lBox = new TQListView(widgetStack); widgetStack->addWidget(lBox, 0); lBox->setMinimumSize(200,120); @@ -425,7 +425,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) ); NoInfoText = new TQLabel(widgetStack); widgetStack->addWidget(NoInfoText, 1); - NoInfoText->tqsetAlignment(AlignCenter | WordBreak); + NoInfoText->setAlignment(AlignCenter | WordBreak); widgetStack->raiseWidget(NoInfoText); load(); } diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp index de7c3a095..9aa0d3767 100644 --- a/kcontrol/info/info_aix.cpp +++ b/kcontrol/info/info_aix.cpp @@ -70,7 +70,7 @@ list_devices(TQListView *lBox, char *criteria) TQListViewItem *lastitem = NULL; lBox->addColumn(i18n("Name")); - lBox->addColumn(i18n("tqStatus")); + lBox->addColumn(i18n("Status")); lBox->addColumn(i18n("Location")); lBox->addColumn(i18n("Description")); diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index 74bb08258..18287c45f 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -503,7 +503,7 @@ bool GetInfo_Partitions(TQListView * lbox) #endif { total = avail = 0; /* initialize size.. */ - found_in_List = (Mounted_Partitions.tqcontains(FS_NAME) > 0); + found_in_List = (Mounted_Partitions.contains(FS_NAME) > 0); if (found_in_List && statfs(FS_FILE, &sfs) == 0) { total = ((LONG_TYPE) sfs.f_blocks) * sfs.f_bsize; avail = (getuid()? sfs.f_bavail : sfs.f_bfree) @@ -573,7 +573,7 @@ bool GetInfo_CD_ROM(TQListView * lBox) if (-1 != rx.search(line)) { TQString text = rx.cap(1); TQString value = rx.cap(2); - if (!text.tqcontains('#')) { + if (!text.contains('#')) { if (value == "0") value = KStdGuiItem::no().plainText(); if (value == "1") diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp index d9857af28..02fd98b1d 100644 --- a/kcontrol/info/info_netbsd.cpp +++ b/kcontrol/info/info_netbsd.cpp @@ -125,18 +125,18 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter, TQListViewItem *olditem = NULL; while(!(s = t->readLine().local8Bit()).isEmpty()) { if (!seencpu) { - if (s.tqcontains("cpu")) + if (s.contains("cpu")) seencpu = true; else continue; } - if (s.tqcontains("boot device") || - s.tqcontains("WARNING: old BSD partition ID!")) + if (s.contains("boot device") || + s.contains("WARNING: old BSD partition ID!")) break; if (!filter || (filter[0] == '^' && s.find(&filter[1]) == 0) - || (filter[0] != '^' && s.tqcontains(filter))) { + || (filter[0] != '^' && s.contains(filter))) { if (func) func(lBox, s); else @@ -253,7 +253,7 @@ bool GetInfo_SCSI (TQListView *lbox) for(; lvitem; lvitem = lvitem->nextSibling()) { TQString s = lvitem->text(0); - if (s.tqcontains("seconds for devices to settle")) { + if (s.contains("seconds for devices to settle")) { lbox->removeItem(lvitem); break; } @@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox) // convert to strings vv[0] = KIO::convertSize(big[0]); - vv[1] = TQString::tqfromLatin1("%1 (%2%%)") + vv[1] = TQString::fromLatin1("%1 (%2%%)") .arg(KIO::convertSize(big[1])) .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); // FIXME: these two are large enough to punctuate vv[2] = TQString::number(mnt->f_files); - vv[3] = TQString::tqfromLatin1("%1 (%2%%) ") + vv[3] = TQString::fromLatin1("%1 (%2%%) ") .arg(mnt->f_ffree) .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0); vv[4] = TQString::null; -#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " "); +#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " "); MNTF(ASYNC) MNTF(DEFEXPORTED) MNTF(EXKERB) diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp index 22b6c8426..12ec8ee2d 100644 --- a/kcontrol/info/info_openbsd.cpp +++ b/kcontrol/info/info_openbsd.cpp @@ -122,16 +122,16 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter, TQListViewItem *olditem = NULL; while(!(s = t->readLine()).isNull()) { if (!seencpu) { - if (s.tqcontains("cpu")) + if (s.contains("cpu")) seencpu = true; else continue; } - if (s.tqcontains("boot device") || - s.tqcontains("WARNING: old BSD partition ID!")) + if (s.contains("boot device") || + s.contains("WARNING: old BSD partition ID!")) break; - if (!filter || s.tqcontains(filter)) { + if (!filter || s.contains(filter)) { if (func) { func(lBox, s, &opaque, false); } diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp index 1b457f18a..5f18aebea 100644 --- a/kcontrol/info/info_osx.cpp +++ b/kcontrol/info/info_osx.cpp @@ -115,7 +115,7 @@ bool GetInfo_Sound (TQListView *lBox) { #ifdef HAVE_COREAUDIO #define kMaxStringSize 1024 - OStqStatus status; + OSStatus status; AudioDeviceID gOutputDeviceID; unsigned long propertySize; char deviceName[kMaxStringSize]; diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp index 6dd215f55..9f2b17e1b 100644 --- a/kcontrol/info/info_solaris.cpp +++ b/kcontrol/info/info_solaris.cpp @@ -184,10 +184,10 @@ bool GetInfo_Partitions( TQListView *lBox ) { lBox->addColumn( i18n( "Mount Point" )); lBox->addColumn( i18n( "FS Type" )); lBox->addColumn( i18n( "Total Size" )); - // XXX: FIXME: how do I set column tqalignment correctly? + // XXX: FIXME: how do I set column alignment correctly? lBox->setColumnAlignment( 3, 2 ); lBox->addColumn( i18n( "Free Size" )); - // XXX: FIXME: how do I set column tqalignment correctly? + // XXX: FIXME: how do I set column alignment correctly? lBox->setColumnAlignment( 4, 2 ); lBox->addColumn( i18n( "Mount Time" )); lBox->addColumn( i18n( "Mount Options" )); diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 0720f32a6..7bfe52948 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) break; }; Widget = new TQLabel(title, this); - Widget->tqsetAlignment(AlignLeft); + Widget->setAlignment(AlignLeft); vbox->addWidget(Widget, 1); } @@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) if (i == SWAP_MEM) vbox->addSpacing(SPACING); Widget = new TQLabel(this); - Widget->tqsetAlignment(AlignRight); + Widget->setAlignment(AlignRight); MemSizeLabel[i][j] = Widget; vbox->addWidget(Widget, 1); } @@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) hint = "<qt>" + hint + "</qt>"; Widget = new TQLabel("<b>" + title + "</b>", this); - Widget->tqsetAlignment(AlignCenter); + Widget->setAlignment(AlignCenter); TQToolTip::add(Widget, hint); vbox->addWidget(Widget); vbox->addSpacing(SPACING / 2); @@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) vbox->addSpacing(SPACING / 2); Widget = new TQLabel(this); /* xx MB used. */ - Widget->tqsetAlignment(AlignCenter); + Widget->setAlignment(AlignCenter); TQToolTip::add(Widget, hint); GraphLabel[i] = Widget; vbox->addWidget(Widget); @@ -424,7 +424,7 @@ void KMemoryWidget::update_Values() used, swap_colors, swap_text); /* RAM + SWAP usage: */ - /* used[0] already tqcontains the amount of used swap */ + /* used[0] already contains the amount of used swap */ used[2] = Memory_Info[FREE_MEM] + ZERO_IF_NO_INFO(Memory_Info[FREESWAP_MEM]); used[1] = Memory_Info[TOTAL_MEM] - Memory_Info[FREE_MEM]; if (!all_colors_initialized) { diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp index 49b29f953..061e368e6 100644 --- a/kcontrol/info/opengl.cpp +++ b/kcontrol/info/opengl.cpp @@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1) if (!ext || !ext[0]) return; - TQString qext = TQString::tqfromLatin1(ext); + TQString qext = TQString::fromLatin1(ext); TQListViewItem *l2 = NULL; i = j = 0; @@ -551,7 +551,7 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ None }; XSetWindowAttributes attr; - unsigned long tqmask; + unsigned long mask; Window root; GLXContext ctx; XVisualInfo *visinfo; @@ -573,10 +573,10 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ attr.border_pixel = 0; attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); attr.event_mask = StructureNotifyMask | ExposureMask; - tqmask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; win = XCreateWindow(dpy, root, 0, 0, width, height, 0, visinfo->depth, InputOutput, - visinfo->visual, tqmask, &attr); + visinfo->visual, mask, &attr); ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect ); if (!ctx) { diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop index fa38a0db3..4451c5167 100644 --- a/kcontrol/info/opengl.desktop +++ b/kcontrol/info/opengl.desktop @@ -121,11 +121,11 @@ Keywords[km]=OpenGL,DRI,GLX,3D,áž”áŸážŽáŸ’ណ​វីដáŸáž¢áž¼,បន្ទ Keywords[lt]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Video plokÅ¡tÄ—,aparatÅ«ros greitinimas,grafika Keywords[lv]=OpenGL,DRI,GLX,3D,VideoKarte,Dzelžu paÄtrinÄÅ¡ana,Grafika,X,X11,Xserveris,X-Serveris,XFree86,EkrÄns Keywords[mk]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Видео-картичка,ХардверÑко забрзување,Графика,екран,приказ -Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm +Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm Keywords[nds]=OpenGL,DRI,GLX,3D,Videokort,Hardware Acceleration,Grafik,X,X11,Xserver,X-Server,XFree86,Display,Dorstellen,Beslünigen Keywords[ne]=खà¥à¤²à¤¾ GL, DRI, GLX, 3D,à¤à¤¿à¤¡à¤¿à¤¯à¥‹ कारà¥à¤¡, हारà¥à¤¡à¤µà¥‡à¤¯à¤° गतिवरà¥à¤§à¤¨, गà¥à¤°à¤¾à¤«à¤¿à¤•à¥à¤¸, X, X11, Xसरà¥à¤à¤°, X-सरà¥à¤à¤°, X सà¥à¤µà¤¤à¤¨à¥à¤¤à¥à¤° 86, पà¥à¤°à¤¦à¤°à¥à¤¶à¤¨ गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥ Keywords[nl]=OpenGL,DRI,GLX,3D,videokaart,hardware-acceleratie,grafisch,graphics,X,X11,Xserver,X-Server,XFree86,display,beeldscherm -Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm +Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm Keywords[pa]=OpenGL,DRI,GLX,3D,ਵੀਡਿਓਕਾਰਡ, ਹਾਰਡਵੇਅਰ ਪਰਵੇਸ਼ਕ,ਗਰਾਫਿਕਸ,X,X11,Xserver,X-Server,XFree86,ਦਰਿਸ਼ Keywords[pl]=OpenGL,DRI,GLX,3D,karta graficzna,grafika,X,X11,Xserver,X-Server,XFree86,ekran Keywords[pt]=OpenGL,DRI,GLX,3D,Placa VÃdeo,Aceleração por Hardware,Gráficos,X,X11,Servidor X,XFree86,Ecrã diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index 90afbbdfd..a2b5f1b86 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -52,10 +52,10 @@ namespace { ThemePage::ThemePage( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); new TQLabel( i18n("Select the cursor theme you want to use:"), this ); diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui index 53353c3f6..01ba9966f 100644 --- a/kcontrol/input/kmousedlg.ui +++ b/kcontrol/input/kmousedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KMouseDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -57,7 +57,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -112,7 +112,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>150</width> <height>115</height> @@ -181,10 +181,10 @@ </widget> <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> - <cstring>cb_pointertqshape</cstring> + <cstring>cb_pointershape</cstring> </property> <property name="text"> - <string>Cha&nge pointer tqshape over icons</string> + <string>Cha&nge pointer shape over icons</string> </property> <property name="checked"> <bool>true</bool> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -217,7 +217,7 @@ </spacer> <widget class="QLayoutWidget" row="4" column="2"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -235,7 +235,7 @@ <property name="name"> <cstring>slAutoSelect</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -258,7 +258,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -283,7 +283,7 @@ <property name="text"> <string>Long</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -301,7 +301,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -331,7 +331,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -344,7 +344,7 @@ <connection> <sender>singleClick</sender> <signal>toggled(bool)</signal> - <receiver>cb_pointertqshape</receiver> + <receiver>cb_pointershape</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> @@ -364,7 +364,7 @@ <tabstop>rightHanded</tabstop> <tabstop>leftHanded</tabstop> <tabstop>singleClick</tabstop> - <tabstop>cb_pointertqshape</tabstop> + <tabstop>cb_pointershape</tabstop> <tabstop>cbAutoSelect</tabstop> <tabstop>slAutoSelect</tabstop> <tabstop>doubleClick</tabstop> @@ -373,6 +373,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index ee0c31b06..9fc8daf32 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -86,7 +86,7 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag if ( mouseCapabilityFlags & HAS_CSR ) { - initCordlesstqStatusReporting(); + initCordlessStatusReporting(); // Do a name cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) ); @@ -118,15 +118,15 @@ LogitechMouse::~LogitechMouse() usb_close( m_usbDeviceHandle ); } -void LogitechMouse::initCordlesstqStatusReporting() +void LogitechMouse::initCordlessStatusReporting() { - updateCordlesstqStatus(); + updateCordlessStatus(); doUpdate = new TQTimer( this ); // will be automatically deleted connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) ); doUpdate->start( 20000 ); } -void LogitechMouse::updateCordlesstqStatus() +void LogitechMouse::updateCordlessStatus() { TQByteArray status(8); @@ -147,7 +147,7 @@ void LogitechMouse::updateCordlesstqStatus() } else { // kdDebug() << "P6 (connect status): " << (status[0] & 0xFF) << endl; if ( status[0] & 0x20 ) { // mouse is talking - m_connecttqStatus = ( status[0] & 0x80 ); + m_connectStatus = ( status[0] & 0x80 ); m_mousePowerup = ( status[0] & 0x40 ); m_receiverUnlock = ( status[0] & 0x10 ); m_waitLock = ( status[0] & 0x08 ); @@ -188,7 +188,7 @@ void LogitechMouse::updateCordlesstqStatus() void LogitechMouse::updateGUI() { - updateCordlesstqStatus(); + updateCordlessStatus(); batteryBar->setProgress( batteryLevel() ); @@ -229,7 +229,7 @@ void LogitechMouse::applyChanges() KMessageBox::information(this, i18n("RF channel 2 has been set. Please press Connect button on mouse to re-establish link"), i18n("Press Connect Button") ); } - initCordlesstqStatusReporting(); + initCordlessStatusReporting(); } } @@ -238,7 +238,7 @@ void LogitechMouse::save(KConfig * /*config*/) kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl; } -TQ_UINT8 LogitechMouse::resolution() +Q_UINT8 LogitechMouse::resolution() { // kdDebug() << "resolution: " << m_resolution << endl; if ( 0 == m_resolution ) { @@ -299,13 +299,13 @@ void LogitechMouse::setLogitechTo400() } } -TQ_UINT8 LogitechMouse::batteryLevel() +Q_UINT8 LogitechMouse::batteryLevel() { return m_batteryLevel; } -TQ_UINT8 LogitechMouse::channel() +Q_UINT8 LogitechMouse::channel() { return m_channel; } diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h index 20e7400c2..4ea296725 100644 --- a/kcontrol/input/logitechmouse.h +++ b/kcontrol/input/logitechmouse.h @@ -61,36 +61,36 @@ protected slots: void stopTimerForNow(); private: - void initCordlesstqStatusReporting(); - void updateCordlesstqStatus(); + void initCordlessStatusReporting(); + void updateCordlessStatus(); void setLogitechTo400(); void setLogitechTo800(); TQString cordlessName(); - TQ_UINT8 resolution(); + Q_UINT8 resolution(); void updateResolution(); - TQ_UINT8 batteryLevel(); - TQ_UINT8 channel(); + Q_UINT8 batteryLevel(); + Q_UINT8 channel(); bool isDualChannelCapable(); TQTimer *doUpdate; struct usb_dev_handle *m_usbDeviceHandle; - bool m_connecttqStatus; // true if the CONNECT button on the mouse is pressed + bool m_connectStatus; // true if the CONNECT button on the mouse is pressed bool m_mousePowerup; // true if we are doing "just out of the box" auto-locking bool m_receiverUnlock; // true if mouse has been disconnected by a long press // of the receiver's CONNECT button bool m_waitLock; // true if receiver searching for new mouse because the // CONNECT button on the receiver was pressed - TQ_UINT8 m_batteryLevel; - TQ_UINT8 m_channel; - TQ_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName() - TQ_UINT16 m_cordlessSecurity; - TQ_UINT16 m_useSecondChannel; - TQ_UINT8 m_caseShape; - TQ_UINT8 m_numberOfButtons; - TQ_UINT8 m_resolution; + Q_UINT8 m_batteryLevel; + Q_UINT8 m_channel; + Q_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName() + Q_UINT16 m_cordlessSecurity; + Q_UINT16 m_useSecondChannel; + Q_UINT8 m_caseShape; + Q_UINT8 m_numberOfButtons; + Q_UINT8 m_resolution; bool m_twoChannelCapable; // true if the mouse supports dual channels bool m_verticalRoller; // true if the mouse has a vertical roller (wheel) bool m_horizontalRoller; // true if the mouse has a horizontal roller (wheel) diff --git a/kcontrol/input/logitechmouse_base.ui b/kcontrol/input/logitechmouse_base.ui index 3b12782dc..5c9c1cd9a 100644 --- a/kcontrol/input/logitechmouse_base.ui +++ b/kcontrol/input/logitechmouse_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LogitechMouseBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -31,7 +31,7 @@ <property name="text"> <string>You have a Logitech Mouse connected, and libusb was found at compile time, but it was not possible to access this mouse. This is probably caused by a permissions problem - you should consult the manual on how to fix this.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -149,5 +149,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 1b64dbb9c..68f376474 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -150,7 +150,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->cb_pointertqshape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick())); @@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(), KDialog::spacingHint()); - TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint()); mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse); vvbox->addWidget(mouseKeys); @@ -506,7 +506,7 @@ void MouseConfig::load( bool useDefaults ) tab1->singleClick->setChecked( settings->singleClick ); tab1->doubleClick->setChecked(!settings->singleClick); - tab1->cb_pointertqshape->setChecked(settings->changeCursor); + tab1->cb_pointershape->setChecked(settings->changeCursor); tab1->cbAutoSelect->setChecked( settings->autoSelectDelay >= 0 ); if ( settings->autoSelectDelay < 0 ) tab1->slAutoSelect->setValue( 0 ); @@ -564,7 +564,7 @@ void MouseConfig::save() settings->autoSelectDelay = tab1->cbAutoSelect->isChecked()? tab1->slAutoSelect->value():-1; settings->visualActivate = tab1->cbVisualActivate->isChecked(); // settings->changeCursor = tab1->singleClick->isChecked(); - settings->changeCursor = tab1->cb_pointertqshape->isChecked(); + settings->changeCursor = tab1->cb_pointershape->isChecked(); settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked(); settings->apply(); @@ -723,7 +723,7 @@ void MouseConfig::slotWheelScrollLinesChanged(int value) void MouseSettings::apply(bool force) { XChangePointerControl( kapp->getDisplay(), - true, true, int(tqRound(accelRate*10)), 10, thresholdMove); + true, true, int(qRound(accelRate*10)), 10, thresholdMove); // 256 might seems extreme, but X has already been known to return 32, // and we don't want to truncate things. Xlib limits the table to 256 bytes, diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop index 8560e6453..fe0f30281 100644 --- a/kcontrol/input/mouse.desktop +++ b/kcontrol/input/mouse.desktop @@ -214,7 +214,7 @@ Keywords[ne]=माउस, माउस गतिवरà¥à¤§à¤¨, माउस à Keywords[nl]=muis,muissnelheid,muisknoppen,selectie,cursor-uiterlijk,input devices,invoerapparaten,knopindeling,klikken,iconen,pictogrammen,icons,aanwijzers,pointers,drag,verslepen,dubbelklikken,linkshandig,rechtshandig.randapparaten Keywords[nn]=mus,musakselerasjon,musterskel,musknappar,val,peikar,peikarform,inneiningar,knappar,klikk,ikon,tilbakemelding,dra,dobbeltklikk,høgrehendt,venstrehendt Keywords[nso]=Legotlo,Koketso ya legotlo,Threshold ya legotlo,Ditobetswa tsa legotlo, Kgetho,Sebopego sa Cursor,Maano a Tsenyo,Mapping Setobetswa,Tobetsa, diemedi,phetolo,Disupi,Topa,Tobetsopedi,mapping,swerwe ka lagoja,swerwe ka lanngele -Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪà©à¨°à¨µà©‡à¨¶,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,tqCursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ +Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪà©à¨°à¨µà©‡à¨¶,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,CursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ Keywords[pl]=Mysz,Akceleracja myszy,Próg myszy,Przyciski myszy,Zaznaczenie,KsztaÅ‚t kursora,UrzÄ…dzenia wejÅ›ciowe,mapowanie przycisków,klikniÄ™cie,ikony,widoczne efekty,wskaźniki,przeciÄ…ganie,podwójne klikniÄ™cie,mapowanie,praworÄ™czny,leworÄ™czny Keywords[pt]=rato,aceleração do rato,limite do rato,botões do rato,selecção,forma do cursor,dispositivos de entrada,atribuição de botões,click,Ãcones,feedback,cursores,arrastar,duplo 'click',atribuição,destro,esquerdino Keywords[pt_BR]=Mouse,aceleração do mouse,limiar do mouse, botões do mouse,Seleção,Formato do Cursor,Dispositivos de entrada,mapeamento de botões,clique,Ãcones,retorno,ponteiros,arrastar,clique duplo,mapeamento,destro,canhoto diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 8d6bba1df..bee04d5ea 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -84,7 +84,7 @@ public: bool reverseScrollPolarity; #ifdef HAVE_LIBUSB - // TODO: In Qt4, tqreplace with a better container. + // TODO: In Qt4, replace with a better container. TQPtrList <LogitechMouse> logitechMouseList; #endif }; diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index a7a35687c..ceb399648 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -68,8 +68,8 @@ namespace { "center_ptr", "circle", "dot", - "dot_box_tqmask", - "dot_box_tqmask", + "dot_box_mask", + "dot_box_mask", "double_arrow", "draped_box", "left_side", @@ -303,7 +303,7 @@ void PreviewWidget::setTheme( const TQString &theme ) current = -1; setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) ); setUpdatesEnabled( true ); - tqrepaint( false ); + repaint( false ); } @@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * ) { TQPixmap buffer( size() ); TQPainter p( &buffer ); - p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) ); Picture dest; if ( !qt_has_xft || !qt_use_xrender ) { diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 38d41fff1..7caf18c3f 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -83,10 +83,10 @@ static TQString defaultThemeDescription( const TQString& theme ) ThemePage::ThemePage( TQWidget* parent, const char* name ) : TQWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL ) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setMargin( KDialog::marginHint() ); - tqlayout->setSpacing( KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setMargin( KDialog::marginHint() ); + layout->setSpacing( KDialog::spacingHint() ); new TQLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this ); @@ -122,7 +122,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) ( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) ) installButton->setEnabled( false ); - if ( !themeDirs.tqcontains( path ) ) + if ( !themeDirs.contains( path ) ) installButton->setEnabled( false ); selectionChanged( listview->currentItem() ); @@ -305,17 +305,17 @@ bool ThemePage::installThemes( const TQString &file ) // Check if a theme with that name already exists if ( TQDir( destDir ).exists( *it ) ) { const TQString question = i18n( "A theme named %1 already exists in your icon " - "theme folder. Do you want tqreplace it with this one?" ).arg( *it ); + "theme folder. Do you want replace it with this one?" ).arg( *it ); int answer = KMessageBox::warningContinueCancel( this, question, i18n( "Overwrite Theme?"), i18n("Replace") ); if ( answer != KMessageBox::Continue ) continue; - // ### If the theme that's being tqreplaced is the current theme, it + // ### If the theme that's being replaced is the current theme, it // will cause cursor inconsistencies in newly started apps. } // ### Should we check if a theme with the same name exists in a global theme dir? - // If that's the case it will effectively tqreplace it, even though the global theme + // If that's the case it will effectively replace it, even though the global theme // won't be deleted. Checking for this situation is easy, since the global theme // will be in the listview. Maybe this should never be allowed since it might // result in strange side effects (from the average users point of view). OTOH @@ -395,7 +395,7 @@ const TQStringList ThemePage::getThemeBaseDirs() const TQString path = XcursorLibraryPath(); #endif // Expand all occurences of ~ to the home dir - path.tqreplace( "~/", TQDir::homeDirPath() + '/' ); + path.replace( "~/", TQDir::homeDirPath() + '/' ); return TQStringList::split( ':', path ); } @@ -414,7 +414,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const continue; const TQStringList subdirs( dir.entryList( TQDir::Dirs ) ); - if ( subdirs.tqcontains( theme ) ) + if ( subdirs.contains( theme ) ) { const TQString path = *it + '/' + theme; const TQString indexfile = path + "/index.theme"; @@ -453,7 +453,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const void ThemePage::insertThemes() { // Scan each base dir for cursor themes and add them to the listview. - // An icon theme is considered to be a cursor theme if it tqcontains + // An icon theme is considered to be a cursor theme if it contains // a cursors subdirectory or if it inherits a cursor theme. for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it ) { @@ -585,7 +585,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) image.setAlphaBuffer( true ); // Clear the image - TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( image.bits() ); + Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( image.bits() ); for ( int i = 0; i < image.width() * image.height(); i++ ) dst[i] = 0; @@ -593,26 +593,26 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 ); TQPoint srcOffset( r.topLeft() ); - dst = reinterpret_cast<TQ_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x(); - src = reinterpret_cast<TQ_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); + dst = reinterpret_cast<Q_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x(); + src = reinterpret_cast<Q_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x(); // Copy the XcursorImage into the TQImage, converting it from premultiplied // to non-premultiplied alpha and cropping it if needed. for ( int y = 0; y < r.height(); y++ ) { for ( int x = 0; x < r.width(); x++, dst++, src++ ) { - const TQ_UINT32 pixel = *src; + const Q_UINT32 pixel = *src; - const TQ_UINT8 a = tqAlpha( pixel ); - const TQ_UINT8 r = tqRed( pixel ); - const TQ_UINT8 g = tqGreen( pixel ); - const TQ_UINT8 b = tqBlue( pixel ); + const Q_UINT8 a = qAlpha( pixel ); + const Q_UINT8 r = qRed( pixel ); + const Q_UINT8 g = qGreen( pixel ); + const Q_UINT8 b = qBlue( pixel ); if ( !a || a == 255 ) { *dst = pixel; } else { float alpha = a / 255.0; - *dst = tqRgba( int(r / alpha), int(g / alpha), int(b / alpha), a ); + *dst = qRgba( int(r / alpha), int(g / alpha), int(b / alpha), a ); } } dst += ( image.width() - r.width() ); @@ -630,7 +630,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample ) TQImage image( iconSize, iconSize, 32 ); image.setAlphaBuffer( true ); - TQ_UINT32 *data = reinterpret_cast< TQ_UINT32* >( image.bits() ); + Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() ); for ( int i = 0; i < image.width() * image.height(); i++ ) data[ i ] = 0; diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp index 647b67621..e2014a1ca 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp +++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp @@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") ) KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &) :KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0) { - TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves.")); setButtons( KCModule::Help ); @@ -65,8 +65,8 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin m_info=new KTextBrowser(hbox); hbox->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(label); - tqlayout->addWidget(hbox); + layout->addWidget(label); + layout->addWidget(hbox); hbox->setStretchFactor(m_ioslavesLb,1); hbox->setStretchFactor(m_info,5); diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp index 84135bb66..095f18f41 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -65,7 +65,7 @@ void CalDialog::calibrate() do { - tqApp->processEvents(2000); + qApp->processEvents(2000); } while ( ti.isActive() && (result() != TQDialog::Rejected) ); @@ -165,7 +165,7 @@ void CalDialog::waitButton(int axis, bool press, int &lastVal) // loop until the user presses a button on the device or on the dialog do { - tqApp->processEvents(100); + qApp->processEvents(100); if ( joydev->getEvent(type, number, value) ) { diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 87b6f4e05..3ffc0e1d7 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -95,7 +95,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &) joyWidget = new JoyWidget(this); - setMinimumSize(joyWidget->tqminimumSize()); + setMinimumSize(joyWidget->minimumSize()); setButtons(KCModule::Default); } diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index d460eaf3c..cfc293b89 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -56,7 +56,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) TQLabel *icon = new TQLabel(messageBox); icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true)); - icon->setFixedSize(icon->tqsizeHint()); + icon->setFixedSize(icon->sizeHint()); message = new TQLabel(messageBox); messageBox->hide(); } diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 9c7d25898..f25eae002 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca // set qwhatsthis help TQWhatsThis::add(this, i18n(intro_text)); _viewer = new KHTMLPart( this, "_viewer" ); - _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); + _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index 4f0b14f4d..598807a2d 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent) , _module(0L) { _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this); - _busyw->tqsetAlignment(AlignCenter); + _busyw->setAlignment(AlignCenter); _busyw->setTextFormat(RichText); _busyw->setGeometry(0,0, width(), height()); addWidget( _busyw ); @@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n" ProxyWidget *widget = loadModule( module ); - KCGlobal::repairAccels( tqtopLevelWidget() ); + KCGlobal::repairAccels( topLevelWidget() ); return ( widget!=0 ); } diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index ed892ac70..0a409b7e0 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/kcontrol/kcontrol/global.cpp @@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup() if (_infocenter) { kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl; - _baseGroup = TQString::tqfromLatin1("Settings/Information/"); + _baseGroup = TQString::fromLatin1("Settings/Information/"); } else { kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl; - _baseGroup = TQString::tqfromLatin1("Settings/"); + _baseGroup = TQString::fromLatin1("Settings/"); } } } diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp index 237cbdfe9..723895de3 100644 --- a/kcontrol/kcontrol/kcrootonly.cpp +++ b/kcontrol/kcontrol/kcrootonly.cpp @@ -26,13 +26,13 @@ KCRootOnly::KCRootOnly(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *tqlayout=new TQVBoxLayout(this); + TQVBoxLayout *layout=new TQVBoxLayout(this); TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>" "Click on the \"Administrator Mode\" button below."), this); - tqlayout->addWidget(label); - label->tqsetAlignment(AlignCenter); + layout->addWidget(label); + label->setAlignment(AlignCenter); label->setTextFormat(RichText); - label->setMinimumSize(label->tqsizeHint()); + label->setMinimumSize(label->sizeHint()); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 67ffdaa46..758b742fd 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -77,9 +77,9 @@ KControlApp::KControlApp() int fontSize = toplevel->fontInfo().pointSize(); if (fontSize == 0) fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX(); - int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()), + int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) ); - int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()), + int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) ); toplevel->resize(x,y); } @@ -91,8 +91,8 @@ KControlApp::~KControlApp() KConfig *config = KGlobal::config(); config->setGroup("General"); TQWidget *desk = TQApplication::desktop(); - config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); - config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); + config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width()); + config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height()); config->sync(); } delete toplevel; diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index 6ab262508..ad60eda5a 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -68,9 +68,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); // Item names may contain ampersands. To avoid them being converted to - // accelators, tqreplace them with two ampersands. + // accelators, replace them with two ampersands. TQString name = group->caption(); - name.tqreplace("&", "&&"); + name.replace("&", "&&"); parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, menu); @@ -83,9 +83,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath) for (module=moduleList.first(); module != 0; module=moduleList.next()) { // Item names may contain ampersands. To avoid them being converted to - // accelators, tqreplace them with two ampersands. + // accelators, replace them with two ampersands. TQString name = module->moduleName(); - name.tqreplace("&", "&&"); + name.replace("&", "&&"); int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall) , name, id); diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 14b75c780..cc8c63af4 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -142,12 +142,12 @@ void ConfigModule::runAsRoot() // create an embed widget that will embed the // kcmshell running as root - _embedLayout = new TQVBoxLayout(_module->tqparentWidget()); - _embedFrame = new TQVBox( _module->tqparentWidget() ); + _embedLayout = new TQVBoxLayout(_module->parentWidget()); + _embedFrame = new TQVBox( _module->parentWidget() ); _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised ); TQPalette pal( red ); pal.setColor( TQColorGroup::Background, - _module->tqparentWidget()->tqcolorGroup().background() ); + _module->parentWidget()->colorGroup().background() ); _embedFrame->setPalette( pal ); _embedFrame->setLineWidth( 2 ); _embedFrame->setMidLineWidth( 2 ); @@ -158,7 +158,7 @@ void ConfigModule::runAsRoot() _module->hide(); _embedFrame->show(); TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack); - _busy->tqsetAlignment(AlignCenter); + _busy->setAlignment(AlignCenter); _busy->setTextFormat(RichText); _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); @@ -338,7 +338,7 @@ TQString ConfigModuleList::findModule(ConfigModule *module) Menu *menu; for(;(menu = it.current());++it) { - if (menu->modules.tqcontainsRef(module)) + if (menu->modules.containsRef(module)) return it.currentKey(); } return TQString::null; diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index b15f0ccd6..6f767ab20 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -133,9 +133,9 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath) -TQSize ModuleTreeView::tqsizeHint() const +TQSize ModuleTreeView::sizeHint() const { - return TQListView::tqsizeHint().boundedTo( + return TQListView::sizeHint().boundedTo( TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) ); } @@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem> { while (item) { - setOpen(item, parentList->tqcontains(item)); + setOpen(item, parentList->contains(item)); if (item->childCount() != 0) expandItem(item->firstChild(), parentList); @@ -342,8 +342,8 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu TQPixmap pixmap(offset, offset); pixmap.fill(Qt::color0); pixmap.setMask(pixmap.createHeuristicMask()); - TQBitmap tqmask( pixmap.size(), true ); - pixmap.setMask( tqmask ); + TQBitmap mask( pixmap.size(), true ); + pixmap.setMask( mask ); TQListViewItem::setPixmap(0, pixmap); } } diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h index 448251a6f..ede3c8a52 100644 --- a/kcontrol/kcontrol/moduletreeview.h +++ b/kcontrol/kcontrol/moduletreeview.h @@ -74,7 +74,7 @@ public: void makeSelected(ConfigModule* module); void makeVisible(ConfigModule *module); void fill(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; signals: void moduleSelected(ConfigModule*); diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index e50b67fa5..b8f83c5fc 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -120,7 +120,7 @@ public: ~ProxyContentWidget(){} // this should be really done by qscrollview in AutoOneFit mode! - TQSize tqsizeHint() const { return tqminimumSizeHint(); } + TQSize sizeHint() const { return minimumSizeHint(); } }; @@ -144,7 +144,7 @@ ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool } client->reparent(contentWidget,0,TQPoint(0,0),true); vbox->addWidget( client ); - vbox->activate(); // make sure we have a proper tqminimumSizeHint + vbox->activate(); // make sure we have a proper minimumSizeHint addChild(contentWidget); } diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index e4fa10d5b..aac3427ff 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -85,7 +85,7 @@ TopLevel::TopLevel(const char* name) connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) ); } - // create the tqlayout box + // create the layout box _splitter = new TQSplitter( TQSplitter::Horizontal, this ); TQFrame* leftFrame = new TQFrame ( _splitter ); @@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name) // help widget _help = new HelpWidget(_dock); - _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // Restore sizes config->setGroup("General"); @@ -514,7 +514,7 @@ void TopLevel::aboutModule() TQString TopLevel::handleAmpersand( TQString modulename ) const { - if( modulename.tqcontains( '&' )) // double it + if( modulename.contains( '&' )) // double it { for( int i = modulename.length(); i >= 0; diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index 461aeab22..f24af2c1e 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -78,7 +78,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) _lvLoD = new KListView( gb ); _lvLoD->addColumn(i18n("Service")); _lvLoD->addColumn(i18n("Description")); - _lvLoD->addColumn(i18n("tqStatus")); + _lvLoD->addColumn(i18n("Status")); _lvLoD->setAllColumnsShowFocus(true); _lvLoD->header()->setStretchEnabled(true, 1); @@ -92,7 +92,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) _lvStartup->addColumn(i18n("Use")); _lvStartup->addColumn(i18n("Service")); _lvStartup->addColumn(i18n("Description")); - _lvStartup->addColumn(i18n("tqStatus")); + _lvStartup->addColumn(i18n("Status")); _lvStartup->setAllColumnsShowFocus(true); _lvStartup->header()->setStretchEnabled(true, 2); @@ -149,7 +149,7 @@ void KDEDConfig::load( bool useDefaults ) { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::tqfromLatin1( "kded/*.desktop" ), + TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); TQListViewItem* item = 0L; @@ -178,7 +178,7 @@ void KDEDConfig::load( bool useDefaults ) { } } - getServicetqStatus(); + getServiceStatus(); emit changed( useDefaults ); } @@ -187,7 +187,7 @@ void KDEDConfig::save() { TQStringList files; KGlobal::dirs()->findAllResources( "services", - TQString::tqfromLatin1( "kded/*.desktop" ), + TQString::fromLatin1( "kded/*.desktop" ), true, true, files ); KConfig kdedrc("kdedrc", false, false); @@ -222,7 +222,7 @@ void KDEDConfig::defaults() } -void KDEDConfig::getServicetqStatus() +void KDEDConfig::getServiceStatus() { QCStringList modules; TQCString replyType; @@ -293,12 +293,12 @@ void KDEDConfig::slotEvalItem(TQListViewItem * item) _pbStop->setEnabled( false ); } - getServicetqStatus(); + getServiceStatus(); } void KDEDConfig::slotServiceRunningToggled() { - getServicetqStatus(); + getServiceStatus(); slotEvalItem(_lvStartup->currentItem()); } diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h index 1548f2b47..8e6ff8d9a 100644 --- a/kcontrol/kded/kcmkded.h +++ b/kcontrol/kded/kcmkded.h @@ -47,7 +47,7 @@ protected slots: void slotServiceRunningToggled(); void slotEvalItem(TQListViewItem *item); void slotItemChecked(TQCheckListItem *item); - void getServicetqStatus(); + void getServiceStatus(); bool autoloadEnabled(KConfig *config, const TQString &filename); void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b); diff --git a/kcontrol/kdm/ChangeLog b/kcontrol/kdm/ChangeLog index 167e413a6..d49bb2548 100644 --- a/kcontrol/kdm/ChangeLog +++ b/kcontrol/kdm/ChangeLog @@ -10,7 +10,7 @@ * Few bug fixes 1998-04-28 Thomas Tanghus <tanghus@earthling.net> - * Improved tqgeometry management. + * Improved geometry management. 1998-05-14 Thomas Tanghus <tanghus@earthling.net> * Fixed bug with "ShutDownButton=...". diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp index 80879fe8c..b5ce18ff5 100644 --- a/kcontrol/kdm/background.cpp +++ b/kcontrol/kdm/background.cpp @@ -4,7 +4,7 @@ * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl> * * Modified 2000.07.14 by Brad Hughes <bhughes@trolltech.com> - * Improve tqlayout and consistency with KDesktop's background selection + * Improve layout and consistency with KDesktop's background selection * * Based on old backgnd.cpp: * @@ -56,7 +56,7 @@ KBackground::KBackground(TQWidget *parent, const char *name) connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - // Top tqlayout + // Top layout TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); top->addWidget(m_pCBEnable); top->addWidget(m_background); diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp index 9f651b433..1ba598e49 100644 --- a/kcontrol/kdm/kbackedcombobox.cpp +++ b/kcontrol/kdm/kbackedcombobox.cpp @@ -28,7 +28,7 @@ void KBackedComboBox::insertItem( const TQString &id, const TQString &name ) void KBackedComboBox::setCurrentId( const TQString &id ) { - if (id2name.tqcontains( id )) + if (id2name.contains( id )) setCurrentItem( id2name[id] ); else setCurrentItem( 0 ); diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp index 7f68deb3b..58696902b 100644 --- a/kcontrol/kdm/kdm-appear.cpp +++ b/kcontrol/kdm/kdm-appear.cpp @@ -216,7 +216,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name) loadLanguageList(langcombo); connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); label = new TQLabel(langcombo, i18n("Languag&e:"), group); - TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() ); + TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); hbox->setColStretch(1, 1); hbox->addWidget(label, 1, 0); hbox->addWidget(langcombo, 1, 1); @@ -250,7 +250,7 @@ void KDMAppearanceWidget::makeReadOnly() void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) { TQStringList langlist = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) @@ -260,9 +260,9 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo) TQString nid = fpath.mid(index + 1); KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); - combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null); } } @@ -316,7 +316,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo) bool KDMAppearanceWidget::setLogo(TQString logo) { TQString flogo = logo.isEmpty() ? - locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) : + locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) : logo; TQImage p(flogo); if (p.isNull()) @@ -324,7 +324,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo) if (p.width() > 100 || p.height() > 100) p = p.smoothScale(100, 100, TQImage::ScaleMin); logobutton->setPixmap(p); - uint bd = style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2; + uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; logobutton->setFixedSize(p.width() + bd, p.height() + bd); logopath = logo; return true; @@ -334,7 +334,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo) void KDMAppearanceWidget::slotLogoButtonClicked() { KImageIO::registerFormats(); - KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")), + KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")), KImageIO::pattern( KImageIO::Reading ), this, 0, true); dialogue.setOperationMode( KFileDialog::Opening ); @@ -392,7 +392,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) if(!url->isLocalFile()) { pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() + "kdm/pics/" + url->fileName()); - KIO::NetAccess::copy(*url, pixurl, tqparentWidget()); + KIO::NetAccess::copy(*url, pixurl, parentWidget()); istmp = true; } else { pixurl = *url; @@ -401,7 +401,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e) // By now url should be "file:/..." if (!setLogo(pixurl.path())) { - KIO::NetAccess::del(pixurl, tqparentWidget()); + KIO::NetAccess::del(pixurl, parentWidget()); TQString msg = i18n("There was an error loading the image:\n" "%1\n" "It will not be saved.") diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp index e7f267ce3..155d5b380 100644 --- a/kcontrol/kdm/kdm-conv.cpp +++ b/kcontrol/kdm/kdm-conv.cpp @@ -50,7 +50,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this ); alGroup->setCheckable( true ); - alGroup->tqsetSizePolicy( vpref ); + alGroup->setSizePolicy( vpref ); TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to KDM's graphical login." @@ -92,7 +92,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name) puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); - puGroup->tqsetSizePolicy( vpref ); + puGroup->setSizePolicy( vpref ); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp index d6c1eaf7d..ce27f6498 100644 --- a/kcontrol/kdm/kdm-users.cpp +++ b/kcontrol/kdm/kdm-users.cpp @@ -94,14 +94,14 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup ); leminuid = new KLineEdit( minGroup ); minlab->setBuddy( leminuid ); - leminuid->tqsetSizePolicy( sp_ign_fix ); + leminuid->setSizePolicy( sp_ign_fix ); leminuid->setValidator( valid ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); - lemaxuid->tqsetSizePolicy( sp_ign_fix ); + lemaxuid->setSizePolicy( sp_ign_fix ); lemaxuid->setValidator( valid ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); @@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name) userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop - uint sz = style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; + uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); connect( userbutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotUserButtonClicked()) ); @@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e) KURL *url = decodeImgDrop(e, this); if (url) { TQString pixpath; - KIO::NetAccess::download(*url, pixpath, tqparentWidget()); + KIO::NetAccess::download(*url, pixpath, parentWidget()); changeUserPix( pixpath ); KIO::NetAccess::removeTempFile(pixpath); delete url; @@ -457,11 +457,11 @@ void KDMUsersWidget::load() cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true)); TQString ps = config->readEntry( "FaceSource" ); - if (ps == TQString::tqfromLatin1("UserOnly")) + if (ps == TQString::fromLatin1("UserOnly")) rbusronly->setChecked(true); - else if (ps == TQString::tqfromLatin1("PreferUser")) + else if (ps == TQString::fromLatin1("PreferUser")) rbprefusr->setChecked(true); - else if (ps == TQString::tqfromLatin1("PreferAdmin")) + else if (ps == TQString::fromLatin1("PreferAdmin")) rbprefadm->setChecked(true); else rbadmonly->setChecked(true); diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp index f342985aa..ae99b51f5 100644 --- a/kcontrol/kdm/main.cpp +++ b/kcontrol/kdm/main.cpp @@ -164,7 +164,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) if ((*umapi).second.find( gn ) == (*umapi).second.end()) (*umapi).second.append( gn ); } else - kdWarning() << "group '" << gn << "' tqcontains unknown user '" << un << "'" << endl; + kdWarning() << "group '" << gn << "' contains unknown user '" << un << "'" << endl; } while (*++grp->gr_mem); } endgrent(); @@ -173,7 +173,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &) kdWarning() << "user(s) '" << tgmapci.data().join(",") << "' have unknown GID " << tgmapci.key() << endl; - config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); + config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" )); TQVBoxLayout *top = new TQVBoxLayout(this); tab = new TQTabWidget(this); diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index edf285a5b..a38f46f29 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -83,13 +83,13 @@ void CommandShortcutsModule::initGUI() label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. " "To edit, add or remove entries from this list use the " "<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>")); - label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &))); connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); - m_tree->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mainLayout->setStretchFactor(m_tree, 10); mainLayout->addWidget(m_tree); TQWhatsThis::add(m_tree, diff --git a/kcontrol/keys/convertShortcuts.pl b/kcontrol/keys/convertShortcuts.pl index fa189c810..9dc216ac6 100755 --- a/kcontrol/keys/convertShortcuts.pl +++ b/kcontrol/keys/convertShortcuts.pl @@ -9,7 +9,7 @@ foreach (<>) { s/^Lock screen/Lock Session/; s/^Lock Screen/Lock Session/; s/^Mouse emulation/Mouse Emulation/; - s/^Next keyboard tqlayout/Switch to Next Keyboard Layout/; + s/^Next keyboard layout/Switch to Next Keyboard Layout/; s/Switch To Next Keyboard Layout/Switch to Next Keyboard Layout/; s/^Screenshot of desktop/Desktop Screenshot/; s/^Pop-up window operations menu/Window Operations Menu/; diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h index faf6b6bd3..144427d9c 100644 --- a/kcontrol/keys/kaccelaction.h +++ b/kcontrol/keys/kaccelaction.h @@ -58,7 +58,7 @@ class KConfigBase; 1) KKey = "Meta+X" 1) Meta+X 2) KKey = "Asterisk" - 1) Shift+8 (English tqlayout) + 1) Shift+8 (English layout) 2) Keypad_Asterisk */ @@ -111,7 +111,7 @@ class KAccelAction bool setKeySequence( uint i, const KKeySequence& ); void clearShortcut(); - bool tqcontains( const KKeySequence& ); + bool contains( const KKeySequence& ); TQString toString() const; TQString toStringInternal() const; diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index a49eea231..09726de63 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -83,7 +83,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) kdDebug(125) << "sConfigKey: " << sConfigKey << " bIsNum: " << bIsNum << " bSeriesOnly: " << bSeriesOnly << endl; - if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.tqcontains( ':' ) ) { + if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.contains( ':' ) ) { actions.removeAction( sConfigKey ); i--; } @@ -170,7 +170,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) topLayout->addRowSpacing(3, 15); topLayout->addMultiCellWidget(kc, 5, 5, 0, 1); - setMinimumSize(topLayout->tqsizeHint()); + setMinimumSize(topLayout->sizeHint()); } KKeyModule::~KKeyModule (){ @@ -332,7 +332,7 @@ void KKeyModule::readScheme( int index ) TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.tqreplace( ind, 1, s ); + sFile.replace( ind, 1, s ); } @@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index ) // Set various appropriate for the scheme if ( indx < nSysSchemes || - (*sFileList->at(indx)).tqcontains( "/global-" ) || - (*sFileList->at(indx)).tqcontains( "/app-" ) ) { + (*sFileList->at(indx)).contains( "/global-" ) || + (*sFileList->at(indx)).contains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); diff --git a/kcontrol/keys/keys.desktop b/kcontrol/keys/keys.desktop index 9594b832a..b39bab385 100644 --- a/kcontrol/keys/keys.desktop +++ b/kcontrol/keys/keys.desktop @@ -179,7 +179,7 @@ Keywords[cs]=Klávesy,Globálnà klávesové zkratky,Schéma kláves,Klávesové Keywords[csb]=Klawisze,globalné klawiszowé skrodzënë,schematë skrodzënów,sparÅ‚Ä…czenia klawiszów,skrodzënë dlô programów Keywords[cy]=Bysell,Rhwymiadau bysell eang,Cynllun bysell,Llwybrau byr,Llwybrau byr y rhaglen Keywords[da]=Taster,Globale tastebindinger,Tastesystem,Tastebindinger,genveje,programgenveje -Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturtqlayout +Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout Keywords[el]=ΠλήκτÏα,Καθολικοί συνδυασμοί πλήκτÏων,ΘÎμα πλήκτÏων,Συνδυασμοί πλήκτÏων,συντομεÏσεις,συντομεÏσεις εφαÏμογών Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj Keywords[es]=Teclas,Asociaciones de teclas globales,Esquema de teclas,Asociaciones de teclas,accesos directos,accesos directos de aplicaciones diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 41e792d6f..d17e1619e 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -341,7 +341,7 @@ void ModifiersModule::slotMacSwapClicked() if( m_pchkMacKeyboard->isChecked() && !KKeyNative::keyboardHasWinKey() ) { KMessageBox::sorry( this, i18n("You can only activate this option if your " - "X keyboard tqlayout has the 'Super' or 'Meta' keys " + "X keyboard layout has the 'Super' or 'Meta' keys " "properly configured as modifier keys."), "Incompatibility" ); m_pchkMacSwap->setChecked( false ); diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 5db554ca6..9f997b7e5 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -145,7 +145,7 @@ void ShortcutsModule::initGUI() m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); - m_pcbSchemes->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); + m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); @@ -190,10 +190,10 @@ void ShortcutsModule::initGUI() m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true ); m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false ); - m_pkcGeneral->resize (m_pkcGeneral->tqsizeHint() ); + m_pkcGeneral->resize (m_pkcGeneral->sizeHint() ); if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) { m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this ); - m_useRmWinKeys->resize( m_useRmWinKeys->tqsizeHint() ); + m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); @@ -234,7 +234,7 @@ void ShortcutsModule::createActionsGeneral() //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( bIsNum && !sConfigKey.tqcontains( ':' ) ) { + if( bIsNum && !sConfigKey.contains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -255,7 +255,7 @@ void ShortcutsModule::createActionsSequence() //kdDebug(125) << "sConfigKey: " << sConfigKey // << " bIsNum: " << bIsNum << endl; - if( !bIsNum && !sConfigKey.tqcontains( ':' ) ) { + if( !bIsNum && !sConfigKey.contains( ':' ) ) { actions[i].setConfigurable( false ); actions[i].setName( TQString::null ); } @@ -327,14 +327,14 @@ void ShortcutsModule::slotSelectScheme( int ) config.setGroup( "Settings" ); //m_sBaseSchemeFile = config.readEntry( "Name" ); - // If the user's keyboard tqlayout doesn't support the Win key, - // but this tqlayout scheme requires it, + // If the user's keyboard layout doesn't support the Win key, + // but this layout scheme requires it, if( !KKeyNative::keyboardHasWinKey() && config.readBoolEntry( "Uses Win Modifier", false ) ) { // TODO: change "Win" to Win's label. int ret = KMessageBox::warningContinueCancel( this, i18n("This scheme requires the \"%1\" modifier key, which is not " - "available on your keyboard tqlayout. Do you wish to view it anyway?" ) + "available on your keyboard layout. Do you wish to view it anyway?" ) .arg(i18n("Win")) ); if( ret == KMessageBox::Cancel ) return; @@ -384,7 +384,7 @@ void ShortcutsModule::slotSaveSchemeAs() // Make the next letter upper case TQString s = sFile.mid( ind, 1 ); s = s.upper(); - sFile.tqreplace( ind, 1, s ); + sFile.replace( ind, 1, s ); } iScheme = -1; diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 0d1ddc3cc..58de8a1f5 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -156,8 +156,8 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) TQString groupCaption = g->caption(); // Item names may contain ampersands. To avoid them being converted - // to accelerators, tqreplace them with two ampersands. - groupCaption.tqreplace("&", "&&"); + // to accelerators, replace them with two ampersands. + groupCaption.replace("&", "&&"); AppTreeItem *item; if (parent == 0) @@ -177,8 +177,8 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent) TQString serviceCaption = s->name(); // Item names may contain ampersands. To avoid them being converted - // to accelerators, tqreplace them with two ampersands. - serviceCaption.tqreplace("&", "&&"); + // to accelerators, replace them with two ampersands. + serviceCaption.replace("&", "&&"); AppTreeItem* item; if (parent == 0) @@ -228,7 +228,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath) TQStringList files = dir.entryList(); for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { // does not work?! - //if (filelist.tqcontains(*it)) continue; + //if (filelist.contains(*it)) continue; if (relativePath.isEmpty()) { filelist.remove(*it); // hack @@ -266,7 +266,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath) for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) { if ((*it) == "." || (*it) == "..") continue; // does not work?! - // if (dirlist.tqcontains(*it)) continue; + // if (dirlist.contains(*it)) continue; if (relativePath.isEmpty()) { dirlist.remove(*it); //hack diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog index fd6995a9c..b00a53f1e 100644 --- a/kcontrol/kfontinst/ChangeLog +++ b/kcontrol/kfontinst/ChangeLog @@ -5,7 +5,7 @@ KDE3.4 -> KDE3.5 e.g. Times New Roman -> times.ttf Helvetica, Bold Oblique-> Hevetica, Bold Oblique.fonts.tar.gz - Which tqcontains: + Which contains: 75dpi_helvBO10.pcf.gz 75dpi_helvBO12.pcf.gz 100dpi_helvBO10.pcf.gz @@ -336,9 +336,9 @@ KDE3.1 -> KDE3.2 2. Rearranged this file! 3. Removed command line interface - KDE2's command line stuff is way different! 4. Re-created dialogs with Qt designer. -5. Removed ProgressDialog, and tqreplaced with a progress bar on a new statusbar. +5. Removed ProgressDialog, and replaced with a progress bar on a new statusbar. 6. Modified configure script to check for FreeType & t1lib. -7. If an encoding (not tqunicode) is selected, then the .enc file is copied to the X11 fonts directory. +7. If an encoding (not unicode) is selected, then the .enc file is copied to the X11 fonts directory. 8. As with the .enc files, the StarOffice .xpp files are also copied, and no longer just sym linked. 9. Removed enabling/disabing of Configure System button. 10. Fontmap.X11 is no longer created, instead the real Fontmap file itself is modified. diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 3e7c699e2..c525cd337 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -97,10 +97,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) && KCmdLineArgs::parsedArgs()->isSet("embed")); - itstqStatusLabel = new TQLabel(this); - itstqStatusLabel->setFrameShape(TQFrame::Panel); - itstqStatusLabel->setFrameShadow(TQFrame::Sunken); - itstqStatusLabel->setLineWidth(1); + itsStatusLabel = new TQLabel(this); + itsStatusLabel->setFrameShape(TQFrame::Panel); + itsStatusLabel->setFrameShadow(TQFrame::Sunken); + itsStatusLabel->setLineWidth(1); itsConfig.setGroup(CFG_GROUP); @@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsSplitter=new TQSplitter(this); fontsFrame=new TQFrame(itsSplitter), itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart"); - itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES)); @@ -129,18 +129,18 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) { #endif fontsFrame=new TQFrame(this); - fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifdef HAVE_XFT } #endif TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1); - TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint()); KToolBar *toolbar=new KToolBar(this); bool showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false)); fontsFrame->setLineWidth(0); - toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); + toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum); toolbar->setMovingEnabled(false); TQString previousPath=itsConfig.readEntry(CFG_PATH); @@ -151,22 +151,22 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDirOp->setMinimumSize(TQSize(96, 64)); setMimeTypes(showBitmap); itsDirOp->dirLister()->setMainWindow(this); - itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); - button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); - tqlayout->addWidget(toolbar); + layout->addWidget(toolbar); #ifdef HAVE_XFT - tqlayout->addWidget(itsPreview ? itsSplitter : fontsFrame); + layout->addWidget(itsPreview ? itsSplitter : fontsFrame); #else - tqlayout->addWidget(fontsFrame); + layout->addWidget(fontsFrame); #endif - tqlayout->addWidget(itstqStatusLabel); + layout->addWidget(itsStatusLabel); setButtons(0); setRootOnlyMsg(i18n("<b>The fonts shown are your personal fonts.</b><br>To see (and install) " @@ -390,7 +390,7 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item) ? list->getFirst() : NULL; - if(previewItem && list && list->tqcontains(previewItem)) // OK, check its been selected - not deselected!!! + if(previewItem && list && list->contains(previewItem)) // OK, check its been selected - not deselected!!! itsPreview->openURL(previewItem->url()); } #endif @@ -545,7 +545,7 @@ void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List & void CKCmFontInst::infoMessage(const TQString &msg) { - itstqStatusLabel->setText(msg); + itsStatusLabel->setText(msg); } static TQString family(const TQString &name) @@ -582,7 +582,7 @@ void CKCmFontInst::updateInformation(int, int fonts) } text+=" - "; text+=i18n("One Family", "%n Families", families.count()); - itstqStatusLabel->setText(text); + itsStatusLabel->setText(text); } void CKCmFontInst::delResult(KIO::Job *job) diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h index 8f655f2a4..b304e0a1a 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h @@ -108,7 +108,7 @@ class CKCmFontInst : public KCModule TQSplitter *itsSplitter; KConfig itsConfig; bool itsEmbeddedAdmin; - TQLabel *itstqStatusLabel; + TQLabel *itsStatusLabel; }; } diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h index b1bb35e88..b4766c5c4 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h @@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem TQRect rect() const { - TQRect r = listView()->tqitemRect(this); + TQRect r = listView()->itemRect(this); return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height())); } diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp index 11f1cdebe..afd9fa204 100644 --- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp +++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp @@ -39,14 +39,14 @@ CPrintDialog::CPrintDialog(TQWidget *parent) : KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false) { TQFrame *page=plainPage(); - TQGridLayout *tqlayout=new TQGridLayout(page, 1, 1, 0, spacingHint()); + TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint()); - tqlayout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0); + layout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0); itsOutput=new TQComboBox(page); itsOutput->insertItem(i18n("All Fonts"), 0); itsOutput->insertItem(i18n("Selected Fonts"), 1); - tqlayout->addWidget(itsOutput, 0, 1); - tqlayout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0); + layout->addWidget(itsOutput, 0, 1); + layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0); itsSize=new TQComboBox(page); itsSize->insertItem(i18n("Waterfall"), 0); itsSize->insertItem(i18n("12pt"), 1); @@ -54,8 +54,8 @@ CPrintDialog::CPrintDialog(TQWidget *parent) itsSize->insertItem(i18n("24pt"), 3); itsSize->insertItem(i18n("36pt"), 4); itsSize->insertItem(i18n("48pt"), 5); - tqlayout->addWidget(itsSize, 1, 1); - tqlayout->addItem(new TQSpacerItem(2, 2), 2, 1); + layout->addWidget(itsSize, 1, 1); + layout->addItem(new TQSpacerItem(2, 2), 2, 1); } bool CPrintDialog::exec(bool select, int size) diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp index 55ab5773a..112e3562b 100644 --- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp +++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp @@ -44,35 +44,35 @@ static int strToWeight(const TQString &str) { if(NULL==str) return FC_WEIGHT_MEDIUM; - else if(str.tqcontains("Bold", false)) + else if(str.contains("Bold", false)) return FC_WEIGHT_BOLD; - else if(str.tqcontains("Heavy", false)) + else if(str.contains("Heavy", false)) return FC_WEIGHT_HEAVY; - else if(str.tqcontains("Black", false)) + else if(str.contains("Black", false)) return FC_WEIGHT_BLACK; - else if(str.tqcontains("ExtraBold", false)) + else if(str.contains("ExtraBold", false)) return FC_WEIGHT_EXTRABOLD; - else if(str.tqcontains("UltraBold", false)) + else if(str.contains("UltraBold", false)) return FC_WEIGHT_ULTRABOLD; - else if(str.tqcontains("ExtraLight", false)) + else if(str.contains("ExtraLight", false)) return FC_WEIGHT_EXTRALIGHT; - else if(str.tqcontains("UltraLight", false)) + else if(str.contains("UltraLight", false)) return FC_WEIGHT_ULTRALIGHT; - else if(str.tqcontains("Light", false)) + else if(str.contains("Light", false)) return FC_WEIGHT_LIGHT; - else if(str.tqcontains("Medium", false) || str.tqcontains("Normal", false) || str.tqcontains("Roman", false)) + else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false)) return FC_WEIGHT_MEDIUM; - else if(str.tqcontains("Regular", false)) + else if(str.contains("Regular", false)) return FC_WEIGHT_REGULAR; - else if(str.tqcontains("SemiBold", false)) + else if(str.contains("SemiBold", false)) return FC_WEIGHT_SEMIBOLD; - else if(str.tqcontains("DemiBold", false)) + else if(str.contains("DemiBold", false)) return FC_WEIGHT_DEMIBOLD; - else if(str.tqcontains("Thin", false)) + else if(str.contains("Thin", false)) return FC_WEIGHT_THIN; - else if(str.tqcontains("Book", false)) + else if(str.contains("Book", false)) return FC_WEIGHT_NORMAL; - else if(str.tqcontains("Demi", false)) + else if(str.contains("Demi", false)) return FC_WEIGHT_NORMAL; else return FC_WEIGHT_MEDIUM; @@ -83,21 +83,21 @@ static int strToWidth(const TQString &str) { if(str.isEmpty()) return FC_WIDTH_NORMAL; - else if(str.tqcontains("UltraCondensed", false)) + else if(str.contains("UltraCondensed", false)) return FC_WIDTH_ULTRACONDENSED; - else if(str.tqcontains("ExtraCondensed", false)) + else if(str.contains("ExtraCondensed", false)) return FC_WIDTH_EXTRACONDENSED; - else if(str.tqcontains("SemiCondensed", false)) + else if(str.contains("SemiCondensed", false)) return FC_WIDTH_SEMICONDENSED; - else if(str.tqcontains("Condensed", false)) + else if(str.contains("Condensed", false)) return FC_WIDTH_CONDENSED; - else if(str.tqcontains("SemiExpanded", false)) + else if(str.contains("SemiExpanded", false)) return FC_WIDTH_SEMIEXPANDED; - else if(str.tqcontains("UltraExpanded", false)) + else if(str.contains("UltraExpanded", false)) return FC_WIDTH_ULTRAEXPANDED; - else if(str.tqcontains("ExtraExpanded", false)) + else if(str.contains("ExtraExpanded", false)) return FC_WIDTH_EXTRAEXPANDED; - else if(str.tqcontains("Expanded", false)) + else if(str.contains("Expanded", false)) return FC_WIDTH_EXPANDED; else return FC_WIDTH_NORMAL; @@ -372,7 +372,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what) const FoundryMap *entry; for(entry=map; NULL!=entry->foundry; entry++) - if(foundryAll.length()==entry->len && foundryAll.tqcontains(entry->foundry, false)) + if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false)) { foundryAll=entry->foundry; break; diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp index 7f14d556f..4fe823c23 100644 --- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp +++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp @@ -157,13 +157,13 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str) static void removeSymbols(TQString &str) { - str.tqreplace(TQRegExp("[\\-\\[\\]()]"), " "); + str.replace(TQRegExp("[\\-\\[\\]()]"), " "); int len=str.length(); TQChar space(' '); for(int c=0; c<len; ++c) - if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E) + if(str[c].unicode()<0x20 || str[c].unicode()>0x7E) str[c]=space; str=str.simplifyWhiteSpace(); diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp index a63efeb5d..476b422bd 100644 --- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp +++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp @@ -113,7 +113,7 @@ static TQString createX11PsName(const TQString &font) unsigned int ch; bool newWord=true; - newName.tqreplace(TQRegExp("\\-"), "_"); + newName.replace(TQRegExp("\\-"), "_"); for(ch=0; ch<newName.length(); ++ch) { @@ -136,7 +136,7 @@ static TQString createX11PsName(const TQString &font) } } - newName.tqreplace(" ", TQString::null); + newName.replace(" ", TQString::null); return newName; } diff --git a/kcontrol/kfontinst/kfontinst/GetPid.c b/kcontrol/kfontinst/kfontinst/GetPid.c index 1251c030c..015ea7ce9 100644 --- a/kcontrol/kfontinst/kfontinst/GetPid.c +++ b/kcontrol/kfontinst/kfontinst/GetPid.c @@ -71,7 +71,7 @@ gcc GetPid.c -DTEST_GETPID -DOS_Linux -o tst - ...tqreplace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris, + ...replace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris, OS_HPUX, or OS_AIX 2. Start a program - such as "vi" diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp index 6b0b54340..112ab3d3c 100644 --- a/kcontrol/kfontinst/kfontinst/XConfig.cpp +++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp @@ -748,7 +748,7 @@ CXConfig::TPath::EType CXConfig::TPath::getType(const TQString &d) { TQString str(d); - str.tqreplace(TQRegExp("\\s*"), ""); + str.replace(TQRegExp("\\s*"), ""); return 0==str.find("unix/:") ? FONT_SERVER diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp index 4246afa66..ee1d2dc3c 100644 --- a/kcontrol/kfontinst/kio/KioFonts.cpp +++ b/kcontrol/kfontinst/kio/KioFonts.cpp @@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url) TQString fname(url.fileName()); int pos; - if(-1!=(pos=fname.findRev(TQString::tqfromLatin1(constMultipleExtension)))) + if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension)))) fname=fname.left(pos); return fname; @@ -158,7 +158,7 @@ static TQString modifyName(const TQString &fname) } for(int s=0; constSymbols[s]; ++s) - rv=rv.tqreplace(constSymbols[s], '_'); + rv=rv.replace(constSymbols[s], '_'); return rv; } @@ -292,7 +292,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con ? KFI_KIO_FONTS_PROTOCOL"/system-folder" : KFI_KIO_FONTS_PROTOCOL"/folder"); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); return true; } else if (sys && !Misc::root()) // Default system fonts folder does not actually exist yet! @@ -390,18 +390,18 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1()); addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime); - addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::tqfindByPath(path, 0, true)->name()); + addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name()); addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream"); - TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/")); + TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/")); if(!Misc::root()) { url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER); - url+=TQString::tqfromLatin1("/"); + url+=TQString::fromLatin1("/"); } if(multiple) - url+=name+TQString::tqfromLatin1(constMultipleExtension); + url+=name+TQString::fromLatin1(constMultipleExtension); else url+=Misc::getFile(path); addAtom(entry, KIO::UDS_URL, 0, url); @@ -411,7 +411,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal return false; } -enum EUrltqStatus +enum EUrlStatus { BAD_URL, URL_OK, @@ -427,7 +427,7 @@ static KURL getRedirect(const KURL &u) sect(CKioFonts::getSect(path)); path.remove(sect); - path.tqreplace("//", "/"); + path.replace("//", "/"); redirect.setPath(path); KFI_DBUG << "Redirect from " << u.path() << " to " << redirect.path() << endl; @@ -441,7 +441,7 @@ static bool nonRootSys(const KURL &u) static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs) { - if(dirs.tqcontains(defaultDir)) + if(dirs.contains(defaultDir)) return defaultDir; else { @@ -494,7 +494,7 @@ static bool isAAfm(const TQString &fname) { line=stream.readLine(); - if(line.tqcontains("StartFontMetrics")) + if(line.contains("StartFontMetrics")) { file.close(); return true; @@ -650,7 +650,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma if(entry!=list.end()) { - if(!(*entry).paths.tqcontains(path)) + if(!(*entry).paths.contains(path)) (*entry).paths.append(path); } else @@ -670,7 +670,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma if((*fIt).paths.count()>1) { // There's more than 1 file with the same name, but in a different locations - // therefore, take the unique part of the path, and tqreplace / with _ + // therefore, take the unique part of the path, and replace / with _ // e.g. // /usr/X11R6/lib/X11/fonts/75dpi/times.pcf.gz // /usr/X11R6/lib/X11/fonts/100dpi/times.pcf.gz @@ -688,11 +688,11 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma if((*pIt).orig[i]!=(*pBegin).orig[i]) { (*pIt).modified=(*pIt).orig.mid(i); - (*pIt).modified=(*pIt).modified.tqreplace('/', '_'); + (*pIt).modified=(*pIt).modified.replace('/', '_'); if((*pBegin).modified.isEmpty()) { (*pBegin).modified=(*pBegin).orig.mid(i); - (*pBegin).modified=(*pBegin).modified.tqreplace('/', '_'); + (*pBegin).modified=(*pBegin).modified.replace('/', '_'); } break; } @@ -806,7 +806,7 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app) { TQString str(paths[path]); - str.tqreplace(TQRegExp("\\s*"), ""); + str.replace(TQRegExp("\\s*"), ""); if(0==str.find("unix/:")) itsUsingXfsFpe=true; @@ -1018,7 +1018,7 @@ void CKioFonts::get(const KURL &url) { // Determine the mimetype of the file to be retrieved, and emit it. // This is mandatory in all slaves (for KRun/BrowserRun to work). - emit mimeType(useMime.isEmpty() ? KMimeType::tqfindByPath(realPathC, buff.st_mode, true)->name() : useMime); + emit mimeType(useMime.isEmpty() ? KMimeType::findByPath(realPathC, buff.st_mode, true)->name() : useMime); totalSize(buff.st_size); @@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo if (markPartial) { - TQString destPart(destOrig+TQString::tqfromLatin1(".part")); + TQString destPart(destOrig+TQString::fromLatin1(".part")); TQCString destPartC(TQFile::encodeName(destPart)); dest = destPart; @@ -1751,9 +1751,9 @@ void CKioFonts::special(const TQByteArray &a) finished(); break; case SPECIAL_RECONFIG: // Only itended to be called from kcmfontinst - when a user has re-enabled doX or doGs - if(itsRoot && !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) + if(itsRoot && !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) itsFolders[FOLDER_SYS].modified.add(itsFolders[FOLDER_SYS].location); - else if(!itsRoot && !itsFolders[FOLDER_USER].modified.tqcontains(itsFolders[FOLDER_USER].location)) + else if(!itsRoot && !itsFolders[FOLDER_USER].modified.contains(itsFolders[FOLDER_USER].location)) itsFolders[FOLDER_USER].modified.add(itsFolders[FOLDER_USER].location); doModified(); @@ -1831,7 +1831,7 @@ void CKioFonts::doModified() // // If a non-default folder has been modified, always configure X if(NULL==strchr(itsKfiParams, 'x') && - (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))) + (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))) { if(0==itsKfiParams[0]) strcpy(itsKfiParams, "-x"); @@ -1850,7 +1850,7 @@ void CKioFonts::doModified() KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl; } - if(itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) + if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) { itsHasSys=true; itsAddToSysFc=false; @@ -1862,7 +1862,7 @@ void CKioFonts::doModified() TQCString cmd; createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false); - if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)) + if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)) { itsHasSys=true; itsAddToSysFc=false; @@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u) if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) || ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || - ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) || + ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/'))) { error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".") .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \ diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h index 802d16eaf..57dc8516a 100644 --- a/kcontrol/kfontinst/kio/KioFonts.h +++ b/kcontrol/kfontinst/kio/KioFonts.h @@ -82,7 +82,7 @@ class CKioFonts : public KIO::SlaveBase CDirList() { } CDirList(const TQString &str) : TQStringList(str) { } - void add(const TQString &d) { if (!tqcontains(d)) append(d); } + void add(const TQString &d) { if (!contains(d)) append(d); } }; struct TFolder diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp index 2b3d40737..44d180fd2 100644 --- a/kcontrol/kfontinst/lib/FcEngine.cpp +++ b/kcontrol/kfontinst/lib/FcEngine.cpp @@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str) ch; for(ch=0; ch<slen; ++ch) - if(!FcCharSetHasChar(font->charset, str[ch].tqunicode())) + if(!FcCharSetHasChar(font->charset, str[ch].unicode())) return false; return true; } diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp index a3c77526a..1e779b514 100644 --- a/kcontrol/kfontinst/lib/Misc.cpp +++ b/kcontrol/kfontinst/lib/Misc.cpp @@ -65,7 +65,7 @@ TQString dirSyntax(const TQString &d) { TQString ds(d); - ds.tqreplace("//", "/"); + ds.replace("//", "/"); int slashPos=ds.findRev('/'); @@ -84,7 +84,7 @@ TQString xDirSyntax(const TQString &d) { TQString ds(d); - ds.tqreplace("//", "/"); + ds.replace("//", "/"); int slashPos=ds.findRev('/'); diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp index bded4fad4..3679be252 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.cpp +++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp @@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *) } } -TQSize CFontPreview::tqsizeHint() const +TQSize CFontPreview::sizeHint() const { return TQSize(132, 132); } -TQSize CFontPreview::tqminimumSizeHint() const +TQSize CFontPreview::minimumSizeHint() const { return TQSize(32, 32); } diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h index 6ef34f5bc..a57e9b9c9 100644 --- a/kcontrol/kfontinst/viewpart/FontPreview.h +++ b/kcontrol/kfontinst/viewpart/FontPreview.h @@ -50,8 +50,8 @@ class CFontPreview : public QWidget virtual ~CFontPreview() {} void paintEvent(TQPaintEvent *); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; void showFont(const KURL &url); void showFont(); diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp index a560d2968..14bda4024 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp @@ -76,7 +76,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) itsToolsFrame=new TQFrame(itsFrame); - TQVBoxLayout *tqlayout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint()); + TQVBoxLayout *layout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint()); TQGridLayout *previewLayout=new TQGridLayout(previewFrame, 1, 1, 1, 1); TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint()); @@ -88,14 +88,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) setInstance(new KInstance("kfontview")); itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview"); - itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); + itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame); itsFaceSelector=new KIntNumInput(1, itsToolsFrame); itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button"); itsInstallButton->hide(); previewLayout->addWidget(itsPreview, 0, 0); - tqlayout->addWidget(previewFrame); - tqlayout->addWidget(itsToolsFrame); + layout->addWidget(previewFrame); + layout->addWidget(itsToolsFrame); toolsLayout->addWidget(itsFaceLabel); toolsLayout->addWidget(itsFaceSelector); itsFaceLabel->hide(); @@ -103,7 +103,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum)); toolsLayout->addWidget(itsInstallButton); itsToolsFrame->hide(); - connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewtqStatus(bool))); + connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool))); connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install())); connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int))); @@ -165,17 +165,17 @@ void CFontViewPart::timeout() if(Misc::root()) { destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); } else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url); - if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget())) + if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget())) itsShowInstallButton=false; else { destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url); - itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()); + itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()); } } } @@ -193,7 +193,7 @@ void CFontViewPart::timeout() itsToolsFrame->hide(); } -void CFontViewPart::previewtqStatus(bool st) +void CFontViewPart::previewStatus(bool st) { itsInstallButton->setShown(st && itsShowInstallButton); itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown()); @@ -220,7 +220,7 @@ void CFontViewPart::install() { KURL destUrl(getDest(m_url, KMessageBox::No==resp)); - if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget())) + if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget())) { // // OK file copied, now look for any AFM or PFM file... @@ -236,7 +236,7 @@ void CFontViewPart::install() for(it=urls.begin(); it!=end; ++it) { destUrl=getDest(*it, KMessageBox::No==resp); - KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget()); + KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget()); } } @@ -274,7 +274,7 @@ void CFontViewPart::print() items.append(itsPreview->engine().getName(m_url)); - Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine()); + Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine()); } } diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h index 79d5c4743..21de2e074 100644 --- a/kcontrol/kfontinst/viewpart/FontViewPart.h +++ b/kcontrol/kfontinst/viewpart/FontViewPart.h @@ -60,7 +60,7 @@ class CFontViewPart : public KParts::ReadOnlyPart private slots: - void previewtqStatus(bool st); + void previewStatus(bool st); void timeout(); void install(); void changeText(); diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index 2d1f392cf..372104c4a 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -46,12 +46,12 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) this, TQT_SLOT(save())); TQFrame* page = plainPage(); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page); + TQVBoxLayout* layout = new TQVBoxLayout(page); m_advancedWidget = new advancedKickerOptions(page); - tqlayout->addWidget(m_advancedWidget); - tqlayout->addStretch(); + layout->addWidget(m_advancedWidget); + layout->addStretch(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); @@ -86,7 +86,7 @@ void advancedDialog::load() int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14); m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize); - TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() ); + TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() ); m_advancedWidget->tintColorB->setColor( color ); int tintValue = c.readNumEntry( "TintValue", 33 ); m_advancedWidget->tintSlider->setValue( tintValue ); @@ -123,7 +123,7 @@ void advancedDialog::save() // is there a config group for this extension? if(!c.hasGroup(group) || - group.tqcontains("Extension") < 1) + group.contains("Extension") < 1) { continue; } diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui index f88303414..215ef7e8b 100644 --- a/kcontrol/kicker/advancedOptions.ui +++ b/kcontrol/kicker/advancedOptions.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>advancedKickerOptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -71,7 +71,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -208,7 +208,7 @@ <property name="text"> <string>Min</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> @@ -225,7 +225,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -250,7 +250,7 @@ <property name="text"> <string>Max</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> @@ -312,8 +312,8 @@ <include location="global" impldecl="in declaration">knuminput.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui index e5120f9a6..6ebfa2c88 100644 --- a/kcontrol/kicker/applettab.ui +++ b/kcontrol/kicker/applettab.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AppletTabBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -123,7 +123,7 @@ <property name="name"> <cstring>pb_add</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -143,7 +143,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -162,7 +162,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -219,8 +219,8 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>qwidget.h</includehint> </includehints> diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index 534f2cbdb..a8b7cdb20 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -132,7 +132,7 @@ void AppletTab::load( bool useDefaults ) TQStringList list = c.readListEntry("TrustedApplets"); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if(available.tqcontains(*it)) + if(available.contains(*it)) l_trusted << (*it); } } @@ -142,7 +142,7 @@ void AppletTab::load( bool useDefaults ) for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it ) { - if(!l_trusted.tqcontains(*it)) + if(!l_trusted.contains(*it)) l_available << (*it); } diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp index 89f000410..d1a0b2766 100644 --- a/kcontrol/kicker/extensionInfo.cpp +++ b/kcontrol/kicker/extensionInfo.cpp @@ -125,7 +125,7 @@ void ExtensionInfo::load() c.setGroup("General"); _position = c.readNumEntry ("Position", _position); - _tqalignment = c.readNumEntry ("Alignment", _tqalignment); + _alignment = c.readNumEntry ("Alignment", _alignment); _xineramaScreen = c.readNumEntry ("XineramaScreen", _xineramaScreen); _showLeftHB = c.readBoolEntry("ShowLeftHideButton", _showLeftHB); _showRightHB = c.readBoolEntry("ShowRightHideButton", _showRightHB); @@ -147,7 +147,7 @@ void ExtensionInfo::load() } _orig_position = _position; - _orig_tqalignment = _tqalignment; + _orig_alignment = _alignment; _orig_size = _size; _orig_customSize = _customSize; @@ -170,10 +170,10 @@ void ExtensionInfo::configChanged() _orig_position = _position = position; } - int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); - if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment) + int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0); + if (alignment != _alignment && alignment != _orig_alignment) { - _orig_tqalignment = _tqalignment = tqalignment; + _orig_alignment = _alignment = alignment; } if (_resizeable) @@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults() { // defaults _position = 3; - _tqalignment = TQApplication::reverseLayout() ? 2 : 0; + _alignment = TQApplication::reverseLayout() ? 2 : 0; _xineramaScreen = TQApplication::desktop()->primaryScreen(); _size = 2; _showLeftHB = false; @@ -225,7 +225,7 @@ void ExtensionInfo::save() c.setGroup("General"); c.writeEntry("Position", _position); - c.writeEntry("Alignment", _tqalignment); + c.writeEntry("Alignment", _alignment); c.writeEntry("XineramaScreen", _xineramaScreen); c.writeEntry("ShowLeftHideButton", _showLeftHB); c.writeEntry("ShowRightHideButton", _showRightHB); @@ -251,7 +251,7 @@ void ExtensionInfo::save() } _orig_position = _position; - _orig_tqalignment = _tqalignment; + _orig_alignment = _alignment; _orig_size = _size; _orig_customSize = _customSize; diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h index 5b890d324..169322aa4 100644 --- a/kcontrol/kicker/extensionInfo.h +++ b/kcontrol/kicker/extensionInfo.h @@ -47,7 +47,7 @@ class ExtensionInfo // Configuration settings TQString _name; int _position; - int _tqalignment; + int _alignment; int _xineramaScreen; int _size; int _customSize; @@ -67,7 +67,7 @@ class ExtensionInfo // Original settings to ensure that we can figure out // what has changed externally to the panel vs within the panel int _orig_position; - int _orig_tqalignment; + int _orig_alignment; int _orig_size; int _orig_customSize; diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 27e40a5fc..935fa5902 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -31,10 +31,10 @@ HidingConfig::HidingConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new HidingTab(this); - tqlayout->addWidget(m_widget); - tqlayout->addStretch(); + layout->addWidget(m_widget); + layout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui index 6bc618591..8d7b0b254 100644 --- a/kcontrol/kicker/hidingtab.ui +++ b/kcontrol/kicker/hidingtab.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>HidingTabBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>342</width> <height>20</height> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -115,7 +115,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -218,7 +218,7 @@ </widget> <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -332,7 +332,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>10</height> @@ -401,7 +401,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -439,7 +439,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -532,7 +532,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -557,7 +557,7 @@ <property name="text"> <string>Fast</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -573,7 +573,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -598,7 +598,7 @@ <property name="text"> <string>Medium</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -637,7 +637,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -753,8 +753,8 @@ <slots> <slot specifier="pure virtual">switchPanel(int)</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index 2c490f6dc..7475ad7b0 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -31,10 +31,10 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new LookAndFeelTab(this); - tqlayout->addWidget(m_widget); - tqlayout->addStretch(); + layout->addWidget(m_widget); + layout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui index 8a802a369..87f87cfc7 100644 --- a/kcontrol/kicker/lookandfeeltab.ui +++ b/kcontrol/kicker/lookandfeeltab.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LookAndFeelTabBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -359,7 +359,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>66</width> <height>130</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -428,13 +428,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>50</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>50</width> <height>50</height> @@ -449,7 +449,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -500,7 +500,7 @@ This option is only active if 'Enable background image' is selected.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>289</width> <height>20</height> @@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -626,8 +626,8 @@ This option is only active if 'Enable background image' is selected.</string> <slot access="protected" specifier="pure virtual">browseTheme(const QString&)</slot> <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index ac977b676..bfdb3a491 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -42,11 +42,11 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) setAboutData( about ); KickerConfig::initScreenNumber(); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lookandfeeltab = new LookAndFeelTab(this); - tqlayout->addWidget(lookandfeeltab); - tqlayout->addStretch(); + layout->addWidget(lookandfeeltab); + layout->addStretch(); connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged())); diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index 10fc45699..e60746db8 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -187,7 +187,7 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re TQString group(*it); // is there a config group for this extension? - if (!config.hasGroup(group) || group.tqcontains("Extension") < 1) + if (!config.hasGroup(group) || group.contains("Extension") < 1) { continue; } diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index 4b6c6c6ff..03ca57582 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -31,10 +31,10 @@ MenuConfig::MenuConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new MenuTab(this); - tqlayout->addWidget(m_widget); - tqlayout->addStretch(); + layout->addWidget(m_widget); + layout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui index ac2b8fe0f..7d3a3d460 100644 --- a/kcontrol/kicker/menutab.ui +++ b/kcontrol/kicker/menutab.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MenuTabBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -85,7 +85,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -197,7 +197,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -261,13 +261,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>26</width> <height>26</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>26</width> <height>26</height> @@ -327,7 +327,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -389,7 +389,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -487,7 +487,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -558,7 +558,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -654,7 +654,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -698,7 +698,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -730,8 +730,8 @@ <include location="global" impldecl="in implementation">knuminput.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistview.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index cd1d27fa9..970aa10a1 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) btnCustomKMenuIcon->setPixmap(kmenu_icon); KConfig *config; - config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::tqfromLatin1("RecentDocuments")); - maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10)); + config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::fromLatin1("RecentDocuments")); + maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10)); m_browserGroupLayout->setColStretch( 1, 1 ); m_pRecentOrderGroupLayout->setColStretch( 1, 1 ); @@ -148,7 +148,7 @@ void MenuTab::load( bool useDefaults ) df.readName(), *it, SmallIcon(df.readIcon()), - tqFind(ext.begin(), ext.end(), *it) != ext.end()); + qFind(ext.begin(), ext.end(), *it) != ext.end()); connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); } } @@ -247,8 +247,8 @@ void MenuTab::save() // Save recent documents KConfig *config; - config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); - config->setGroup(TQString::tqfromLatin1("RecentDocuments")); + config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); + config->setGroup(TQString::fromLatin1("RecentDocuments")); config->writeEntry("MaxEntries", maxrecentdocs->value()); config->sync(); diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 2367f2317..6e5dcdeb2 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -31,10 +31,10 @@ PositionConfig::PositionConfig(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); m_widget = new PositionTab(this); - tqlayout->addWidget(m_widget); - tqlayout->addStretch(); + layout->addWidget(m_widget); + layout->addStretch(); setQuickHelp(KickerConfig::the()->quickHelp()); setAboutData(KickerConfig::the()->aboutData()); diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui index 90217d5e4..b0566f5dc 100644 --- a/kcontrol/kicker/positiontab.ui +++ b/kcontrol/kicker/positiontab.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>PositionTabBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>342</width> <height>20</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -123,7 +123,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>151</width> <height>115</height> @@ -132,7 +132,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="whatsThis" stdset="0"> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>101</height> @@ -357,7 +357,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -426,7 +426,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>40</height> @@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -555,7 +555,7 @@ how it is positioned on the screen and how much of the screen it should use.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>0</height> @@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>16</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>16</height> @@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.</st <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>16</width> <height>24</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>16</width> <height>24</height> @@ -1118,8 +1118,8 @@ how it is positioned on the screen and how much of the screen it should use.</st <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot> <slot specifier="pure virtual">switchPanel( int )</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index b5c4c0ac7..d65498430 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -43,7 +43,7 @@ #include "positiontab_impl.moc" -// magic numbers for the preview widget tqlayout +// magic numbers for the preview widget layout extern const int offsetX = 23; extern const int offsetY = 14; extern const int maxX = 150; @@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) { TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png")); m_monitorImage->setPixmap(monitor); - m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint()); + m_monitorImage->setFixedSize(m_monitorImage->sizeHint()); m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG"); m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY); @@ -558,7 +558,7 @@ void PositionTab::switchPanel(int panelItem) m_customSpinbox->setValue(m_panelInfo->_customSize); m_sizeGroup->setEnabled(m_panelInfo->_resizeable); m_panelPos = m_panelInfo->_position; - m_panelAlign = m_panelInfo->_tqalignment; + m_panelAlign = m_panelInfo->_alignment; if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens()) m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen); else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */ @@ -672,7 +672,7 @@ void PositionTab::storeInfo() } m_panelInfo->_position = m_panelPos; - m_panelInfo->_tqalignment = m_panelAlign; + m_panelInfo->_alignment = m_panelAlign; if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1) m_panelInfo->_xineramaScreen = -2; /* all screens */ else @@ -696,14 +696,14 @@ void PositionTab::showIdentify() screenLabel->setFrameStyle(TQFrame::Panel); screenLabel->setFrameShadow(TQFrame::Plain); - screenLabel->tqsetAlignment(Qt::AlignCenter); + screenLabel->setAlignment(Qt::AlignCenter); screenLabel->setNum(s + 1); // BUGLET: we should not allow the identification to be entered again // until the timer fires. TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); - TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint()); + TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); targetGeometry.moveCenter(screenCenter); screenLabel->setGeometry(targetGeometry); diff --git a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO index b0b32404e..8d67d9a37 100644 --- a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO +++ b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO @@ -37,7 +37,7 @@ to group the entries whenever necessary. Currently there are 5 approximations: IE, NN, MOZ, OP, MISC. These represent Internet Explorer, Netscape Navigator, Mozilla, Opera and Miscellaneous respectively. NOTE: you can enter any value here as it is just -a place holder that would be automatically tqreplaced with the +a place holder that would be automatically replaced with the actual user-agent name (X-KDE-UA-NAME). X-KDE-UA-FULL @@ -46,7 +46,7 @@ TYPE: QString TRANSLATE: NO DESCRIPTION: The full user-agent description that will be sent to the remote -site. It can contain the following keywords that would be tqreplaced +site. It can contain the following keywords that would be replaced with the appropriate value as defined by "uname": appSysName the name of the operating system (ex: Linux). @@ -56,7 +56,7 @@ appSysRelease the version of the operating system (ex: 2.2.18). appKDERelease the current release number as set by KDE (ex: 2.1.9 >=20010310). appMachineType the processor or machine type (ex: i686). -NOTE: if you use any of these values and want them to be tqreplaced +NOTE: if you use any of these values and want them to be replaced automatically, make sure you include the X-KDE-UA-DYNAMIC-ENTRY field and set its value to 1 (for true). @@ -98,7 +98,7 @@ DESCRIPTION: A boolean that indicates whether the keywords described under X-KDE-UA-FULL should be translated. Make sure this field is there with its value set to "1" if you want the keywords to -be tqreplaced appropriately. +be replaced appropriately. EXAMPLES: @@ -127,7 +127,7 @@ X-KDE-UA-DYNAMIC-ENTRY=1 The first entry is a description file for Internet Explorer running on a Windows 98 machine while the second one is an example of a description file for Netscape browser using the "keyword" based approach to describe -the fields that should be tqreplaced dynamically based on the current system +the fields that should be replaced dynamically based on the current system settings. Note that all "keyword" based desktop files should always set X-KDE-UA-DYNAMIC-ENTRY to 1. diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui index 20368e748..c0e504057 100644 --- a/kcontrol/kio/cache_ui.ui +++ b/kcontrol/kio/cache_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>CacheDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>21</height> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>21</height> @@ -183,5 +183,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/kio/envvarproxy_ui.ui b/kcontrol/kio/envvarproxy_ui.ui index 4a0130f46..471b9f868 100644 --- a/kcontrol/kio/envvarproxy_ui.ui +++ b/kcontrol/kio/envvarproxy_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EnvVarProxyDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -171,5 +171,5 @@ Alternatively, you can click on the <b>"Auto Detect"</b> button to a <tabstop>pbVerify</tabstop> <tabstop>pbDetect</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp index 1920ddad9..00a87567e 100644 --- a/kcontrol/kio/fakeuaprovider.cpp +++ b/kcontrol/kio/fakeuaprovider.cpp @@ -27,14 +27,14 @@ #include "fakeuaprovider.h" #define UA_PTOS(x) (*it)->property(x).toString() -#define QFL(x) TQString::tqfromLatin1(x) +#define QFL(x) TQString::fromLatin1(x) FakeUASProvider::FakeUASProvider() { m_bIsDirty = true; } -FakeUASProvider::tqStatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr ) +FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr ) { TQStringList split; int pos = (uaStr).find("::"); @@ -53,7 +53,7 @@ FakeUASProvider::tqStatusCode FakeUASProvider::createNewUAProvider( const TQStri split = TQStringList::split("::", uaStr); } - if ( m_lstIdentity.tqcontains(split[1]) ) + if ( m_lstIdentity.contains(split[1]) ) return DUPLICATE_ENTRY; else { @@ -90,29 +90,29 @@ void FakeUASProvider::parseDescription() struct utsname utsn; uname( &utsn ); - tmp.tqreplace( QFL("appSysName"), TQString(utsn.sysname) ); - tmp.tqreplace( QFL("appSysRelease"), TQString(utsn.release) ); - tmp.tqreplace( QFL("appMachineType"), TQString(utsn.machine) ); + tmp.replace( QFL("appSysName"), TQString(utsn.sysname) ); + tmp.replace( QFL("appSysRelease"), TQString(utsn.release) ); + tmp.replace( QFL("appMachineType"), TQString(utsn.machine) ); TQStringList languageList = KGlobal::locale()->languageList(); if ( languageList.count() ) { - TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") ); + TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") ); if( it != languageList.end() ) { - if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 ) + if( languageList.contains( TQString::fromLatin1("en") ) > 0 ) languageList.remove( it ); else - (*it) = TQString::tqfromLatin1("en"); + (*it) = TQString::fromLatin1("en"); } } - tmp.tqreplace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); - tmp.tqreplace( QFL("appPlatform"), QFL("X11") ); + tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) ); + tmp.replace( QFL("appPlatform"), QFL("X11") ); } // Ignore dups... - if ( m_lstIdentity.tqcontains(tmp) ) + if ( m_lstIdentity.contains(tmp) ) continue; m_lstIdentity << tmp; diff --git a/kcontrol/kio/fakeuaprovider.h b/kcontrol/kio/fakeuaprovider.h index 01a6aeae5..8aedb639d 100644 --- a/kcontrol/kio/fakeuaprovider.h +++ b/kcontrol/kio/fakeuaprovider.h @@ -27,7 +27,7 @@ class TQStringList; class FakeUASProvider { public: - enum tqStatusCode { + enum StatusCode { SUCCEEDED=0, ALREADY_EXISTS, DUPLICATE_ENTRY @@ -36,7 +36,7 @@ public: FakeUASProvider(); ~FakeUASProvider(){}; - tqStatusCode createNewUAProvider( const TQString& ); + StatusCode createNewUAProvider( const TQString& ); TQString aliasStr( const TQString& ); TQString agentStr( const TQString& ); TQStringList userAgentStringList(); diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp index d8639d1be..8233f0d20 100644 --- a/kcontrol/kio/kcookiesmain.cpp +++ b/kcontrol/kio/kcookiesmain.cpp @@ -34,9 +34,9 @@ KCookiesMain::KCookiesMain(TQWidget *parent) "are stored on your computer.")); } - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); policies = new KCookiesPolicies(this); tab->addTab(policies, i18n("&Policy")); diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp index 85a16edd5..f2cd45c42 100644 --- a/kcontrol/kio/kcookiesmanagement.cpp +++ b/kcontrol/kio/kcookiesmanagement.cpp @@ -102,7 +102,7 @@ TQString CookieListViewItem::text(int f) const KCookiesManagement::KCookiesManagement(TQWidget *parent) : KCModule(parent, "kcmkio") { - // Toplevel tqlayout + // Toplevel layout TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui index 63f9a2008..f36c0a707 100644 --- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui +++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KCookiesManagementDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -71,7 +71,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>62</height> @@ -130,7 +130,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -315,8 +315,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistviewsearchline.h</includehint> </includehints> diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp index 00d2b9860..63f4dd21a 100644 --- a/kcontrol/kio/kcookiespolicies.cpp +++ b/kcontrol/kio/kcookiespolicies.cpp @@ -175,7 +175,7 @@ bool KCookiesPolicies::handleDuplicate( const TQString& domain, int advice ) { TQString msg = i18n("<qt>A policy already exists for" "<center><b>%1</b></center>" - "Do you want to tqreplace it?</qt>").arg(domain); + "Do you want to replace it?</qt>").arg(domain); int res = KMessageBox::warningContinueCancel(this, msg, i18n("Duplicate Policy"), i18n("Replace")); @@ -392,7 +392,7 @@ void KCookiesPolicies::save() while( at ) { - domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); + domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at])); at = at->nextSibling(); } diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui index 50b6805b4..435ca8640 100644 --- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui +++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KCookiesPolicyDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -161,7 +161,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -170,7 +170,7 @@ To add a new policy, simply click on the <b>Add...</b> button and su </spacer> <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -256,7 +256,7 @@ List of sites for which you have set a specific cookie policy. Specific policies </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -314,8 +314,8 @@ List of sites for which you have set a specific cookie policy. Specific policies <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistviewsearchline.h</includehint> diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp index 8d21c7a5b..22accb4e9 100644 --- a/kcontrol/kio/kenvvarproxydlg.cpp +++ b/kcontrol/kio/kenvvarproxydlg.cpp @@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed() setHighLight (mDlg->lbNoProxy, false); // Detect HTTP proxy settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]); // Detect HTTPS proxy settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]); // Detect FTP proxy settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); + found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]); // Detect the NO_PROXY settings... - found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); + found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]); if ( !found ) { diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp index 3b0745961..92e8a98e6 100644 --- a/kcontrol/kio/kmanualproxydlg.cpp +++ b/kcontrol/kio/kmanualproxydlg.cpp @@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name ) mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) ); TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() ); - mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy ); + mDlg->pbCopyDown->setSizePolicy( sizePolicy ); init(); } @@ -423,7 +423,7 @@ bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const // We only check for a relevant subset of characters that are // not allowed in <authority> component of a URL. - if ( host.tqcontains ('*') || host.tqcontains (' ') || host.tqcontains ('?') ) + if ( host.contains ('*') || host.contains (' ') || host.contains ('?') ) return false; if ( result ) diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp index 5f43afce2..bbe7a76bd 100644 --- a/kcontrol/kio/kproxydlg.cpp +++ b/kcontrol/kio/kproxydlg.cpp @@ -43,10 +43,10 @@ KProxyOptions::KProxyOptions (TQWidget* parent ) :KCModule (parent, "kcmkio") { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); mTab = new TQTabWidget(this); - tqlayout->addWidget(mTab); + layout->addWidget(mTab); mProxy = new KProxyDialog(mTab); mSocks = new KSocksConfig(mTab); diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui index c2f654358..1a6b5d6e2 100644 --- a/kcontrol/kio/kproxydlg_ui.ui +++ b/kcontrol/kio/kproxydlg_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ProxyDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -99,7 +99,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -115,7 +115,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -145,7 +145,7 @@ Automatic detection is performed using the <b>Web Proxy Auto-Discovery Pro </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -194,7 +194,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -284,7 +284,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -300,7 +300,7 @@ Environment variables such as <b>HTTP_PROXY</b> and <b>NO_PROX <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -433,8 +433,8 @@ Although a persistent proxy connection is faster, note that it only works correc <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/kio/lanbrowser.desktop index 6959cba35..5d3965667 100644 --- a/kcontrol/kio/lanbrowser.desktop +++ b/kcontrol/kio/lanbrowser.desktop @@ -96,7 +96,7 @@ Comment[bn]=lisa, reslisa à¦à¦¬à¦‚ ioslaves সেট-আপ Comment[br]=Kefluniadur lisa, reslisa and skalvoù IO Comment[bs]=Podesite lisa, reslisa i ioslaves Comment[ca]=Arranja lisa, reslisa i els ioslaves -Comment[cs]=Nastavenà Lisa, ResLisa a potqmocných zaÅ™Ãzenà +Comment[cs]=Nastavenà Lisa, ResLisa a pomocných zaÅ™Ãzenà Comment[csb]=Ùstôw lisa, reslisa ë procedurów wé/wi Comment[cy]=Gosodiad lisa,reslisa a'r gweision-io Comment[da]=Opsætning af lisa, reslisa og ioslaverne diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp index fb2c0edfd..96821defa 100644 --- a/kcontrol/kio/main.cpp +++ b/kcontrol/kio/main.cpp @@ -79,7 +79,7 @@ extern "C" LanBrowser::LanBrowser(TQWidget *parent) :KCModule(parent,"kcmkio") -,tqlayout(this) +,layout(this) ,tabs(this) { setQuickHelp( i18n("<h1>Local Network Browsing</h1>Here you setup your " @@ -99,7 +99,7 @@ LanBrowser::LanBrowser(TQWidget *parent) "the LISa Homepage</a> or contact Alexander Neundorf " "<<a href=\"mailto:neundorf@kde.org\">neundorf@kde.org</a>>.")); - tqlayout.addWidget(&tabs); + layout.addWidget(&tabs); smbPage = create_smb(&tabs, 0); tabs.addTab(smbPage, i18n("&Windows Shares")); diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h index 9d3609924..5c6d35ef9 100644 --- a/kcontrol/kio/main.h +++ b/kcontrol/kio/main.h @@ -35,7 +35,7 @@ class LanBrowser:public KCModule virtual void save(); private: - TQVBoxLayout tqlayout; + TQVBoxLayout layout; TQTabWidget tabs; KCModule *smbPage; KCModule *lisaPage; diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui index 6202a78ab..1c8ef8634 100644 --- a/kcontrol/kio/manualproxy_ui.ui +++ b/kcontrol/kio/manualproxy_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ManualProxyDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -137,7 +137,7 @@ <property name="name"> <cstring>sbHttp</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -211,7 +211,7 @@ Reverse the use of the exception list. Checking this box will result in the prox </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>114</height> @@ -313,5 +313,5 @@ Reverse the use of the exception list. Checking this box will result in the prox <tabstop>pbDelete</tabstop> <tabstop>pbDeleteAll</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp index 19cccaf22..463806266 100644 --- a/kcontrol/kio/policydlg.cpp +++ b/kcontrol/kio/policydlg.cpp @@ -70,7 +70,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); - setFixedSize (tqsizeHint()); + setFixedSize (sizeHint()); m_dlgUI->leDomain->setFocus (); } diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h index a67bfccaa..2bf7a4c99 100644 --- a/kcontrol/kio/policydlg.h +++ b/kcontrol/kio/policydlg.h @@ -52,11 +52,11 @@ public: if (advice.isEmpty()) return KCookieAdvice::Dunno; - if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0) + if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0) return KCookieAdvice::Accept; - else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0) + else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0) return KCookieAdvice::Reject; - else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0) + else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0) return KCookieAdvice::Ask; return KCookieAdvice::Dunno; diff --git a/kcontrol/kio/policydlg_ui.ui b/kcontrol/kio/policydlg_ui.ui index 627a985cf..1bae63208 100644 --- a/kcontrol/kio/policydlg_ui.ui +++ b/kcontrol/kio/policydlg_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PolicyDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -101,6 +101,6 @@ Select the desired policy: <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp index 93267c0e2..90dfd9170 100644 --- a/kcontrol/kio/smbrodlg.cpp +++ b/kcontrol/kio/smbrodlg.cpp @@ -38,40 +38,40 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) : KCModule(parent, "kcmkio") { - TQGridLayout *tqlayout = new TQGridLayout(this,2,-1,KDialog::marginHint(), + TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(), KDialog::spacingHint()); TQLabel *label=new TQLabel(i18n("This is the configuration for the samba client only, not the server."),this); - tqlayout->addMultiCellWidget(label,0,0,0,1); + layout->addMultiCellWidget(label,0,0,0,1); m_userLe=new TQLineEdit(this); label=new TQLabel(m_userLe,i18n("Default user name:"),this); - tqlayout->addWidget(label,1,0); - tqlayout->addWidget(m_userLe,1,1); + layout->addWidget(label,1,0); + layout->addWidget(m_userLe,1,1); m_passwordLe=new TQLineEdit(this); m_passwordLe->setEchoMode(TQLineEdit::Password); label=new TQLabel(m_passwordLe,i18n("Default password:"),this); - tqlayout->addWidget(label,2,0); - tqlayout->addWidget(m_passwordLe,2,1); + layout->addWidget(label,2,0); + layout->addWidget(m_passwordLe,2,1); /* m_workgroupLe=new TQLineEdit(this); label=new TQLabel(m_workgroupLe,i18n("Workgroup:"),this); - tqlayout->addWidget(label,3,0); - tqlayout->addWidget(m_workgroupLe,3,1); + layout->addWidget(label,3,0); + layout->addWidget(m_workgroupLe,3,1); m_showHiddenShares=new TQCheckBox(i18n("Show hidden shares"),this); - tqlayout->addMultiCellWidget(m_showHiddenShares,4,4,0,1); + layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1); m_encodingList = new KComboBox( false, this ); TQStringList _strList = KGlobal::charsets()->availableEncodingNames(); m_encodingList->insertStringList( _strList ); label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this ); - tqlayout->addWidget( label, 3, 0 ); - tqlayout->addWidget( m_encodingList, 3, 1 ); + layout->addWidget( label, 3, 0 ); + layout->addWidget( m_encodingList, 3, 1 ); */ - tqlayout->addWidget(new TQWidget(this),4,0); + layout->addWidget(new TQWidget(this),4,0); // connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); @@ -79,7 +79,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) // connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); // connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) ); - tqlayout->setRowStretch(4, 1); + layout->setRowStretch(4, 1); // finaly read the options load(); @@ -140,7 +140,7 @@ void SMBRoOptions::save() for (uint i=0; i<password.length(); i++) { TQChar c = password[i]; - unsigned int num = (c.tqunicode() ^ 173) + 17; + unsigned int num = (c.unicode() ^ 173) + 17; unsigned int a1 = (num & 0xFC00) >> 10; unsigned int a2 = (num & 0x3E0) >> 5; unsigned int a3 = (num & 0x1F); diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp index 3a322ab29..fd1ce7d8e 100644 --- a/kcontrol/kio/socks.cpp +++ b/kcontrol/kio/socks.cpp @@ -48,9 +48,9 @@ KSocksConfig::KSocksConfig(TQWidget *parent) setAboutData( about ); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); base = new SocksBase(this); - tqlayout->add(base); + layout->add(base); connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int))); diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui index 03adb5202..5def84076 100644 --- a/kcontrol/kio/socksbase.ui +++ b/kcontrol/kio/socksbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SocksBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -15,9 +15,9 @@ <property name="caption"> <string>SOCKS</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -127,7 +127,7 @@ <property name="name"> <cstring>_c_customPath</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>20</height> @@ -211,7 +211,7 @@ <property name="name"> <cstring>_c_newPath</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>25</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -330,6 +330,6 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp index 5bf92cdb7..9e945948d 100644 --- a/kcontrol/kio/uagentproviderdlg.cpp +++ b/kcontrol/kio/uagentproviderdlg.cpp @@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e ) TQString keycode = e->text(); if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period || (cursorPosition() > 0 && key == Qt::Key_Minus) || - (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) ) + (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) ) { KLineEdit::keyPressEvent(e); return; diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui index add8356d7..6f2a006ec 100644 --- a/kcontrol/kio/uagentproviderdlg_ui.ui +++ b/kcontrol/kio/uagentproviderdlg_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>UAProviderDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> @@ -126,7 +126,7 @@ The actual browser identification text that will be sent to the remote machine. </spacer> <widget class="QLayoutWidget" row="8" column="0"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine. <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>29</width> <height>20</height> @@ -197,8 +197,8 @@ The actual browser identification text that will be sent to the remote machine. <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp index 09ebe351f..c34d5cadc 100644 --- a/kcontrol/kio/useragentdlg.cpp +++ b/kcontrol/kio/useragentdlg.cpp @@ -111,12 +111,12 @@ void UserAgentDlg::load() dlg->cbSendUAString->setChecked( b ); m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower(); dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent( m_ua_keys ) ); - dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); + dlg->cbOS->setChecked( m_ua_keys.contains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); updateButtons(); emit changed( false ); } @@ -135,12 +135,12 @@ void UserAgentDlg::defaults() dlg->lvDomainPolicyList->clear(); m_ua_keys = DEFAULT_USER_AGENT_KEYS; dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent(m_ua_keys) ); - dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') ); - dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') ); - dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') ); - dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') ); - dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') ); - dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') ); + dlg->cbOS->setChecked( m_ua_keys.contains('o') ); + dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') ); + dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') ); + dlg->cbPlatform->setChecked( m_ua_keys.contains('p') ); + dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') ); + dlg->cbLanguage->setChecked( m_ua_keys.contains('l') ); dlg->cbSendUAString->setChecked( true ); updateButtons(); configChanged(); @@ -224,7 +224,7 @@ bool UserAgentDlg::handleDuplicate( const TQString& site, { TQString msg = i18n("<qt><center>Found an existing identification for" "<br/><b>%1</b><br/>" - "Do you want to tqreplace it?</center>" + "Do you want to replace it?</center>" "</qt>").arg(site); int res = KMessageBox::warningContinueCancel(this, msg, i18n("Duplicate Identification"), @@ -351,7 +351,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int ) if ( dlg->cbLanguage->isChecked() ) m_ua_keys += 'l'; - dlg->cbOSVersion->setEnabled(m_ua_keys.tqcontains('o')); + dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o')); TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys ); if ( dlg->leDefaultId->text() != modVal ) diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui index 2beb0beb1..0db2a2440 100644 --- a/kcontrol/kio/useragentdlg_ui.ui +++ b/kcontrol/kio/useragentdlg_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>UserAgentDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -101,7 +101,7 @@ By default, only minimal identification information is sent to remote sites. The </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -250,7 +250,7 @@ By default, only minimal identification information is sent to remote sites. The </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> @@ -346,8 +346,8 @@ By default, only minimal identification information is sent to remote sites. The <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistview.h</includehint> diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index 9baa6fdba..edfa28e48 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -64,19 +64,19 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & "any additional visual or audible alert." "</ul>")); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQLabel *label = new TQLabel( i18n( "Event source:" ), this ); m_appCombo = new KComboBox( false, this, "app combo" ); - TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout ); + TQHBoxLayout *hbox = new TQHBoxLayout( layout ); hbox->addWidget( label ); hbox->addWidget( m_appCombo, 10 ); m_notifyWidget = new KNotifyWidget( this, "knotify widget", true ); connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool))); - tqlayout->addWidget( m_notifyWidget ); + layout->addWidget( m_notifyWidget ); connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ), TQT_SLOT( slotAppActivated( const TQString& )) ); diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui index 81e0ff8a0..f990fc995 100644 --- a/kcontrol/knotify/playersettings.ui +++ b/kcontrol/knotify/playersettings.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PlayerSettingsUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -93,7 +93,7 @@ </spacer> <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -118,7 +118,7 @@ </spacer> <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>233</width> <height>20</height> @@ -205,7 +205,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -265,7 +265,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -321,7 +321,7 @@ <tabstop>cbExternal</tabstop> <tabstop>cbNone</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg Binary files differindex 321b35b8d..daa451531 100644 --- a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg +++ b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg diff --git a/kcontrol/knotify/sounds/KDE_Startup_1.ogg b/kcontrol/knotify/sounds/KDE_Startup_1.ogg Binary files differindex 251683347..2fca9715b 100644 --- a/kcontrol/knotify/sounds/KDE_Startup_1.ogg +++ b/kcontrol/knotify/sounds/KDE_Startup_1.ogg diff --git a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav Binary files differindex 52bc44bf1..55b4e4598 100644 --- a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav +++ b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav diff --git a/kcontrol/konq/README b/kcontrol/konq/README index 22d05d7ff..11ad5c7b5 100644 --- a/kcontrol/konq/README +++ b/kcontrol/konq/README @@ -1,7 +1,7 @@ -This module tqcontains a combination of configuration items which at first +This module contains a combination of configuration items which at first sight seem to be a rather weird combination. -It tqcontains configuration for: +It contains configuration for: * KDesktop * Konqueror * Number of virtual desktops. (Handled by KWin via NETWM) diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 75a46c717..af6c12cc4 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); winPixmap->setPixmap(TQPixmap(locate("data", "kcontrol/pics/onlyone.png"))); - winPixmap->setFixedSize( winPixmap->tqsizeHint() ); + winPixmap->setFixedSize( winPixmap->sizeHint() ); // ---- @@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * TQHBox *hboxpreview = new TQHBox(vbox); TQWidget* spacer = new TQWidget( hboxpreview ); spacer->setMinimumSize( 20, 0 ); - spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); + spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); @@ -146,7 +146,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget * "while calling 'Move to Trash'.")); TQButtonGroup *bg = new TQVButtonGroup( i18n("Ask Confirmation For"), this ); - bg->tqlayout()->setSpacing( KDialog::spacingHint() ); + bg->layout()->setSpacing( KDialog::spacingHint() ); TQWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask" " for a confirmation when you \"delete\" a file." " <ul><li><em>Move To Trash:</em> moves the file to your trash folder," diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index a17631927..cb1b5c47e 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -33,18 +33,18 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name) : KCModule( parent, "kcmkonq" ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); TQTabWidget *tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); appearance = new KonqFontOptions(config, group, false, tab, name); - appearance->tqlayout()->setMargin( KDialog::marginHint() ); + appearance->layout()->setMargin( KDialog::marginHint() ); behavior = new KBehaviourOptions(config, group, tab, name); - behavior->tqlayout()->setMargin( KDialog::marginHint() ); + behavior->layout()->setMargin( KDialog::marginHint() ); previews = new KPreviewOptions(tab, name); - previews->tqlayout()->setMargin( KDialog::marginHint() ); + previews->layout()->setMargin( KDialog::marginHint() ); kuick = KCModuleLoader::loadModule("kcmkuick", tab); @@ -53,7 +53,7 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *pare tab->addTab(previews, i18n("&Previews && Meta-Data")); if (kuick) { - kuick->tqlayout()->setMargin( KDialog::marginHint() ); + kuick->layout()->setMargin( KDialog::marginHint() ); tab->addTab(kuick, i18n("&Quick Copy && Move")); } diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index f0f922845..98275995c 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -59,7 +59,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) Q_ASSERT(maxDesktops % 2 == 0); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // number group TQGroupBox *number_group = new TQGroupBox(this); @@ -82,7 +82,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) lay->addWidget(_numInput); lay->setStretchFactor( _numInput, 2 ); - tqlayout->addWidget(number_group); + layout->addWidget(number_group); // name group TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this); @@ -109,13 +109,13 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) for(int i = 1; i < maxDesktops; i++) setTabOrder( _nameInput[i-1], _nameInput[i] ); - tqlayout->addWidget(name_group); + layout->addWidget(name_group); _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - tqlayout->addWidget(_wheelOption); - tqlayout->addStretch(1); + layout->addWidget(_wheelOption); + layout->addStretch(1); load(); } diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui index 30da90234..6e614b022 100644 --- a/kcontrol/konq/desktopbehavior.ui +++ b/kcontrol/konq/desktopbehavior.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DesktopBehaviorBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -58,7 +58,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>80</height> @@ -287,7 +287,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -410,7 +410,7 @@ <tabstop>enableMediaBox</tabstop> <tabstop>mediaListView</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistview.h</includehint> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index a48550628..6b4aaadb0 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -49,9 +49,9 @@ const int customMenu2ID = 6; DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * ) : KCModule( parent, "kcmkonq" ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout(this); + TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); - tqlayout->addWidget(m_behavior); + layout->addWidget(m_behavior); connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); } @@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * */ bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded); - m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")); + m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); @@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char * if ( leftHandedMouse ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(strButtonTxt1, strButtonTxt3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(strButtonTxt1, strButtonTxt3); } leftLabel->setText( strMouseButton1 ); @@ -259,7 +259,7 @@ void DesktopBehavior::fillMediaListView() for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { - bool ok=excludedMedia.tqcontains((*it2)->name())==0; + bool ok=excludedMedia.contains((*it2)->name())==0; new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok); } } @@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults ) previewListView->clear(); TQStringList previews = g_pConfig->readListEntry("Preview"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) - new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName())); - new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/")); + new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName())); + new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/")); // g_pConfig->setGroup( "FMSettings" ); toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) ); diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 66a49309f..0e3ea0861 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -198,7 +198,7 @@ void KPreviewOptions::save() group.writeEntry( protocol, it.current()->isOn(), true, true ); } // config key is in bytes, numinput is in MB - group.writeEntry( "MaximumSize", tqRound( m_maxSize->value() *1024*1024 ), true, true ); + group.writeEntry( "MaximumSize", qRound( m_maxSize->value() *1024*1024 ), true, true ); group.writeEntry( "BoostSize", m_boostSize->isChecked(), true, true ); group.writeEntry( "UseFileThumbnails", m_useFileThumbnails->isChecked(), true, true ); group.sync(); diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h index 03c3a175e..8cf3ceade 100644 --- a/kcontrol/konq/previews.h +++ b/kcontrol/konq/previews.h @@ -24,7 +24,7 @@ /* -The "Previews" Tab tqcontains : +The "Previews" Tab contains : List of protocols that support listing, with a checkbox for each Configuration of the maximum image size diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index c4e2c26d2..f4111cfda 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) tmpLabel->setBuddy( urDesktop ); lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL); connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); - TQString wtstr = i18n("This folder tqcontains all the files" + TQString wtstr = i18n("This folder contains all the files" " which you see on your desktop. You can change the location of this" " folder if you want to, and the contents will move automatically" " to the new location as well."); @@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) tmpLabel->setBuddy( urAutostart ); lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL); connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); - wtstr = i18n("This folder tqcontains applications or" + wtstr = i18n("This folder contains applications or" " links to applications (shortcuts) that you want to have started" " automatically whenever KDE starts. You can change the location of this" " folder if you want to, and the contents will move automatically" @@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::ListJob* job = KIO::listDir( src ); connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ), this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) ); - tqApp->enter_loop(); + qApp->enter_loop(); if (m_ok) { @@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt KIO::Job * job = KIO::move( src, dest ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // wait for job - tqApp->enter_loop(); + qApp->enter_loop(); } } kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl; @@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest ); connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); - tqApp->enter_loop(); + qApp->enter_loop(); } - tqApp->exit_loop(); + qApp->exit_loop(); } void DesktopPathConfig::slotResult( KIO::Job * job ) @@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job ) job->showErrorDialog(this); } - tqApp->exit_loop(); + qApp->exit_loop(); } #include "rootopts.moc" diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h index 51737f8d0..7af18f1ae 100644 --- a/kcontrol/konq/rootopts.h +++ b/kcontrol/konq/rootopts.h @@ -30,7 +30,7 @@ class KURLRequester; namespace KIO { class Job; } //----------------------------------------------------------------------------- -// The "Path" Tab tqcontains : +// The "Path" Tab contains : // The paths for Desktop, Autostart and Documents class DesktopPathConfig : public KCModule diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index 9c533c9e2..681863cb6 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/kcontrol/konqhtml/advancedTabDialog.cpp @@ -52,11 +52,11 @@ advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const ch this, TQT_SLOT(save())); actionButton(Apply)->setEnabled(false); TQFrame* page = plainPage(); - TQVBoxLayout* tqlayout = new TQVBoxLayout(page); + TQVBoxLayout* layout = new TQVBoxLayout(page); m_advancedWidget = new advancedTabOptions(page); - tqlayout->addWidget(m_advancedWidget); - tqlayout->addSpacing( 20 ); - tqlayout->addStretch(); + layout->addWidget(m_advancedWidget); + layout->addSpacing( 20 ); + layout->addStretch(); connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui index 886d602c5..7116bc1ee 100644 --- a/kcontrol/konqhtml/advancedTabOptions.ui +++ b/kcontrol/konqhtml/advancedTabOptions.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>advancedTabOptions</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -43,7 +43,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout</cstring> + <cstring>layout</cstring> </property> <vbox> <property name="name"> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -150,6 +150,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index 3eff2fd25..29dccb14b 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -36,10 +36,10 @@ DomainListView::DomainListView(KConfig *config,const TQString &title, TQWidget *parent,const char *name) : TQGroupBox(title, parent, name), config(config) { setColumnLayout(0, Qt::Vertical); - tqlayout()->setSpacing(0); - tqlayout()->setMargin(0); - TQGridLayout* thisLayout = new TQGridLayout(tqlayout()); - thisLayout->tqsetAlignment(Qt::AlignTop); + layout()->setSpacing(0); + layout()->setMargin(0); + TQGridLayout* thisLayout = new TQGridLayout(layout()); + thisLayout->setAlignment(Qt::AlignTop); thisLayout->setSpacing(KDialog::spacingHint()); thisLayout->setMargin(KDialog::marginHint()); diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h index 7d0d30b82..a8238bbb4 100644 --- a/kcontrol/konqhtml/domainlistview.h +++ b/kcontrol/konqhtml/domainlistview.h @@ -85,21 +85,21 @@ public: /** * returns the add push-button. * - * Note: The add button already tqcontains a default "what's this" text. + * Note: The add button already contains a default "what's this" text. */ TQPushButton *addButton() const { return addDomainPB; } /** * returns the change push-button. * - * Note: The change button already tqcontains a default "what's this" text. + * Note: The change button already contains a default "what's this" text. */ TQPushButton *changeButton() const { return changeDomainPB; } /** * returns the delete push-button. * - * Note: The delete button already tqcontains a default "what's this" text. + * Note: The delete button already contains a default "what's this" text. */ TQPushButton *deleteButton() const { return deleteDomainPB; } diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index e1fcb28c7..79ab4d45a 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -323,5 +323,5 @@ TQString KCMFilter::quickHelp() const { return i18n("<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK allows you to create a list of filters" " that are checked against linked images and frames. URL's that match are either discarded or" - " tqreplaced with a placeholder image. "); + " replaced with a placeholder image. "); } diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index e6a6c59bb..3cca58732 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -81,7 +81,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa // Tabbed Browsing TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this ); - TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() ); + TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() ); m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing ); TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, " @@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this ); m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); - TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change " + TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h index 3f19d3b98..503eadfdd 100644 --- a/kcontrol/konqhtml/htmlopts.h +++ b/kcontrol/konqhtml/htmlopts.h @@ -15,7 +15,7 @@ //----------------------------------------------------------------------------- -// The "Misc Options" Tab for the HTML view tqcontains : +// The "Misc Options" Tab for the HTML view contains : // Change cursor over links // Underline links diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 54186a6bb..af168ed1f 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -123,14 +123,14 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group, TQWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java " "that can be contained in HTML pages. " "Note that, as with any browser, enabling active contents can be a security problem.") ); - TQString wtstr = i18n("This box tqcontains the domains and hosts you have set " + TQString wtstr = i18n("This box contains the domains and hosts you have set " "a specific Java policy for. This policy will be used " "instead of the default policy for enabling or disabling Java applets on pages sent by these " "domains or hosts. <p>Select a policy and use the controls on " "the right to modify it."); TQWhatsThis::add( domainSpecific->listView(), wtstr ); #if 0 - TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " "the Java policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped " @@ -163,7 +163,7 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group, TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in " "your path, simply leave it as 'java'. If you need to use a different jre, " "enter the path to the java executable (e.g. /usr/lib/jdk/bin/java), " - "or the path to the directory that tqcontains 'bin/java' (e.g. /opt/IBMJava2-13).") ); + "or the path to the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13).") ); TQWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") ); diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h index fbced3897..de8f7c7eb 100644 --- a/kcontrol/konqhtml/javaopts.h +++ b/kcontrol/konqhtml/javaopts.h @@ -41,10 +41,10 @@ public: /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance tqcontains the global + * @param group config group to use if this instance contains the global * policies (global == true) - * @param global true if this instance tqcontains the global policy settings, - * false if this instance tqcontains policies specific for a domain. + * @param global true if this instance contains the global policy settings, + * false if this instance contains policies specific for a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index cf0124395..ae73fc686 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -79,14 +79,14 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidge "button allows you to easily share your policies with other people by allowing " "you to save and retrieve them from a zipped file.") ); - TQString wtstr = i18n("This box tqcontains the domains and hosts you have set " + TQString wtstr = i18n("This box contains the domains and hosts you have set " "a specific JavaScript policy for. This policy will be used " "instead of the default policy for enabling or disabling JavaScript on pages sent by these " "domains or hosts. <p>Select a policy and use the controls on " "the right to modify it."); TQWhatsThis::add( domainSpecific->listView(), wtstr ); - TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " "the JavaScript policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped " diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 0360f2bf8..5196af8dd 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -68,9 +68,9 @@ void JSPolicies::load() { window_focus = config->readUnsignedNumEntry(key, is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY); - key = prefix + "WindowtqStatusPolicy"; + key = prefix + "WindowStatusPolicy"; window_status = config->readUnsignedNumEntry(key, - is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY); + is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY); } void JSPolicies::defaults() { @@ -83,7 +83,7 @@ void JSPolicies::defaults() { window_resize = is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY; window_move = is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY; window_focus = is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY; - window_status = is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY; + window_status = is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY; } void JSPolicies::save() { @@ -114,7 +114,7 @@ void JSPolicies::save() { else config->deleteEntry(key); - key = prefix + "WindowtqStatusPolicy"; + key = prefix + "WindowStatusPolicy"; if (window_status != INHERIT_POLICY) config->writeEntry(key, window_status); else @@ -133,12 +133,12 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, bool is_per_domain = !policies->isGlobal(); setColumnLayout(0, Qt::Vertical); - tqlayout()->setSpacing(0); - tqlayout()->setMargin(0); - TQGridLayout *this_tqlayout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2); - this_tqlayout->tqsetAlignment(Qt::AlignTop); - this_tqlayout->setSpacing(3); - this_tqlayout->setMargin(11); + layout()->setSpacing(0); + layout()->setMargin(0); + TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2); + this_layout->setAlignment(Qt::AlignTop); + this_layout->setSpacing(3); + this_layout->setMargin(11); TQString wtstr; // what's this description int colIdx; // column index @@ -146,7 +146,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.open ================================ colIdx = 0; TQLabel *label = new TQLabel(i18n("Open new windows:"),this); - this_tqlayout->addWidget(label,0,colIdx++); + this_layout->addWidget(label,0,colIdx++); js_popup = new TQButtonGroup(this); js_popup->setExclusive(true); @@ -157,35 +157,35 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_popup->insert(policy_btn,INHERIT_POLICY); - this_tqlayout->addWidget(policy_btn,0,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow); - this_tqlayout->addWidget(policy_btn,0,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ask"), this); TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk); - this_tqlayout->addWidget(policy_btn,0,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Deny"), this); TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny); - this_tqlayout->addWidget(policy_btn,0,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Smart"), this); TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when " "links are activated through an explicit " "mouse click or keyboard operation.")); js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart); - this_tqlayout->addWidget(policy_btn,0,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,0,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("If you disable this, Konqueror will stop " "interpreting the <i>window.open()</i> " @@ -202,7 +202,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.resizeBy/resizeTo ================================ colIdx = 0; label = new TQLabel(i18n("Resize window:"),this); - this_tqlayout->addWidget(label,1,colIdx++); + this_layout->addWidget(label,1,colIdx++); js_resize = new TQButtonGroup(this); js_resize->setExclusive(true); @@ -212,23 +212,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_resize->insert(policy_btn,INHERIT_POLICY); - this_tqlayout->addWidget(policy_btn,1,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,1,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size.")); js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow); - this_tqlayout->addWidget(policy_btn,1,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,1,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. " "The web page will <i>think</i> it changed the " "size but the actual window is not affected.")); js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore); - this_tqlayout->addWidget(policy_btn,1,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,1,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the window size on their own by using " "<i>window.resizeBy()</i> or <i>window.resizeTo()</i>. " @@ -240,7 +240,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.moveBy/moveTo ================================ colIdx = 0; label = new TQLabel(i18n("Move window:"),this); - this_tqlayout->addWidget(label,2,colIdx++); + this_layout->addWidget(label,2,colIdx++); js_move = new TQButtonGroup(this); js_move->setExclusive(true); @@ -250,23 +250,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_move->insert(policy_btn,INHERIT_POLICY); - this_tqlayout->addWidget(policy_btn,2,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,2,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position.")); js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow); - this_tqlayout->addWidget(policy_btn,2,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,2,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. " "The web page will <i>think</i> it moved the " "window but the actual position is not affected.")); js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore); - this_tqlayout->addWidget(policy_btn,2,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,2,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the window position on their own by using " "<i>window.moveBy()</i> or <i>window.moveTo()</i>. " @@ -278,7 +278,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.focus ================================ colIdx = 0; label = new TQLabel(i18n("Focus window:"),this); - this_tqlayout->addWidget(label,3,colIdx++); + this_layout->addWidget(label,3,colIdx++); js_focus = new TQButtonGroup(this); js_focus->setExclusive(true); @@ -288,15 +288,15 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_focus->insert(policy_btn,INHERIT_POLICY); - this_tqlayout->addWidget(policy_btn,3,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,3,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") ); js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow); - this_tqlayout->addWidget(policy_btn,3,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,3,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. " @@ -304,8 +304,8 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "the focus to the window but the actual " "focus will remain unchanged.") ); js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore); - this_tqlayout->addWidget(policy_btn,3,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,3,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites set the focus to their browser window on their " "own by using <i>window.focus()</i>. This usually leads to " @@ -319,7 +319,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, // === window.status ================================ colIdx = 0; label = new TQLabel(i18n("Modify status bar text:"),this); - this_tqlayout->addWidget(label,4,colIdx++); + this_layout->addWidget(label,4,colIdx++); js_statusbar = new TQButtonGroup(this); js_statusbar->setExclusive(true); @@ -329,32 +329,32 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, policy_btn = new TQRadioButton(i18n("Use global"), this); TQWhatsThis::add(policy_btn,i18n("Use setting from global policy.")); js_statusbar->insert(policy_btn,INHERIT_POLICY); - this_tqlayout->addWidget(policy_btn,4,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + this_layout->addWidget(policy_btn,4,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); }/*end if*/ policy_btn = new TQRadioButton(i18n("Allow"), this); TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar.")); - js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusAllow); - this_tqlayout->addWidget(policy_btn,4,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow); + this_layout->addWidget(policy_btn,4,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); policy_btn = new TQRadioButton(i18n("Ignore"), this); TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. " "The web page will <i>think</i> it changed " "the text but the actual text will remain " "unchanged.") ); - js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusIgnore); - this_tqlayout->addWidget(policy_btn,4,colIdx++); - this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++); + js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore); + this_layout->addWidget(policy_btn,4,colIdx++); + this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++); wtstr = i18n("Some websites change the status bar text by setting " - "<i>window.status</i> or <i>window.defaulttqStatus</i>, " + "<i>window.status</i> or <i>window.defaultStatus</i>, " "thus sometimes preventing displaying the real URLs of hyperlinks. " "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowtqStatusPolicy(int))); + connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int))); } JSPoliciesFrame::~JSPoliciesFrame() { @@ -399,7 +399,7 @@ void JSPoliciesFrame::setWindowFocusPolicy(int id) { emit changed(); } -void JSPoliciesFrame::setWindowtqStatusPolicy(int id) { +void JSPoliciesFrame::setWindowStatusPolicy(int id) { policies->window_status = id; emit changed(); } diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h index b2d08c11d..45352fbb9 100644 --- a/kcontrol/konqhtml/jspolicies.h +++ b/kcontrol/konqhtml/jspolicies.h @@ -50,16 +50,16 @@ public: * Enumeration for all policies */ enum Policies { JavaScriptEnabled = 0, WindowOpen, WindowResize, - WindowMove, WindowFocus, WindowtqStatus, NumPolicies }; + WindowMove, WindowFocus, WindowStatus, NumPolicies }; #endif /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance tqcontains the global + * @param group config group to use if this instance contains the global * policies (global == true) - * @param global true if this instance tqcontains the global policy settings, - * false if this instance tqcontains policies specific for a domain. + * @param global true if this instance contains the global policy settings, + * false if this instance contains policies specific for a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ @@ -141,19 +141,19 @@ public: } /** - * Returns whether the WindowtqStatus policy is inherited. + * Returns whether the WindowStatus policy is inherited. */ - bool isWindowtqStatusPolicyInherited() const { + bool isWindowStatusPolicyInherited() const { return window_status == INHERIT_POLICY; } /** - * Returns the current value of the WindowtqStatus policy. + * Returns the current value of the WindowStatus policy. * - * This will return an illegal value if isWindowtqStatusPolicyInherited is + * This will return an illegal value if isWindowStatusPolicyInherited is * true. */ - KHTMLSettings::KJSWindowtqStatusPolicy windowtqStatusPolicy() const { - return (KHTMLSettings::KJSWindowtqStatusPolicy)window_status; + KHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const { + return (KHTMLSettings::KJSWindowStatusPolicy)window_status; } /** @@ -178,7 +178,7 @@ private: unsigned int window_move; // one of KHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY unsigned int window_focus; - // one of KHTMLSettings::KJSWindowtqStatusPolicy or INHERIT_POLICY + // one of KHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY unsigned int window_status; friend class JSPoliciesFrame; // for changing policies @@ -187,7 +187,7 @@ private: /** * @short Provides a framed widget with controls for the JavaScript policy settings. * - * This widget tqcontains controls for changing all JavaScript policies + * This widget contains controls for changing all JavaScript policies * except the JavaScript enabled policy itself. The rationale behind this is * that the enabled policy be separate from the rest in a prominent * place. @@ -253,7 +253,7 @@ private slots: void setWindowResizePolicy(int id); void setWindowMovePolicy(int id); void setWindowFocusPolicy(int id); - void setWindowtqStatusPolicy(int id); + void setWindowStatusPolicy(int id); private: diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index de08bf995..28654869e 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -97,9 +97,9 @@ KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name) setAboutData( about ); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); // ### the groupname is duplicated in KJSParts::save java = new KJavaOptions( config, "Java/JavaScript Settings", this, name ); diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui index 3bbbe9f8e..d772595c2 100644 --- a/kcontrol/konqhtml/nsconfigwidget.ui +++ b/kcontrol/konqhtml/nsconfigwidget.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>NSConfigWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="caption"> <string>Netscape Plugin Config</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> <vbox> <property name="name"> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -96,7 +96,7 @@ <property name="name"> <cstring>GroupBox1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -261,8 +261,8 @@ <include location="global" impldecl="in declaration">klistbox.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>qwidget.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index ee434b710..d5cd4cc2b 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); + hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed); /************************************************************************** ********************* Domain-specific Settings *************************** *************************************************************************/ TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); - domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); + domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, @@ -99,13 +99,13 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren "that can be contained in HTML pages, e.g. Macromedia Flash. " "Note that, as with any browser, enabling active contents can be a security problem.") ); - TQString wtstr = i18n("This box tqcontains the domains and hosts you have set " + TQString wtstr = i18n("This box contains the domains and hosts you have set " "a specific plugin policy for. This policy will be used " "instead of the default policy for enabling or disabling plugins on pages sent by these " "domains or hosts. <p>Select a policy and use the controls on " "the right to modify it."); TQWhatsThis::add( domainSpecific->listView(), wtstr ); - TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains " + TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains " "the plugin policies. These policies will be merged " "with the existing ones. Duplicate entries are ignored.") ); TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped " diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h index c51ad5ffe..8b61f8f16 100644 --- a/kcontrol/konqhtml/pluginopts.h +++ b/kcontrol/konqhtml/pluginopts.h @@ -37,10 +37,10 @@ public: /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance tqcontains the global + * @param group config group to use if this instance contains the global * policies (global == true) - * @param global true if this instance tqcontains the global policy settings, - * false if this instance tqcontains policies specific for a domain. + * @param global true if this instance contains the global policy settings, + * false if this instance contains policies specific for a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) */ diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h index 4943ac373..a9814396a 100644 --- a/kcontrol/konqhtml/policies.h +++ b/kcontrol/konqhtml/policies.h @@ -42,10 +42,10 @@ public: /** * constructor * @param config configuration to initialize this instance from - * @param group config group to use if this instance tqcontains the global + * @param group config group to use if this instance contains the global * policies (global == true) - * @param global true if this instance tqcontains the global policy settings, - * false if it tqcontains policies specific to a domain. + * @param global true if this instance contains the global policy settings, + * false if it contains policies specific to a domain. * @param domain name of the domain this instance is used to configure the * policies for (case insensitive, ignored if global == true) * @param prefix prefix to use for configuration keys. The domain-specific diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h index bc10b3b5c..e4a176fb3 100644 --- a/kcontrol/konqhtml/policydlg.h +++ b/kcontrol/konqhtml/policydlg.h @@ -99,7 +99,7 @@ public: void refresh(); /** - * Adds another panel which tqcontains controls for more policies. + * Adds another panel which contains controls for more policies. * * The widget is inserted between the "feature enabled" combo box and * the dialog buttons at the bottom. diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui index 36c294b4a..bb805ed4b 100644 --- a/kcontrol/konsole/kcmkonsoledialog.ui +++ b/kcontrol/konsole/kcmkonsoledialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KCMKonsoleDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -12,9 +12,9 @@ <height>490</height> </rect> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -30,9 +30,9 @@ <property name="margin"> <number>0</number> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <widget class="QWidget"> <property name="name"> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -377,8 +377,8 @@ <include location="global" impldecl="in declaration">knuminput.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kcontrol/konsole/schemadialog.ui b/kcontrol/konsole/schemadialog.ui index 62a4380e4..64fda6a49 100644 --- a/kcontrol/konsole/schemadialog.ui +++ b/kcontrol/konsole/schemadialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SchemaDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -15,9 +15,9 @@ <property name="caption"> <string>Konsole Schema Editor</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -357,7 +357,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -389,7 +389,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -498,13 +498,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>120</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>180</width> <height>120</height> @@ -540,7 +540,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -626,6 +626,6 @@ <include location="global" impldecl="in declaration">kcolorbutton.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui index fa3f89327..a86a74077 100644 --- a/kcontrol/konsole/sessiondialog.ui +++ b/kcontrol/konsole/sessiondialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SessionDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -15,9 +15,9 @@ <property name="caption"> <string>Konsole Session Editor</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -28,7 +28,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -184,13 +184,13 @@ <property name="name"> <cstring>previewIcon</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>100</width> <height>100</height> @@ -212,7 +212,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>100</height> @@ -221,7 +221,7 @@ <property name="text"> <string>&Icon:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -280,7 +280,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -312,7 +312,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -320,7 +320,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -371,7 +371,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -435,8 +435,8 @@ <include location="global" impldecl="in declaration">kcolorbutton.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kicondialog.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index 6cd4cc2d0..ccb906301 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version) TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc)); if (list.count() == 0) { - list.append(TQString::tqfromLatin1(sysGtkrc(version))); + list.append(TQString::fromLatin1(sysGtkrc(version))); list.append(TQDir::homeDirPath()+userGtkrc(version)); } list.remove(gtkkde); @@ -174,9 +174,9 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified.. TQString qversion = qVersion(); - if ( qversion.tqcontains( '.' ) > 1 ) + if ( qversion.contains( '.' ) > 1 ) qversion.truncate( qversion.findRev( '.' ) ); - if ( qversion.tqcontains( '-' ) ) + if ( qversion.contains( '-' ) ) qversion.truncate( qversion.findRev( '-' ) ); TQStringList kdeAdded = @@ -220,8 +220,8 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings ) pathDb[path]=true; - if(path.tqcontains("/lib64/")) - path.tqreplace("/lib64/","/lib/"); + if(path.contains("/lib64/")) + path.replace("/lib64/","/lib/"); pathDb[path]=true; } @@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n" "# \"Apply colors to non-KDE applications\"\n" "#\n" - "#\n").arg(TQDateTime::tqcurrentDateTime().toString()); + "#\n").arg(TQDateTime::currentDateTime().toString()); t << "style \"default\"" << endl; t << "{" << endl; @@ -590,7 +590,7 @@ void runRdb( uint flags ) // Qt-only apps without adversely affecting ourselves. // Cheat and use the current timestamp, since we just saved to qtrc. - TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime(); + TQDateTime settingsstamp = TQDateTime::currentDateTime(); static Atom qt_settings_timestamp = 0; if (!qt_settings_timestamp) { diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h index 8ea226d8b..5a0df045a 100644 --- a/kcontrol/kthememanager/knewthemedlg.h +++ b/kcontrol/kthememanager/knewthemedlg.h @@ -26,7 +26,7 @@ class NewThemeWidget; /** - * Dialog for creating new themes, tqcontains just + * Dialog for creating new themes, contains just * getters and setters used for the theme general properties * @author Lukas Tinkl <lukas@kde.org> */ diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index f2d0395ed..b78a354be 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -469,14 +469,14 @@ void KTheme::apply() iconConf->setGroup( "ToolbarIcons" ); TQString iconName = iconSubElem.tagName(); - if ( iconName.tqcontains( "Color" ) ) + if ( iconName.contains( "Color" ) ) { TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) ); iconConf->writeEntry( iconName, iconColor, true, true ); } - else if ( iconName.tqcontains( "Value" ) || iconName == "Size" ) + else if ( iconName.contains( "Value" ) || iconName == "Size" ) iconConf->writeEntry( iconName, iconSubElem.attribute( "value" ).toUInt(), true, true ); - else if ( iconName.tqcontains( "Effect" ) ) + else if ( iconName.contains( "Effect" ) ) iconConf->writeEntry( iconName, iconSubElem.attribute( "name" ), true, true ); else iconConf->writeEntry( iconName, static_cast<bool>( iconSubElem.attribute( "value" ).toUInt() ), true, true ); @@ -738,18 +738,18 @@ void KTheme::createIconElems( const TQString & group, const TQString & object, << "DisabledColor" << "DisabledColor2" << "DisabledEffect" << "DisabledSemiTransparent" << "DisabledValue"; for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) { - if ( (*it).tqcontains( "Color" ) ) + if ( (*it).contains( "Color" ) ) createColorElem( *it, object, parent, cfg ); else { TQDomElement tmpCol = m_dom.createElement( *it ); tmpCol.setAttribute( "object", object ); - if ( (*it).tqcontains( "Value" ) || *it == "Size" ) + if ( (*it).contains( "Value" ) || *it == "Size" ) tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) ); - else if ( (*it).tqcontains( "DisabledEffect" ) ) + else if ( (*it).contains( "DisabledEffect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) ); - else if ( (*it).tqcontains( "Effect" ) ) + else if ( (*it).contains( "Effect" ) ) tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) ); else tmpCol.setAttribute( "value", cfg->readBoolEntry( *it, false ) ); @@ -832,7 +832,7 @@ TQString KTheme::processFilePath( const TQString & section, const TQString & pat TQString KTheme::unprocessFilePath( const TQString & section, TQString path ) { if ( path.startsWith( "theme:/" ) ) - return path.tqreplace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); + return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" ); if ( TQFile::exists( path ) ) return path; diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui index 361ca5129..4b46fdc26 100644 --- a/kcontrol/kthememanager/kthemedlg.ui +++ b/kcontrol/kthememanager/kthemedlg.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>KThemeDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -30,7 +30,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -60,7 +60,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>170</width> <height>20</height> @@ -88,7 +88,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -109,7 +109,7 @@ <property name="frameShape"> <enum>Box</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -193,7 +193,7 @@ </widget> <widget class="QLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -211,13 +211,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -251,13 +251,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -291,13 +291,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -331,13 +331,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -371,13 +371,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -411,13 +411,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>60</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>60</height> @@ -511,7 +511,7 @@ <slot specifier="non virtual">startFonts()</slot> <slot specifier="non virtual">startSaver()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurllabel.h</includehint> </includehints> diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index e64642109..2668bd87c 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -298,7 +298,7 @@ void kthememanager::slotCreateTheme() m_theme->setAuthor( dlg.getAuthor() ); m_theme->setEmail( dlg.getEmail() ); m_theme->setHomepage( dlg.getHomepage() ); - m_theme->setComment( dlg.getComment().tqreplace( "\n", "" ) ); + m_theme->setComment( dlg.getComment().replace( "\n", "" ) ); m_theme->setVersion( dlg.getVersion() ); TQString result = m_theme->createYourself( true ); diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui index ae9ef90d0..905b0749a 100644 --- a/kcontrol/kthememanager/newthemewidget.ui +++ b/kcontrol/kthememanager/newthemewidget.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>NewThemeWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -88,7 +88,7 @@ <property name="text"> <string>Co&mment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> <property name="buddy" stdset="0"> @@ -126,5 +126,5 @@ <tabstop>leVersion</tabstop> <tabstop>teComment</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index f73303bc0..ba6193107 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -57,10 +57,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "given in the section 'Startup indication timeout'")); GroupBox1->setColumnLayout(0, Qt::Vertical ); - GroupBox1->tqlayout()->setSpacing( 0 ); - GroupBox1->tqlayout()->setMargin( 0 ); + GroupBox1->layout()->setSpacing( 0 ); + GroupBox1->layout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox1 ); - TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 ); + TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 ); GroupBox1Layout->setSpacing( 6 ); GroupBox1Layout->setMargin( 11 ); GroupBox1Layout->setColStretch( 1, 1 ); @@ -97,10 +97,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL "given in the section 'Startup indication timeout'")); GroupBox2->setColumnLayout( 0, Qt::Vertical ); - GroupBox2->tqlayout()->setSpacing( 0 ); - GroupBox2->tqlayout()->setMargin( 0 ); + GroupBox2->layout()->setSpacing( 0 ); + GroupBox2->layout()->setMargin( 0 ); Form1Layout->addWidget( GroupBox2 ); - TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 ); + TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 ); GroupBox2Layout->setSpacing( 6 ); GroupBox2Layout->setMargin( 11 ); GroupBox2Layout->setColStretch( 1, 1 ); diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 9b4ff303c..baa127e2f 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale, this, TQT_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); - m_labLang->tqsetAlignment( AlignTop ); + m_labLang->setAlignment( AlignTop ); m_languages = new TQListBox(this); connect(m_languages, TQT_SIGNAL(selectionChanged()), @@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList() it != first.end(); ++it ) { - TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop") + TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop") .arg(*it)); if (!str.isNull()) prilang << str; @@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList() // add all languages to the list TQStringList alllang = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop"), + TQString::fromLatin1("*/entry.desktop"), false, true); TQStringList langlist = prilang; if (langlist.count() > 0) @@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList() if ((*it).isNull()) { m_addLanguage->insertSeparator(); - submenu = TQString::tqfromLatin1("other"); + submenu = TQString::fromLatin1("other"); m_addLanguage->insertSubmenu(m_locale->translate("Other"), submenu, TQString::null, -1); menu_index = -2; // first entries should _not_ be sorted @@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList() KLocale *lsave = KGlobal::_locale; KGlobal::_locale = m_locale; - TQString sub = TQString::tqfromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list m_comboCountry->clear(); TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", - sub + TQString::tqfromLatin1("*.desktop"), + sub + TQString::fromLatin1("*.desktop"), false, true ); for ( TQStringList::ConstIterator it = regionlist.begin(); @@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList() m_locale->translate("without name")); TQString map( locate( "locale", - TQString::tqfromLatin1( "l10n/%1.png" ) + TQString::fromLatin1( "l10n/%1.png" ) .arg(tag) ) ); TQIconSet icon; if ( !map.isNull() ) @@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList() // add all languages to the list TQStringList countrylist = KGlobal::dirs()->findAllResources - ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true); + ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) @@ -381,7 +381,7 @@ void KLocaleConfig::loadCountryList() int menu_index = submenu.isEmpty() ? -1 : -2; TQString flag( locate( "locale", - TQString::tqfromLatin1( "l10n/%1/flag.png" ) + TQString::fromLatin1( "l10n/%1/flag.png" ) .arg(tag) ) ); TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) ); m_comboCountry->insertItem( icon, name, tag, submenu, menu_index ); @@ -399,7 +399,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name, KGlobal::_locale = m_locale; // read the name - TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop") + TQString filepath = TQString::fromLatin1("%1%2/entry.desktop") .arg(sub) .arg(path); @@ -419,7 +419,7 @@ void KLocaleConfig::save() config->writeEntry("Country", m_locale->country(), true, true); if ( m_locale->languageList().isEmpty() ) - config->writeEntry("Language", TQString::tqfromLatin1(""), true, true); + config->writeEntry("Language", TQString::fromLatin1(""), true, true); else config->writeEntry("Language", m_locale->languageList(), ':', true, true); @@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate() TQStringList KLocaleConfig::languageList() const { TQString fileName = locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())); KSimpleConfig entry(fileName); diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index b7dbe5088..bf4cc8b32 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample() void KLocaleSample::slotUpdateTime() { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); m_dateSample->setText(m_locale->formatDate(dt.date(), false)); m_dateShortSample->setText(m_locale->formatDate(dt.date(), true)); @@ -98,11 +98,11 @@ void KLocaleSample::slotUpdateTime() void KLocaleSample::slotLocaleChanged() { m_numberSample->setText(m_locale->formatNumber(1234567.89) + - TQString::tqfromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatNumber(-1234567.89)); m_moneySample->setText(m_locale->formatMoney(123456789.00) + - TQString::tqfromLatin1(" / ") + + TQString::fromLatin1(" / ") + m_locale->formatMoney(-123456789.00)); slotUpdateTime(); diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index b4c516ecf..9fa1ad708 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -131,7 +131,7 @@ void KLocaleConfigMoney::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); @@ -139,24 +139,24 @@ void KLocaleConfigMoney::save() int i; bool b; - str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$")); + str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$")); config->deleteEntry("CurrencySymbol", false, true); if (str != m_locale->currencySymbol()) config->writeEntry("CurrencySymbol", m_locale->currencySymbol(), true, true); - str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1(".")); + str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1(".")); config->deleteEntry("MonetaryDecimalSymbol", false, true); if (str != m_locale->monetaryDecimalSymbol()) config->writeEntry("MonetaryDecimalSymbol", m_locale->monetaryDecimalSymbol(), true, true); - str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(",")); - str.tqreplace(TQString::tqfromLatin1("$0"), TQString::null); + str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(",")); + str.replace(TQString::fromLatin1("$0"), TQString::null); config->deleteEntry("MonetaryThousandsSeparator", false, true); if (str != m_locale->monetaryThousandsSeparator()) config->writeEntry("MonetaryThousandsSeparator", - TQString::tqfromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .arg(m_locale->monetaryThousandsSeparator()), true, true); diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index 79ae74c67..537cc99ab 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -89,26 +89,26 @@ void KLocaleConfigNumber::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; str = ent.readEntry("DecimalSymbol", - TQString::tqfromLatin1(".")); + TQString::fromLatin1(".")); config->deleteEntry("DecimalSymbol", false, true); if (str != m_locale->decimalSymbol()) config->writeEntry("DecimalSymbol", m_locale->decimalSymbol(), true, true); str = ent.readEntry("ThousandsSeparator", - TQString::tqfromLatin1(",")); + TQString::fromLatin1(",")); config->deleteEntry("ThousandsSeparator", false, true); - str.tqreplace(TQString::tqfromLatin1("$0"), TQString::null); + str.replace(TQString::fromLatin1("$0"), TQString::null); if (str != m_locale->thousandsSeparator()) config->writeEntry("ThousandsSeparator", - TQString::tqfromLatin1("$0%1$0") + TQString::fromLatin1("$0%1$0") .arg(m_locale->thousandsSeparator()), true, true); str = ent.readEntry("PositiveSign"); @@ -116,7 +116,7 @@ void KLocaleConfigNumber::save() if (str != m_locale->positiveSign()) config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true); - str = ent.readEntry("NegativeSign", TQString::tqfromLatin1("-")); + str = ent.readEntry("NegativeSign", TQString::fromLatin1("-")); config->deleteEntry("NegativeSign", false, true); if (str != m_locale->negativeSign()) config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true); diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 33b039c6e..1cf6b949b 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -80,7 +80,7 @@ void KLocaleConfigOther::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 17b78a79c..2519ea794 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -253,28 +253,28 @@ void KLocaleConfigTime::save() KConfigGroupSaver saver(config, "Locale"); KSimpleConfig ent(locate("locale", - TQString::tqfromLatin1("l10n/%1/entry.desktop") + TQString::fromLatin1("l10n/%1/entry.desktop") .arg(m_locale->country())), true); ent.setGroup("KCM Locale"); TQString str; - str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian")); + str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian")); config->deleteEntry("CalendarSystem", false, true); if (str != m_locale->calendarType()) config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true); - str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S")); + str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S")); config->deleteEntry("TimeFormat", false, true); if (str != m_locale->timeFormat()) config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true); - str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y")); + str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y")); config->deleteEntry("DateFormat", false, true); if (str != m_locale->dateFormat()) config->writeEntry("DateFormat", m_locale->dateFormat(), true, true); - str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d")); + str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d")); config->deleteEntry("DateFormatShort", false, true); if (str != m_locale->dateFormatShort()) config->writeEntry("DateFormatShort", @@ -345,7 +345,7 @@ void KLocaleConfigTime::slotLocaleChanged() TQString calendarType = m_locale->calendarType(); int calendarSystem = 0; - CalendarVector::iterator it = tqFind(calendars.begin(), calendars.end(), + CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(), calendarType); if ( it != calendars.end() ) calendarSystem = it - calendars.begin(); @@ -371,7 +371,7 @@ calendarType); kdDebug(173) << storeToUser(timeMap(), m_locale->timeFormat()) << endl; kdDebug(173) << userToStore(timeMap(), - TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl; + TQString::fromLatin1("HH:MM:SS AMPM test")) << endl; } @@ -416,7 +416,7 @@ void KLocaleConfigTime::slotTranslate() { TQString str; - TQString sep = TQString::tqfromLatin1("\n"); + TQString sep = TQString::fromLatin1("\n"); TQString old; @@ -462,7 +462,7 @@ void KLocaleConfigTime::slotTranslate() str = m_locale->translate ("<p>The text in this textbox will be used to format " - "time strings. The sequences below will be tqreplaced:</p>" + "time strings. The sequences below will be replaced:</p>" "<table>" "<tr><td><b>HH</b></td><td>The hour as a decimal number using a 24-hour " "clock (00-23).</td></tr>" @@ -506,14 +506,14 @@ void KLocaleConfigTime::slotTranslate() str = m_locale->translate ( "<p>The text in this textbox will be used to format long " - "dates. The sequences below will be tqreplaced:</p>") + datecodes; + "dates. The sequences below will be replaced:</p>") + datecodes; TQWhatsThis::add( m_labDateFmt, str ); TQWhatsThis::add( m_comboDateFmt, str ); str = m_locale->translate ( "<p>The text in this textbox will be used to format short " "dates. For instance, this is used when listing files. " - "The sequences below will be tqreplaced:</p>") + datecodes; + "The sequences below will be replaced:</p>") + datecodes; TQWhatsThis::add( m_labDateFmtShort, str ); TQWhatsThis::add( m_comboDateFmtShort, str ); diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 523fa50ea..de47ce661 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -62,7 +62,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/, m_nullConfig = new KConfig(TQString::null, false, false); m_globalConfig = new KConfig(TQString::null, false, true); - m_locale = new KLocale(TQString::tqfromLatin1("kcmlocale"), m_nullConfig); + m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l->setAutoAdd(TRUE); @@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults ) { m_globalConfig->setReadDefaults( useDefaults ); m_globalConfig->reparseConfiguration(); - *m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig); + *m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig); emit localeChanged(); emit languageChanged(); @@ -180,7 +180,7 @@ void KLocaleApplication::save() "language of all programs, you will have to " "logout first."), m_locale->translate("Applying Language Settings"), - TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); + TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms")); // restore the old global locale KGlobal::_locale = lsave; diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 0e97bbf5e..5bc340f7b 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -74,7 +74,7 @@ struct MyNIC { TQString name; TQString addr; - TQString nettqmask; + TQString netmask; TQString state; TQString type; TQString HWaddr; @@ -123,7 +123,7 @@ void KCMNic::update() NICList *nics=findNICs(); nics->setAutoDelete(true); for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next()) - new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->nettqmask, tmp->type, tmp->state, tmp->HWaddr); + new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->netmask, tmp->type, tmp->state, tmp->HWaddr); delete nics; } @@ -211,10 +211,10 @@ NICList* findNICs() if (result==0) { sinptr = (struct sockaddr_in *) &ifcopy.ifr_addr; - tmp->nettqmask=inet_ntoa(sinptr->sin_addr); + tmp->netmask=inet_ntoa(sinptr->sin_addr); } else - tmp->nettqmask=i18n("Unknown"); + tmp->netmask=i18n("Unknown"); ifcopy=*ifr; result=-1; // if none of the two #ifs below matches, ensure that result!=0 so that "Unknown" is returned as result @@ -265,10 +265,10 @@ NICList* findNICs() getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); tmp->addr = buf; - if (ifa->ifa_nettqmask != NULL) { + if (ifa->ifa_netmask != NULL) { bzero(buf, 128); - getnameinfo(ifa->ifa_nettqmask, ifa->ifa_nettqmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); - tmp->nettqmask = buf; + getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST); + tmp->netmask = buf; } tmp->state= (ifa->ifa_flags & IFF_UP) ? upMessage : downMessage; @@ -298,21 +298,21 @@ TQString flags_tos (unsigned int flags) if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += TQString::tqfromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index afa6e4847..b85dca5d8 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -51,11 +51,11 @@ Config::Config( TQWidget* parent_P, const char* ) TQVBoxLayout *topLayout = new TQVBoxLayout( this ); TQTabWidget* tabs = new TQTabWidget( this ); konqueror_widget = new Konqueror( tabs ); - konqueror_widget->tqlayout()->setMargin( KDialog::marginHint() ); + konqueror_widget->layout()->setMargin( KDialog::marginHint() ); connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); tabs->addTab( konqueror_widget, i18n( "Konqueror" )); system_widget = new SystemWidget( tabs ); - system_widget->tqlayout()->setMargin( KDialog::marginHint() ); + system_widget->layout()->setMargin( KDialog::marginHint() ); connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); tabs->addTab( system_widget, i18n( "System" )); topLayout->add( tabs ); diff --git a/kcontrol/performance/konqueror_ui.ui b/kcontrol/performance/konqueror_ui.ui index ca92c6ad9..3ace0b5db 100644 --- a/kcontrol/performance/konqueror_ui.ui +++ b/kcontrol/performance/konqueror_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Konqueror_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -69,7 +69,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> @@ -150,6 +150,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui index f6e7e6a15..a8d0e7956 100644 --- a/kcontrol/performance/system_ui.ui +++ b/kcontrol/performance/system_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>System_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -64,6 +64,6 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui index 01cb00c21..df79e2ec1 100644 --- a/kcontrol/privacy/kcmprivacydialog.ui +++ b/kcontrol/privacy/kcmprivacydialog.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>KCMPrivacyDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -79,13 +79,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>50</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>200</height> @@ -104,7 +104,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -114,13 +114,13 @@ <property name="name"> <cstring>selectAllButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -134,13 +134,13 @@ <property name="name"> <cstring>selectNoneButton</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -179,7 +179,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -197,5 +197,5 @@ <include location="global" impldecl="in implementation">klistview.h</include> <include location="global" impldecl="in implementation">ktextedit.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui index 686d0c2fe..93afe5dff 100644 --- a/kcontrol/privacy/kprivacysettings.ui +++ b/kcontrol/privacy/kprivacysettings.ui @@ -9,7 +9,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <property name="name"> <cstring>KPrivacySettings</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -246,7 +246,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. </widget> <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -272,7 +272,7 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. </widget> <widget class="QLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -303,6 +303,6 @@ Derived from AT&T's Privacy Bird settings panel screenshot originally. <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index f48d621cf..e97cf4836 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -60,7 +60,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = tqsizeHint(); + TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h index 615d9a2f5..584237975 100644 --- a/kcontrol/randr/configdialog.h +++ b/kcontrol/randr/configdialog.h @@ -62,11 +62,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a tqsizeHint... - virtual TQSize tqsizeHint () const { - int w = tqminimumSizeHint().width(); + // TQListView has a weird idea of a sizeHint... + virtual TQSize sizeHint () const { + int w = minimumSizeHint().width(); int h = header()->height(); - h += viewport()->tqsizeHint().height(); + h += viewport()->sizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp index 4c918c583..087585d3f 100644 --- a/kcontrol/randr/krandrmodule.cpp +++ b/kcontrol/randr/krandrmodule.cpp @@ -131,7 +131,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); TQHBox* syncBox = new TQHBox(this); - syncBox->tqlayout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); + syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox); topLayout->addWidget(syncBox); TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary.")); diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp index 98c6c0a18..5cf6fa6b2 100644 --- a/kcontrol/randr/krandrpassivepopup.cpp +++ b/kcontrol/randr/krandrpassivepopup.cpp @@ -94,14 +94,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P ) bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() - && watched_widgets.tqcontains( static_cast< TQWidget* >( o ))) + && watched_widgets.contains( static_cast< TQWidget* >( o ))) TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); return false; } bool KRandrPassivePopup::x11Event( XEvent* e ) { - if( e->type == ConfigureNotify && watched_windows.tqcontains( e->xconfigure.window )) + if( e->type == ConfigureNotify && watched_windows.contains( e->xconfigure.window )) { if( !update_timer.isActive()) update_timer.start( 10, true ); diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp index e712b71d6..e35fba9d2 100644 --- a/kcontrol/randr/krandrtray.cpp +++ b/kcontrol/randr/krandrtray.cpp @@ -54,7 +54,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection())) { setPixmap(KSystemTray::loadSizedIcon("randr", width())); - tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter); + setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; @@ -509,7 +509,7 @@ void KRandRSystemTray::slotCycleDisplays() int current_on_index = -1; int max_index = -1; int prev_on_index; - tqStatus s; + Status s; randr_screen_info = read_screen_info(randr_display); @@ -782,7 +782,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter) char *output_name; RROutput output_id; int i; - tqStatus s; + Status s; int num_outputs_on; num_outputs_on = 0; diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index 3af8fdf1c..071088e9b 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -20,7 +20,7 @@ */ #include <qhbox.h> -#include <qtqlayout.h> +#include <qlayout.h> #include <qvbox.h> #include <qtimer.h> #include <qprogressbar.h> @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); - connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); + connect( totalTimer, SIGNAL( timeout() ), SLOT( slotInternalTimeout() ) ); + connect( updateTimer, SIGNAL( timeout() ), SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new QVBox( this, "mainWidget" ); @@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget ) // yuck, here goes. QVBox *newWidget = new QVBox( this ); - if ( widget->tqparentWidget() != mainWidget ) { + if ( widget->parentWidget() != mainWidget ) { widget->reparent( newWidget, 0, QPoint(0,0) ); } else { newWidget->insertChild( widget ); diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h index c4037e389..23b4a92b0 100644 --- a/kcontrol/randr/ktimerdialog.h +++ b/kcontrol/randr/ktimerdialog.h @@ -144,7 +144,7 @@ class KTimerDialog : public KDialogBase private: /** - * Prepares the tqlayout that manages the widgets of the dialog + * Prepares the layout that manages the widgets of the dialog */ void setupLayout(); diff --git a/kcontrol/samba/AUTHORS b/kcontrol/samba/AUTHORS index 71854fa7a..0bebeaa06 100644 --- a/kcontrol/samba/AUTHORS +++ b/kcontrol/samba/AUTHORS @@ -1,4 +1,4 @@ -Samba tqStatus Module: +Samba Status Module: Michael Glauche <glauche@isa.rwth-aachen.de> diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index 8540fc4b2..fd31f7800 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -74,13 +74,13 @@ void ImportsView::updateList() if (e!=0) { s=buf; - if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs "))) + if ((s.contains(" nfs ")) || (s.contains(" smbfs "))) { strSource=s.left(s.find(" on /")); strMount=s.mid(s.find(" on /")+4,s.length()); - if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on "))) + if ((s.contains(" nfs ")) || (s.contains("/remote on "))) strType="NFS"; - else if (s.tqcontains(" smbfs ")) + else if (s.contains(" smbfs ")) strType="SMB"; int pos(strMount.find(" type ")); if (pos==-1) pos=strMount.find(" read/"); diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index 935944ea5..224bc6fa2 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -62,7 +62,7 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) mainLayout->addWidget(&updateButton,0,Qt::AlignLeft); TQWhatsThis::add( &logFileName, i18n("This page presents the contents of" - " your samba log file in a friendly tqlayout. Check that the correct log" + " your samba log file in a friendly layout. Check that the correct log" " file for your computer is listed here. If you need to, correct the name" " or location of the log file, and then click the \"Update\" button.") ); @@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name) connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); - label.setMinimumSize(label.tqsizeHint()); - logFileName.setMinimumSize(250,logFileName.tqsizeHint().height()); + label.setMinimumSize(label.sizeHint()); + logFileName.setMinimumSize(250,logFileName.sizeHint().height()); viewHistory.setMinimumSize(425,200); - showConnOpen.setMinimumSize(showConnOpen.tqsizeHint()); - showConnClose.setMinimumSize(showConnClose.tqsizeHint()); - showFileOpen.setMinimumSize(showFileOpen.tqsizeHint()); - showFileClose.setMinimumSize(showFileClose.tqsizeHint()); - updateButton.setFixedSize(updateButton.tqsizeHint()); + showConnOpen.setMinimumSize(showConnOpen.sizeHint()); + showConnClose.setMinimumSize(showConnClose.sizeHint()); + showFileOpen.setMinimumSize(showFileOpen.sizeHint()); + showFileClose.setMinimumSize(showFileClose.sizeHint()); + updateButton.setFixedSize(updateButton.sizeHint()); } void LogView::loadSettings() diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index 6fd788b2e..f75fd72e5 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam hostLe->setText("*"); viewStatistics->setMinimumSize(375,200); - connectionsL->setMinimumSize(connectionsL->tqsizeHint()); - filesL->setMinimumSize(filesL->tqsizeHint()); - eventL->setMinimumSize(eventL->tqsizeHint()); - eventCb->setMinimumSize(eventCb->tqsizeHint()); - hostL->setMinimumSize(hostL->tqsizeHint()); - hostLe->setMinimumSize(120,hostLe->tqsizeHint().height()); - serviceL->setMinimumSize(serviceL->tqsizeHint()); - serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height()); - calcButton->setMinimumSize(calcButton->tqsizeHint()); - clearButton->setMinimumSize(clearButton->tqsizeHint()); - expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint()); - expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint()); + connectionsL->setMinimumSize(connectionsL->sizeHint()); + filesL->setMinimumSize(filesL->sizeHint()); + eventL->setMinimumSize(eventL->sizeHint()); + eventCb->setMinimumSize(eventCb->sizeHint()); + hostL->setMinimumSize(hostL->sizeHint()); + hostLe->setMinimumSize(120,hostLe->sizeHint().height()); + serviceL->setMinimumSize(serviceL->sizeHint()); + serviceLe->setMinimumSize(120,serviceLe->sizeHint().height()); + calcButton->setMinimumSize(calcButton->sizeHint()); + clearButton->setMinimumSize(clearButton->sizeHint()); + expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint()); + expandedUserCb->setMinimumSize(expandedUserCb->sizeHint()); TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); @@ -150,8 +150,8 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) + if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -163,8 +163,8 @@ void StatisticsView::calculate() } else { - if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) + if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) { if (expandedInfoCb->isChecked()) item2=item->text(2); else item2=serviceLe->text(); @@ -201,14 +201,14 @@ void StatisticsView::calculate() { if (connCount) { - if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED"))) - && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) + if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) count++; } else { - if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED"))) - && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost))) + if ((TQString(item->text(1)).contains(i18n("FILE OPENED"))) + && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost))) count++; }; item=item->nextSibling(); diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index 89263c2c6..c94bc5129 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -32,7 +32,7 @@ #define Before(ttf,in) in.left(in.find(ttf)) -#define After(ttf,in) (in.tqcontains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) +#define After(ttf,in) (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString("")) NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) : TQWidget(parent, name) @@ -77,7 +77,7 @@ NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name ) void NetMon::processNFSLine(char *bufline, int) { TQCString line(bufline); - if (line.tqcontains(":/")) + if (line.contains(":/")) new TQListViewItem(list,"NFS",After(":",line),Before(":/",line)); } @@ -87,14 +87,14 @@ void NetMon::processSambaLine(char *bufline, int) rownumber++; if (rownumber == 2) version->setText(bufline); // second line = samba version - if ((readingpart==header) && line.tqcontains("Service")) + if ((readingpart==header) && line.contains("Service")) { iUser=line.find("uid"); iGroup=line.find("gid"); iPid=line.find("pid"); iMachine=line.find("machine"); } - else if ((readingpart==header) && (line.tqcontains("---"))) + else if ((readingpart==header) && (line.contains("---"))) { readingpart=connexions; } diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index 52669c2f8..88d95680a 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -58,8 +58,8 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin ,logView(&tabs,&config) ,statisticsView(&tabs,&config) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - tqlayout->addWidget(&tabs); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + layout->addWidget(&tabs); tabs.addTab(&status,i18n("&Exports")); tabs.addTab(&imports,i18n("&Imports")); tabs.addTab(&logView,i18n("&Log")); @@ -68,7 +68,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin setButtons(Help); load(); - setQuickHelp( i18n("The Samba and NFS tqStatus Monitor is a front end to the programs" + setQuickHelp( i18n("The Samba and NFS Status Monitor is a front end to the programs" " <em>smbstatus</em> and <em>showmount</em>. Smbstatus reports on current" " Samba connections, and is part of the suite of Samba tools, which" " implements the SMB (Session Message Block) protocol, also called the" diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop index 02ab8aebf..14b8425ed 100644 --- a/kcontrol/samba/smbstatus.desktop +++ b/kcontrol/samba/smbstatus.desktop @@ -9,20 +9,20 @@ X-KDE-Library=samba X-KDE-FactoryName=samba X-KDE-ParentApp=kinfocenter -Name=Samba tqStatus +Name=Samba Status Name[ar]=Øالة Samba Name[az]=Samba'nın VÉ™ziyyÉ™ti Name[be]=Стан Samba Name[bg]=Сървър Samba Name[bn]=সামà§à¦¬à¦¾ সà§à¦Ÿà§à¦¯à¦¾à¦Ÿà¦¾à¦¸ Name[br]=Saviad Samba -Name[bs]=tqStatus Sambe +Name[bs]=Status Sambe Name[ca]=Estat de Samba Name[cs]=Stav Samby Name[csb]=Sztaus Samba Name[cy]=Cyflwr Samba Name[da]=Samba-status -Name[de]=Samba-tqStatus +Name[de]=Samba-Status Name[el]=Κατάσταση samba Name[eo]=Sambo-stato Name[es]=Estado de Samba @@ -38,7 +38,7 @@ Name[he]=מצב Samba Name[hi]=सामà¥à¤¬à¤¾ सà¥à¤¥à¤¿à¤¤à¤¿ Name[hr]=Stanje Sambe Name[hu]=Samba -Name[id]=tqStatus Samba +Name[id]=Status Samba Name[is]=Staða Samba Name[it]=Stato di Samba Name[ja]=Samba ã®çŠ¶æ…‹ @@ -48,13 +48,13 @@ Name[km]=ស្ážáž¶áž“ភាព Samba Name[ko]=삼바 ìƒíƒœ Name[lo]=ສະຖານະຂàºàº‡ Samba Name[lt]=Samba bÅ«sena -Name[lv]=Samba tqStatuss +Name[lv]=Samba Statuss Name[mk]=Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð½Ð° Samba Name[mn]=Samba-Төлөв -Name[ms]=tqStatus Samba +Name[ms]=Status Samba Name[mt]=Stat tas-Samba Name[nb]=Samba-status -Name[nds]=Samba-tqStatus +Name[nds]=Samba-Status Name[ne]=सामà¥à¤¬à¤¾ वसà¥à¤¤à¥à¤¸à¥à¤¥à¤¿à¤¤à¤¿ Name[nl]=Samba-status Name[nn]=Samba-status @@ -68,9 +68,9 @@ Name[ru]=Сервер Samba Name[rw]=Imimerere Samba Name[se]=Samba stáhtus Name[sk]=Stav systému Samba -Name[sl]=tqStatus Sambe +Name[sl]=Status Sambe Name[sr]=Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¡Ð°Ð¼Ð±Ðµ -Name[sr@Latn]=tqStatus Sambe +Name[sr@Latn]=Status Sambe Name[ss]=Simo se Samba Name[sv]=Samba-status Name[ta]=சமà¯à®ªà®¾ நிலை @@ -102,7 +102,7 @@ Comment[cs]=Monitor stavu Samby Comment[csb]=Mònitor stónu Sambë Comment[cy]=Monitr cyflwr samba Comment[da]=OvervÃ¥gning af samba-status -Comment[de]=Samba-tqStatusmonitor +Comment[de]=Samba-Statusmonitor Comment[el]=Εποπτεία της Samba Comment[eo]=Rigardilo por la stato de Sambo Comment[es]=Monitor de estado de Samba @@ -133,7 +133,7 @@ Comment[mn]=Samba-Төлөв харуулагч Comment[ms]=Monitor status Samba Comment[mt]=Monitur tal-istat tas-Samba Comment[nb]=OvervÃ¥king av Samba-status -Comment[nds]=tqStatuskieker för Samba +Comment[nds]=Statuskieker för Samba Comment[ne]=सामà¥à¤¬à¤¾ वसà¥à¤¤à¥à¤¸à¥à¤¥à¤¿à¤¤à¤¿ मोनिटर Comment[nl]=Sambastatusmonitor Comment[nn]=Overvaking av Samba-status diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui index fda54f257..814a3867c 100644 --- a/kcontrol/screensaver/advanceddialogimpl.ui +++ b/kcontrol/screensaver/advanceddialogimpl.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -99,7 +99,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -107,7 +107,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -162,7 +162,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -202,7 +202,7 @@ </widget> <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -210,7 +210,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -256,7 +256,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -265,7 +265,7 @@ </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -305,7 +305,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -321,7 +321,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -365,7 +365,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -382,7 +382,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -393,5 +393,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/screensaver/category_list b/kcontrol/screensaver/category_list index c0b1d5687..61115c0dc 100644 --- a/kcontrol/screensaver/category_list +++ b/kcontrol/screensaver/category_list @@ -1,4 +1,4 @@ -// This list tqcontains all screen saver categories. +// This list contains all screen saver categories. // The categories are extracted for translation (see Makefile.am). // To show a screen saver in the list under a category, add the diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index 0f799c4a2..d13d131dc 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) } } } - Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()), + Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()), x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs ); create( w ); #endif diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 5dd0ca5c3..f80cc19e9 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -50,7 +50,7 @@ template class TQPtrList<SaverConfig>; -const uint widgetEventMask = // X event tqmask +const uint widgetEventMask = // X event mask (uint)( ExposureMask | PropertyChangeMask | @@ -133,12 +133,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); vLayout->addWidget(mSaverGroup); vLayout->setStretchFactor( mSaverGroup, 10 ); - TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(), + TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(), KDialog::spacingHint() ); mSaverListView = new TQListView( mSaverGroup ); mSaverListView->setMinimumHeight( 120 ); - mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->addColumn(""); mSaverListView->header()->hide(); mSelected = -1; @@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); leftColumnLayout->addWidget( mSettingsGroup ); - groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(), + groupLayout = new TQVBoxLayout( mSettingsGroup->layout(), KDialog::spacingHint() ); mEnabledCheckBox = new TQCheckBox(i18n( @@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitLockEdit->setSuffix(i18n(" sec")); mWaitLockEdit->setValue(mLockTimeout/1000); mWaitLockEdit->setEnabled(mEnabled && mLock); - if ( mWaitLockEdit->tqsizeHint().width() < - mWaitEdit->tqsizeHint().width() ) { - mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); - mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); + if ( mWaitLockEdit->sizeHint().width() < + mWaitEdit->sizeHint().width() ) { + mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); } else { - mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); - mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); + mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); } connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); @@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis new TQVBoxLayout(topLayout, KDialog::spacingHint()); mMonitorLabel = new TQLabel( this ); - mMonitorLabel->tqsetAlignment( AlignCenter ); + mMonitorLabel->setAlignment( AlignCenter ); mMonitorLabel->setPixmap( TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); rightColumnLayout->addWidget(mMonitorLabel, 0); @@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis advancedLayout->addWidget( new TQWidget( this ) ); TQPushButton* advancedBt = new TQPushButton( i18n( "Advanced &Options" ), this, "advancedBtn" ); - advancedBt->tqsetSizePolicy( TQSizePolicy( + advancedBt->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); connect( advancedBt, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); @@ -739,7 +739,7 @@ void KScreenSaver::slotSetup() // void KScreenSaver::slotAdvanced() { - KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); + KScreenSaverAdvancedDialog dlg( topLevelWidget() ); if ( dlg.exec() ) { mChanged = true; emit changed(true); diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui index 44fdf064a..fe8c4fa06 100644 --- a/kcontrol/smartcard/nosmartcardbase.ui +++ b/kcontrol/smartcard/nosmartcardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NoSmartcardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -23,7 +23,7 @@ <property name="text"> <string><b>Unable to contact the KDE smartcard service.</b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -48,7 +48,7 @@ 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -76,6 +76,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index ce2a8027d..0a1ea39ef 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -47,7 +47,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) : KCModule(parent, name),DCOPObject(name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); config = new KConfig("ksmartcardrc", false, false); DCOPClient *dc = KApplication::kApplication()->dcopClient(); @@ -67,7 +67,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) base = new SmartcardBase(this); - tqlayout->add(base); + layout->add(base); _popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser"); _popUpKardChooser->insertItem(i18n("Change Module..."), @@ -107,7 +107,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) _cardDB= new KCardDB(); load(); } else { - tqlayout->add(new NoSmartcardBase(this)); + layout->add(new NoSmartcardBase(this)); } } diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui index c1fe3f0ed..b5dda006b 100644 --- a/kcontrol/smartcard/smartcardbase.ui +++ b/kcontrol/smartcard/smartcardbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SmartcardBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>15</width> <height>20</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -231,7 +231,7 @@ <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>10</x> <y>20</y> @@ -250,7 +250,7 @@ <property name="text"> <string>To add new readers you have to modify /etc/readers.conf file and re-start pcscd</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -305,6 +305,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui index b4df94d96..518052675 100644 --- a/kcontrol/smserver/smserverconfigdlg.ui +++ b/kcontrol/smserver/smserverconfigdlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SMServerConfigDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -15,7 +15,7 @@ <property name="caption"> <string>Session Manager</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> <vbox> <property name="name"> @@ -190,7 +190,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> @@ -243,6 +243,6 @@ <slots> <slot>configChanged()</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index c0972f520..a7ed79b46 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -34,13 +34,13 @@ K_EXPORT_COMPONENT_FACTORY (kcm_spellchecking, SpellFactory("kcmspellchecking") KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &): KCModule(SpellFactory::instance(), parent, name) { - TQBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGroupBox *box = new TQVGroupBox( i18n("Spell Checking Settings"), this ); - box->tqlayout()->setSpacing( KDialog::spacingHint() ); - tqlayout->addWidget(box); + box->layout()->setSpacing( KDialog::spacingHint() ); + layout->addWidget(box); spellConfig = new KSpellConfig(box, 0L ,0L, false ); - tqlayout->addStretch(1); + layout->addStretch(1); connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() )); setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the KDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The KDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between KDE applications and non-KDE applications.</p>")); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index a9a3e00aa..f351d3f2c 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -157,11 +157,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) // ----------------- gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" ); gbWidgetStyle->setColumnLayout( 0, Qt::Vertical ); - gbWidgetStyle->tqlayout()->setMargin( KDialog::marginHint() ); - gbWidgetStyle->tqlayout()->setSpacing( KDialog::spacingHint() ); + gbWidgetStyle->layout()->setMargin( KDialog::marginHint() ); + gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() ); - gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() ); - gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop ); + gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() ); + gbWidgetStyleLayout->setAlignment( Qt::AlignTop ); hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" ); cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" ); @@ -169,7 +169,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) hbLayout->addWidget( cbStyle ); pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle ); - pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); + pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum ); pbConfigStyle->setEnabled( FALSE ); hbLayout->addWidget( pbConfigStyle ); @@ -189,11 +189,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 ); gbPreview->setColumnLayout( 0, Vertical ); - gbPreview->tqlayout()->setMargin( 0 ); - gbPreview->tqlayout()->setSpacing( KDialog::spacingHint() ); + gbPreview->layout()->setMargin( 0 ); + gbPreview->layout()->setSpacing( KDialog::spacingHint() ); gbPreview->setFlat( true ); stylePreview = new StylePreview( gbPreview ); - gbPreview->tqlayout()->add( stylePreview ); + gbPreview->layout()->add( stylePreview ); page1Layout->addWidget( gbWidgetStyle ); page1Layout->addWidget( gbPreview ); @@ -294,16 +294,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) box1->setSpacing( KDialog::spacingHint() ); box1->setMargin( 0 ); TQLabel* lbl = new TQLabel( i18n("0%"), box1 ); - lbl->tqsetAlignment( AlignLeft ); + lbl->setAlignment( AlignLeft ); lbl = new TQLabel( i18n("50%"), box1 ); - lbl->tqsetAlignment( AlignHCenter ); + lbl->setAlignment( AlignHCenter ); lbl = new TQLabel( i18n("100%"), box1 ); - lbl->tqsetAlignment( AlignRight ); + lbl->setAlignment( AlignRight ); lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer ); - lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft ); + lblMenuEffectType->setAlignment( AlignBottom | AlignLeft ); lblMenuOpacity = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer ); - lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft ); + lblMenuOpacity->setAlignment( AlignBottom | AlignLeft ); menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 ); menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 ); @@ -795,9 +795,9 @@ void KCMStyle::loadStyle( KConfig& config ) item = i; if ( id == cfgStyle ) // ExactMatch break; - else if ( id.tqcontains( cfgStyle ) ) + else if ( id.contains( cfgStyle ) ) break; - else if ( id.tqcontains( TQApplication::style().className() ) ) + else if ( id.contains( TQApplication::style().className() ) ) break; item = 0; } @@ -837,7 +837,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force) setStyleRecursive( stylePreview, style ); // this flickers, but reliably draws the widgets correctly. - stylePreview->resize( stylePreview->tqsizeHint() ); + stylePreview->resize( stylePreview->sizeHint() ); delete appliedStyle; appliedStyle = style; diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index d238efab7..0350ab969 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -41,17 +41,17 @@ extern "C" KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) { //Should have no margins here, the dialog provides them - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); KGlobal::locale()->insertCatalogue("kstyle_keramik_config"); //highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this); highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this); animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); - //tqlayout->add(highlightLineEdits); - tqlayout->add(highlightScrollBar); - tqlayout->add(animateProgressBar); - tqlayout->addStretch(1); + //layout->add(highlightLineEdits); + layout->add(highlightScrollBar); + layout->add(animateProgressBar); + layout->addStretch(1); TQSettings s; //origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false); diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp index 64ca00fff..112f2c241 100644 --- a/kcontrol/style/menupreview.cpp +++ b/kcontrol/style/menupreview.cpp @@ -68,7 +68,7 @@ void MenuPreview::createPixmaps() if (pixBlended) pixBlended->resize( w, h ); - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); TQColor c1 = cg.background(); TQColor c2 = cg.mid(); @@ -96,7 +96,7 @@ void MenuPreview::createPixmaps() void MenuPreview::blendPixmaps() { - // Rebuild pixmaps, and tqrepaint + // Rebuild pixmaps, and repaint if (pixBlended && pixBackground) { if (mode == Blend && pixOverlay) { @@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps() KImageEffect::blend(src, dst, menuOpacity); pixBlended->convertFromImage( dst ); } else if (mode == Tint) { - TQColor clr = tqcolorGroup().button(); + TQColor clr = colorGroup().button(); TQImage dst = pixBackground->convertToImage(); KImageEffect::blend(clr, dst, menuOpacity); pixBlended->convertFromImage( dst ); @@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity ) if ((int)(menuOpacity*100) != opacity) { menuOpacity = opacity/100.0; blendPixmaps(); - tqrepaint( false ); + repaint( false ); } } @@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm ) if (mode != pvm) { mode = pvm; blendPixmaps(); - tqrepaint( false ); + repaint( false ); } } void MenuPreview::paintEvent( TQPaintEvent* /* pe */ ) { // Paint the frame and blended pixmap - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); int x2 = width()-1; int y2 = height()-1; diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui index 7dcee7930..fbb4929f2 100644 --- a/kcontrol/style/stylepreview.ui +++ b/kcontrol/style/stylepreview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>StylePreview</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -161,7 +161,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -177,7 +177,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -196,13 +196,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>32767</height> @@ -224,13 +224,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>200</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -280,6 +280,6 @@ <slot>init()</slot> <slot returnType="bool">eventFilter( QObject *, QEvent * ev )</slot> </slots> -<tqlayoutdefaults spacing="6" margin="10"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="10"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 155865440..a13963e09 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -121,9 +121,9 @@ TQStringList TaskbarConfig::i18nGroupModeList() TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList&) : KCModule(TaskBarFactory::instance(), parent, name) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); m_widget = new TaskbarConfigUI(this); - tqlayout->addWidget(m_widget); + layout->addWidget(m_widget); // TODO: Load these from .desktop files? m_appearances.append(TaskbarAppearance(i18n("Elegant"), false, false, true)); diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui index dda71c6c3..d234683ca 100644 --- a/kcontrol/taskbar/kcmtaskbarui.ui +++ b/kcontrol/taskbar/kcmtaskbarui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TaskbarConfigUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -15,7 +15,7 @@ <property name="caption"> <string>Taskbar</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> <vbox> <property name="name"> @@ -31,9 +31,9 @@ <property name="title"> <string>Taskbar</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> - <property name="tqlayoutSpacing" stdset="0"> + <property name="layoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -193,7 +193,7 @@ By default, this option is selected and all windows are shown.</string> </widget> <widget class="QLayoutWidget" row="10" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -209,7 +209,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -234,7 +234,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -300,7 +300,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>191</width> <height>20</height> @@ -319,7 +319,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -434,7 +434,7 @@ By default, this option is selected and all windows are shown.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -472,8 +472,8 @@ By default, this option is selected and all windows are shown.</string> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index 5939e5997..f3a5a85df 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) gbox->setColumnLayout( 0, Qt::Horizontal ); vbox->addWidget(gbox); - TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint()); + TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint()); TQSplitter *splitter = new TQSplitter(gbox); vvbox->addWidget(splitter); @@ -87,12 +87,12 @@ void USBViewer::load() refresh(); } -static TQ_UINT32 key( USBDevice &dev ) +static Q_UINT32 key( USBDevice &dev ) { return dev.bus()*256 + dev.device(); } -static TQ_UINT32 key_parent( USBDevice &dev ) +static Q_UINT32 key_parent( USBDevice &dev ) { return dev.bus()*256 + dev.parent(); } @@ -130,7 +130,7 @@ void USBViewer::refresh() for ( ; it.current(); ++it) if (it.current()->level() == level) { - TQ_UINT32 k = key(*it.current()); + Q_UINT32 k = key(*it.current()); if (level == 0) { TQListViewItem *item = _items.find(k); @@ -178,7 +178,7 @@ void USBViewer::selectionChanged(TQListViewItem *item) { if (item) { - TQ_UINT32 busdev = item->text(1).toUInt(); + Q_UINT32 busdev = item->text(1).toUInt(); USBDevice *dev = USBDevice::find(busdev>>8, busdev&255); if (dev) { diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop index 8a0f5afb9..76729bb5d 100644 --- a/kcontrol/usbview/kcmusb.desktop +++ b/kcontrol/usbview/kcmusb.desktop @@ -132,11 +132,11 @@ Comment[mk]=Видете ги USB-уредите закачени на овој Comment[mn]=ÐÐ½Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ‚ залгагдÑан USB-төхөөрөмж харуулах Comment[ms]=Papar peranti USB yang dilekapkan pada komputer Comment[mt]=Ara l-apparat USB imqabbad ma' dal-kompjuter -Comment[nb]=Se hvilke USB-enheter som er koblet til denne tqmaskinen +Comment[nb]=Se hvilke USB-enheter som er koblet til denne maskinen Comment[nds]=de USB-Reedschappen ankieken, de dissen Reekner tokoppelt sünd Comment[ne]=यो कमà¥à¤ªà¥à¤¯à¥à¤Ÿà¤°à¤®à¤¾ सङà¥à¤²à¤—à¥à¤¨ गरिà¤à¤•à¤¾ USB यनà¥à¤¤à¥à¤° देखाउनà¥à¤¹à¥‹à¤¸à¥ Comment[nl]=Hier kunt u de USB-apparaten die op deze computer zijn aangesloten bekijken -Comment[nn]=Viser USB-einingane knytte til datatqmaskina +Comment[nn]=Viser USB-einingane knytte til datamaskina Comment[nso]=Bona maano a USB ao a kgwathisitswego go computer ye Comment[pa]=ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਜà©à©œà©‡ USB ਜੰਤਰ ਵੇਖੋ Comment[pl]=Informacja o urzÄ…dzeniach USB podÅ‚Ä…czonych do tego komputera diff --git a/kcontrol/usbview/usb.ids b/kcontrol/usbview/usb.ids index d05480250..c2d3e4da9 100644 --- a/kcontrol/usbview/usb.ids +++ b/kcontrol/usbview/usb.ids @@ -1833,8 +1833,8 @@ 0202 Apple Keyboard [ALPS] 0205 Apple Extended Keyboard [Mitsumi] 0206 Apple Extended Keyboard [Mitsumi] - 020b Apple Pro Keyboard [Mitsumi, A1048/US tqlayout] - 020d Apple Pro Keyboard [Mitsumi, A1048/JIS tqlayout] + 020b Apple Pro Keyboard [Mitsumi, A1048/US layout] + 020d Apple Pro Keyboard [Mitsumi, A1048/JIS layout] 020e Apple Internal Keyboard/Trackpad 020f Apple Internal Keyboard/Trackpad 0301 Apple USB Mouse [Mitsumi, M4848] @@ -5895,7 +5895,7 @@ HUT 0f PID Page 087 Move Destination 088 Move Length 089 PID Block Load Report - 08B Block Load tqStatus + 08B Block Load Status 08C Block Load Success 08D Block Load Full 08E Block Load Error @@ -5940,7 +5940,7 @@ HUT 14 Alphanumeric Display 02a Horizontal Scroll 02b Character Report 02c Display Data - 02d Display tqStatus + 02d Display Status 02e Stat Not Ready 02f Stat Ready 030 Err Not a loadable Character @@ -6015,8 +6015,8 @@ HUT 82 Monitor VESA Virtual Controls HUT 84 Power Device Page 000 Undefined 001 iName - 002 Present tqStatus - 003 Changed tqStatus + 002 Present Status + 003 Changed Status 004 UPS 005 Power Supply 010 Battery System @@ -6095,10 +6095,10 @@ HUT 84 Power Device Page HUT 85 Battery System Page 000 Undefined 001 SMB Battery Mode - 002 SMB Battery tqStatus + 002 SMB Battery Status 003 SMB Alarm Warning 004 SMB Charger Mode - 005 SMB Charger tqStatus + 005 SMB Charger Status 006 SMB Charger Spec Info 007 SMB Selector State 008 SMB Selector Presets @@ -6195,7 +6195,7 @@ HUT f0 Cash Device 0f1 Cash Drawer 0f2 Cash Drawer Number 0f3 Cash Drawer Set - 0f4 Cash Drawer tqStatus + 0f4 Cash Drawer Status HUT ff Vendor Specific # List of Languages diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp index 8c116eb16..466fd9a98 100644 --- a/kcontrol/usbview/usbdevices.cpp +++ b/kcontrol/usbview/usbdevices.cpp @@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname) TQStringList list = dir.entryList(); for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - if ((*it).tqcontains(':')) + if ((*it).contains(':')) continue; USBDevice* dev = new USBDevice(); @@ -277,7 +277,7 @@ bool USBDevice::parse(TQString fname) // read in the device infos USBDevice *device = 0; int start=0, end; - result.tqreplace(TQRegExp("^\n"),""); + result.replace(TQRegExp("^\n"),""); while ((end = result.find('\n', start)) > 0) { TQString line = result.mid(start, end-start); @@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent) _bus = di.udi_bus; _device = di.udi_addr; - _product = TQString::tqfromLatin1(di.udi_product); + _product = TQString::fromLatin1(di.udi_product); if ( _device == 1 ) _product += " " + TQString::number( _bus ); - _manufacturer = TQString::tqfromLatin1(di.udi_vendor); + _manufacturer = TQString::fromLatin1(di.udi_vendor); _prodID = di.udi_productNo; _vendorID = di.udi_vendorNo; _class = di.udi_class; diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop index ea0340e4a..fb1b7ad79 100644 --- a/kcontrol/view1394/kcmview1394.desktop +++ b/kcontrol/view1394/kcmview1394.desktop @@ -122,11 +122,11 @@ Comment[mk]=Видете ги IEEE 1394 уредите закачени на оРComment[mn]=ÐÐ½Ñ ÐºÐ¾Ð¼Ð¿ÑŒÑŽÑ‚ÐµÑ€Ñ‚ залгагдÑан IEEE 1394-төхөөрөмж харуулах Comment[ms]=Papar peranti IEEE 1394 yang dilekapkan pada komputer ini Comment[mt]=Ara l-apparat IEEE 1394 imqabbad ma' dal-kompjuter -Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne tqmaskinen +Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne maskinen Comment[nds]=De IEEE1394-Reedschappen ankieken, de dissen Reekner tokoppelt sünd Comment[ne]=यो कमà¥à¤ªà¥à¤¯à¥à¤Ÿà¤°à¤®à¤¾ सङà¥à¤²à¤—à¥à¤¨ गरिà¤à¤•à¤¾ IEEE 1394 यनà¥à¤¤à¥à¤° देखाउनà¥à¤¹à¥‹à¤¸à¥ Comment[nl]=Hier kunt u de IEEE 1394-apparaten die op deze computer zijn aangesloten bekijken -Comment[nn]=Viser IEE 1394-einingane knytte til datatqmaskina +Comment[nn]=Viser IEE 1394-einingane knytte til datamaskina Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਨਾਲ ਜà©à©œà©‡ IEEE 1394 ਜੰਤਰ ਵੇਖੋ Comment[pl]=Informacja o urzÄ…dzeniach IEEE 1394 podÅ‚Ä…czonych do tego komputera Comment[pt]=Ver os dispositivos IEEE 1394 ligados a este computador diff --git a/kcontrol/view1394/oui.db b/kcontrol/view1394/oui.db index dfe302b5b..76f80cc84 100644 --- a/kcontrol/view1394/oui.db +++ b/kcontrol/view1394/oui.db @@ -3509,7 +3509,7 @@ 000E02 Advantech AMT Inc. 000E03 Aarohi Communications, Inc. 000E05 WIRELESS MATRIX CORP. -000E06 Team Sitqmoco Ltd +000E06 Team Simoco Ltd 000E07 Sony Ericsson Mobile Communications AB 000E08 Sipura Technology, Inc. 000E09 Shenzhen Coship Software Co.,LTD. diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui index 1677e9ab0..5b6ba13e8 100644 --- a/kcontrol/view1394/view1394widget.ui +++ b/kcontrol/view1394/view1394widget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>View1394Widget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -147,7 +147,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -182,5 +182,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index a481e8f86..df9cbb6a6 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -223,10 +223,10 @@ TQWidget *KCMXinerama::indicator(int dpy) { si->setFont(fnt); si->setFrameStyle(TQFrame::Panel); si->setFrameShadow(TQFrame::Plain); - si->tqsetAlignment(Qt::AlignCenter); + si->setAlignment(Qt::AlignCenter); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center()); - TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint()); + TQRect targetGeometry(TQPoint(0,0), si->sizeHint()); targetGeometry.moveCenter(screenCenter); si->setGeometry(targetGeometry); si->show(); diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui index d0b69c183..cab732afd 100644 --- a/kcontrol/xinerama/xineramawidget.ui +++ b/kcontrol/xinerama/xineramawidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>XineramaWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -156,7 +156,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>431</width> <height>21</height> @@ -165,7 +165,7 @@ </spacer> <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <grid> <property name="name"> @@ -321,6 +321,6 @@ <slots> <slot access="private">emitConfigChanged()</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui index ec9928480..5d1de7a93 100644 --- a/kdcop/kdcopview.ui +++ b/kdcop/kdcopview.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>kdcopview</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <grid> <property name="name"> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -139,8 +139,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistviewsearchline.h</includehint> <includehint>kdcoplistview.h</includehint> diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 06f6a6e28..b7b21bd7f 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem { setExpandable(true); setText(0, TQString::fromUtf8(app_)); - setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "exec" ), KIcon::Small )); + setPixmap(0, KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small )); /* Get the icon: we use the icon from a mainwindow in that class. @@ -467,7 +467,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) e->setValidator( new TQIntValidator( e ) ); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" - || type == "TQ_UINT32" ) + || type == "Q_UINT32" ) { TQLabel* n = new TQLabel( name, frame ); grid->addWidget( n, i, 0 ); @@ -493,7 +493,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) e->setValidator( new TQIntValidator( e ) ); } else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int" - || type == "TQ_UINT64" ) + || type == "Q_UINT64" ) { TQLabel* n = new TQLabel( name, frame ); grid->addWidget( n, i, 0 ); @@ -697,7 +697,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) arg << e->text().toInt(); } else if ( type == "unsigned" || type == "uint" || type == "unsigned int" - || type == "TQ_UINT32" ) + || type == "Q_UINT32" ) { KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUInt(); @@ -722,7 +722,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it ) KLineEdit* e = (KLineEdit*)wl.at( i ); arg << e->text().toUShort(); } - else if ( type == "TQ_UINT64" ) + else if ( type == "Q_UINT64" ) { KLineEdit* e = ( KLineEdit* )wl.at( i ); arg << e->text().toULongLong(); @@ -936,7 +936,7 @@ bool KDCOPWindow::demarshal if ( replyType == "TQVariant" ) { // read data type from stream - TQ_INT32 type; + Q_INT32 type; reply >> type; // change replyType to real typename @@ -952,7 +952,7 @@ bool KDCOPWindow::demarshal ret << TQString::number(i); } else if ( replyType == "uint" || replyType == "unsigned int" - || replyType == "TQ_UINT32" ) + || replyType == "Q_UINT32" ) { uint i; reply >> i; @@ -970,9 +970,9 @@ bool KDCOPWindow::demarshal reply >> l; ret << TQString::number(l); } - else if ( replyType == "TQ_UINT64" ) + else if ( replyType == "Q_UINT64" ) { - TQ_UINT64 i; + Q_UINT64 i; reply >> i; ret << TQString::number(i); } @@ -1053,7 +1053,7 @@ bool KDCOPWindow::demarshal TQCursor r; reply >> r; //theList->insertItem(r, 1); - ret << "Cursor #" + TQString::number(r.tqshape()); + ret << "Cursor #" + TQString::number(r.shape()); } else if (replyType == "TQPixmap") { @@ -1191,7 +1191,7 @@ KDCOPWindow::getParameters int s = (*it).findRev(' '); - if (-1 != s && !intTypes.tqcontains((*it).mid(s + 1))) + if (-1 != s && !intTypes.contains((*it).mid(s + 1))) { names.append((*it).mid(s + 1)); diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp index 43d6699dd..bdf267dd1 100644 --- a/kdebugdialog/kabstractdebugdialog.cpp +++ b/kdebugdialog/kabstractdebugdialog.cpp @@ -52,11 +52,11 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout ) pCancelButton = new KPushButton( KStdGuiItem::cancel(), this ); hbox->addWidget( pCancelButton ); - int w1 = pHelpButton->tqsizeHint().width(); - int w2 = pOKButton->tqsizeHint().width(); - int w3 = pCancelButton->tqsizeHint().width(); + int w1 = pHelpButton->sizeHint().width(); + int w2 = pOKButton->sizeHint().width(); + int w3 = pCancelButton->sizeHint().width(); int w4 = QMAX( w1, QMAX( w2, w3 ) ); - int w5 = pApplyButton->tqsizeHint().width(); + int w5 = pApplyButton->sizeHint().width(); w4 = QMAX(w4, w5); pHelpButton->setFixedWidth( w4 ); diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp index ed823e262..2660356fc 100644 --- a/kdebugdialog/kdebugdialog.cpp +++ b/kdebugdialog/kdebugdialog.cpp @@ -54,7 +54,7 @@ KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char // Build combo of debug areas pDebugAreas = new TQComboBox( false, this ); - pDebugAreas->setFixedHeight( pDebugAreas->tqsizeHint().height() ); + pDebugAreas->setFixedHeight( pDebugAreas->sizeHint().height() ); pDebugAreas->insertStringList( areaList ); topLayout->addWidget( pDebugAreas ); diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/klistdebugdialog.cpp index a947d0ec5..7ddb2b559 100644 --- a/kdebugdialog/klistdebugdialog.cpp +++ b/kdebugdialog/klistdebugdialog.cpp @@ -83,7 +83,7 @@ void KListDebugDialog::generateCheckBoxes( const TQString& filter ) for ( ; it != m_areaList.end() ; ++it ) { TQString data = (*it).simplifyWhiteSpace(); - if ( filter.isEmpty() || data.lower().tqcontains( filter.lower() ) ) + if ( filter.isEmpty() || data.lower().contains( filter.lower() ) ) { int space = data.find(" "); if (space == -1) @@ -182,7 +182,7 @@ void KListDebugDialog::activateArea( TQCString area, bool activate ) for ( ; it.current() ; ++it ) { if ( area == (*it)->name() // debug area code = cb's name - || (*it)->text().find( TQString::tqfromLatin1(area) ) != -1 ) // area name included in cb text + || (*it)->text().find( TQString::fromLatin1(area) ) != -1 ) // area name included in cb text { (*it)->setChecked( activate ); return; diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp index 76d5209ea..4f6af0add 100644 --- a/kdepasswd/kcm/chfnprocess.cpp +++ b/kdepasswd/kcm/chfnprocess.cpp @@ -60,7 +60,7 @@ int ChfnProcess::ConverseChfn(const char *pass) if ( line.isEmpty() ) continue;// discard line - if ( line.tqcontains( "Password: " )/*isPrompt( line, "password" )*/ ) + if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ ) { WaitSlave(); write(m_Fd, pass, strlen(pass)); @@ -69,11 +69,11 @@ int ChfnProcess::ConverseChfn(const char *pass) line = readLine(); // Let's see what the outcome was - if ( line.tqcontains( "Changing finger info" ) ) + if ( line.contains( "Changing finger info" ) ) { // do nothing } - else if ( line.tqcontains( "information changed" ) ) + else if ( line.contains( "information changed" ) ) { status=0; break; @@ -83,7 +83,7 @@ int ChfnProcess::ConverseChfn(const char *pass) status=0; break; } - else if ( line.tqcontains( "Password error" ) || line.tqcontains("Incorrect password") ) + else if ( line.contains( "Password error" ) || line.contains("Incorrect password") ) { status=PasswordError; break; diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index c521a73b1..a3a25c0f3 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -150,11 +150,11 @@ void KCMUserAccount::load() KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/"; TQString fs = KCFGUserAccount::faceSource(); - if (fs == TQString::tqfromLatin1("UserOnly")) + if (fs == TQString::fromLatin1("UserOnly")) _facePerm = userOnly; - else if (fs == TQString::tqfromLatin1("PreferUser")) + else if (fs == TQString::fromLatin1("PreferUser")) _facePerm = userFirst; - else if (fs == TQString::tqfromLatin1("PreferAdmin")) + else if (fs == TQString::fromLatin1("PreferAdmin")) _facePerm = adminFirst; else _facePerm = adminOnly; // Admin Only diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui index 4852ab5b8..29adb0835 100644 --- a/kdepasswd/kcm/main_widget.ui +++ b/kdepasswd/kcm/main_widget.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>MainWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,13 +32,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>74</width> <height>74</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>74</width> <height>74</height> @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -163,7 +163,7 @@ </spacer> <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -182,7 +182,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -193,7 +193,7 @@ <property name="text"> <string><i>(Click the button to change your image)</i></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter</set> </property> </widget> @@ -217,7 +217,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>20</height> @@ -289,6 +289,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp index 6e3bb223f..89bbbdf82 100644 --- a/kdepasswd/passwd.cpp +++ b/kdepasswd/passwd.cpp @@ -158,7 +158,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass, case 2: m_Error = ""; - if( line.tqcontains("again")) + if( line.contains("again")) { m_Error = line; kill(m_Pid, SIGKILL); @@ -278,7 +278,7 @@ bool PasswdProcess::isPrompt(TQCString line, const char *word) return false; if (word == 0L) return true; - return line.tqcontains(word, false); + return line.contains(word, false); } diff --git a/kdeprint/descriptions/sortthem.cpp b/kdeprint/descriptions/sortthem.cpp index 1e1a37d93..9adc284b1 100644 --- a/kdeprint/descriptions/sortthem.cpp +++ b/kdeprint/descriptions/sortthem.cpp @@ -15,7 +15,7 @@ char buf[1024]; while (!feof(stdin)) { char *cline = fgets(buf, 1000, stdin); if (!cline) break; - if (!have.tqcontains(cline)) { + if (!have.contains(cline)) { have << cline; fprintf(stdout, "%s", cline); } diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp index 8b1e7169e..c8d6ccb15 100644 --- a/kdeprint/kdeprint_part/printpart.cpp +++ b/kdeprint/kdeprint_part/printpart.cpp @@ -33,7 +33,7 @@ typedef KParts::GenericFactory<PrintPart> PrintPartFactory; K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, PrintPartFactory ) -PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ , +PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ , TQObject *parent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadOnlyPart(parent, name) @@ -42,7 +42,7 @@ PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ , instance()->iconLoader()->addAppDir("kdeprint"); m_extension = new PrintPartExtension(this); - m_view = new KMMainView(tqparentWidget, "MainView", actionCollection()); + m_view = new KMMainView(parentWidget, "MainView", actionCollection()); m_view->setFocusPolicy(TQWidget::ClickFocus); m_view->enableToolbar(false); setWidget(m_view); diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h index f89a3574b..c84fed1cc 100644 --- a/kdeprint/kdeprint_part/printpart.h +++ b/kdeprint/kdeprint_part/printpart.h @@ -31,7 +31,7 @@ class PrintPart : public KParts::ReadOnlyPart { Q_OBJECT public: - PrintPart(TQWidget *tqparentWidget, const char *widgetName, + PrintPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & ); virtual ~PrintPart(); diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp index e19cdf94b..757c54af7 100644 --- a/kdeprint/kdeprintfax/confgeneral.cpp +++ b/kdeprint/kdeprintfax/confgeneral.cpp @@ -45,11 +45,11 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) QLabel *m_numberlabel = new TQLabel(i18n("N&umber:"), this); m_numberlabel->setBuddy(m_number); KSeparator *sep = new KSeparator( this ); - m_tqreplace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this ); - m_tqreplace_int_char_val = new TQLineEdit( this ); - m_tqreplace_int_char_val->setEnabled( false ); + m_replace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this ); + m_replace_int_char_val = new TQLineEdit( this ); + m_replace_int_char_val->setEnabled( false ); - connect( m_tqreplace_int_char, TQT_SIGNAL( toggled( bool ) ), m_tqreplace_int_char_val, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) ); QGridLayout *l0 = new TQGridLayout(this, 6, 2, 10, 10); l0->setColStretch(1, 1); @@ -63,8 +63,8 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) l0->addMultiCellWidget( sep, 3, 3, 0, 1 ); TQHBoxLayout *l1 = new TQHBoxLayout( this, 0, 10 ); l0->addMultiCellLayout( l1, 4, 4, 0, 1 ); - l1->addWidget( m_tqreplace_int_char ); - l1->addWidget( m_tqreplace_int_char_val ); + l1->addWidget( m_replace_int_char ); + l1->addWidget( m_replace_int_char_val ); } void ConfGeneral::load() @@ -74,8 +74,8 @@ void ConfGeneral::load() m_name->setText(conf->readEntry("Name", getenv("USER"))); m_number->setText(conf->readEntry("Number")); m_company->setText(conf->readEntry("Company")); - m_tqreplace_int_char->setChecked( conf->readBoolEntry( "ReplaceIntChar", false ) ); - m_tqreplace_int_char_val->setText( conf->readEntry( "ReplaceIntCharVal" ) ); + m_replace_int_char->setChecked( conf->readBoolEntry( "ReplaceIntChar", false ) ); + m_replace_int_char_val->setText( conf->readEntry( "ReplaceIntCharVal" ) ); } void ConfGeneral::save() @@ -85,6 +85,6 @@ void ConfGeneral::save() conf->writeEntry("Name", m_name->text()); conf->writeEntry("Number", m_number->text()); conf->writeEntry("Company", m_company->text()); - conf->writeEntry( "ReplaceIntChar", m_tqreplace_int_char->isChecked() ); - conf->writeEntry( "ReplaceIntCharVal", m_tqreplace_int_char_val->text() ); + conf->writeEntry( "ReplaceIntChar", m_replace_int_char->isChecked() ); + conf->writeEntry( "ReplaceIntCharVal", m_replace_int_char_val->text() ); } diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h index da5bba2e0..5a3ee6ca9 100644 --- a/kdeprint/kdeprintfax/confgeneral.h +++ b/kdeprint/kdeprintfax/confgeneral.h @@ -36,8 +36,8 @@ public: private: QLineEdit *m_name, *m_company, *m_number; - TQCheckBox *m_tqreplace_int_char; - TQLineEdit *m_tqreplace_int_char_val; + TQCheckBox *m_replace_int_char; + TQLineEdit *m_replace_int_char_val; }; #endif diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp index 0a0a4968d..51ea326c8 100644 --- a/kdeprint/kdeprintfax/confsystem.cpp +++ b/kdeprint/kdeprintfax/confsystem.cpp @@ -178,13 +178,13 @@ void ConfSystem::slotSystemChanged(int ID) m_commands[m_current] = m_command->text(); m_current = ID; if (ID == EFAX_ID) - m_device->tqparentWidget()->show(); + m_device->parentWidget()->show(); else - m_device->tqparentWidget()->hide(); + m_device->parentWidget()->hide(); if (ID == HYLAFAX_ID) - m_server->tqparentWidget()->show(); + m_server->parentWidget()->show(); else - m_server->tqparentWidget()->hide(); + m_server->parentWidget()->hide(); m_command->setText(m_commands[m_current]); } diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp index f0f5cfdd5..09631b51d 100644 --- a/kdeprint/kdeprintfax/defcmds.cpp +++ b/kdeprint/kdeprintfax/defcmds.cpp @@ -32,7 +32,7 @@ TQString defaultCommand(const TQString& cmd) QString exe = KStandardDirs::findExe(r.cap(1)); if (exe.isEmpty()) exe = "/usr/bin/"+r.cap(1); - str.tqreplace(p, r.matchedLength(), exe); + str.replace(p, r.matchedLength(), exe); } return str; } diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp index 49a9be89e..ebd6b9cb2 100644 --- a/kdeprint/kdeprintfax/faxab.cpp +++ b/kdeprint/kdeprintfax/faxab.cpp @@ -163,7 +163,7 @@ bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& ent /* number = kab.m_fax->currentText(); name = kab.m_name->currentText(); - if (kab.m_entries.tqcontains(name)) + if (kab.m_entries.contains(name)) { enterprise = kab.m_entries[name][0]; } diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp index 6638c1b7f..1d1cd1fa5 100644 --- a/kdeprint/kdeprintfax/faxctrl.cpp +++ b/kdeprint/kdeprintfax/faxctrl.cpp @@ -87,9 +87,9 @@ static TQString stripNumber( const TQString& s ) // removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools) TQString strip_s = s; - strip_s.tqreplace( TQRegExp( "[^\\d+*#]" ), "" ); + strip_s.replace( TQRegExp( "[^\\d+*#]" ), "" ); if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) ) - strip_s.tqreplace( "+", conf->readEntry( "ReplaceIntCharVal" ) ); + strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) ); return strip_s; } @@ -172,7 +172,7 @@ static TQString processTag( const TQString& match, const TQString& value ) if ( match[ p+1 ] == '{' ) { v = match.mid( p+2, match.length()-p-3 ); - v.tqreplace( "@@", quote( value ) ); + v.replace( "@@", quote( value ) ); } else v = ( "-" + match.mid( p+1 ) + " " + quote( value ) ); @@ -188,9 +188,9 @@ static bool isTag( const TQString& m, const TQString& t ) return ( m == t || m.startsWith( t+"_" ) ); } -static TQString tqreplaceTags( const TQString& s, const TQString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() ) +static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() ) { - // unquote variables (they will be tqreplaced with quoted values later) + // unquote variables (they will be replaced with quoted values later) TQValueStack<bool> stack; KConfig *conf = KGlobal::config(); @@ -244,7 +244,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint else if (cmd[i]=='`') { // Replace all `...` with safer $(...) - cmd.tqreplace (i, 1, "$("); + cmd.replace (i, 1, "$("); TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)"); for ( int i2=re_backticks.search(cmd,i+2); i2!=-1; @@ -253,7 +253,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint { if (cmd[i2] == '`') { - cmd.tqreplace (i2, 1, ")"); + cmd.replace (i2, 1, ")"); i2=cmd.length(); // leave loop } else @@ -291,7 +291,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint if (v.isEmpty()) v = getenv("FAXSERVER"); if (v.isEmpty()) - v = TQString::tqfromLatin1("localhost"); + v = TQString::fromLatin1("localhost"); v = processTag( match, v ); } else if (isTag( match, "%page" )) @@ -343,7 +343,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint else if (issinglequote) v="'"+v+"'"; - cmd.tqreplace (i, match.length(), v); + cmd.replace (i, match.length(), v); i+=v.length(); } } @@ -375,8 +375,8 @@ bool FaxCtrl::send(KdeprintFax *f) if (m_command.isEmpty()) return false; - // tqreplace tags common to all fax "operations" - m_command = tqreplaceTags( m_command, tagList( 11, "%dev", "%server", "%page", "%res", "%user", "%from", "%email", "%comment", "%time", "%subject", "%cover" ), f ); + // replace tags common to all fax "operations" + m_command = replaceTags( m_command, tagList( 11, "%dev", "%server", "%page", "%res", "%user", "%from", "%email", "%comment", "%time", "%subject", "%cover" ), f ); m_log = TQString::null; m_filteredfiles.clear(); @@ -447,11 +447,11 @@ void FaxCtrl::sendFax() { if ( m_command.find( "%files" ) != -1 ) { - // tqreplace %files tag + // replace %files tag QString filestr; for (TQStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it) filestr += (quote(*it)+" "); - m_command.tqreplace("%files", filestr); + m_command.replace("%files", filestr); } if ( !m_faxlist.isEmpty() ) @@ -461,7 +461,7 @@ void FaxCtrl::sendFax() addLogTitle( i18n( "Sending fax to %1 (%2)" ).arg( item.number ).arg( item.name ) ); - TQString cmd = tqreplaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item ); + TQString cmd = replaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item ); m_process->clearArguments(); *m_process << cmd; addLog(i18n("Sending to fax using: %1").arg(cmd)); @@ -491,7 +491,7 @@ void FaxCtrl::filter() m_tempfiles.append(tmp); m_process->clearArguments(); *m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters")) - << TQString::tqfromLatin1("--mime=%1").arg(mimeType) + << TQString::fromLatin1("--mime=%1").arg(mimeType) << "-p" << pageSize() << KProcess::quote(m_files[0]) << KProcess::quote(tmp); if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput)) @@ -553,7 +553,7 @@ void FaxCtrl::viewLog(TQWidget *) } else { - KWin::activateWindow(m_logview->tqparentWidget()->winId()); + KWin::activateWindow(m_logview->parentWidget()->winId()); } } @@ -605,7 +605,7 @@ void FaxCtrl::slotCloseLog() QTextEdit *view = m_logview; m_logview = 0; if (obj && obj->inherits("QPushButton")) - delete view->tqparentWidget(); + delete view->parentWidget(); kdDebug() << "slotClose()" << endl; } } @@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog() KPrinter printer; printer.setDocName( i18n( "Fax log" ) ); printer.setDocFileName( "faxlog" ); - if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) ) + if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) ) { TQPainter painter( &printer ); TQPaintDeviceMetrics metric( &printer ); @@ -625,7 +625,7 @@ void FaxCtrl::slotPrintLog() //TQString txt = m_logview->text(); TQString txt = m_log; - txt.tqreplace( '\n', "<br>" ); + txt.replace( '\n', "<br>" ); txt.prepend( "<h2>" + i18n( "KDEPrint Fax Tool Log" ) + "</h2>" ); kdDebug() << "Log: " << txt << endl; @@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog() richText.setWidth( &painter, body.width() ); do { - richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() ); + richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() ); view.moveBy( 0, body.height() ); painter.translate( 0, -body.height() ); if ( view.top() >= richText.height() ) diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp index 81f144b9a..a5f66992b 100644 --- a/kdeprint/kdeprintfax/kdeprintfax.cpp +++ b/kdeprint/kdeprintfax/kdeprintfax.cpp @@ -429,14 +429,14 @@ void KdeprintFax::updateState() if ( !m_cover->isEnabled() ) m_cover->setChecked(false); m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked()); - //m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background)); + //m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background)); if (!m_comment->isEnabled()) { m_comment->setText(""); - m_comment->setPaper( tqcolorGroup().background() ); + m_comment->setPaper( colorGroup().background() ); } else - m_comment->setPaper( tqcolorGroup().base() ); + m_comment->setPaper( colorGroup().base() ); /* m_enterprise->setEnabled(cmd.find("%enterprise") != -1); if (!m_enterprise->isEnabled()) diff --git a/kdeprint/kprinter/printwrapper.cpp b/kdeprint/kprinter/printwrapper.cpp index 25ec75e28..f5e67f96e 100644 --- a/kdeprint/kprinter/printwrapper.cpp +++ b/kdeprint/kprinter/printwrapper.cpp @@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0) void showmsgconsole(const TQString& msg, int type = 0) { - QString errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); + QString errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error")))); kdDebug() << errmsg << msg << endl; } @@ -237,7 +237,7 @@ void PrintWrapper::slotPrint() mgr->printerList(false); if (!printer.isEmpty()) - prt = mgr->tqfindPrinter(printer); + prt = mgr->findPrinter(printer); else prt = mgr->defaultPrinter(); diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp index 4871b74de..4613edeb8 100644 --- a/kdeprint/slave/kio_print.cpp +++ b/kdeprint/slave/kio_print.cpp @@ -180,23 +180,23 @@ void KIO_Print::listDir(const KURL& url) { PRINT_DEBUG << "listing group " << path[0] << endl; - int tqmask; + int mask; QString mimeType; KIO::UDSEntry entry; if (group == "printers") { - tqmask = KMPrinter::Printer; + mask = KMPrinter::Printer; mimeType = "print/printer"; } else if (group == "classes") { - tqmask = KMPrinter::Class | KMPrinter::Implicit; + mask = KMPrinter::Class | KMPrinter::Implicit; mimeType = "print/class"; } else if (group == "specials") { - tqmask = KMPrinter::Special; + mask = KMPrinter::Special; mimeType = "print/printer"; } else @@ -208,7 +208,7 @@ void KIO_Print::listDir(const KURL& url) TQPtrListIterator<KMPrinter> it(*(KMManager::self()->printerList())); for (;it.current();++it) { - if (!(it.current()->type() & tqmask) || !it.current()->instanceName().isEmpty()) + if (!(it.current()->type() & mask) || !it.current()->instanceName().isEmpty()) { PRINT_DEBUG << "rejecting " << it.current()->name() << endl; continue; @@ -587,7 +587,7 @@ void KIO_Print::get(const KURL& url) PRINT_DEBUG << "extracted printer name = " << printer << endl; KMManager::self()->printerList(false); - mprinter = KMManager::self()->tqfindPrinter(printer); + mprinter = KMManager::self()->findPrinter(printer); if (!mprinter) path = locateData(printer.isEmpty() ? group : printer); @@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer) mimeType("text/html"); QString content; - if (!loadTemplate(TQString::tqfromLatin1("printer.template"), content)) + if (!loadTemplate(TQString::fromLatin1("printer.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template")); return; @@ -676,7 +676,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) mimeType("text/html"); QString content; - if (!loadTemplate(TQString::tqfromLatin1("class.template"), content)) + if (!loadTemplate(TQString::fromLatin1("class.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template")); return; @@ -686,7 +686,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer) QStringList members(printer->members()); for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) { - memberContent.append(TQString::tqfromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it)); + memberContent.append(TQString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it)); } memberContent.append("</ul>\n"); @@ -719,7 +719,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) mimeType("text/html"); QString content; - if (!loadTemplate(TQString::tqfromLatin1("pseudo.template"), content)) + if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer) bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer) { - QFile f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename)); + QFile f(locate("data", TQString::fromLatin1("kdeprint/template/")+filename)); if (f.exists() && f.open(IO_ReadOnly)) { QTextStream t(&f); @@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed) } QString content; - if (!loadTemplate(TQString::tqfromLatin1("jobs.template"), content)) + if (!loadTemplate(TQString::fromLatin1("jobs.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; @@ -891,7 +891,7 @@ void KIO_Print::showDriver(KMPrinter *prt) mimeType("text/html"); QString content; - if (!loadTemplate(TQString::tqfromLatin1("driver.template"), content)) + if (!loadTemplate(TQString::fromLatin1("driver.template"), content)) { error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template")); return; diff --git a/kdesktop/DESIGN b/kdesktop/DESIGN index ca2d6fb46..e2a6a2b8b 100644 --- a/kdesktop/DESIGN +++ b/kdesktop/DESIGN @@ -74,7 +74,7 @@ Multiple monitors Two monitors showing different things (not a mirror-setup) can be configured in X to either use one X screen, or 2 X screens. Difference is that if I drag a window from one monitor to the other the application gets asked to -tqrepaint itself on a 2 screen setup and a simple move of the window will be +repaint itself on a 2 screen setup and a simple move of the window will be done in memory (by XFree) if you have a 1 screen setup. Monitors example: diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index 3c81e26db..6d106a484 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -334,7 +334,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num) /* * Call this when the desktop has been changed. * Desk is in KWin convention: [1..desks], instead of [0..desks-1]. - * 0 tqrepaints the current desktop. + * 0 repaints the current desktop. */ void KBackgroundManager::slotChangeDesktop(int desk) { @@ -394,7 +394,7 @@ void KBackgroundManager::slotChangeDesktop(int desk) /* * Call this when the viewport has been changed. * Desk is in KWin convention: [1..desks], instead of [0..desks-1]. - * 0 tqrepaints the current viewport. + * 0 repaints the current viewport. */ void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport) { @@ -518,11 +518,11 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) { TQScrollView* sv = dynamic_cast<TQScrollView*>( m_pDesktop ); if ( sv ) { - // Qt eats tqrepaint events in this case :-(( + // Qt eats repaint events in this case :-(( sv->viewport()->update(); } m_pDesktop->setErasePixmap(*ep); - m_pDesktop->tqrepaint(); + m_pDesktop->repaint(); static bool root_cleared = false; if( !root_cleared ) { // clear the root window pixmap set by kdm @@ -920,10 +920,10 @@ void KBackgroundManager::setWallpaper(int desk, TQString wallpaper, int mode) slotChangeDesktop(sdesk); } -void KBackgroundManager::tqrepaintBackground() +void KBackgroundManager::repaintBackground() { if (m_pDesktop) - m_pDesktop->tqrepaint(); + m_pDesktop->repaint(); else KApplication::desktop()->screen()->erase(); } @@ -952,10 +952,10 @@ void KBackgroundManager::desktopResized() m_Hash = 0; if( m_pDesktop ) - m_pDesktop->resize( kapp->desktop()->tqgeometry().size()); + m_pDesktop->resize( kapp->desktop()->geometry().size()); // Repaint desktop slotChangeDesktop(0); - tqrepaintBackground(); + repaintBackground(); // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index 2923fd1b5..5b9bf70f1 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -84,7 +84,7 @@ private slots: void slotChangeDesktop(int); void slotChangeViewport(int, const TQPoint&); void slotChangeNumberOfDesktops(int); - void tqrepaintBackground(); + void repaintBackground(); void desktopResized(); void clearRoot(); void saveImages(); diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 2a35eacd0..f923d953d 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -159,7 +159,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)", "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false); - // Dont tqrepaint on configuration changes during construction + // Dont repaint on configuration changes during construction m_bInit = true; // It's the child widget that gets the focus, not us @@ -179,7 +179,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : } - setGeometry( TQApplication::desktop()->tqgeometry() ); + setGeometry( TQApplication::desktop()->geometry() ); lower(); connect( kapp, TQT_SIGNAL( shutDown() ), @@ -230,7 +230,7 @@ KDesktop::initRoot() TQToolTip::add( &w, "foo" ); } // NOTE: If mouse clicks stop working again, it's most probably something doing XSelectInput() - // on the root window after this, and setting it to some fixed value instead of adding its tqmask. + // on the root window after this, and setting it to some fixed value instead of adding its mask. XWindowAttributes attrs; XGetWindowAttributes(dpy, root, &attrs); XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask); @@ -279,7 +279,7 @@ KDesktop::initRoot() m_pIconView->viewport()->setBackgroundMode( X11ParentRelative ); m_pIconView->setFocusPolicy( StrongFocus ); m_pIconView->viewport()->setFocusPolicy( StrongFocus ); - m_pIconView->setGeometry( tqgeometry() ); + m_pIconView->setGeometry( geometry() ); m_pIconView->show(); // Geert Jansen: backgroundmanager belongs here @@ -1168,7 +1168,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int i.uDest = KURL::fromPathOrURL( _dest ); i.uDest.addPath( filename ); files.append(i); - if (!TQFile::exists(i.uDest.prettyURL().tqreplace("file://",TQString::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files ); + if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files ); KIO::copy( i.uSource, i.uDest, false ); } // m_pIconView->addFuturePosition(filename, x, y); diff --git a/kdesktop/init.cc b/kdesktop/init.cc index 1d4411ce6..27441b170 100644 --- a/kdesktop/init.cc +++ b/kdesktop/init.cc @@ -123,7 +123,7 @@ static TQString realDesktopPath() if (kdesktop_screen_number != 0) { TQString dn = "Desktop"; dn += TQString::number(kdesktop_screen_number); - desktopPath.tqreplace("Desktop", dn); + desktopPath.replace("Desktop", dn); } return desktopPath; } diff --git a/kdesktop/init/Templates/linkFloppy.desktop b/kdesktop/init/Templates/linkFloppy.desktop index 6e18b2888..2a86dd575 100644 --- a/kdesktop/init/Templates/linkFloppy.desktop +++ b/kdesktop/init/Templates/linkFloppy.desktop @@ -53,7 +53,7 @@ Name[pt_BR]=Dispositivo de disquete... Name[ro]=Dispozitiv Floppy... Name[ru]=ДиÑковод... Name[rw]=Apareye Disikete... -Name[se]=Dibtqmaskearroovttadat … +Name[se]=Dibmaskearroovttadat … Name[sk]=Disketová mechanika... Name[sl]=Disketna naprava ... Name[sr]=Флопи уређај... @@ -131,7 +131,7 @@ Comment[pt_BR]=Novo dispositivo de disquete Comment[ro]=Dispozitiv Floppy nou Comment[ru]=СÑылка на уÑтройÑтво диÑковода Comment[rw]=Apareye Disikete Nshya -Comment[se]=OÄ‘Ä‘a dibtqmaskearroovttadat +Comment[se]=OÄ‘Ä‘a dibmaskearroovttadat Comment[sk]=Nová disketová mechanika Comment[sl]=Nova disketna naprava Comment[sr]=Ðови флопи уређај diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc index 2a6b64ec6..1d39a093d 100644 --- a/kdesktop/kcustommenu.cc +++ b/kdesktop/kcustommenu.cc @@ -81,8 +81,8 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/) TQString serviceName = s->name(); // item names may contain ampersands. To avoid them being converted - // to accelators, tqreplace them with two ampersands. - serviceName.tqreplace("&", "&&"); + // to accelators, replace them with two ampersands. + serviceName.replace("&", "&&"); TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small, 0, KIcon::DefaultState, 0L, true); diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 3c7611be4..5d20aa12d 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -67,7 +67,7 @@ extern int kdesktop_screen_number; TQRect KDIconView::desktopRect() { return ( kdesktop_screen_number == 0 ) - ? TQApplication::desktop()->tqgeometry() // simple case, or xinerama + ? TQApplication::desktop()->geometry() // simple case, or xinerama : TQApplication::desktop()->screenGeometry( kdesktop_screen_number ); // multi-head } @@ -296,7 +296,7 @@ void KDIconView::initConfig( bool init ) m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst(); m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in - if (KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"))) + if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"))) m_enableMedia=KDesktopSettings::mediaEnabled(); else m_enableMedia=false; @@ -321,7 +321,7 @@ void KDIconView::initConfig( bool init ) if ( previewSettings().count() ) { for ( TQStringList::ConstIterator it = oldPreview.begin(); it != oldPreview.end(); ++it) - if ( !previewSettings().tqcontains( *it ) ){ + if ( !previewSettings().contains( *it ) ){ kdDebug(1204) << "Disabling preview for " << *it << endl; if ( *it == "audio/" ) disableSoundPreviews(); @@ -581,7 +581,7 @@ KURL KDIconView::desktopURL() if (kdesktop_screen_number != 0) { TQString dn = "Desktop"; dn += TQString::number(kdesktop_screen_number); - desktopPath.tqreplace("Desktop", dn); + desktopPath.replace("Desktop", dn); } KURL desktopURL; @@ -748,7 +748,7 @@ void KDIconView::fillMediaListView() for (; it2 != mimetypes.end(); ++it2) { if ( ((*it2)->name().startsWith("media/")) ) { - bool ok=excludedMedia.tqcontains((*it2)->name())==0; + bool ok=excludedMedia.contains((*it2)->name())==0; new DesktopBehaviorMediaItem (mMediaListView, (*it2)->comment(), (*it2)->name(),ok); } } @@ -960,20 +960,20 @@ bool KDIconView::isDesktopFile( KFileItem * _item ) const return false; // return true if desktop file - return ( (_item->mimetype() == TQString::tqfromLatin1("application/x-desktop")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mydocuments")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mycomputer")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mynetworkplaces")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-printers")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-trash")) - || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-webbrowser")) ); + return ( (_item->mimetype() == TQString::fromLatin1("application/x-desktop")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-mydocuments")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-mycomputer")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-mynetworkplaces")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-printers")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-trash")) + || (_item->mimetype() == TQString::fromLatin1("media/builtin-webbrowser")) ); } TQString KDIconView::stripDesktopExtension( const TQString & text ) { - if (text.right(7) == TQString::tqfromLatin1(".kdelnk")) + if (text.right(7) == TQString::fromLatin1(".kdelnk")) return text.left(text.length() - 7); - else if (text.right(8) == TQString::tqfromLatin1(".desktop")) + else if (text.right(8) == TQString::fromLatin1(".desktop")) return text.left(text.length() - 8); return text; } @@ -1009,12 +1009,12 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI ) TQStringList tmpList; if (cfg.hasKey("OnlyShowIn")) { - if (!cfg.readListEntry("OnlyShowIn", ';').tqcontains("KDE")) + if (!cfg.readListEntry("OnlyShowIn", ';').contains("KDE")) return false; } if (cfg.hasKey("NotShowIn")) { - if (cfg.readListEntry("NotShowIn", ';').tqcontains("KDE")) + if (cfg.readListEntry("NotShowIn", ';').contains("KDE")) return false; } if (cfg.hasKey("TryExec")) @@ -1055,7 +1055,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries ) KURL desktop_URL = desktopURL(); if (desktop_URL.isLocalFile()) desktopPath = desktop_URL.path(); - // We have new items, so we'll need to tqrepaint in slotCompleted + // We have new items, so we'll need to repaint in slotCompleted m_bNeedRepaint = true; kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() << endl; KFileItemListIterator it(entries); @@ -1198,7 +1198,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries ) } else { - // In case we tqreplace a big icon with a small one, need to tqrepaint. + // In case we replace a big icon with a small one, need to repaint. updateContents(); // Can't do that with m_bNeedRepaint since slotCompleted isn't called m_bNeedRepaint = false; @@ -1305,7 +1305,7 @@ void KDIconView::slotCompleted() if (!m_hasExistingPos) rearrangeIcons(); -// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " tqrepaint:" << m_bNeedRepaint << endl; +// kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " repaint:" << m_bNeedRepaint << endl; if ( m_bNeedSave ) { // Done here because we want to align icons only once initially, and each time new icons appear. @@ -1317,7 +1317,7 @@ void KDIconView::slotCompleted() } if ( m_bNeedRepaint ) { - viewport()->tqrepaint(); + viewport()->repaint(); m_bNeedRepaint = false; } } @@ -1463,7 +1463,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) { kdDebug(1204)<<"void KDIconView::contentsDropEvent( TQDropEvent * e )\n"; // mind: if it's a filedrag which itself is an image, libkonq is called. There's a popup for drops as well - // that tqcontains the same line "Set as Wallpaper" in void KonqOperations::asyncDrop + // that contains the same line "Set as Wallpaper" in void KonqOperations::asyncDrop bool isColorDrag = KColorDrag::canDecode(e); bool isImageDrag = TQImageDrag::canDecode(e); bool isUrlDrag = KURLDrag::canDecode(e); @@ -1471,7 +1471,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) bool isImmutable = KGlobal::config()->isImmutable(); if ( (isColorDrag || isImageDrag) && !isUrlDrag ) { - // Hack to clear the drag tqshape + // Hack to clear the drag shape bool bMovable = itemsMovable(); bool bSignals = signalsBlocked(); setItemsMovable(false); @@ -1499,7 +1499,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) bool adjustedAnyItems = false; for( TQIconViewItem *item = firstItem(); item; item = item->nextItem() ) { - if( !desk.tqcontains( item->rect(), true )) + if( !desk.contains( item->rect(), true )) { TQRect r = item->rect(); @@ -1519,7 +1519,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e ) if( adjustedAnyItems ) { // Make sure the viewport isn't unnecessarily resized by now, - // then schedule a tqrepaint to remove any garbage pixels. + // then schedule a repaint to remove any garbage pixels. resizeContents( width(), height() ); viewport()->update(); } @@ -1541,7 +1541,7 @@ void KDIconView::updateWorkArea( const TQRect &wr ) { m_gotIconsArea = true; // now we have it! - if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid tqrepaint/saveIconPosition ... + if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return; // nothing changed; avoid repaint/saveIconPosition ... TQRect oldArea = iconArea(); setIconArea( wr ); @@ -1593,8 +1593,8 @@ void KDIconView::updateWorkArea( const TQRect &wr ) } } if ( needRepaint ) { - viewport()->tqrepaint( FALSE ); - tqrepaint( FALSE ); + viewport()->repaint( FALSE ); + repaint( FALSE ); saveIconPositions(); } } @@ -1718,7 +1718,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item ) TQRect rect=item->rect(); if (m_bVertAlign) { - kdDebug(1214)<<"moveToFreePosition for vertical tqalignment"<<endl; + kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl; rect.moveTopLeft(TQPoint(spacing(),spacing())); do diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h index c9a680b4f..6afde0e4b 100644 --- a/kdesktop/kdiconview.h +++ b/kdesktop/kdiconview.h @@ -43,7 +43,7 @@ class KDesktopShadowSettings; * * Added shadow capability by Laur Ivan (C) 2003 * The shadow is supported by the new KFileIVIDesktop objects - * which tqreplace KFileIVI objects. + * which replace KFileIVI objects. */ class KDIconView : public KonqIconViewWidget, public KDirNotify { diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp index 7d0f201ab..d5e367bc0 100644 --- a/kdesktop/kfileividesktop.cpp +++ b/kdesktop/kfileividesktop.cpp @@ -73,15 +73,15 @@ void KFileIVIDesktop::calcRect( const TQString& _text ) int spread = shadowThickness(); TQRect itemTextRect = textRect(); - TQRect tqitemRect = rect(); + TQRect itemRect = rect(); itemTextRect.setBottom( itemTextRect.bottom() + spread ); itemTextRect.setRight( itemTextRect.right() + spread ); - tqitemRect.setBottom( tqitemRect.bottom() + spread ); - tqitemRect.setRight( tqitemRect.right() + spread ); + itemRect.setBottom( itemRect.bottom() + spread ); + itemRect.setRight( itemRect.right() + spread ); setTextRect( itemTextRect ); - setItemRect( tqitemRect ); + setItemRect( itemRect ); } void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg) @@ -191,7 +191,7 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg ) else { text = settings->textColor(); shadow = ( settings->bgColor().isValid() ) ? settings->bgColor() : - ( tqGray( text.rgb() ) > 127 ) ? black : white; + ( qGray( text.rgb() ) > 127 ) ? black : white; if (rebuild) { setNormalImage(buildShadow(p, align, shadow)); _normalUID = uid; diff --git a/kdesktop/kfileividesktop.h b/kdesktop/kfileividesktop.h index b0a7ff33f..129abec07 100644 --- a/kdesktop/kfileividesktop.h +++ b/kdesktop/kfileividesktop.h @@ -40,7 +40,7 @@ class TQFont; class KShadowEngine; /** - * This class tqreplaces KFileIVI in the desktop only. + * This class replaces KFileIVI in the desktop only. * If the shadow object is NULL, then the class should behave almost identical * to its parent. * @since 3.2 @@ -91,7 +91,7 @@ class KFileIVIDesktop : public KFileIVI * Builds the shadow. As the algorithm is pretty slow (at pixel level), * This method is triggered only if the configuration has changed. * @param p the painter for drawing the item - * @param align the shadow tqalignment + * @param align the shadow alignment * @param shadowColor the shadow color */ virtual TQImage *buildShadow(TQPainter *p, const int align, TQColor &shadowColor); diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 036061ccb..e44c027c2 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -243,7 +243,7 @@ void KRootWm::initConfig() if (s == s_choices[c]) { rightButtonChoice = (menuChoice) c; break; } - // Read configuration for icons tqalignment + // Read configuration for icons alignment if ( m_bDesktopEnabled ) { bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); if ( kapp->authorize( "editable_desktop_icons" ) ) { @@ -630,14 +630,14 @@ void KRootWm::slotWindowList() { TQDesktopWidget* desktop = KApplication::desktop(); TQRect r; if (desktop->numScreens() < 2) - r = desktop->tqgeometry(); + r = desktop->geometry(); else r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos())); windowListMenu->init(); disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice - // windowListMenu->rect() is not valid before showing, use tqsizeHint() - windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->tqsizeHint()).center()); + // windowListMenu->rect() is not valid before showing, use sizeHint() + windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center()); windowListMenu->selectActiveWindow(); // make the popup more useful connect( windowListMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotWindowListAboutToShow() ) ); @@ -650,13 +650,13 @@ void KRootWm::slotSwitchUser() { TQDesktopWidget* desktop = KApplication::desktop(); TQRect r; if (desktop->numScreens() < 2) - r = desktop->tqgeometry(); + r = desktop->geometry(); else r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos())); slotPopulateSessions(); disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice - sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->tqsizeHint()).center()); + sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center()); connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotPopulateSessions() ) ); } diff --git a/kdesktop/kshadowengine.cpp b/kdesktop/kshadowengine.cpp index e8493b92b..893eac8e0 100644 --- a/kdesktop/kshadowengine.cpp +++ b/kdesktop/kshadowengine.cpp @@ -110,7 +110,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow; // update the shadow's i,j pixel. - result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); + result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); } } return result; @@ -127,15 +127,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j) return 0; double alphaShadow; - alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + - tqGray(source.pixel(i-1,j )) * AXIS_FACTOR + - tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + - tqGray(source.pixel(i ,j-1)) * AXIS_FACTOR + + alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + + qGray(source.pixel(i-1,j )) * AXIS_FACTOR + + qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + + qGray(source.pixel(i ,j-1)) * AXIS_FACTOR + 0 + - tqGray(source.pixel(i ,j+1)) * AXIS_FACTOR + - tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + - tqGray(source.pixel(i+1,j )) * AXIS_FACTOR + - tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); + qGray(source.pixel(i ,j+1)) * AXIS_FACTOR + + qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + + qGray(source.pixel(i+1,j )) * AXIS_FACTOR + + qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); return alphaShadow; } @@ -185,7 +185,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j) else sy = j + m; - opacity += tqGray(source.pixel(sx, sy)); + opacity += qGray(source.pixel(sx, sy)); } } alphaShadow += opacity / m_shadowSettings->multiplicationFactor(); diff --git a/kdesktop/kshadowengine.h b/kdesktop/kshadowengine.h index 4a9d6b7eb..33391e464 100644 --- a/kdesktop/kshadowengine.h +++ b/kdesktop/kshadowengine.h @@ -92,13 +92,13 @@ class KShadowEngine /* * a slower algorithm where the influence of a pixel - * is tqGray(px)/(abs(dx) + abs(dy) +1). + * is qGray(px)/(abs(dx) + abs(dy) +1). */ double doubleLinearDecay(TQImage& source, int x, int y); /* * a very slow algorithm where the influence of a pixel - * is tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). + * is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). */ double radialDecay(TQImage& source, int x, int y); diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 01792ad76..ff173c842 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -52,9 +52,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents) while (!line.isNull()) { if (line.startsWith("XDG_DESKTOP_DIR=")) - *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); else if (line.startsWith("XDG_DOCUMENTS_DIR=")) - *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath()); + *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); line = s.readLine(); } @@ -132,7 +132,7 @@ int main( int argc, char **argv) } if (directoryOk == true) { TQString xdgModifiedDirectory = newDirectory; - xdgModifiedDirectory = xdgModifiedDirectory.tqreplace(TQDir::homeDirPath(), "$HOME"); + xdgModifiedDirectory = xdgModifiedDirectory.replace(TQDir::homeDirPath(), "$HOME"); while (xdgModifiedDirectory.endsWith("/")) { xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1); } diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index 79a59787b..b51791d98 100644 --- a/kdesktop/lock/autologout.cc +++ b/kdesktop/lock/autologout.cc @@ -39,8 +39,8 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" TQLabel *greetLabel = new TQLabel(i18n("<nobr><qt><b>Automatic Log Out</b></qt><nobr>"), frame); TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame); - mtqStatusLabel = new TQLabel("<b> </b>", frame); - mtqStatusLabel->tqsetAlignment(TQLabel::AlignCenter); + mStatusLabel = new TQLabel("<b> </b>", frame); + mStatusLabel->setAlignment(TQLabel::AlignCenter); TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame); mProgressRemaining = new TQProgressBar(frame); @@ -52,7 +52,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop); frameLayout->addWidget(greetLabel, 0, 1); - frameLayout->addWidget(mtqStatusLabel, 1, 1); + frameLayout->addWidget(mStatusLabel, 1, 1); frameLayout->addWidget(infoLabel, 2, 1); frameLayout->addWidget(mProgressLabel, 3, 1); frameLayout->addWidget(mProgressRemaining, 4, 1); @@ -66,7 +66,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" mCountdownTimerId = startTimer(1000/25); - connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity())); + connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity())); } AutoLogout::~AutoLogout() @@ -76,7 +76,7 @@ AutoLogout::~AutoLogout() void AutoLogout::updateInfo(int timeout) { - mtqStatusLabel->setText(i18n("<nobr><qt>You will be automatically logged out in 1 second</qt></nobr>", + mStatusLabel->setText(i18n("<nobr><qt>You will be automatically logged out in 1 second</qt></nobr>", "<nobr><qt>You will be automatically logged out in %n seconds</qt></nobr>", timeout / 25) ); mProgressRemaining->setProgress(timeout); diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h index 355ac8635..f40ac5f0d 100644 --- a/kdesktop/lock/autologout.h +++ b/kdesktop/lock/autologout.h @@ -39,7 +39,7 @@ private: void updateInfo(int); TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; int mCountdownTimerId; int mRemaining; TQTimer countDownTimer; diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index 460c8d590..2249dc46e 100644 --- a/kdesktop/lock/infodlg.cc +++ b/kdesktop/lock/infodlg.cc @@ -71,18 +71,18 @@ InfoDlg::InfoDlg(LockProcess *parent) KUser user; - mtqStatusLabel = new TQLabel( "<b> </b>", frame ); - mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); + mStatusLabel = new TQLabel( "<b> </b>", frame ); + mStatusLabel->setAlignment( TQLabel::AlignCenter ); TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); - TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); - laytqStatus->addWidget( mtqStatusLabel ); + TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); + layStatus->addWidget( mStatusLabel ); frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop ); - frameLayout->addLayout( laytqStatus, 1, 1 ); + frameLayout->addLayout( layStatus, 1, 1 ); installEventFilter(this); } @@ -94,8 +94,8 @@ InfoDlg::~InfoDlg() void InfoDlg::updateLabel(TQString &txt) { - mtqStatusLabel->setPaletteForegroundColor(Qt::black); - mtqStatusLabel->setText("<b>" + txt + "</b>"); + mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setText("<b>" + txt + "</b>"); } void InfoDlg::setUnlockIcon() diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h index 687a7c28a..a0ca3b8c0 100644 --- a/kdesktop/lock/infodlg.h +++ b/kdesktop/lock/infodlg.h @@ -43,11 +43,11 @@ public: private: TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; TQLabel *mpixLabel; int mCapsLocked; bool mUnlockingFailed; - TQStringList tqlayoutsList; + TQStringList layoutsList; TQStringList::iterator currLayout; int sPid, sFd; }; diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 67c2a063e..2efe56a8a 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/kdesktop/lock/lockdlg.cc @@ -82,8 +82,8 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) i18n("<nobr><b>The session is locked</b><br>") : i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame ); - mtqStatusLabel = new TQLabel( "<b> </b>", frame ); - mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); + mStatusLabel = new TQLabel( "<b> </b>", frame ); + mStatusLabel->setAlignment( TQLabel::AlignCenter ); mLayoutButton = new TQPushButton( frame ); mLayoutButton->setFlat( true ); @@ -101,9 +101,9 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); - TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); - laytqStatus->addWidget( mtqStatusLabel ); - laytqStatus->addWidget( mLayoutButton ); + TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); + layStatus->addWidget( mStatusLabel ); + layStatus->addWidget( mLayoutButton ); TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); layButtons->addWidget( mNewSessButton ); @@ -115,7 +115,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, AlignTop ); frameLayout->addWidget( greetLabel, 0, 1 ); frameLayout->addItem( greet->getLayoutItem(), 1, 1 ); - frameLayout->addLayout( laytqStatus, 2, 1 ); + frameLayout->addLayout( layStatus, 2, 1 ); frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 ); frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 ); @@ -123,7 +123,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) setTabOrder( cancel, mNewSessButton ); setTabOrder( mNewSessButton, mLayoutButton ); - connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(tqlayoutClicked())); + connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked())); connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK())); connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser())); @@ -135,17 +135,17 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin) mFailedTimerId = 0; mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT); - connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); + connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); greet->start(); DCOPRef kxkb("kxkb", "kxkb"); if( !kxkb.isNull() ) { - tqlayoutsList = kxkb.call("getLayoutsList"); + layoutsList = kxkb.call("getLayoutsList"); TQString currentLayout = kxkb.call("getCurrentLayout"); - if( !currentLayout.isEmpty() && tqlayoutsList.count() > 1 ) { - currLayout = tqlayoutsList.find(currentLayout); - if (currLayout == tqlayoutsList.end()) + if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) { + currLayout = layoutsList.find(currentLayout); + if (currLayout == layoutsList.end()) setLayoutText("err"); else setLayoutText(*currLayout); @@ -164,11 +164,11 @@ PasswordDlg::~PasswordDlg() delete greet; } -void PasswordDlg::tqlayoutClicked() +void PasswordDlg::layoutClicked() { - if( ++currLayout == tqlayoutsList.end() ) - currLayout = tqlayoutsList.begin(); + if( ++currLayout == layoutsList.end() ) + currLayout = layoutsList.begin(); DCOPRef kxkb("kxkb", "kxkb"); setLayoutText( kxkb.call("setLayout", *currLayout) ? *currLayout : "err" ); @@ -179,7 +179,7 @@ void PasswordDlg::setLayoutText( const TQString &txt ) { mLayoutButton->setText( txt ); TQSize sz = mLayoutButton->fontMetrics().size( 0, txt ); - int mrg = mLayoutButton->style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2; + int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2; mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg ); } @@ -187,18 +187,18 @@ void PasswordDlg::updateLabel() { if (mUnlockingFailed) { - mtqStatusLabel->setPaletteForegroundColor(Qt::black); - mtqStatusLabel->setText(i18n("<b>Unlocking failed</b>")); + mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setText(i18n("<b>Unlocking failed</b>")); } else if (mCapsLocked) { - mtqStatusLabel->setPaletteForegroundColor(Qt::red); - mtqStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>")); + mStatusLabel->setPaletteForegroundColor(Qt::red); + mStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>")); } else { - mtqStatusLabel->setText("<b> </b>"); + mStatusLabel->setText("<b> </b>"); } } @@ -480,7 +480,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) TQLabel *label2 = new TQLabel( text, winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 ); @@ -667,9 +667,9 @@ void PasswordDlg::slotSwitchUser() ns++; } int fw = lv->frameWidth() * 2; - TQSize hds( lv->header()->tqsizeHint() ); + TQSize hds( lv->header()->sizeHint() ); lv->setMinimumWidth( fw + hds.width() + - (ns > 10 ? style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) ); + (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) ); lv->setFixedHeight( fw + hds.height() + itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) ); lv->header()->adjustHeaderSize(); @@ -709,11 +709,11 @@ void PasswordDlg::slotSessionActivated() void PasswordDlg::capsLocked() { - unsigned int ltqmask; + unsigned int lmask; Window dummy1, dummy2; int dummy3, dummy4, dummy5, dummy6; - XQueryPointer(qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, <qmask); - mCapsLocked = ltqmask & LockMask; + XQueryPointer(qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, &lmask); + mCapsLocked = lmask & LockMask; updateLabel(); } diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h index fa506ee50..258339314 100644 --- a/kdesktop/lock/lockdlg.h +++ b/kdesktop/lock/lockdlg.h @@ -55,7 +55,7 @@ private slots: void slotSessionActivated(); void slotStartNewSession(); void slotOK(); - void tqlayoutClicked(); + void layoutClicked(); void slotActivity(); private: @@ -77,14 +77,14 @@ private: KGreeterPlugin *greet; TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; KPushButton *mNewSessButton, *ok, *cancel; TQPushButton *mLayoutButton; int mFailedTimerId; int mTimeoutTimerId; int mCapsLocked; bool mUnlockingFailed; - TQStringList tqlayoutsList; + TQStringList layoutsList; TQStringList::iterator currLayout; int sPid, sFd; TQListView *lv; diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 3d264a08c..cdd5581e7 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -88,7 +88,7 @@ extern "C" { #include <X11/extensions/dpms.h> #ifndef HAVE_DPMSINFO_PROTO -tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); +Status DPMSInfo ( Display *, CARD16 *, BOOL * ); #endif } #endif @@ -195,7 +195,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly) TQStringList dmopt = TQStringList::split(TQChar(','), - TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" ))); + TQString::fromLatin1( ::getenv( "XDM_MANAGED" ))); for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it) if ((*it).startsWith("method=")) mMethod = (*it).mid(7); @@ -944,7 +944,7 @@ void LockProcess::stopSaver() TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt) { LockProcess *that = (LockProcess *)ctx; - TQString fkey = TQString::tqfromLatin1( key ) + '='; + TQString fkey = TQString::fromLatin1( key ) + '='; for (TQStringList::ConstIterator it = that->mPluginOptions.begin(); it != that->mPluginOptions.end(); ++it) if ((*it).startsWith( fkey )) @@ -1174,7 +1174,7 @@ int LockProcess::execDialog( TQDialog *dlg ) currentDialog=dlg; dlg->adjustSize(); - TQRect rect = dlg->tqgeometry(); + TQRect rect = dlg->geometry(); rect.moveCenter(KGlobalSettings::desktopGeometry(TQCursor::pos()).center()); dlg->move( rect.topLeft() ); @@ -1341,7 +1341,7 @@ bool LockProcess::x11Event(XEvent *event) { XEvent ev2 = *event; ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId(); - tqApp->x11ProcessEvent( &ev2 ); + qApp->x11ProcessEvent( &ev2 ); return true; } @@ -1453,7 +1453,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt ) TQLabel *label2 = new TQLabel( txt, winFrame ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) ); TQVBoxLayout *vbox = new TQVBoxLayout( &box ); @@ -1481,7 +1481,7 @@ void LockProcess::showVkbd() mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS ); connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId ))); mVkbdProcess = new KProcess; - *mVkbdProcess << "xvkbd" << "-compact" << "-tqgeometry" << "-0-0" << "-xdm"; + *mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm"; mVkbdProcess->start(); } } @@ -1525,7 +1525,7 @@ void LockProcess::windowAdded( WId w, bool managed ) &length, &after, &data ); bool withdrawn = true; if ( r == Success && data && format == 32 ) { - TQ_UINT32 *wstate = (TQ_UINT32*)data; + Q_UINT32 *wstate = (Q_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -1576,15 +1576,15 @@ bool LockProcess::forwardVkbdEvent( XEvent* event ) for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin(); it != mVkbdWindows.end(); ++it ) { - if( (*it).rect.tqcontains( pos )) { + if( (*it).rect.contains( pos )) { // Find the subwindow where the event should actually go. // Not exactly cheap in the number of X roundtrips but oh well. Window window = (*it).id; Window root, child; int root_x, root_y, x, y; - unsigned int tqmask; + unsigned int mask; for(;;) { - if( !XQueryPointer( qt_xdisplay(), window, &root, &child, &root_x, &root_y, &x, &y, &tqmask )) + if( !XQueryPointer( qt_xdisplay(), window, &root, &child, &root_x, &root_y, &x, &y, &mask )) return false; if( child == None ) break; diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index ea1d1bc06..d4ad06e88 100644 --- a/kdesktop/lock/querydlg.cc +++ b/kdesktop/lock/querydlg.cc @@ -71,9 +71,9 @@ QueryDlg::QueryDlg(LockProcess *parent) KUser user; - mtqStatusLabel = new TQLabel( "<b> </b>", frame ); - //mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter ); - mtqStatusLabel->tqsetAlignment( TQLabel::AlignLeft ); + mStatusLabel = new TQLabel( "<b> </b>", frame ); + //mStatusLabel->setAlignment( TQLabel::AlignCenter ); + mStatusLabel->setAlignment( TQLabel::AlignLeft ); KSeparator *sep = new KSeparator( KSeparator::HLine, frame ); @@ -82,8 +82,8 @@ QueryDlg::QueryDlg(LockProcess *parent) TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this ); unlockDialogLayout->addWidget( frame ); - TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); - laytqStatus->addWidget( mtqStatusLabel ); + TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); + layStatus->addWidget( mStatusLabel ); TQHBoxLayout *layPin = new TQHBoxLayout( 0, 0, KDialog::spacingHint()); pin_box = new KPasswordEdit( this, "pin_box" ); @@ -96,7 +96,7 @@ QueryDlg::QueryDlg(LockProcess *parent) frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop ); - frameLayout->addLayout( laytqStatus, 0, 1 ); + frameLayout->addLayout( layStatus, 0, 1 ); frameLayout->addLayout( layPin, 2, 1 ); frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 ); frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 ); @@ -123,8 +123,8 @@ const char * QueryDlg::getEntry() void QueryDlg::updateLabel(TQString &txt) { - mtqStatusLabel->setPaletteForegroundColor(Qt::black); - mtqStatusLabel->setText("<b>" + txt + "</b>"); + mStatusLabel->setPaletteForegroundColor(Qt::black); + mStatusLabel->setText("<b>" + txt + "</b>"); } void QueryDlg::setUnlockIcon() diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h index 698d7805d..e6a768369 100644 --- a/kdesktop/lock/querydlg.h +++ b/kdesktop/lock/querydlg.h @@ -46,11 +46,11 @@ private slots: private: TQFrame *frame; TQGridLayout *frameLayout; - TQLabel *mtqStatusLabel; + TQLabel *mStatusLabel; TQLabel *mpixLabel; int mCapsLocked; bool mUnlockingFailed; - TQStringList tqlayoutsList; + TQStringList layoutsList; TQStringList::iterator currLayout; int sPid, sFd; KPushButton *ok; diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index 601efb1c4..43c39f19f 100644 --- a/kdesktop/lockeng.cc +++ b/kdesktop/lockeng.cc @@ -157,7 +157,7 @@ bool SaverEngine::enable( bool e ) } mXAutoLock->setTimeout(mTimeout); mXAutoLock->setDPMS(true); - //mXAutoLock->changeCornerLocktqStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); + //mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight); // We'll handle blanking XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures); diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index c036a4306..027aa0bfc 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -89,7 +89,7 @@ Minicli::Minicli( TQWidget *parent, const char *name) mainLayout->addWidget(m_dlg); m_dlg->lbRunIcon->setPixmap(DesktopIcon("kmenu")); - m_dlg->lbComment->tqsetAlignment( Qt::WordBreak ); + m_dlg->lbComment->setAlignment( Qt::WordBreak ); m_dlg->cbCommand->setDuplicatesEnabled( false ); m_dlg->cbCommand->setTrapReturnKey( true ); @@ -179,9 +179,9 @@ void Minicli::setCommand(const TQString& command) } } -TQSize Minicli::tqsizeHint() const +TQSize Minicli::sizeHint() const { - int maxWidth = tqApp->desktop()->screenGeometry((TQWidget*)this).width(); + int maxWidth = qApp->desktop()->screenGeometry((TQWidget*)this).width(); if (maxWidth < 603) { // a sensible max for smaller screens @@ -389,7 +389,7 @@ TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args) else terminal += TQString(" -e /bin/sh -c \"%1 %2\"").arg(cmd).arg(args); - if (!m_terminalAppList.tqcontains(cmd)) + if (!m_terminalAppList.contains(cmd)) m_terminalAppList << cmd; return terminal; @@ -414,13 +414,13 @@ int Minicli::runCommand() cmd = uri.url(); TQCString asn; - if( tqApp->desktop()->isVirtualDesktop()) + if( qApp->desktop()->isVirtualDesktop()) { asn = KStartupInfo::createNewStartupId(); KStartupInfoId id; id.initId( asn ); KStartupInfoData data; - data.setXinerama( tqApp->desktop()->screenNumber( this )); + data.setXinerama( qApp->desktop()->screenNumber( this )); KStartupInfo::sendChange( id, data ); } @@ -558,7 +558,7 @@ int Minicli::runCommand() case KURIFilterData::HELP: { // No need for kfmclient, KRun does it all (David) - (void) new KRun( m_filterData->uri(), tqparentWidget(), asn ); + (void) new KRun( m_filterData->uri(), parentWidget(), asn ); return 0; } case KURIFilterData::EXECUTABLE: @@ -570,7 +570,7 @@ int Minicli::runCommand() if (service && service->isValid() && service->type() == "Application") { notifyServiceStarted(service); - KRun::run(*service, KURL::List(), tqparentWidget(), asn ); + KRun::run(*service, KURL::List(), parentWidget(), asn ); return 0; } } @@ -605,7 +605,7 @@ int Minicli::runCommand() if (service && service->isValid() && service->type() == "Application") { notifyServiceStarted(service); - KRun::run(*service, KURL::List(), tqparentWidget(), asn ); + KRun::run(*service, KURL::List(), parentWidget(), asn ); return 0; } @@ -613,7 +613,7 @@ int Minicli::runCommand() if (service && service->isValid() && service->type() == "Application") { notifyServiceStarted(service); - KRun::run(*service, KURL::List(), tqparentWidget(), asn ); + KRun::run(*service, KURL::List(), parentWidget(), asn ); return 0; } @@ -625,7 +625,7 @@ int Minicli::runCommand() } } - if ( KRun::runCommand( cmd, exec, m_iconName, tqparentWidget(), asn ) ) + if ( KRun::runCommand( cmd, exec, m_iconName, parentWidget(), asn ) ) return 0; else { @@ -674,7 +674,7 @@ void Minicli::slotCmdChanged(const TQString& text) // Also use autocompletion if it appears that I am using some kind of ioslave, except the http:// ioslave m_urlCompletionStarted = true; // flag for slotMatch() - if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.tqcontains("://", false) != 0)) && (text.tqcontains("http://", false) == 0)) { + if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.contains("://", false) != 0)) && (text.contains("http://", false) == 0)) { TQString completion = m_pURLCompletion->makeCompletion( text ); } } @@ -730,7 +730,7 @@ void Minicli::slotAdvanced() // Set the focus back to the widget that had it to begin with, i.e. // do not put the focus on the "Options" button. - m_FocusWidget = tqfocusWidget(); + m_FocusWidget = focusWidget(); if( m_FocusWidget ) m_FocusWidget->setFocus(); @@ -763,7 +763,7 @@ void Minicli::parseLine( bool final ) KURIFilter::self()->filterURI( *(m_filterData), m_middleFilters ); bool isTerminalApp = ((m_filterData->uriType() == KURIFilterData::EXECUTABLE) && - m_terminalAppList.tqcontains(m_filterData->uri().url())); + m_terminalAppList.contains(m_filterData->uri().url())); if( !isTerminalApp ) { @@ -792,7 +792,7 @@ void Minicli::parseLine( bool final ) void Minicli::setIcon () { if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" ) - m_iconName = TQString::tqfromLatin1("kmenu"); + m_iconName = TQString::fromLatin1("kmenu"); TQPixmap icon = DesktopIcon( m_iconName ); @@ -806,14 +806,14 @@ void Minicli::setIcon () { int x = icon.width() - overlay.width(); int y = icon.height() - overlay.height(); - if ( icon.tqmask() ) + if ( icon.mask() ) { - TQBitmap tqmask = *icon.tqmask(); - bitBlt( &tqmask, x, y, - overlay.tqmask() ? const_cast<TQBitmap *>(overlay.tqmask()) : &overlay, + TQBitmap mask = *icon.mask(); + bitBlt( &mask, x, y, + overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay, 0, 0, overlay.width(), overlay.height(), - overlay.tqmask() ? OrROP : SetROP ); - icon.setMask(tqmask); + overlay.mask() ? OrROP : SetROP ); + icon.setMask(mask); } bitBlt( &icon, x, y, &overlay ); } @@ -837,9 +837,9 @@ void Minicli::updateAuthLabel() m_prevChecked = m_dlg->cbRunAsOther->isChecked(); m_prevCached = true; } - if (m_dlg->leUsername->text() != TQString::tqfromLatin1("root")) + if (m_dlg->leUsername->text() != TQString::fromLatin1("root")) m_dlg->lePassword->setText(TQString::null); - m_dlg->leUsername->setText(TQString::tqfromLatin1("root")); + m_dlg->leUsername->setText(TQString::fromLatin1("root")); m_dlg->cbRunAsOther->setChecked(true); m_dlg->cbRunAsOther->setEnabled(false); m_dlg->leUsername->setEnabled(false); @@ -884,7 +884,7 @@ void Minicli::slotTerminal(bool enable) if (enable) { m_prevIconName = m_iconName; - m_iconName = TQString::tqfromLatin1( "konsole" ); + m_iconName = TQString::fromLatin1( "konsole" ); setIcon(); } else if (!m_prevIconName.isEmpty()) diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h index 93c296600..4ae49cf7c 100644 --- a/kdesktop/minicli.h +++ b/kdesktop/minicli.h @@ -57,7 +57,7 @@ public: void clearHistory(); virtual void show(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void saveConfig(); diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui index e426a4725..3809eb852 100644 --- a/kdesktop/minicli_ui.ui +++ b/kdesktop/minicli_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>MinicliDlgUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -107,7 +107,7 @@ </widget> <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>57</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -286,7 +286,7 @@ </widget> <widget class="QLayoutWidget" row="6" column="1"> <property name="name"> - <cstring>tqlayout30</cstring> + <cstring>layout30</cstring> </property> <vbox> <property name="name"> @@ -319,7 +319,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>9</height> @@ -360,7 +360,7 @@ </widget> <widget class="QLayoutWidget" row="6" column="2" rowspan="1" colspan="2"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <grid> <property name="name"> @@ -393,7 +393,7 @@ <property name="text"> <string>High</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="whatsThis" stdset="0"> @@ -448,7 +448,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -515,7 +515,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -531,7 +531,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>388</width> <height>0</height> @@ -556,7 +556,7 @@ <property name="text"> <string>Enter the name of the application you want to run or the URL you want to view</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -636,8 +636,8 @@ <include location="local" impldecl="in implementation">kpushbutton.h</include> </includes> <pixmapfunction>BarIcon</pixmapfunction> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc index 30da39f01..bc869d341 100644 --- a/kdesktop/pixmapserver.cc +++ b/kdesktop/pixmapserver.cc @@ -58,7 +58,7 @@ KPixmapServer::~KPixmapServer() void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite) { - if (m_Names.tqcontains(name)) + if (m_Names.contains(name)) { if (overwrite) remove(name); @@ -174,7 +174,7 @@ bool KPixmapServer::x11Event(XEvent *event) } // Check if there is no transaction in progress to the same property - if (m_Active.tqcontains(ev->property)) + if (m_Active.contains(ev->property)) { kdDebug(1204) << ID << "selection is busy.\n"; XSendEvent(qt_xdisplay(), ev->requestor, false, 0, &reply); diff --git a/kdesktop/programs/xplanet.desktop b/kdesktop/programs/xplanet.desktop index db0df2c47..5590a53e0 100644 --- a/kdesktop/programs/xplanet.desktop +++ b/kdesktop/programs/xplanet.desktop @@ -1,5 +1,5 @@ [KDE Desktop Program] -Command=xplanet --tqgeometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f +Command=xplanet --geometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f Comment=XPlanet by Hari Nair Comment[af]=XPlaneet deur Hari Nair Comment[ar]=XPlanet من تلي٠Hari Nair @@ -76,5 +76,5 @@ Comment[zh_CN]=Hari Nair çš„ XPlanet Comment[zh_TW]=XPlanet (Hari Nair 繪製) Comment[zu]=XPlanet ngu-Hari Nair Executable=xplanet -PreviewCommand=xplanet --tqgeometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f +PreviewCommand=xplanet --geometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f Refresh=10 diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index d8c9be53f..720dd4bba 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -82,7 +82,7 @@ void StartupId::configure() void StartupId::gotNewStartup( const KStartupInfoId& id_P, const KStartupInfoData& data_P ) { - TQString icon = data_P.tqfindIcon(); + TQString icon = data_P.findIcon(); current_startup = id_P; startups[ id_P ] = icon; start_startupid( icon ); @@ -92,7 +92,7 @@ void StartupId::gotStartupChange( const KStartupInfoId& id_P, const KStartupInfo { if( current_startup == id_P ) { - TQString icon = data_P.tqfindIcon(); + TQString icon = data_P.findIcon(); if( !icon.isEmpty() && icon != startups[ current_startup ] ) { startups[ id_P ] = icon; @@ -218,8 +218,8 @@ void StartupId::start_startupid( const TQString& icon_P ) } else { - if( icon_pixmap.tqmask() != NULL ) - startup_widget->setMask( *icon_pixmap.tqmask()); + if( icon_pixmap.mask() != NULL ) + startup_widget->setMask( *icon_pixmap.mask()); else startup_widget->clearMask(); startup_widget->setBackgroundPixmap( icon_pixmap ); @@ -257,8 +257,8 @@ void StartupId::update_startupid() yoffset = frame_to_yoffset[ frame ]; TQPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ]; startup_widget->setBackgroundPixmap( pm ); - if ( pm.tqmask() != NULL ) - startup_widget->setMask( *pm.tqmask() ); + if ( pm.mask() != NULL ) + startup_widget->setMask( *pm.mask() ); else startup_widget->clearMask(); if ( ++frame >= ( sizeof( frame_to_yoffset ) / sizeof( frame_to_yoffset[ 0 ] ) ) ) diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cc index 40f26e58a..b69325f17 100644 --- a/kdesktop/xautolock.cc +++ b/kdesktop/xautolock.cc @@ -32,7 +32,7 @@ extern "C" { #include <X11/extensions/dpms.h> #ifndef HAVE_DPMSINFO_PROTO -tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * ); +Status DPMSInfo ( Display *, CARD16 *, BOOL * ); #endif } #endif diff --git a/kdesktop/xautolock_diy.c b/kdesktop/xautolock_diy.c index 52a4254d5..b9df2f895 100644 --- a/kdesktop/xautolock_diy.c +++ b/kdesktop/xautolock_diy.c @@ -115,7 +115,7 @@ selectEvents (Window window, Bool substructureOnly) if (nofChildren) (void) XFree ((char*) children); /* - * Build the appropriate event tqmask. The basic idea is that we don't + * Build the appropriate event mask. The basic idea is that we don't * want to interfere with the normal event propagation mechanism if * we don't have to. * @@ -134,8 +134,8 @@ selectEvents (Window window, Bool substructureOnly) { if (parent == None) /* the *real* rootwindow */ { - attribs.all_event_tqmasks = - attribs.do_not_propagate_tqmask = KeyPressMask; + attribs.all_event_masks = + attribs.do_not_propagate_mask = KeyPressMask; } else if (!XGetWindowAttributes (queue.display, window, &attribs)) #else @@ -149,19 +149,19 @@ selectEvents (Window window, Bool substructureOnly) #if 0 (void) XSelectInput (queue.display, window, SubstructureNotifyMask - | ( ( attribs.all_event_tqmasks - | attribs.do_not_propagate_tqmask) + | ( ( attribs.all_event_masks + | attribs.do_not_propagate_mask) & KeyPressMask)); #else { - int tqmask = SubstructureNotifyMask | attribs.your_event_mask; + int mask = SubstructureNotifyMask | attribs.your_event_mask; if( !substructureOnly ) { - tqmask |= ( ( attribs.all_event_masks + mask |= ( ( attribs.all_event_masks | attribs.do_not_propagate_mask) & KeyPressMask ); } - (void) XSelectInput (queue.display, window, tqmask ); + (void) XSelectInput (queue.display, window, mask ); } #endif diff --git a/kdesktop/xautolock_engine.c b/kdesktop/xautolock_engine.c index 64c542bfb..1825b7fe2 100644 --- a/kdesktop/xautolock_engine.c +++ b/kdesktop/xautolock_engine.c @@ -74,7 +74,7 @@ xautolock_queryPointer (Display* d) { Window dummyWin; /* as it says */ int dummyInt; /* as it says */ - unsigned tqmask; /* modifier tqmask */ + unsigned mask; /* modifier mask */ int rootX; /* as it says */ int rootY; /* as it says */ int corner; /* corner index */ @@ -104,7 +104,7 @@ xautolock_queryPointer (Display* d) * of pointer events. */ if (!XQueryPointer (d, root, &root, &dummyWin, &rootX, &rootY, - &dummyInt, &dummyInt, &tqmask)) + &dummyInt, &dummyInt, &mask)) { /* * Pointer has moved to another screen, so let's find out which one. @@ -121,7 +121,7 @@ xautolock_queryPointer (Display* d) if ( rootX == prevRootX && rootY == prevRootY - && tqmask == prevMask) + && mask == prevMask) { xautolock_corner_t* corners = xautolock_corners; /* @@ -186,7 +186,7 @@ xautolock_queryPointer (Display* d) #endif prevRootX = rootX; prevRootY = rootY; - prevMask = tqmask; + prevMask = mask; xautolock_resetTriggers (); } @@ -224,7 +224,7 @@ evaluateTriggers (Display* d) * when we are finally re-enabled. */ #ifdef VMS - if (vmstqStatus == 0) + if (vmsStatus == 0) { #else /* VMS */ if (lockerPid) @@ -336,7 +336,7 @@ evaluateTriggers (Display* d) || now >= lockTrigger) { #ifdef VMS - if (vmstqStatus != 0) + if (vmsStatus != 0) #else /* VMS */ if (!lockerPid) #endif /* VMS */ @@ -350,9 +350,9 @@ evaluateTriggers (Display* d) case 0: (void) close (ConnectionNumber (d)); #ifdef VMS - vmstqStatus = 0; + vmsStatus = 0; lockerPid = lib$spawn ((lockNow ? &nowLockerDescr : &lockerDescr), - 0, 0, &1, 0, 0, &vmstqStatus); + 0, 0, &1, 0, 0, &vmsStatus); if (!(lockerPid & 1)) exit (lockerPid); @@ -380,7 +380,7 @@ evaluateTriggers (Display* d) * Nevertheless, simply resetting the screensaver is a * convenience action that aids many xlock users, and doesn't * harm anyone (*). The problem with older versions of xlock - * is that they can be told to tqreplace (= disable) the real + * is that they can be told to replace (= disable) the real * screensaver, but forget to reset that same screensaver if * it was already active at the time xlock starts. I guess * xlock initially wasn't designed to be run without a user diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp index 3e3e97c96..1d52a58ac 100644 --- a/kdesu/kdesud/handler.cpp +++ b/kdesu/kdesud/handler.cpp @@ -304,9 +304,9 @@ int ConnectionHandler::doCommand(TQCString buf) SuProcess proc; proc.setCommand(command); proc.setUser(user); - if (options.tqcontains('x')) + if (options.contains('x')) proc.setXOnly(true); - if (options.tqcontains('f')) + if (options.contains('f')) proc.setDCOPForwarding(true); proc.setPriority(m_Priority); proc.setScheduler(m_Scheduler); diff --git a/kdesu/kdesud/kdesud.cpp b/kdesu/kdesud/kdesud.cpp index f699c65de..49006a401 100644 --- a/kdesu/kdesud/kdesud.cpp +++ b/kdesu/kdesud/kdesud.cpp @@ -166,7 +166,7 @@ int create_socket() } // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display))); int stat_err=lstat(sock, &s); diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp index 539dc35ed..cdbbcaed1 100644 --- a/kdesu/kdesud/repo.cpp +++ b/kdesu/kdesud/repo.cpp @@ -134,7 +134,7 @@ TQCString Repository::findKeys(const TQCString &group, const char *sep ) const if (!list.isEmpty()) { // Add the same keys only once please :) - if( !list.tqcontains(key) ) + if( !list.contains(key) ) { kdDebug(1205) << "Key added to list: " << key << endl; list += '\007'; // I do not know diff --git a/kdialog/README b/kdialog/README index e7df11e1f..d029419c0 100644 --- a/kdialog/README +++ b/kdialog/README @@ -3,7 +3,7 @@ The syntax is very much inspired from the "dialog" command (which shows text mode dialogs). However the width and height attributes have been removed for -most dialogs - Qt/KDE have tqlayouts ;) +most dialogs - Qt/KDE have layouts ;) A tutorial on using kdialog is available at http://developer.kde.org/documentation/tutorials/kdialog/t1.html diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 297822e96..8cf9b581f 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -108,10 +108,10 @@ class WinIdEmbedder: public QObject { public: WinIdEmbedder(bool printID, WId winId): - TQObject(tqApp), print(printID), id(winId) + TQObject(qApp), print(printID), id(winId) { - if (tqApp) - tqApp->installEventFilter(this); + if (qApp) + qApp->installEventFilter(this); } protected: bool eventFilter(TQObject *o, TQEvent *e); @@ -241,9 +241,9 @@ static int directCommand(KCmdLineArgs *args) TQString text = TQString::fromLocal8Bit(args->getOption( option )); int pos; - while ((pos = text.find( TQString::tqfromLatin1("\\n") )) >= 0) + while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0) { - text.tqreplace(pos, 2, TQString::tqfromLatin1("\n")); + text.replace(pos, 2, TQString::fromLatin1("\n")); } if ( type == KMessageBox::WarningContinueCancel ) { @@ -491,7 +491,7 @@ static int directCommand(KCmdLineArgs *args) if (args->count() >= 1) { filter = TQString::fromLocal8Bit(args->arg(0)); } - // copied from KFileDialog::getSaveFileName(), so we can add tqgeometry + // copied from KFileDialog::getSaveFileName(), so we can add geometry bool specialDir = ( startDir.at(0) == ':' ); KFileDialog dlg( specialDir ? startDir : TQString::null, filter, 0, "filedialog", true ); if ( !specialDir ) @@ -597,44 +597,44 @@ static int directCommand(KCmdLineArgs *args) contextStr = TQString::fromLocal8Bit(args->arg(0)); } KIcon::Group group = KIcon::NoGroup; - if ( groupStr == TQString::tqfromLatin1( "Desktop" ) ) + if ( groupStr == TQString::fromLatin1( "Desktop" ) ) group = KIcon::Desktop; - else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) ) + else if ( groupStr == TQString::fromLatin1( "Toolbar" ) ) group = KIcon::Toolbar; - else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) ) + else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) ) group = KIcon::MainToolbar; - else if ( groupStr == TQString::tqfromLatin1( "Small" ) ) + else if ( groupStr == TQString::fromLatin1( "Small" ) ) group = KIcon::Small; - else if ( groupStr == TQString::tqfromLatin1( "Panel" ) ) + else if ( groupStr == TQString::fromLatin1( "Panel" ) ) group = KIcon::Panel; - else if ( groupStr == TQString::tqfromLatin1( "User" ) ) + else if ( groupStr == TQString::fromLatin1( "User" ) ) group = KIcon::User; KIcon::Context context = KIcon::Any; // From kicontheme.cpp - if ( contextStr == TQString::tqfromLatin1( "Devices" ) ) + if ( contextStr == TQString::fromLatin1( "Devices" ) ) context = KIcon::Device; - else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) ) + else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) ) context = KIcon::MimeType; - else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) ) + else if ( contextStr == TQString::fromLatin1( "FileSystems" ) ) context = KIcon::FileSystem; - else if ( contextStr == TQString::tqfromLatin1( "Applications" ) ) + else if ( contextStr == TQString::fromLatin1( "Applications" ) ) context = KIcon::Application; - else if ( contextStr == TQString::tqfromLatin1( "Actions" ) ) + else if ( contextStr == TQString::fromLatin1( "Actions" ) ) context = KIcon::Action; - else if ( contextStr == QString::tqfromLatin1( "Animations" ) ) + else if ( contextStr == QString::fromLatin1( "Animations" ) ) context = KIcon::Animation; - else if ( contextStr == QString::tqfromLatin1( "Categories" ) ) + else if ( contextStr == QString::fromLatin1( "Categories" ) ) context = KIcon::Category; - else if ( contextStr == QString::tqfromLatin1( "Emblems" ) ) + else if ( contextStr == QString::fromLatin1( "Emblems" ) ) context = KIcon::Emblem; - else if ( contextStr == QString::tqfromLatin1( "Emotes" ) ) + else if ( contextStr == QString::fromLatin1( "Emotes" ) ) context = KIcon::Emote; - else if ( contextStr == QString::tqfromLatin1( "International" ) ) + else if ( contextStr == QString::fromLatin1( "International" ) ) context = KIcon::International; - else if ( contextStr == QString::tqfromLatin1( "Places" ) ) + else if ( contextStr == QString::fromLatin1( "Places" ) ) context = KIcon::Place; - else if ( contextStr == QString::tqfromLatin1( "tqStatus" ) ) - context = KIcon::tqStatusIcon; + else if ( contextStr == QString::fromLatin1( "Status" ) ) + context = KIcon::StatusIcon; KIconDialog dlg(0, "icon dialog"); kapp->setTopWidget( &dlg ); diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp index 23fe18f53..d7abfb694 100644 --- a/kdialog/klistboxdialog.cpp +++ b/kdialog/klistboxdialog.cpp @@ -32,7 +32,7 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent) TQVBox *page = makeVBoxMainWidget(); label = new TQLabel(text, page); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); table = new TQListBox(page); table->setFocus(); diff --git a/kdialog/progressdemo b/kdialog/progressdemo index 6c2ac6afb..e6f4bb48c 100755 --- a/kdialog/progressdemo +++ b/kdialog/progressdemo @@ -1,5 +1,5 @@ #!/bin/sh -dcopRef=`./kdialog --tqgeometry 300x200+100-100 --progressbar "Initialising" 6` +dcopRef=`./kdialog --geometry 300x200+100-100 --progressbar "Initialising" 6` dcop $dcopRef setProgress 1 dcop $dcopRef setLabel "Thinking really hard" sleep 2 diff --git a/kdialog/test b/kdialog/test index 442b9c307..0d41dbb0a 100755 --- a/kdialog/test +++ b/kdialog/test @@ -1,6 +1,6 @@ #!/bin/sh echo "yesno box:" -./kdialog --tqgeometry 400x300+100+50 --title "This is a yesno box" --yesno "Choose: yes or no" +./kdialog --geometry 400x300+100+50 --title "This is a yesno box" --yesno "Choose: yes or no" if [ $? = 0 ]; then echo " your choice was: yes" else @@ -8,7 +8,7 @@ else fi echo "continue or cancel warning box:" -./kdialog --tqgeometry 200x300+100-50 --title "This is a warningcontinuecancel box" --warningcontinuecancel "Choose: continue or cancel" +./kdialog --geometry 200x300+100-50 --title "This is a warningcontinuecancel box" --warningcontinuecancel "Choose: continue or cancel" if [ $? = 0 ]; then echo " your choice was: continue" else @@ -16,7 +16,7 @@ else fi echo "message box:" -./kdialog --tqgeometry 300x400-100-50 --title "This is a message" --msgbox "Well, this is it:\nthe message" +./kdialog --geometry 300x400-100-50 --title "This is a message" --msgbox "Well, this is it:\nthe message" echo "input box:" ./kdialog --title "This is a input box" --inputbox "What is your name" "Joe User" @@ -26,8 +26,8 @@ else echo " you did not accept" fi -echo "input box, with tqgeometry:" -./kdialog --tqgeometry 300x400-100-50 --title "This is a input box" --inputbox "What is your name" "Joe User" +echo "input box, with geometry:" +./kdialog --geometry 300x400-100-50 --title "This is a input box" --inputbox "What is your name" "Joe User" if [ $? = 0 ]; then echo " you accepted" else @@ -35,25 +35,25 @@ else fi echo "text box:" -./kdialog --tqgeometry 300x400-100-50 --miniicon "about_kde" --title "This is a text box" --textbox widgets.h 400 300 +./kdialog --geometry 300x400-100-50 --miniicon "about_kde" --title "This is a text box" --textbox widgets.h 400 300 echo "menu:" -./kdialog --miniicon "about_kde" --tqgeometry 300x400-100-50 --title "This is a menu" --default "French" --menu "Choose one of these" a English b German c French d Spanish +./kdialog --miniicon "about_kde" --geometry 300x400-100-50 --title "This is a menu" --default "French" --menu "Choose one of these" a English b German c French d Spanish echo "checklist:" -./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --title "This is a checklist" --checklist "Choose some of these" a English on b German off c French off d Spanish on +./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --title "This is a checklist" --checklist "Choose some of these" a English on b German off c French off d Spanish on echo "radiolist:" -./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --title "This is a radiolist" --radiolist "Choose one of these" a English off b German off c French on d Spanish off +./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --title "This is a radiolist" --radiolist "Choose one of these" a English off b German off c French on d Spanish off echo "combobox:" -./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --default "Chocolate" --title "This is a combobox" --combobox "Pick your favorite ice-cream flavor:" "Vanilla" "Chocolate" "Strawberry" "Fudge" +./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --default "Chocolate" --title "This is a combobox" --combobox "Pick your favorite ice-cream flavor:" "Vanilla" "Chocolate" "Strawberry" "Fudge" echo "passivepopup:" -./kdialog --tqgeometry 1x1+200+350 --title "This is a passive popup" --passivepopup "It will disappear in about 10 seconds" 10 +./kdialog --geometry 1x1+200+350 --title "This is a passive popup" --passivepopup "It will disappear in about 10 seconds" 10 echo "password:" -./kdialog --title "This is a password dialog" --tqgeometry 400x300+100+50 --icon "desktop" --miniicon "about_kde" --password "Enter the password:" +./kdialog --title "This is a password dialog" --geometry 400x300+100+50 --icon "desktop" --miniicon "about_kde" --password "Enter the password:" echo "Open File:" ./kdialog --getopenfilename . "*.cpp *.cc *.c |C and C++ Source Files" diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index be20c51d7..a2064a5ba 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -218,7 +218,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& table.setCurrentItem(0); // This is to circumvent a Qt bug for (unsigned int i=0; i+2<args.count(); i += 3) { - table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") ); + table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") ); } handleXGeometry(&box); @@ -233,7 +233,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& } else { for (unsigned int i=0; i<table.count(); i++) if (table.isSelected(i)) - rs += TQString::tqfromLatin1("\"") + tags[i] + TQString::tqfromLatin1("\" "); + rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" "); result.append(rs); } } @@ -260,7 +260,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString& table.insertStringList(entries); for (unsigned int i=0; i+2<args.count(); i += 3) { - table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") ); + table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") ); } handleXGeometry(&box); diff --git a/kdm/ChangeLog b/kdm/ChangeLog index 6d1674701..0189ab24a 100644 --- a/kdm/ChangeLog +++ b/kdm/ChangeLog @@ -1,4 +1,4 @@ -This change log tqcontains only changes relevant to the KDM configuration, +This change log contains only changes relevant to the KDM configuration, startup and packaging. Bug fixes are not listed, and feature changes only if they affect the configuration. @@ -22,7 +22,7 @@ if they affect the configuration. 2005-01-23 Oswald Buddenhagen <ossi@kde.org> - * Added Grub support to boot options. Option UseLilo tqreplaced + * Added Grub support to boot options. Option UseLilo replaced with BootManager { None, Grub, Lilo }. Removed options LiloCmd and LiloMap. @@ -49,7 +49,7 @@ if they affect the configuration. 2004-07-10 Oswald Buddenhagen <ossi@kde.org> - * GreeterPosX, GreeterPosY and GreeterPosFixed tqreplaced with + * GreeterPosX, GreeterPosY and GreeterPosFixed replaced with single GreeterPos which is a pair of relative coordinates 2004-07-01 Oswald Buddenhagen <ossi@kde.org> @@ -98,7 +98,7 @@ if they affect the configuration. * The default Xsession no longer tries to merge kdm's PATH into the one set up by the shell startup scripts. Instead, kde.desktop - tqcontains a full pathname and startkde fixes up PATH if necessary. + contains a full pathname and startkde fixes up PATH if necessary. * The default Xsession will emulate the startup behaviour of more shells, in particular bash, zsh and csh/tcsh. * Setting up the session log is now done by kdm, not the Session @@ -363,7 +363,7 @@ if they affect the configuration. - AutoPass -> [X-<dpy>-Core]/AutoLoginPass - AutoString -> [X-<dpy>-Core]/AutoLoginSession - remaining server & session resources -> [X-<dpy>-Core]/ - * In GreetString the HOSTNAME substitution was tqreplaced with the + * In GreetString the HOSTNAME substitution was replaced with the %%, %d, %h, %n, %s, %r & %m expandos * EchoMode does not understand "NoStars" any more. Use "NoEcho". * Defaults changed: AuthDir to /var/lib/kdm, KeyFile to @@ -444,7 +444,7 @@ if they affect the configuration. * Default for PidFile and Setup changed back to empty * Displays restarting too fast are disabled; resource StartInterval * Option UserView, and NoUsers dependency on Users being empty - tqreplaced with explicit option ShowUsers {All,Selected,None} + replaced with explicit option ShowUsers {All,Selected,None} * Made the greeter dynamically loadable (libKdmGreet.so) * Moved chooser and greeter to separate directories, same for unused stuff (misc/) @@ -483,7 +483,7 @@ if they affect the configuration. 1999-11-15 Matthias Hoelzer-Kluepfel <hoelzer@kde.org> - * kdmdesktop tqreplaced with ../kdesktop/kdmdesktop. Uses new config + * kdmdesktop replaced with ../kdesktop/kdmdesktop. Uses new config file (kdmdesktoprc) with new options (all in section [Desktop0]): 1999-07-01 Steffen Hansen <hansen@kde.org> diff --git a/kdm/README b/kdm/README index 0422dcae2..bdf34814e 100644 --- a/kdm/README +++ b/kdm/README @@ -1,5 +1,5 @@ This is the K Display Manager (KDM) for KDE 3.4, -the KDE tqreplacement for the X Display Manager (XDM). +the KDE replacement for the X Display Manager (XDM). Semi-official home page: http://devel-home.kde.org/~ossi/sw/kdm.html @@ -40,11 +40,11 @@ configure options that affect KDM Compile KDM without XDMCP support. --with-kdm-xconsole - Compile KDM with a builtin "xconsole" tqreplacement in the greeter. I don't + Compile KDM with a builtin "xconsole" replacement in the greeter. I don't consider this too useful, but SuSE wanted it, so it's there. ;) -KDM's file system tqlayout +KDM's file system layout ------------------------ ${kde_confdir} is usually ${prefix}/share/config @@ -107,7 +107,7 @@ directory ${kde_confdir}/kdm/sessions and add this to kdmrc: SessionsDirs=${kde_confdir}/kdm/sessions,${kde_datadir}/kdm/sessions (Note that you must use actual paths instead of variables, see the section -about KDM's file system tqlayout.) +about KDM's file system layout.) Do any changes only in the config directory - any changes in the data directory will be lost after the next KDE update. @@ -418,7 +418,7 @@ switch to the X server's vt, press alt-ctrl-f7 (the exact function key may be different on your system). You may also use a remote login from a second machine. In any case it is advantageous to have mouse support on the debugging console for copying the backtrace. -Note that a backtrace is usually _much_ more useful if the binary tqcontains +Note that a backtrace is usually _much_ more useful if the binary contains debugging info, so you should install from source with the --enable-debug configure flag if at all possible. @@ -1,6 +1,6 @@ theming (#37349): - maybe add a Themable plugin flag. if not set and no talker, abort. -- minor: show QWidgets only when the tqlayout is ready and the theme was painted. +- minor: show QWidgets only when the layout is ready and the theme was painted. but one can't hide the widgets in a QLayout, as they have no size then. - add attribute inheritance. apply attributes extracted from particular elements of the (hidden) talker. diff --git a/kdm/backend/auth.c b/kdm/backend/auth.c index 7d7af6e54..3fb18ac4c 100644 --- a/kdm/backend/auth.c +++ b/kdm/backend/auth.c @@ -1038,16 +1038,16 @@ static void startUserAuth( char *buf, char *nbuf, FILE **old, FILE **new ) { const char *home; - int locktqStatus; + int lockStatus; initAddrs(); *new = 0; if ((home = getEnv( userEnviron, "HOME" )) && strlen( home ) < NBSIZE - 12) { sprintf( buf, "%s/.Xauthority", home ); Debug( "XauLockAuth %s\n", buf ); - locktqStatus = XauLockAuth( buf, 1, 2, 10 ); - Debug( "lock is %d\n", locktqStatus ); - if (locktqStatus == LOCK_SUCCESS) + lockStatus = XauLockAuth( buf, 1, 2, 10 ); + Debug( "lock is %d\n", lockStatus ); + if (lockStatus == LOCK_SUCCESS) if (!openFiles( buf, nbuf, old, new )) XauUnlockAuth( buf ); } diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c index d54cccb87..a372686df 100644 --- a/kdm/backend/dm.c +++ b/kdm/backend/dm.c @@ -288,11 +288,11 @@ main( int argc, char **argv ) LogError( "Failed to execute shutdown command %\"s\n", cmd ); exit( 1 ); } else { - sigset_t tqmask; - sigemptyset( &tqmask ); - sigaddset( &tqmask, SIGCHLD ); - sigaddset( &tqmask, SIGHUP ); - sigsuspend( &tqmask ); + sigset_t mask; + sigemptyset( &mask ); + sigaddset( &mask, SIGCHLD ); + sigaddset( &mask, SIGHUP ); + sigsuspend( &mask ); } } Debug( "nothing left to do, exiting\n" ); @@ -997,8 +997,8 @@ ReapChildren( void ) /* don't kill again */ break; case running: - if (startingServer == d && d->servertqStatus != ignore) { - if (d->servertqStatus == starting && waitCode( status ) != 47) + if (startingServer == d && d->serverStatus != ignore) { + if (d->serverStatus == starting && waitCode( status ) != 47) LogError( "X server died during startup\n" ); StartServerFailed(); break; @@ -1183,7 +1183,7 @@ MainLoop( void ) break; case SIGUSR1: if (startingServer && - startingServer->servertqStatus == starting) + startingServer->serverStatus == starting) StartServerSuccess(); break; } @@ -1214,7 +1214,7 @@ MainLoop( void ) } static void -CheckDisplaytqStatus( struct display *d ) +CheckDisplayStatus( struct display *d ) { if ((d->displayType & d_origin) == dFromFile && !d->stillThere) StopDisplay( d ); @@ -1235,7 +1235,7 @@ KickDisplay( struct display *d ) { if (d->status == notRunning) StartDisplay( d ); - if (d->servertqStatus == awaiting && !startingServer) + if (d->serverStatus == awaiting && !startingServer) StartServer( d ); } @@ -1314,7 +1314,7 @@ AllocateVT( struct display *d ) static void StartDisplays( void ) { - ForEachDisplay( CheckDisplaytqStatus ); + ForEachDisplay( CheckDisplayStatus ); CloseGetter(); #ifdef HAVE_VTS active_vts = -1; @@ -1356,7 +1356,7 @@ StartDisplay( struct display *d ) kill( d->serverPid, d->resetSignal ); } if (d->serverPid == -1) { - d->servertqStatus = awaiting; + d->serverStatus = awaiting; return; } } else { diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h index f73f68e10..c05d4c865 100644 --- a/kdm/backend/dm.h +++ b/kdm/backend/dm.h @@ -181,11 +181,11 @@ typedef struct GProc { int pid; } GProc; -typedef enum displaytqStatus { notRunning = 0, running, zombie, phoenix, raiser, - textMode, reserve, remoteLogin } DisplaytqStatus; +typedef enum displayStatus { notRunning = 0, running, zombie, phoenix, raiser, + textMode, reserve, remoteLogin } DisplayStatus; -typedef enum servertqStatus { ignore = 0, awaiting, starting, - terminated, killed, pausing } ServertqStatus; +typedef enum serverStatus { ignore = 0, awaiting, starting, + terminated, killed, pausing } ServerStatus; typedef struct RcStr { struct RcStr *next; @@ -241,7 +241,7 @@ struct display { CfgArr cfg; /* config data array */ /* display state */ - DisplaytqStatus status; /* current status */ + DisplayStatus status; /* current status */ int zstatus; /* substatus while zombie */ int pid; /* process id of child */ int serverPid; /* process id of server (-1 if none) */ @@ -249,7 +249,7 @@ struct display { int serverVT; /* server VT (0 = none, -1 = pending) */ struct display *follower; /* on exit, hand VT to this display */ #endif - ServertqStatus servertqStatus; /* X server startup state */ + ServerStatus serverStatus; /* X server startup state */ Time_t lastStart; /* time of last display start */ int startTries; /* current start try */ int stillThere; /* state during HUP processing */ diff --git a/kdm/backend/greet.h b/kdm/backend/greet.h index 2b7b28504..985edc29c 100644 --- a/kdm/backend/greet.h +++ b/kdm/backend/greet.h @@ -111,7 +111,7 @@ from the copyright holder. #endif /* - * tqStatus/command codes greeter -> core + * Status/command codes greeter -> core */ #define G_Ready 0 /* nop */ #define G_Cancel 1 /* abort login, etc. */ @@ -194,7 +194,7 @@ from the copyright holder. #define DM_PANIC 4 /* - * tqStatus codes from Verify + * Status codes from Verify */ /* terminal status codes */ #define V_OK 0 diff --git a/kdm/backend/server.c b/kdm/backend/server.c index c5f0c3136..e78d8a66c 100644 --- a/kdm/backend/server.c +++ b/kdm/backend/server.c @@ -77,7 +77,7 @@ StartServerOnce( void ) int pid; Debug( "StartServerOnce for %s, try %d\n", d->name, ++d->startTries ); - d->servertqStatus = starting; + d->serverStatus = starting; switch (pid = Fork()) { case 0: argv = PrepServerArgv( d, d->serverArgsLocal ); @@ -136,9 +136,9 @@ AbortStartServer( struct display *d ) { if (startingServer == d) { - if (d->servertqStatus != ignore) + if (d->serverStatus != ignore) { - d->servertqStatus = ignore; + d->serverStatus = ignore; serverTimeout = TO_INF; Debug( "aborting X server start\n" ); } @@ -150,7 +150,7 @@ void StartServerSuccess() { struct display *d = startingServer; - d->servertqStatus = ignore; + d->serverStatus = ignore; serverTimeout = TO_INF; Debug( "X server ready, starting session\n" ); StartDisplayP2( d ); @@ -161,10 +161,10 @@ StartServerFailed() { struct display *d = startingServer; if (!d->serverAttempts || d->startTries < d->serverAttempts) { - d->servertqStatus = pausing; + d->serverStatus = pausing; serverTimeout = d->openDelay + now; } else { - d->servertqStatus = ignore; + d->serverStatus = ignore; serverTimeout = TO_INF; startingServer = 0; LogError( "X server for display %s can't be started," @@ -177,20 +177,20 @@ void StartServerTimeout() { struct display *d = startingServer; - switch (d->servertqStatus) { + switch (d->serverStatus) { case ignore: case awaiting: break; /* cannot happen */ case starting: LogError( "X server startup timeout, terminating\n" ); kill( d->serverPid, d->termSignal ); - d->servertqStatus = d->termSignal == SIGKILL ? killed : terminated; + d->serverStatus = d->termSignal == SIGKILL ? killed : terminated; serverTimeout = d->serverTimeout + now; break; case terminated: LogInfo( "X server termination timeout, killing\n" ); kill( d->serverPid, SIGKILL ); - d->servertqStatus = killed; + d->serverStatus = killed; serverTimeout = 10 + now; break; case killed: diff --git a/kdm/backend/session.c b/kdm/backend/session.c index d603c6b44..9a12ce312 100644 --- a/kdm/backend/session.c +++ b/kdm/backend/session.c @@ -154,13 +154,13 @@ AutoLogon( Time_t tdiff ) !td->hstent->lastExit)) || td->autoAgain)) { - unsigned int ltqmask; + unsigned int lmask; Window dummy1, dummy2; int dummy3, dummy4, dummy5, dummy6; XQueryPointer( dpy, DefaultRootWindow( dpy ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, - <qmask ); - if (ltqmask & ShiftMask) + &lmask ); + if (lmask & ShiftMask) return 0; DoAutoLogon(); return 1; diff --git a/kdm/config.def b/kdm/config.def index 64a6429ac..1dfb26ba6 100644 --- a/kdm/config.def +++ b/kdm/config.def @@ -182,7 +182,7 @@ </kdmrc> # The contents of this section are copied into kdmrc-ref.docbook. -# The macro %REF% is tqreplaced with the accumulated Description:s from the key +# The macro %REF% is replaced with the accumulated Description:s from the key # definitions below. <docu> <chapter id="kdm-files"> @@ -205,7 +205,7 @@ issue non-fatal error messages.</para> are ignored as well.</para> <para>Sections are denoted by -<literal>[</literal><tqreplaceable>Name of Section</tqreplaceable><literal>]</literal>. +<literal>[</literal><replaceable>Name of Section</replaceable><literal>]</literal>. </para> <para>You can configure every X-display individually.</para> @@ -216,16 +216,16 @@ Additionally, a display belongs to a display class (which can be ignored in most cases).</para> <para>Sections with display-specific settings have the formal syntax -<literal>[X-</literal> <tqreplaceable>host</tqreplaceable> [ <literal>:</literal> <tqreplaceable>number</tqreplaceable> [ <literal>_</literal> <tqreplaceable>class</tqreplaceable> ] ] <literal>-</literal> <tqreplaceable>sub-section</tqreplaceable> <literal>]</literal> +<literal>[X-</literal> <replaceable>host</replaceable> [ <literal>:</literal> <replaceable>number</replaceable> [ <literal>_</literal> <replaceable>class</replaceable> ] ] <literal>-</literal> <replaceable>sub-section</replaceable> <literal>]</literal> </para> -<para>All sections with the same <tqreplaceable>sub-section</tqreplaceable> +<para>All sections with the same <replaceable>sub-section</replaceable> make up a section class.</para> <para>You can use the wildcard <literal>*</literal> (match any) for -<tqreplaceable>host</tqreplaceable>, <tqreplaceable>number</tqreplaceable>, -and <tqreplaceable>class</tqreplaceable>. You may omit trailing components; +<replaceable>host</replaceable>, <replaceable>number</replaceable>, +and <replaceable>class</replaceable>. You may omit trailing components; they are assumed to be <literal>*</literal> then. The host part may be a -domain specification like <tqreplaceable>.inf.tu-dresden.de</tqreplaceable> +domain specification like <replaceable>.inf.tu-dresden.de</replaceable> or the wildcard <literal>+</literal> (match non-empty).</para> <para>From which section a setting is actually taken is determined by @@ -289,7 +289,7 @@ Example: display name <quote>myhost.foo:0</quote>, class <quote>dpy</quote> and [X-:0] (the first local display).</para> <para>The format for all keys is -<userinput><option><tqreplaceable>key</tqreplaceable></option> <literal>=</literal> <parameter>value</parameter></userinput>. +<userinput><option><replaceable>key</replaceable></option> <literal>=</literal> <parameter>value</parameter></userinput>. Keys are only valid in the section class they are defined for. Some keys do not apply to particular displays, in which case they are ignored. </para> @@ -329,12 +329,12 @@ local machine or rather remotely.</para> <para>The formal syntax of a specification is <screen> -<userinput><tqreplaceable>display name</tqreplaceable> [<literal>_</literal><tqreplaceable>display class</tqreplaceable>]</userinput> +<userinput><replaceable>display name</replaceable> [<literal>_</literal><replaceable>display class</replaceable>]</userinput> </screen> for all &X-Server;s. <quote>Foreign</quote> displays differ in having a host name in the display name, may it be <literal>localhost</literal>.</para> -<para>The <tqreplaceable>display name</tqreplaceable> must be something that can +<para>The <replaceable>display name</replaceable> must be something that can be passed in the <option>-display</option> option to an X program. This string is used to generate the display-specific section names, so be careful to match the names. @@ -344,7 +344,7 @@ reverse host name resolution. For configuration purposes, the <emphasis>not</emphasis> stripped to make them distinguishable from local &X-Server;s started by &kdm;.</para> -<para>The <tqreplaceable>display class</tqreplaceable> portion is also used in the +<para>The <replaceable>display class</replaceable> portion is also used in the display-specific sections. This is useful if you have a large collection of similar displays (such as a corral of X terminals) and would like to set options for groups of them. @@ -364,7 +364,7 @@ reserve displays available, the menu item will be disabled.</para> <para>When &kdm; starts a session, it sets up authorization data for the &X-Server;. For local servers, &kdm; passes -<command><option>-auth</option> <filename><tqreplaceable>filename</tqreplaceable></filename></command> +<command><option>-auth</option> <filename><replaceable>filename</replaceable></filename></command> on the &X-Server;'s command line to point it at its authorization data. For &XDMCP; displays, &kdm; passes the authorization data to the &X-Server; via the <quote>Accept</quote> &XDMCP; message.</para> @@ -377,7 +377,7 @@ via the <quote>Accept</quote> &XDMCP; message.</para> <para>The file specified by the <option>AccessFile</option> option provides information which &kdm; uses to control access from displays requesting service via &XDMCP;. -The file tqcontains four types of entries: entries which control the response +The file contains four types of entries: entries which control the response to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which control the response to <quote>Indirect</quote> queries, macro definitions for <quote>Indirect</quote> entries, and entries which control on which network @@ -409,7 +409,7 @@ it can be followed by the optional <literal>NOBROADCAST</literal> keyword. This can be used to prevent a &kdm; server from appearing on menus based on <quote>Broadcast</quote> queries.</para> -<para>An <quote>Indirect</quote> entry also tqcontains a host name or pattern, +<para>An <quote>Indirect</quote> entry also contains a host name or pattern, but follows it with a list of host names or macros to which the queries should be forwarded. <quote>Indirect</quote> entries can be excluding as well, in which case a (valid) dummy host name must be supplied to make the entry @@ -422,7 +422,7 @@ character and hop count. If no hop count is specified, the multicast hop count defaults to 1, keeping the packet on the local network. For IPv4 multicasting, the hop count is used as the TTL. --> -If the indirect host list tqcontains the keyword <literal>CHOOSER</literal>, +If the indirect host list contains the keyword <literal>CHOOSER</literal>, <quote>Indirect</quote> queries are not forwarded, but instead a host chooser dialog is displayed by &kdm;. The chooser will send a <quote>Direct</quote> query to each of the remaining host names in the list and offer a menu of @@ -437,27 +437,27 @@ in turn and the first matching entry determines the response. <quote>Direct</quote> and <quote>Broadcast</quote> entries are ignored when scanning for an <quote>Indirect</quote> entry and vice-versa.</para> -<para>A macro definition tqcontains a macro name and a list of host names and +<para>A macro definition contains a macro name and a list of host names and other macros that the macro expands to. To distinguish macros from hostnames, macro names start with a <literal>%</literal> character.</para> <para>The last entry type is the <literal>LISTEN</literal> directive. The formal syntax is <screen> -<userinput> <literal>LISTEN</literal> [<tqreplaceable>interface</tqreplaceable> [<tqreplaceable>multicast list</tqreplaceable>]]</userinput> +<userinput> <literal>LISTEN</literal> [<replaceable>interface</replaceable> [<replaceable>multicast list</replaceable>]]</userinput> </screen> If one or more <literal>LISTEN</literal> lines are specified, &kdm; listens for &XDMCP; requests only on the specified interfaces. -<tqreplaceable>interface</tqreplaceable> may be a hostname or IP address +<replaceable>interface</replaceable> may be a hostname or IP address representing a network interface on this machine, or the wildcard <literal>*</literal> to represent all available network interfaces. If multicast group addresses are listed on a <literal>LISTEN</literal> line, &kdm; joins the multicast groups on the given interface. For IPv6 multicasts, -the IANA has assigned ff0<tqreplaceable>X</tqreplaceable>:0:0:0:0:0:0:12b as the +the IANA has assigned ff0<replaceable>X</replaceable>:0:0:0:0:0:0:12b as the permanently assigned range of multicast addresses for &XDMCP;. The -<tqreplaceable>X</tqreplaceable> in the prefix may be tqreplaced by any valid scope +<replaceable>X</replaceable> in the prefix may be replaced by any valid scope identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and -so on (see IETF RFC 2373 or its tqreplacement for further details and scope +so on (see IETF RFC 2373 or its replacement for further details and scope definitions). &kdm; defaults to listening on the Link-Local scope address ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. If no <literal>LISTEN</literal> lines are given, &kdm; listens on all @@ -770,7 +770,7 @@ or unmounting directories from file servers.</para> # The contents are automatically enclosed in <para></para>. # If "-" is given to Description, no comment is generated at all. # If "!" is given, enums are not treated specially; otherwise, the macro -# %ENUM% is tqreplaced with a list of the defined element/description pairs, +# %ENUM% is replaced with a list of the defined element/description pairs, # or - if the macro is not present - the list is appended to the # description. # Finally, a sentence with the Default (or CDefault, if given) is appended, @@ -782,7 +782,7 @@ or unmounting directories from file servers.</para> Section: General Description: - This section tqcontains global options that do not fit into any specific section. + This section contains global options that do not fit into any specific section. Key: ConfigVersion Type: string @@ -1064,7 +1064,7 @@ Description: Section: Xdmcp If: defined(XDMCP) Description: - This section tqcontains options that control &kdm;'s handling of + This section contains options that control &kdm;'s handling of &XDMCP; requests. # See <xref linkend="xdmcp-with-kdm"/> to find out what &XDMCP; is. @@ -1118,7 +1118,7 @@ Comment: &XDMCP; access control file in the usual XDM-Xaccess format. Description: To prevent unauthorized &XDMCP; service and to allow forwarding of &XDMCP; - IndirectQuery requests, this file tqcontains a database of hostnames which + IndirectQuery requests, this file contains a database of hostnames which are either allowed direct access to this machine, or have a list of hosts to which queries should be forwarded to. The format of this file is described in <xref linkend="kdmrc-xaccess"/>. @@ -1193,7 +1193,7 @@ Description: Section: Shutdown Description: - This section tqcontains global options concerning system shutdown. + This section contains global options concerning system shutdown. Key: HaltCmd Type: string @@ -1264,7 +1264,7 @@ Description: Section: -Core Description: - This section class tqcontains options concerning the configuration + This section class contains options concerning the configuration of the &kdm; backend (core). Key: OpenDelay @@ -1946,7 +1946,7 @@ Instance: */".xsession-errors-%s" Instance: :0/".xsession-errors" Comment: The file (relative to $HOME) to redirect the session output to. This is - a printf format string; one %s will be tqreplaced with the display name. + a printf format string; one %s will be replaced with the display name. Description: The file (relative to the user's home directory) to redirect the session output to. One occurrence of <parameter>%s</parameter> in this string will be @@ -1970,7 +1970,7 @@ Description: Section: -Greeter Description: - This section class tqcontains options concerning the configuration + This section class contains options concerning the configuration of the &kdm; frontend (greeter). Key: GUIStyle @@ -2066,7 +2066,7 @@ Default: "Welcome to Trinity at %n" User: greeter Instance: #*/"Welcome to Trinity at %n" Comment: - The headline in the greeter. The following character pairs are tqreplaced: + The headline in the greeter. The following character pairs are replaced: - %d -> current display - %h -> host name, possibly with domain name - %n -> node name, most probably the host name without domain name @@ -2077,7 +2077,7 @@ Comment: Description: The headline in the greeter. An empty greeting means none at all. </para><para> - The following character pairs are tqreplaced by their value: + The following character pairs are replaced by their value: <variablelist> <varlistentry> <term><parameter>%d</parameter></term> @@ -2157,7 +2157,7 @@ Type: enum On: turn on Keep: do not change the state Default: Keep -User: greeter(numLocktqStatus) +User: greeter(numLockStatus) Instance: #*/Off Comment: & Description: @@ -2206,7 +2206,7 @@ Description: ! This option controls which users will be shown in the user view (<option>UserList</option>) and/or offered for autocompletion (<option>UserCompletion</option>). - If it is <literal>Selected</literal>, <option>SelectedUsers</option> tqcontains + If it is <literal>Selected</literal>, <option>SelectedUsers</option> contains the final list of users. If it is <literal>NotHidden</literal>, the initial user list are all users found on the system. Users contained in <option>HiddenUsers</option> are @@ -2399,7 +2399,7 @@ Comment: The configuration file to be used by krootimage. Description: The configuration file to be used by <command>krootimage</command>. - It tqcontains a section named <literal>[Desktop0]</literal> like + It contains a section named <literal>[Desktop0]</literal> like <filename>kdesktoprc</filename> does. Its options are not described herein; guess their meanings or use the control center. @@ -2552,7 +2552,7 @@ Description: Specify conversation plugins for the login dialog; the first in the list is selected initially. Each plugin can be specified as a base name (which expands to - <filename>$<envar>kde_modulesdir</envar>/kgreet_<tqreplaceable>base</tqreplaceable></filename>) + <filename>$<envar>kde_modulesdir</envar>/kgreet_<replaceable>base</replaceable></filename>) or as a full pathname. </para><para> Conversation plugins are modules for the greeter which obtain authentication @@ -2578,7 +2578,7 @@ Comment: these settings; it is up to them what possible keys are. Description: A list of options of the form - <tqreplaceable>Key</tqreplaceable><literal>=</literal><tqreplaceable>Value</tqreplaceable>. + <replaceable>Key</replaceable><literal>=</literal><replaceable>Value</replaceable>. The conversation plugins can query these settings; it is up to them what possible keys are. diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c index 43ef6d5b0..f0981afe8 100644 --- a/kdm/kfrontend/genkdmconf.c +++ b/kdm/kfrontend/genkdmconf.c @@ -580,7 +580,7 @@ static const char def_setup[] = "#! /bin/sh\n" "# Xsetup - run as root before the login dialog appears\n" "\n" -"#xconsole -tqgeometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &\n"; +"#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &\n"; static const char def_startup[] = "#! /bin/sh\n" @@ -591,7 +591,7 @@ static const char def_startup[] = "if [ -e /etc/nologin ]; then\n" " # always display the nologin message, if possible\n" " if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n" -" xmessage -file /etc/nologin -tqgeometry 640x480\n" +" xmessage -file /etc/nologin -geometry 640x480\n" " fi\n" " if [ \"$(id -u)\" != \"0\" ] && \\\n" " ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n" @@ -940,7 +940,7 @@ mem_mem( char *mem, int lmem, const char *smem, int lsmem ) return 0; } -static int maxTTY, TTYtqmask; +static int maxTTY, TTYmask; static void getInitTab( void ) @@ -953,7 +953,7 @@ getInitTab( void ) return; if (!maxTTY) { maxTTY = 6; - TTYtqmask = 0x3f; + TTYmask = 0x3f; } } #endif @@ -1111,7 +1111,7 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value ) char *sdpys, *rdpys; StrList **argp, **arglp, *ap, *ap2; File file; - int nldpys = 0, nrdpys = 0, dpytqmask = 0; + int nldpys = 0, nrdpys = 0, dpymask = 0; int cpcmd, cpcmdl; #ifdef HAVE_VTS int dn, cpvt, mtty; @@ -1193,7 +1193,7 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value ) *argp = *arglp = 0; if ((se->type & dLocation) == dLocal) { nldpys++; - dpytqmask |= 1 << atoi( se->name + 1 ); + dpymask |= 1 << atoi( se->name + 1 ); if (se->reserve) nrdpys++; } @@ -1266,8 +1266,8 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value ) /* add reserve dpys */ if (nldpys < 4 && nldpys && !nrdpys) for (; nldpys < 4; nldpys++) { - for (dn = 0; dpytqmask & (1 << dn); dn++); - dpytqmask |= (1 << dn); + for (dn = 0; dpymask & (1 << dn); dn++); + dpymask |= (1 << dn); StrCat( &rdpys, ",:%d", dn ); } #endif @@ -1302,7 +1302,7 @@ upd_consolettys( Entry *ce, Section *cs ATTR_UNUSED ) getInitTab(); for (i = 0, buf = 0; i < 16; i++) - if (TTYtqmask & (1 << i)) + if (TTYmask & (1 << i)) StrCat( &buf, ",tty%d", i + 1 ); if (buf) { ce->value = buf + 1; diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp index fb1954d95..df602efea 100644 --- a/kdm/kfrontend/kchooser.cpp +++ b/kdm/kfrontend/kchooser.cpp @@ -59,13 +59,13 @@ ChooserDlg::ChooserDlg() TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 ); TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this ); - title->tqsetAlignment( AlignCenter ); + title->setAlignment( AlignCenter ); vbox->addWidget( title ); host_view = new TQListView( this, "hosts" ); host_view->addColumn( i18n("Hostname") ); host_view->setColumnWidth( 0, fontMetrics().width( "login.crap.net" ) ); - host_view->addColumn( i18n("tqStatus") ); + host_view->addColumn( i18n("Status") ); host_view->setMinimumWidth( fontMetrics().width( "login.crap.com Display not authorized to connect this server" ) ); host_view->setResizeMode( TQListView::LastColumn ); host_view->setAllColumnsShowFocus( true ); @@ -145,14 +145,14 @@ void ChooserDlg::pingHosts() void ChooserDlg::accept() { - if (tqfocusWidget() == iline) { + if (focusWidget() == iline) { if (!iline->text().isEmpty()) { GSendInt( G_Ch_DirectChoice ); GSendStr( iline->text().latin1() ); iline->clear(); } return; - } else /*if (tqfocusWidget() == host_view)*/ { + } else /*if (focusWidget() == host_view)*/ { TQListViewItem *item = host_view->currentItem(); if (item) { GSendInt( G_Ready ); @@ -170,7 +170,7 @@ TQString ChooserDlg::recvStr() { char *arr = GRecvStr(); if (arr) { - TQString str = TQString::tqfromLatin1( arr ); + TQString str = TQString::fromLatin1( arr ); free( arr ); return str; } else diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c index d9c39e35f..b03d96e15 100644 --- a/kdm/kfrontend/kdm_greet.c +++ b/kdm/kfrontend/kdm_greet.c @@ -4,7 +4,7 @@ KDE Greeter module for xdm Copyright (C) 2001-2003 Oswald Buddenhagen <ossi@kde.org> -This file tqcontains code from the old xdm core, +This file contains code from the old xdm core, Copyright 1988, 1998 Keith Packard, MIT X Consortium/The Open Group This program is free software; you can redistribute it and/or modify @@ -560,7 +560,7 @@ xkb_init( Display *dpy ) } static unsigned int -xkb_modifier_tqmask_work( XkbDescPtr xkb, const char *name ) +xkb_modifier_mask_work( XkbDescPtr xkb, const char *name ) { int i; @@ -569,23 +569,23 @@ xkb_modifier_tqmask_work( XkbDescPtr xkb, const char *name ) for (i = 0; i < XkbNumVirtualMods; i++) { char *modStr = XGetAtomName( xkb->dpy, xkb->names->vmods[i] ); if (modStr != NULL && strcmp( name, modStr ) == 0) { - unsigned int tqmask; - XkbVirtualModsToReal( xkb, 1 << i, &tqmask ); - return tqmask; + unsigned int mask; + XkbVirtualModsToReal( xkb, 1 << i, &mask ); + return mask; } } return 0; } static unsigned int -xkb_modifier_tqmask( Display *dpy, const char *name ) +xkb_modifier_mask( Display *dpy, const char *name ) { XkbDescPtr xkb; if ((xkb = XkbGetKeyboard( dpy, XkbAllComponentsMask, XkbUseCoreKbd ))) { - unsigned int tqmask = xkb_modifier_tqmask_work( xkb, name ); + unsigned int mask = xkb_modifier_mask_work( xkb, name ); XkbFreeKeyboard( xkb, 0, True ); - return tqmask; + return mask; } return 0; } @@ -593,23 +593,23 @@ xkb_modifier_tqmask( Display *dpy, const char *name ) static int xkb_get_modifier_state( Display *dpy, const char *name ) { - unsigned int tqmask; + unsigned int mask; XkbStateRec state; - if (!(tqmask = xkb_modifier_tqmask( dpy, name ))) + if (!(mask = xkb_modifier_mask( dpy, name ))) return 0; XkbGetState( dpy, XkbUseCoreKbd, &state ); - return (tqmask & state.locked_mods) != 0; + return (mask & state.locked_mods) != 0; } static int xkb_set_modifier( Display *dpy, const char *name, int sts ) { - unsigned int tqmask; + unsigned int mask; - if (!(tqmask = xkb_modifier_tqmask( dpy, name ))) + if (!(mask = xkb_modifier_mask( dpy, name ))) return 0; - XkbLockModifiers( dpy, XkbUseCoreKbd, tqmask, sts ? tqmask : 0 ); + XkbLockModifiers( dpy, XkbUseCoreKbd, mask, sts ? mask : 0 ); return 1; } #endif /* HAVE_XKB */ @@ -620,7 +620,7 @@ xtest_get_modifier_state( Display *dpy, int key ) { XModifierKeymap *map; KeyCode modifier_keycode; - unsigned int i, tqmask; + unsigned int i, mask; Window dummy1, dummy2; int dummy3, dummy4, dummy5, dummy6; @@ -632,8 +632,8 @@ xtest_get_modifier_state( Display *dpy, int key ) XFreeModifiermap( map ); XQueryPointer( dpy, DefaultRootWindow( dpy ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, - &tqmask ); - return (tqmask & (1 << i)) != 0; + &mask ); + return (mask & (1 << i)) != 0; } XFreeModifiermap( map ); return 0; @@ -700,11 +700,11 @@ restore_modifiers( void ) } void -setCursor( Display *mdpy, int window, int tqshape ) +setCursor( Display *mdpy, int window, int shape ) { Cursor xcursor; - if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) { + if ((xcursor = XCreateFontCursor( mdpy, shape ))) { XDefineCursor( mdpy, window, xcursor ); XFreeCursor( mdpy, xcursor ); XFlush( mdpy ); diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h index eaead7b62..df325c28d 100644 --- a/kdm/kfrontend/kdm_greet.h +++ b/kdm/kfrontend/kdm_greet.h @@ -4,7 +4,7 @@ KDE Greeter module for xdm Copyright (C) 2001-2003 Oswald Buddenhagen <ossi@kde.org> -This file tqcontains code from the old xdm core, +This file contains code from the old xdm core, Copyright 1988, 1998 Keith Packard, MIT X Consortium/The Open Group This program is free software; you can redistribute it and/or modify @@ -77,7 +77,7 @@ int PingServer( struct _XDisplay *dpy ); void setup_modifiers( struct _XDisplay *mdpy, int numlock ); void restore_modifiers( void ); -void setCursor( struct _XDisplay *mdpy, int window, int tqshape ); +void setCursor( struct _XDisplay *mdpy, int window, int shape ); extern int rfd; /* for select() loops */ diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp index 7c9bbb7d5..637d6dd90 100644 --- a/kdm/kfrontend/kdmadmindialog.cpp +++ b/kdm/kfrontend/kdmadmindialog.cpp @@ -75,10 +75,10 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent ) box->addWidget( new KSeparator( KSeparator::HLine, this ) ); okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->tqsetSizePolicy( fp ); + okButton->setSizePolicy( fp ); okButton->setDefault( true ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->tqsetSizePolicy( fp ); + cancelButton->setSizePolicy( fp ); hlay = new TQHBoxLayout( box ); hlay->addStretch( 1 ); @@ -103,8 +103,8 @@ void KDMAdmin::slotActivatePlugMenu() { TQPopupMenu *cmnu = verify->getPlugMenu(); - TQSize sh( cmnu->tqsizeHint() / 2 ); - cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) ); + TQSize sh( cmnu->sizeHint() / 2 ); + cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } void diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp index 87e6a32ba..88cd53970 100644 --- a/kdm/kfrontend/kdmclock.cpp +++ b/kdm/kfrontend/kdmclock.cpp @@ -50,7 +50,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) mBorder = false;//config->readNumEntry( "border", FALSE ); //config->setGroup( "Font" ); - mFont.setFamily( TQString::tqfromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); + mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ ); mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ ); mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ ); mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ ); @@ -76,19 +76,19 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) //setBackgroundOrigin( WindowOrigin ); mBackgroundBrush = backgroundBrush(); setBackgroundMode( NoBackground ); - tqrepaint(); + repaint(); } void KdmClock::showEvent( TQShowEvent * ) { - tqrepaint(); + repaint(); } void KdmClock::timeout() { - tqrepaint(); + repaint(); } void KdmClock::paintEvent( TQPaintEvent * ) diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp index 6c79a6918..15a63fa67 100644 --- a/kdm/kfrontend/kdmconfig.cpp +++ b/kdm/kfrontend/kdmconfig.cpp @@ -72,7 +72,7 @@ Str2Font( const TQString &aValue ) TQFont aRetFont; TQString chStr; - TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue ); + TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue ); if (sl.count() == 1) { /* X11 font spec */ @@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc ) sess->vt ? TQString("vt%1").arg( sess->vt ) : #endif - TQString::tqfromLatin1( *sess->from ? sess->from : sess->display ); + TQString::fromLatin1( *sess->from ? sess->from : sess->display ); } else { user = !sess->user ? @@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc ) sess->vt ? TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) : #endif - TQString::tqfromLatin1( sess->display ); + TQString::fromLatin1( sess->display ); } } diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index 1097e0074..dcd8a4cf1 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -115,7 +115,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) hlay->addStretch( 1 ); if (mayOk) { okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->tqsetSizePolicy( fp ); + okButton->setSizePolicy( fp ); okButton->setDefault( true ); hlay->addWidget( okButton ); hlay->addStretch( 1 ); @@ -124,13 +124,13 @@ KDMShutdownBase::complete( TQWidget *prevWidget ) if (maySched) { KPushButton *schedButton = new KPushButton( KGuiItem( i18n("&Schedule...") ), this ); - schedButton->tqsetSizePolicy( fp ); + schedButton->setSizePolicy( fp ); hlay->addWidget( schedButton ); hlay->addStretch( 1 ); connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); } cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->tqsetSizePolicy( fp ); + cancelButton->setSizePolicy( fp ); if (!mayOk) cancelButton->setDefault( true ); hlay->addWidget( cancelButton ); @@ -147,8 +147,8 @@ KDMShutdownBase::slotActivatePlugMenu() TQPopupMenu *cmnu = verify->getPlugMenu(); if (!cmnu) return; - TQSize sh( cmnu->tqsizeHint() / 2 ); - cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) ); + TQSize sh( cmnu->sizeHint() / 2 ); + cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } } @@ -272,7 +272,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) freeStrArr( tlist ); targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget ); TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh ); - int spc = kapp->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth ) + howGroup->insideSpacing(); hb->addSpacing( spc ); hb->addWidget( targets ); @@ -280,7 +280,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) } GSet( 0 ); - howGroup->tqsetSizePolicy( fp ); + howGroup->setSizePolicy( fp ); schedGroup = new TQGroupBox( i18n("Scheduling"), this ); hlay->addWidget( schedGroup, 0, AlignTop ); @@ -306,7 +306,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent ) grid->addWidget( le_timeout, 2, 1 ); grid->addMultiCellWidget( cb_force, 3,3, 0,1 ); - schedGroup->tqsetSizePolicy( fp ); + schedGroup->setSizePolicy( fp ); le_start->setText( "0" ); if (_defSdMode == SHUT_SCHEDULE) @@ -477,7 +477,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) if(doUbuntuLogout) { lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - lfrm->setLineWidth( style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) ); + lfrm->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) ); // we need to set the minimum size for the logout box, since it // gets too small if there isn't all options available lfrm->setMinimumSize(300,120); @@ -487,7 +487,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) // first line of buttons hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox->setAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( lfrm ); @@ -531,7 +531,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) // cancel buttonbox TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); - hbuttonbox2->tqsetAlignment( Qt::AlignRight ); + hbuttonbox2->setAlignment( Qt::AlignRight ); // Back to kdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index 8fd5a8097..78359e237 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -59,7 +59,7 @@ FDialog::resizeEvent( TQResizeEvent *e ) void FDialog::adjustGeometry() { - TQDesktopWidget *dsk = tqApp->desktop(); + TQDesktopWidget *dsk = qApp->desktop(); if (_greeterScreen < 0) _greeterScreen = _greeterScreen == -2 ? @@ -74,7 +74,7 @@ FDialog::adjustGeometry() adjustSize(); } - if (tqparentWidget()) + if (parentWidget()) return; TQRect grt( rect() ); @@ -140,10 +140,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t TQLabel *label2 = new TQLabel( text, this ); TQRect d = KGlobalSettings::desktopGeometry(this); if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5) - label2->tqsetAlignment(Qt::WordBreak | Qt::AlignAuto ); + label2->setAlignment(Qt::WordBreak | Qt::AlignAuto ); KPushButton *button = new KPushButton( KStdGuiItem::ok(), this ); button->setDefault( true ); - button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); + button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index 2f1ba913c..50e65e916 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -167,7 +167,7 @@ kg_main( const char *argv0 ) app.setFont( _normalFont ); - setup_modifiers( dpy, _numLocktqStatus ); + setup_modifiers( dpy, _numLockStatus ); SecureDisplay( dpy ); KProcess *proc = 0; if (!_grabServer) { @@ -201,7 +201,7 @@ kg_main( const char *argv0 ) } if (cmd == G_ErrorGreet) { - if (KGVerify::handleFailVerify( tqApp->desktop()->screen( _greeterScreen ) )) + if (KGVerify::handleFailVerify( qApp->desktop()->screen( _greeterScreen ) )) break; _autoLoginDelay = 0; cmd = G_Greet; diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp index d85157bce..f4ed918c6 100644 --- a/kdm/kfrontend/kgdialog.cpp +++ b/kdm/kfrontend/kgdialog.cpp @@ -134,8 +134,8 @@ void KGDialog::slotActivateMenu( int id ) { TQPopupMenu *cmnu = optMenu->findItem( id )->popup(); - TQSize sh( cmnu->tqsizeHint() / 2 ); - cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) ); + TQSize sh( cmnu->sizeHint() / 2 ); + cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) ); } void diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp index 8e144f06f..bd2e2651a 100644 --- a/kdm/kfrontend/kgreeter.cpp +++ b/kdm/kfrontend/kgreeter.cpp @@ -79,7 +79,7 @@ class UserListView : public KListView { : KListView( parent, name ) , themed(_them), cachedSizeHint( -1, 0 ) { - tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); + setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ); header()->hide(); addColumn( TQString::null ); setColumnAlignment( 0, AlignVCenter ); @@ -105,10 +105,10 @@ class UserListView : public KListView { return sum; } public: - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { if (themed) - return KListView::tqsizeHint(); + return KListView::sizeHint(); if (!cachedSizeHint.isValid()) { constPolish(); @@ -119,7 +119,7 @@ public: maxw = thisw; } cachedSizeHint.setWidth( - style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + + style().pixelMetric( TQStyle::PM_ScrollBarExtent ) + frameWidth() * 2 + maxw ); } return cachedSizeHint; @@ -235,12 +235,12 @@ class UserListViewItem : public KListViewItem { parent->cachedSizeHint.setWidth( -1 ); } - virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) + virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { if (((UserListView*)listView())->themed) - TQListViewItem::paintCell(p, cg, column, width, tqalignment); + TQListViewItem::paintCell(p, cg, column, width, alignment); else - KListViewItem::paintCell(p, cg, column, width, tqalignment); + KListViewItem::paintCell(p, cg, column, width, alignment); } TQString login; @@ -343,7 +343,7 @@ KGreeter::insertUser( const TQImage &default_pix, class KCStringList : public TQValueList<TQCString> { public: - bool tqcontains( const char *str ) const + bool contains( const char *str ) const { for (ConstIterator it = begin(); it != end(); ++it) if (*it == str) @@ -355,7 +355,7 @@ class KCStringList : public TQValueList<TQCString> { class UserList { public: UserList( char **in ); - bool hasUser( const char *str ) const { return users.tqcontains( str ); } + bool hasUser( const char *str ) const { return users.contains( str ); } bool hasGroup( gid_t gid ) const { return groups.find( gid ) != groups.end(); } bool hasGroups() const { return !groups.isEmpty(); } @@ -786,14 +786,14 @@ KStdGreeter::KStdGreeter() i18n("This display requires no X authorization.\n" "This means that anybody can connect to it,\n" "open windows on it or intercept your input.") ); - complainLabel->tqsetAlignment( AlignCenter ); + complainLabel->setAlignment( AlignCenter ); complainLabel->setFont( _failFont ); complainLabel->setPaletteForegroundColor( Qt::red ); inner_box->addWidget( complainLabel ); } if (!_greetString.isEmpty()) { TQLabel *welcomeLabel = new TQLabel( _greetString, this ); - welcomeLabel->tqsetAlignment( AlignCenter ); + welcomeLabel->setAlignment( AlignCenter ); welcomeLabel->setFont( _greetFont ); inner_box->addWidget( welcomeLabel ); } @@ -1092,7 +1092,7 @@ TQString KThemedGreeter::timedUser = TQString::null; int KThemedGreeter::timedDelay = -1; void -KThemedGreeter::updatetqStatus( bool fail, bool caps, int timedleft ) +KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft ) { if (pam_error) { if (fail) diff --git a/kdm/kfrontend/kgreeter.h b/kdm/kfrontend/kgreeter.h index 2eb76674b..fdbd56209 100644 --- a/kdm/kfrontend/kgreeter.h +++ b/kdm/kfrontend/kgreeter.h @@ -149,7 +149,7 @@ class KThemedGreeter : public KGreeter { void slotAskAdminPassword(); protected: - virtual void updatetqStatus( bool fail, bool caps, int timedleft ); + virtual void updateStatus( bool fail, bool caps, int timedleft ); virtual void pluginSetup(); virtual void keyPressEvent( TQKeyEvent * ); virtual bool event( TQEvent *e ); diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp index 460336d45..98abb4fb5 100644 --- a/kdm/kfrontend/kgverify.cpp +++ b/kdm/kfrontend/kgverify.cpp @@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <stdlib.h> #include <unistd.h> -#include <X11/Xlib.h> // for updateLocktqStatus() +#include <X11/Xlib.h> // for updateLockStatus() #include <fixx11h.h> // ... and make eventFilter() work again #define FULL_GREET_TO 40 // normal inactivity timeout @@ -62,7 +62,7 @@ void KGVerifyHandler::verifyClear() { } -void KGVerifyHandler::updatetqStatus( bool, bool, int ) +void KGVerifyHandler::updateStatus( bool, bool, int ) { } @@ -150,7 +150,7 @@ KGVerify::pluginName() const TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() ); uint st = name.findRev( '/' ) + 1; uint en = name.find( '.', st ); - if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_") + if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_") st += 7; return name.mid( st, en - st ); } @@ -163,7 +163,7 @@ showWidgets( TQLayoutItem *li ) if ((w = li->widget())) w->show(); - else if ((l = li->tqlayout())) { + else if ((l = li->layout())) { TQLayoutIterator it = l->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) showWidgets( itm ); @@ -233,7 +233,7 @@ KGVerify::scheduleAutoLogin( bool initial ) timedLeft = QMAX( _autoLoginDelay - TIMED_GREET_TO, MIN_TIMED_TO ); deadTicks = DEAD_TIMED_TO; } - updatetqStatus(); + updateStatus(); running = false; isClear = true; return true; @@ -310,7 +310,7 @@ KGVerify::suspend() greet->abort(); } suspended = true; - updatetqStatus(); + updateStatus(); timer.suspend(); } @@ -319,7 +319,7 @@ KGVerify::resume() { timer.resume(); suspended = false; - updateLocktqStatus(); + updateLockStatus(); if (running) { Debug( "%s->start()\n", pName.data() ); greet->start(); @@ -373,7 +373,7 @@ KGVerify::setEnabled( bool on ) Debug( "%s->setEnabled(%s)\n", pName.data(), on ? "true" : "false" ); greet->setEnabled( on ); enabled = on; - updatetqStatus(); + updateStatus(); } void // private @@ -381,7 +381,7 @@ KGVerify::slotTimeout() { if (failed) { failed = false; - updatetqStatus(); + updateStatus(); Debug( "%s->revive()\n", pName.data() ); greet->revive(); handler->verifyRetry(); @@ -402,7 +402,7 @@ KGVerify::slotTimeout() performAutoLogin(); else timer.start( 1000 ); - updatetqStatus(); + updateStatus(); } else { // assert( ctx == Login ); isClear = true; @@ -420,7 +420,7 @@ KGVerify::slotActivity() greet->start(); running = true; timedLeft = 0; - updatetqStatus(); + updateStatus(); timer.start( TIMED_GREET_TO * SECONDS ); } else if (timeable) timer.start( TIMED_GREET_TO * SECONDS ); @@ -709,7 +709,7 @@ KGVerify::handleVerify() if (ret == V_AUTH) { Debug( " V_AUTH\n" ); failed = true; - updatetqStatus(); + updateStatus(); handler->verifyFailed(); timer.start( 1500 + kapp->random()/(RAND_MAX/1000) ); return; @@ -733,7 +733,7 @@ void KGVerify::gplugReturnText( const char *text, int tag ) { Debug( "%s: gplugReturnText(%\"s, %d)\n", pName.data(), - tag & V_IS_SECRET ? "<tqmasked>" : text, tag ); + tag & V_IS_SECRET ? "<masked>" : text, tag ); GSendStr( text ); if (text) { GSendInt( tag ); @@ -813,7 +813,7 @@ KGVerify::eventFilter( TQObject *o, TQEvent *e ) } /* fall through */ case TQEvent::KeyRelease: - updateLocktqStatus(); + updateLockStatus(); /* fall through */ default: break; @@ -822,16 +822,16 @@ KGVerify::eventFilter( TQObject *o, TQEvent *e ) } void -KGVerify::updateLocktqStatus() +KGVerify::updateLockStatus() { - unsigned int ltqmask; + unsigned int lmask; Window dummy1, dummy2; int dummy3, dummy4, dummy5, dummy6; XQueryPointer( qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, - <qmask ); - capsLocked = ltqmask & LockMask; - updatetqStatus(); + &lmask ); + capsLocked = lmask & LockMask; + updateStatus(); } void @@ -849,7 +849,7 @@ KGVerify::getConf( void *, const char *key, const TQVariant &dflt ) if (!qstrcmp( key, "EchoMode" )) return TQVariant( _echoMode ); else { - TQString fkey = TQString::tqfromLatin1( key ) + '='; + TQString fkey = TQString::fromLatin1( key ) + '='; for (TQStringList::ConstIterator it = _pluginOptions.begin(); it != _pluginOptions.end(); ++it) if ((*it).startsWith( fkey )) @@ -923,13 +923,13 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent, , failedLabelState( 0 ) { grid = new TQGridLayout; - grid->tqsetAlignment( AlignCenter ); + grid->setAlignment( AlignCenter ); failedLabel = new TQLabel( parent ); failedLabel->setFont( _failFont ); grid->addWidget( failedLabel, 1, 0, AlignCenter ); - updateLocktqStatus(); + updateLockStatus(); } KGStdVerify::~KGStdVerify() @@ -965,7 +965,7 @@ KGStdVerify::slotPluginSelected( int id ) } void -KGStdVerify::updatetqStatus() +KGStdVerify::updateStatus() { int nfls; @@ -1019,7 +1019,7 @@ KGThemedVerify::KGThemedVerify( KGVerifyHandler *_handler, : inherited( _handler, _themer, _parent, _predecessor, _fixedUser, _pluginList, _func, _ctx ) { - updateLocktqStatus(); + updateLockStatus(); } KGThemedVerify::~KGThemedVerify() @@ -1063,9 +1063,9 @@ KGThemedVerify::slotPluginSelected( int id ) } void -KGThemedVerify::updatetqStatus() +KGThemedVerify::updateStatus() { - handler->updatetqStatus( enabled && failed, + handler->updateStatus( enabled && failed, enabled && !suspended && capsLocked, timedLeft ); } @@ -1080,10 +1080,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user, { TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); okButton = new KPushButton( KStdGuiItem::ok(), this ); - okButton->tqsetSizePolicy( fp ); + okButton->setSizePolicy( fp ); okButton->setDefault( true ); cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); - cancelButton->tqsetSizePolicy( fp ); + cancelButton->setSizePolicy( fp ); verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx ); verify->selectPlugin( curPlugin ); diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h index b5daad969..0276b2f97 100644 --- a/kdm/kfrontend/kgverify.h +++ b/kdm/kfrontend/kgverify.h @@ -68,7 +68,7 @@ class KGVerifyHandler { virtual void verifyFailed() = 0; virtual void verifyRetry() = 0; virtual void verifySetUser( const TQString &user ) = 0; - virtual void updatetqStatus( bool fail, bool caps, int left ); // for themed only + virtual void updateStatus( bool fail, bool caps, int left ); // for themed only }; class TQWidget; @@ -126,8 +126,8 @@ class KGVerify : public TQObject, public KGreeterPluginHandler { bool eventFilter( TQObject *, TQEvent * ); void MsgBox( TQMessageBox::Icon typ, const TQString &msg ); void setTimer(); - void updateLocktqStatus(); - virtual void updatetqStatus() = 0; + void updateLockStatus(); + virtual void updateStatus() = 0; void handleVerify(); QXTimer timer; @@ -188,7 +188,7 @@ class KGStdVerify : public KGVerify { void selectPlugin( int id ); protected: - void updatetqStatus(); + void updateStatus(); private: TQGridLayout *grid; @@ -214,7 +214,7 @@ class KGThemedVerify : public KGVerify { void selectPlugin( int id ); protected: - void updatetqStatus(); + void updateStatus(); private slots: void slotPluginSelected( int id ); diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp index bb9d897b2..67b575c5f 100644 --- a/kdm/kfrontend/krootimage.cpp +++ b/kdm/kfrontend/krootimage.cpp @@ -61,7 +61,7 @@ void MyApplication::renderDone() { desktop()->setBackgroundPixmap( renderer.pixmap() ); - desktop()->tqrepaint( true ); + desktop()->repaint( true ); renderer.saveCacheFile(); renderer.cleanup(); for (unsigned i=0; i<renderer.numRenderers(); ++i) diff --git a/kdm/kfrontend/sessions/ratpoison.desktop b/kdm/kfrontend/sessions/ratpoison.desktop index ededb43d8..1127db151 100644 --- a/kdm/kfrontend/sessions/ratpoison.desktop +++ b/kdm/kfrontend/sessions/ratpoison.desktop @@ -59,7 +59,7 @@ Comment[ne]=परà¥à¤¦à¤¾ पछाडि सञà¥à¤à¥à¤¯à¤¾à¤² पà¥à¤°à¤ Comment[nl]=Een eenvoudige windowmanager die alleen met het toetsenbord te bedienen is, geïnspireerd door Screen Comment[nn]=Ein enkel tastaturbasert vindaugssjef, med Screen som førebilete Comment[pa]=ਪਰਦੇ ਮੈਡੀਊਲ ਬਾਅਦ ਸਿਰਫ ਕੀ-ਬੋਰਡ ਤੇ ਆਧਾਰਿਤ à¨à¨°à©‹à¨–ਾ ਮੈਨੇਜਰ -Comment[pl]=Prosty menedżer okien obsÅ‚ugiwany wyÅ‚Ä…cznie za potqmocÄ… klawiatury, stworzony na podobieÅ„stwo programu screen +Comment[pl]=Prosty menedżer okien obsÅ‚ugiwany wyÅ‚Ä…cznie za pomocÄ… klawiatury, stworzony na podobieÅ„stwo programu screen Comment[pt]=Um gestor de janelas simples, só para o teclado e modelado sobre o Screen Comment[pt_BR]=Um simples gerenciador de janelas baseado somente em teclado, modelado após a tela Comment[ro]=Un manager de ferestre manipulat din tastatură, modelat după Screen diff --git a/kdm/kfrontend/sessions/sawfish.desktop b/kdm/kfrontend/sessions/sawfish.desktop index 59482d1f9..668620fff 100644 --- a/kdm/kfrontend/sessions/sawfish.desktop +++ b/kdm/kfrontend/sessions/sawfish.desktop @@ -52,7 +52,7 @@ Comment[ne]=इमाकà¥à¤¸ लिसà¥à¤ª जसà¥à¤¤à¥‹ à¤à¤¾à¤·à¤¸à¤à¤ Comment[nl]=Een uitbreidbare windowmanager, scriptbaar via een Emacs Lisp-achtige taal Comment[nn]=Ein utvidbar vindaugssjef som kan skriptast med eit sprÃ¥k som liknar Emacs Lisp Comment[pa]= Emacs Lisp-ਵਰਗੀ à¨à¨¾à¨¶à¨¾ ਸਕà©à¨°à¨¿à¨ªà¨Ÿà¨¯à©‹à¨— à¨à¨°à©‹à¨–ਾ ਮੈਨੇਜਰ -Comment[pl]=Menedżer okien, który można rozszerzać za potqmocÄ… skrytów w jÄ™zyku podobnym do Emacs Lisp +Comment[pl]=Menedżer okien, który można rozszerzać za pomocÄ… skrytów w jÄ™zyku podobnym do Emacs Lisp Comment[pt]=Um gestor de janelas extensÃvel e programável com uma linguagem semelhante ao Emacs Lisp Comment[pt_BR]=um gerenciador de janelas extensÃvel, baseado em scripts, com uma linguagem parecida com o Lisp do Emacs Comment[ro]=Un manager de ferestre extensibil scriptabil cu un limbaj similar cu Emacs Lisp diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 1233a96d2..a171bd1bb 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -66,7 +66,7 @@ KdmItem::KdmItem( TQWidget *parent, const TQDomNode &node, const char *name ) void KdmItem::init( const TQDomNode &node, const char * ) { - // Set default tqlayout for every item + // Set default layout for every item currentManager = MNone; pos.x = pos.y = 0; pos.width = pos.height = 1; @@ -146,7 +146,7 @@ KdmItem::show( bool force ) if (myWidget) myWidget->show(); - // XXX showing of tqlayouts not implemented, prolly pointless anyway + // XXX showing of layouts not implemented, prolly pointless anyway needUpdate(); } @@ -170,7 +170,7 @@ KdmItem::hide( bool force ) if (myWidget) myWidget->hide(); - // XXX hiding of tqlayouts not implemented, prolly pointless anyway + // XXX hiding of layouts not implemented, prolly pointless anyway needUpdate(); } @@ -236,14 +236,14 @@ KdmItem::setLayoutItem( TQLayoutItem *item ) // XXX hiding not supported - it think it's pointless here if (myLayoutItem->widget()) connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()), - TQT_SLOT(tqlayoutItemGone()) ); - else if (myLayoutItem->tqlayout()) - connect( myLayoutItem->tqlayout(), TQT_SIGNAL(destroyed()), - TQT_SLOT(tqlayoutItemGone()) ); + TQT_SLOT(layoutItemGone()) ); + else if (myLayoutItem->layout()) + connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()), + TQT_SLOT(layoutItemGone()) ); } void -KdmItem::tqlayoutItemGone() +KdmItem::layoutItemGone() { myLayoutItem = 0; } @@ -278,7 +278,7 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force ) if (fixedManager && !fixedManager->isEmpty()) fixedManager->update( newGeometry, force ); - // TODO send *selective* tqrepaint signal + // TODO send *selective* repaint signal } void @@ -295,8 +295,8 @@ KdmItem::paint( TQPainter *p, const TQRect &rect ) // Maybe set a darker version of the background instead of an exact copy? if ( myWidget && myWidget->isA( "KListView" ) ) { TQPixmap copy( myWidget->size() ); - kdDebug() << myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl; - bitBlt( ©, TQPoint( 0, 0), p->device(), myWidget->tqgeometry(), Qt::CopyROP ); + kdDebug() << myWidget->geometry() << " " << area << " " << myWidget->size() << endl; + bitBlt( ©, TQPoint( 0, 0), p->device(), myWidget->geometry(), Qt::CopyROP ); // Lighten it slightly TQImage lightVersion; lightVersion = copy.convertToImage(); @@ -368,7 +368,7 @@ KdmItem::mouseEvent( int x, int y, bool pressed, bool released ) } ItemState oldState = state; - if (area.tqcontains( x, y )) { + if (area.contains( x, y )) { if (released && oldState == Sactive) { if (buttonParent) emit activated( id ); @@ -415,12 +415,12 @@ KdmItem::statusChanged() // BEGIN protected inheritable QSize -KdmItem::tqsizeHint() +KdmItem::sizeHint() { if (myWidget) return myWidget->size(); if (myLayoutItem) - return myLayoutItem->tqsizeHint(); + return myLayoutItem->sizeHint(); int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1, h = pos.hType == DTpixel ? kAbs( pos.height ) : -1; return TQSize( w, h ); @@ -429,7 +429,7 @@ KdmItem::tqsizeHint() QRect KdmItem::placementHint( const TQRect &parentRect ) { - TQSize hintedSize = tqsizeHint(); + TQSize hintedSize = sizeHint(); TQSize boxHint; int x = parentRect.left(), @@ -446,7 +446,7 @@ KdmItem::placementHint( const TQRect &parentRect ) else { if (!boxManager) return parentRect; - boxHint = boxManager->tqsizeHint(); + boxHint = boxManager->sizeHint(); } kdDebug() << timestamp() << " boxHint " << boxHint << endl; } @@ -456,21 +456,21 @@ KdmItem::placementHint( const TQRect &parentRect ) else if (pos.xType == DTnpixel) x = parentRect.right() - pos.x; else if (pos.xType == DTpercent) - x += tqRound( parentRect.width() / 100.0 * pos.x ); + x += qRound( parentRect.width() / 100.0 * pos.x ); if (pos.yType == DTpixel) y += pos.y; else if (pos.yType == DTnpixel) y = parentRect.bottom() - pos.y; else if (pos.yType == DTpercent) - y += tqRound( parentRect.height() / 100.0 * pos.y ); + y += qRound( parentRect.height() / 100.0 * pos.y ); if (pos.wType == DTpixel) w = pos.width; else if (pos.wType == DTnpixel) w -= pos.width; else if (pos.wType == DTpercent) - w = tqRound( parentRect.width() / 100.0 * pos.width ); + w = qRound( parentRect.width() / 100.0 * pos.width ); else if (pos.wType == DTbox) w = boxHint.width(); else if (hintedSize.width() > 0) @@ -483,7 +483,7 @@ KdmItem::placementHint( const TQRect &parentRect ) else if (pos.hType == DTnpixel) h -= pos.height; else if (pos.hType == DTpercent) - h = tqRound( parentRect.height() / 100.0 * pos.height ); + h = qRound( parentRect.height() / 100.0 * pos.height ); else if (pos.hType == DTbox) h = boxHint.height(); else if (hintedSize.height() > 0) { @@ -496,7 +496,7 @@ KdmItem::placementHint( const TQRect &parentRect ) // we choose to take the hinted size, but it's better to listen to the aspect ratio if (pos.wType == DTnone && pos.hType != DTnone && h && w) { - w = tqRound(float(hintedSize.width() * h) / hintedSize.height()); + w = qRound(float(hintedSize.width() * h) / hintedSize.height()); } // defaults to center @@ -559,7 +559,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) dType = DTpercent; TQString sCopy = s; sCopy.remove( p, 1 ); - sCopy.tqreplace( ',', '.' ); + sCopy.replace( ',', '.' ); val = (int)sCopy.toDouble(); } else { // int value dType = DTpixel; @@ -568,7 +568,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) sCopy.remove( 0, 1 ); dType = DTnpixel; } - sCopy.tqreplace( ',', '.' ); + sCopy.replace( ',', '.' ); val = (int)sCopy.toDouble(); } } @@ -614,7 +614,7 @@ KdmItem::setFixedLayout( const TQDomNode &node ) } TQWidget * -KdmItem::tqparentWidget() const +KdmItem::parentWidget() const { if (myWidget) return myWidget; @@ -623,7 +623,7 @@ KdmItem::tqparentWidget() const if (parent()->qt_cast("TQWidget")) return (TQWidget*)parent(); - return ((KdmItem*)parent())->tqparentWidget(); + return ((KdmItem*)parent())->parentWidget(); } #include "kdmitem.moc" diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h index 975033b33..230ed71c4 100644 --- a/kdm/kfrontend/themer/kdmitem.h +++ b/kdm/kfrontend/themer/kdmitem.h @@ -52,14 +52,14 @@ class TQLayoutItem; */ /** - * A note on tqlayouting - how does it work? - * - settqgeometry is called by parent (passing the new tqgeometry) - * - item changes its tqgeometry + * A note on layouting - how does it work? + * - setgeometry is called by parent (passing the new geometry) + * - item changes its geometry * - if item embeds a widget, reposition it too * - call children's box manager. box->update( my geom ) * - sum up the whole space taken by children (via *hint calls) if * needed for box width / height computation. note that the computed - * tqgeometry should be equal or similar to parent's tqgeometry. + * geometry should be equal or similar to parent's geometry. * - pad the rectangle bounding box' contents * - for every child * - if vertical @@ -74,7 +74,7 @@ class TQLayoutItem; * and insertion entry points are vertical lines * - call to children's fix manager. fixed->update( my geom ) * - for every child - * - S = get child's tqgeometry hint (and we'll give item the whole + * - S = get child's geometry hint (and we'll give item the whole * space it needs, without constraints) * - call to child->setGeometry( S ) * - TODO: send a selective redraw signal also merging children's areas @@ -95,8 +95,8 @@ public: virtual ~KdmItem(); /** - * Fixup the tqgeometry of an item and its children (even if fixed - * or boxed ones). Note that this will generate tqrepaint signals + * Fixup the geometry of an item and its children (even if fixed + * or boxed ones). Note that this will generate repaint signals * when needed. The default implementation should fit all needs. */ virtual void setGeometry( const TQRect &newGeometry, bool force ); @@ -109,7 +109,7 @@ public: void paint( TQPainter *painter, const TQRect &boundaries ); /** - * Update representation of contents and tqrepaint. + * Update representation of contents and repaint. */ virtual void update(); @@ -120,22 +120,22 @@ public: void mouseEvent( int x, int y, bool pressed = false, bool released = false ); /** - * Similar to tqsizeHint(..), this returns the area of the item + * Similar to sizeHint(..), this returns the area of the item * given the @p parentGeometry. The default implementation - * takes into account geometric constraints and tqlayoutings. - * @param parentGeometry the tqgeometry of the caller item or a - * null rect if the tqgeometry of the parent is not yet defined. + * takes into account geometric constraints and layoutings. + * @param parentGeometry the geometry of the caller item or a + * null rect if the geometry of the parent is not yet defined. */ virtual TQRect placementHint( const TQRect &parentGeometry ); /** - * Create the box tqlayout manager; next children will be - * managed by the box tqlayouter + * Create the box layout manager; next children will be + * managed by the box layouter */ void setBoxLayout( const TQDomNode &node = TQDomNode() ); /** - * Create the fixed tqlayout manager; next children will be + * Create the fixed layout manager; next children will be * in fixed position relative to this item */ void setFixedLayout( const TQDomNode &node = TQDomNode() ); @@ -163,7 +163,7 @@ public: bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; } TQRect rect() const { return area; } - TQWidget *tqparentWidget() const; + TQWidget *parentWidget() const; TQString getId() const { return id; } signals: @@ -172,7 +172,7 @@ signals: protected slots: void widgetGone(); - void tqlayoutItemGone(); + void layoutItemGone(); protected: /** @@ -181,7 +181,7 @@ protected: * @return (-1,-1) if no size can be determined (so it should * default to parent's size). */ - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); /** * Low level graphical function to paint the item. @@ -195,7 +195,7 @@ protected: /** * Called when item changes its 'state' variable. This must - * handle item's tqrepaint. + * handle item's repaint. */ virtual void statusChanged(); diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp index fb6a03b91..e83ae9dc7 100644 --- a/kdm/kfrontend/themer/kdmlabel.cpp +++ b/kdm/kfrontend/themer/kdmlabel.cpp @@ -115,8 +115,8 @@ KdmLabel::setTextInt( const TQString &txt) myAccel = 0; if (cAccel != -1) { cText.remove('&'); - myAccel = new TQAccel(tqparentWidget()); - myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().tqunicode()); + myAccel = new TQAccel(parentWidget()); + myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode()); connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); } } @@ -138,7 +138,7 @@ KdmLabel::setText( const TQString &txt ) } QSize -KdmLabel::tqsizeHint() +KdmLabel::sizeHint() { // choose the correct label class struct LabelStruct::LabelClass *l = &label.normal; @@ -250,7 +250,7 @@ KdmLabel::lookupText( const TQString &t ) { TQString text = t; - text.tqreplace( '_', '&' ); + text.replace( '_', '&' ); TQMap<TQChar,TQString> m; struct utsname uts; @@ -268,7 +268,7 @@ KdmLabel::lookupText( const TQString &t ) m['s'] = KThemedGreeter::timedUser; // xgettext:no-c-format KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") ); - m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false, false ); + m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false ); return KMacroExpander::expandMacros( text, m ); } diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h index 33ce1cc00..1ec2f88ec 100644 --- a/kdm/kfrontend/themer/kdmlabel.h +++ b/kdm/kfrontend/themer/kdmlabel.h @@ -42,7 +42,7 @@ public: protected: // reimplemented; returns the minimum size of rendered text - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); // draw the label virtual void drawContents( TQPainter *p, const TQRect &r ); diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp index bc1a059c5..b17d2e7b7 100644 --- a/kdm/kfrontend/themer/kdmlayout.cpp +++ b/kdm/kfrontend/themer/kdmlayout.cpp @@ -38,7 +38,7 @@ KdmLayoutFixed::update( const TQRect &parentGeometry, bool force ) { kdDebug() << timestamp() << " KdmLayoutFixed::update " << parentGeometry << endl; - // I can't tqlayout children if the parent rectangle is not valid + // I can't layout children if the parent rectangle is not valid if (parentGeometry.width() < 0 || parentGeometry.height() < 0) { kdDebug() << timestamp() << " invalid\n"; return; @@ -67,14 +67,14 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) { kdDebug() << this << " update " << parentGeometry << endl; - // I can't tqlayout children if the parent rectangle is not valid + // I can't layout children if the parent rectangle is not valid if (!parentGeometry.isValid() || parentGeometry.isEmpty()) return; // Check if box size was computed. If not compute it // TODO check if this prevents updating changing items // if (!hintedSize.isValid()) -// tqsizeHint(); +// sizeHint(); // kdDebug() << this << " hintedSize " << hintedSize << endl; @@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force ) if ((*it)->isExplicitlyHidden()) continue; - TQRect temp = childrenRect, tqitemRect; + TQRect temp = childrenRect, itemRect; if (box.isVertical) { temp.setHeight( 0 ); - tqitemRect = (*it)->placementHint( temp ); - temp.setHeight( tqitemRect.height() ); - childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing ); + itemRect = (*it)->placementHint( temp ); + temp.setHeight( itemRect.height() ); + childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing ); } else { temp.setWidth( 0 ); - tqitemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl; - temp.setWidth( tqitemRect.width() ); - childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing ); + itemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl; + temp.setWidth( itemRect.width() ); + childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing ); kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl; } - tqitemRect = (*it)->placementHint( temp ); - kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl; - (*it)->setGeometry( tqitemRect, force ); + itemRect = (*it)->placementHint( temp ); + kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl; + (*it)->setGeometry( itemRect, force ); } } } -//FIXME truly experimental (is so close to greeter_tqgeometry.c) +//FIXME truly experimental (is so close to greeter_geometry.c) QSize -KdmLayoutBox::tqsizeHint() +KdmLayoutBox::sizeHint() { // Sum up area taken by children int w = 0, h = 0; diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h index 75e90d573..4c73e9a1b 100644 --- a/kdm/kfrontend/themer/kdmlayout.h +++ b/kdm/kfrontend/themer/kdmlayout.h @@ -43,11 +43,11 @@ public: // Adds an item that will be managed void addItem( KdmItem *item ) { m_children.append( item ); } - // Return false if any item are managed by this tqlayouter + // Return false if any item are managed by this layouter bool isEmpty() { return m_children.isEmpty(); } - // Updates the tqlayout of all items knowing that the parent - // has the @p parentGeometry tqgeometry + // Updates the layout of all items knowing that the parent + // has the @p parentGeometry geometry // virtual void update( const TQRect &parentGeometry ) = 0; protected: @@ -59,8 +59,8 @@ class KdmLayoutFixed : public KdmLayout { public: KdmLayoutFixed( const TQDomNode &node ); - // Updates the tqlayout of all boxed items knowing that the parent - // has the @p parentGeometry tqgeometry + // Updates the layout of all boxed items knowing that the parent + // has the @p parentGeometry geometry void update( const TQRect &parentGeometry, bool force ); }; @@ -74,13 +74,13 @@ class KdmLayoutBox : public KdmLayout { public: KdmLayoutBox( const TQDomNode &node ); - // Updates the tqlayout of all boxed items knowing that they + // Updates the layout of all boxed items knowing that they // should fit into @p parentGeometry container void update( const TQRect &parentGeometry, bool force ); // Computes the size hint of the box, telling which is the // smallest size inside which boxed items will fit - TQSize tqsizeHint(); + TQSize sizeHint(); private: struct { diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp index ce7ef8e07..0fcbc065c 100644 --- a/kdm/kfrontend/themer/kdmpixmap.cpp +++ b/kdm/kfrontend/themer/kdmpixmap.cpp @@ -97,7 +97,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name ) } QSize -KdmPixmap::tqsizeHint() +KdmPixmap::sizeHint() { // choose the correct pixmap class PixmapStruct::PixmapClass * pClass = &pixmap.normal; @@ -108,7 +108,7 @@ KdmPixmap::tqsizeHint() // use the pixmap size as the size hint if (!pClass->pixmap.isNull()) return pClass->pixmap.size(); - return KdmItem::tqsizeHint(); + return KdmItem::sizeHint(); } void @@ -268,11 +268,11 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r ) QRgb *ls = (QRgb *)scaledImage.scanLine( y ); for (int x = 0; x < w; ++x) { QRgb l = ls[x]; - int r = int( tqRed( l ) * tint_red ); - int g = int( tqGreen( l ) * tint_green ); - int b = int( tqBlue( l ) * tint_blue ); - int a = int( tqAlpha( l ) * tint_alpha ); - ls[x] = tqRgba( r, g, b, a ); + int r = int( qRed( l ) * tint_red ); + int g = int( qGreen( l ) * tint_green ); + int b = int( qBlue( l ) * tint_blue ); + int a = int( qAlpha( l ) * tint_alpha ); + ls[x] = qRgba( r, g, b, a ); } } diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h index d49394bc9..a12c9fea4 100644 --- a/kdm/kfrontend/themer/kdmpixmap.h +++ b/kdm/kfrontend/themer/kdmpixmap.h @@ -42,7 +42,7 @@ public: protected: // reimplemented; returns the size of loaded pixmap - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); // draw the pixmap virtual void drawContents( TQPainter *p, const TQRect &r ); diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp index 5a252151c..1d854d213 100644 --- a/kdm/kfrontend/themer/kdmrect.cpp +++ b/kdm/kfrontend/themer/kdmrect.cpp @@ -141,7 +141,7 @@ KdmRect::recursiveSetAttribs( TQLayoutItem *li ) if ((w = li->widget())) setAttribs( w ); - else if ((l = li->tqlayout())) { + else if ((l = li->layout())) { TQLayoutIterator it = l->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) recursiveSetAttribs( itm ); diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp index 16d9e4f86..9e6db33db 100644 --- a/kdm/kfrontend/themer/kdmthemer.cpp +++ b/kdm/kfrontend/themer/kdmthemer.cpp @@ -223,7 +223,7 @@ KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node ) TQString id = el.attribute("id"); if (id.startsWith("plugin-specific-")) { id = id.mid(strlen("plugin-specific-")); - if (!_pluginsLogin.tqcontains(id)) + if (!_pluginsLogin.contains(id)) continue; } diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h index 0c4cd3753..6dc2318dd 100644 --- a/kdm/kfrontend/themer/kdmthemer.h +++ b/kdm/kfrontend/themer/kdmthemer.h @@ -60,9 +60,9 @@ public: bool isOK() { return rootItem != 0; } /* - * Gives a tqsizeHint to the widget (parent size) + * Gives a sizeHint to the widget (parent size) */ - //TQSize tqsizeHint() const{ return tqparentWidget()->size(); } + //TQSize sizeHint() const{ return parentWidget()->size(); } /* * Takes a shot of the current widget diff --git a/kdm/kfrontend/themes/o2_enterprise/gpl.txt b/kdm/kfrontend/themes/o2_enterprise/gpl.txt index 4ab04989b..b6f92f3db 100644 --- a/kdm/kfrontend/themes/o2_enterprise/gpl.txt +++ b/kdm/kfrontend/themes/o2_enterprise/gpl.txt @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp index ac52d5353..58d4f8379 100644 --- a/kdmlib/dmctl.cpp +++ b/kdmlib/dmctl.cpp @@ -121,7 +121,7 @@ DM::exec( const char *cmd ) * @p ret might contain addional results. * @li If false and @p ret is empty, a communication error occurred * (most probably KDM is not running). - * @li If false and @p ret is non-empty, it tqcontains the error message + * @li If false and @p ret is non-empty, it contains the error message * from KDM. */ bool @@ -249,7 +249,7 @@ DM::bootOptions( TQStringList &opts, int &defopt, int ¤t ) opts = TQStringList::split( ' ', opts[1] ); for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it) - (*it).tqreplace( "\\s", " " ); + (*it).replace( "\\s", " " ); return true; } diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp index bc4bda77e..fd2e65bd8 100644 --- a/kdmlib/kgreet_classic.cpp +++ b/kdmlib/kgreet_classic.cpp @@ -63,7 +63,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, TQGridLayout *grid = 0; int line = 0; - tqlayoutItem = 0; + layoutItem = 0; if (themer && (!(user_entry = themer->findNode( "user-entry" )) || @@ -71,7 +71,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, themer = 0; if (!themer) - tqlayoutItem = grid = new TQGridLayout( 0, 0, 10 ); + layoutItem = grid = new TQGridLayout( 0, 0, 10 ); loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; loginEdit = 0; @@ -161,15 +161,15 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, KClassicGreeter::~KClassicGreeter() { abort(); - if (!tqlayoutItem) { + if (!layoutItem) { delete loginEdit; delete passwdEdit; return; } - TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator(); + TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); - delete tqlayoutItem; + delete layoutItem; } void // virtual diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp index 5ac93e074..b43952488 100644 --- a/kdmlib/kgreet_pam.cpp +++ b/kdmlib/kgreet_pam.cpp @@ -94,12 +94,12 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, debug("KPamGreeter constructed\n"); - m_tqparentWidget = parent; + m_parentWidget = parent; KdmItem *user_entry = 0, *pw_entry = 0; int line = 0; - tqlayoutItem = 0; + layoutItem = 0; if (themer && (!(user_entry = themer->findNode( "user-entry" )) || @@ -109,7 +109,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, m_themer = themer; if (!themer) - tqlayoutItem = new TQGridLayout( 0, 0, 10 ); + layoutItem = new TQGridLayout( 0, 0, 10 ); loginLabel = 0; authLabel.clear(); @@ -205,14 +205,14 @@ KPamGreeter::~KPamGreeter() { debug("KPamGreeter::~KPamGreeter"); abort(); - if (!tqlayoutItem) { + if (!layoutItem) { delete loginEdit; return; } - TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator(); + TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); - delete tqlayoutItem; + delete layoutItem; debug("destructor finished, good bye"); } @@ -314,7 +314,7 @@ KPamGreeter::textMessage( const char *text, bool err ) return false; if (getLayoutItem()) { - TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_tqparentWidget); + TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_parentWidget); getLayoutItem()->addWidget(label, state+1, 0, 0); } @@ -341,9 +341,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) } else if (state >= authEdit.size()) { if (getLayoutItem()) { - TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_tqparentWidget); + TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_parentWidget); getLayoutItem()->addWidget(label, state+1, 0, 0); - debug("added label widget to tqlayout"); + debug("added label widget to layout"); } else if (m_themer) { debug("themer found!"); @@ -361,9 +361,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) KDMPasswordEdit* passwdEdit; if (echoMode == -1) - passwdEdit = new KDMPasswordEdit( m_tqparentWidget ); + passwdEdit = new KDMPasswordEdit( m_parentWidget ); else - passwdEdit = new KDMPasswordEdit( echoMode, m_tqparentWidget); + passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget); connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h index 16dc0d7ea..f0bea7d02 100644 --- a/kdmlib/kgreet_pam.h +++ b/kdmlib/kgreet_pam.h @@ -64,7 +64,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { virtual void revive(); virtual void clear(); - TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(tqlayoutItem); } + TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(layoutItem); } public slots: void slotLoginLostFocus(); @@ -78,7 +78,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { TQLabel *loginLabel; TQValueList<TQLabel*> authLabel; KLineEdit *loginEdit; - TQWidget* m_tqparentWidget; + TQWidget* m_parentWidget; TQValueList<KPasswordEdit*> authEdit; KSimpleConfig *stsFile; KdmThemer *m_themer; diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp index 0e188ba3b..5f6530707 100644 --- a/kdmlib/kgreet_winbind.cpp +++ b/kdmlib/kgreet_winbind.cpp @@ -80,7 +80,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, TQGridLayout *grid = 0; int line = 0; - tqlayoutItem = 0; + layoutItem = 0; if (themer && (!(user_entry = themer->findNode( "user-entry" )) || @@ -89,7 +89,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, themer = 0; if (!themer) - tqlayoutItem = grid = new TQGridLayout( 0, 0, 10 ); + layoutItem = grid = new TQGridLayout( 0, 0, 10 ); domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; domainCombo = 0; @@ -206,16 +206,16 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, KWinbindGreeter::~KWinbindGreeter() { abort(); - if (!tqlayoutItem) { + if (!layoutItem) { delete loginEdit; delete passwdEdit; delete domainCombo; return; } - TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator(); + TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); - delete tqlayoutItem; + delete layoutItem; delete m_domainLister; } @@ -593,7 +593,7 @@ KWinbindGreeter::slotEndDomainList() for (TQStringList::const_iterator it = mDomainListing.begin(); it != mDomainListing.end(); ++it) { - if (!domainList.tqcontains(*it)) + if (!domainList.contains(*it)) domainList.append(*it); } @@ -625,7 +625,7 @@ static bool init( const TQString &, { echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt(); staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() ); - if (!staticDomains.tqcontains("<local>")) + if (!staticDomains.contains("<local>")) staticDomains << "<local>"; defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString(); diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h index c4591e14b..44799a622 100644 --- a/kdmlib/kgreeterplugin.h +++ b/kdmlib/kgreeterplugin.h @@ -280,11 +280,11 @@ public: * Obtain the TQLayoutItem containg the widget(s) to actually handle the * conversation. See TQLayout and TQWidgetItem for possible implementations. */ - TQLayoutItem *getLayoutItem() const { return tqlayoutItem; } + TQLayoutItem *getLayoutItem() const { return layoutItem; } protected: KGreeterPluginHandler *handler; - TQLayoutItem *tqlayoutItem; + TQLayoutItem *layoutItem; }; struct KDE_EXPORT kgreeterplugin_info { diff --git a/kfind/ChangeLog b/kfind/ChangeLog index fedc124f2..c13408a52 100644 --- a/kfind/ChangeLog +++ b/kfind/ChangeLog @@ -10,7 +10,7 @@ Fri Jul 30 22:33:25 1999 Carsten Pfeiffer <pfeiffer@kde.org> 1999-06-13 Harri Porten <porten@kde.org> - * kftabdlg.cpp: introduced flexible tqgeometry managment. Patch provided + * kftabdlg.cpp: introduced flexible geometry managment. Patch provided by Dima Rogozin <dima@mercury.co.il>. 1999-04-30 Harri Porten <porten@kde.org> @@ -21,7 +21,7 @@ Fri Jul 30 22:33:25 1999 Carsten Pfeiffer <pfeiffer@kde.org> 1999-04-06 Harri Porten <porten@kde.org> - * kfind.cpp: tqreplaced simple delete and free() with delete [] iBuffer + * kfind.cpp: replaced simple delete and free() with delete [] iBuffer 1998-12-07 Mario Weilguni <mweilguni@kde.org> @@ -55,7 +55,7 @@ ver. 0.4.1: Mario Weilguni <mweilguni@kde.org> * kfind compiles now without warnings with -Wall * result list is now scrollable without having the focus (only page up and page down) - * tqmoc files are now #included in tqmoc.cpp instead of compiling + * moc files are now #included in moc.cpp instead of compiling separate files. Speeds up compilation and makes binary smaller * file patterns are remembered between sessions * introduced new filetypes for searching: files, folders, diff --git a/kfind/README b/kfind/README index cf31826fd..7b6c24890 100644 --- a/kfind/README +++ b/kfind/README @@ -1,7 +1,7 @@ kfind ===== -Kfind is a graphical tqreplacement for the utility `find' inspired by +Kfind is a graphical replacement for the utility `find' inspired by the find utility from NT. At this time it is fully functional. All options available in kfind diff --git a/kfind/TODO b/kfind/TODO index a4552bf2c..0bf6ac832 100644 --- a/kfind/TODO +++ b/kfind/TODO @@ -6,7 +6,7 @@ TODO DONE: o drag found files to somewhere - o some tqlayout managment + o some layout managment o context menus o get preference dialog to work o find pattern history diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index 9f62b0eb5..95e4045ac 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -18,7 +18,7 @@ KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(FALSE, parent,name) { - TQDate date = TQDate::tqcurrentDate(); + TQDate date = TQDate::currentDate(); initObject(date, parent, name); } @@ -33,7 +33,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) popupFrame = new KPopupFrame(this, "popupFrame"); popupFrame->installEventFilter(this); datePicker = new KDatePicker(popupFrame, date, "datePicker"); - datePicker->setMinimumSize(datePicker->tqsizeHint()); + datePicker->setMinimumSize(datePicker->sizeHint()); datePicker->installEventFilter(this); popupFrame->setMainWidget(datePicker); setDate(date); @@ -57,9 +57,9 @@ TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd) return *qd = KGlobal::locale()->readDate(str); } -TQDate & KDateCombo::getDate(TQDate *tqcurrentDate) +TQDate & KDateCombo::getDate(TQDate *currentDate) { - return string2Date(currentText(), tqcurrentDate); + return string2Date(currentText(), currentDate); } bool KDateCombo::setDate(const TQDate & newDate) @@ -86,7 +86,7 @@ void KDateCombo::mousePressEvent (TQMouseEvent * e) { if (e->button() & TQMouseEvent::LeftButton) { - if (rect().tqcontains( e->pos())) + if (rect().contains( e->pos())) { TQDate tempDate; getDate(& tempDate); @@ -103,7 +103,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e) { TQMouseEvent *me = (TQMouseEvent *)e; TQPoint p = mapFromGlobal( me->globalPos() ); - if (rect().tqcontains( p ) ) + if (rect().contains( p ) ) { TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent())); return true; diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h index d8da787b8..ab714a3ba 100644 --- a/kfind/kdatecombo.h +++ b/kfind/kdatecombo.h @@ -26,7 +26,7 @@ public: KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0); ~KDateCombo(); - TQDate & getDate(TQDate *tqcurrentDate); + TQDate & getDate(TQDate *currentDate); bool setDate(const TQDate & newDate); private: diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index ee978d446..8908b26c8 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -65,12 +65,12 @@ Kfind::Kfind(TQWidget *parent, const char *name) // create button box TQVBox * mButtonBox = new TQVBox( this ); - TQVBoxLayout *lay = (TQVBoxLayout*)mButtonBox->tqlayout(); + TQVBoxLayout *lay = (TQVBoxLayout*)mButtonBox->layout(); lay->addStretch(1); mTopLayout->addWidget(mButtonBox); mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox ); - mButtonBox->setSpacing( (tabWidget->tqsizeHint().height()-4*mSearch->tqsizeHint().height()) / 4); + mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4); connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) ); mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox ); connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) ); diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 252aca295..92082019f 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -33,7 +33,7 @@ class KonqDirPart; typedef KParts::GenericFactory<KFindPart> KFindFactory; K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory ) -KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName, +KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, TQObject *parent, const char *name , const TQStringList & /*args*/ ) : KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/ @@ -43,8 +43,8 @@ KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName, setBrowserExtension( new KonqDirPartBrowserExtension( this ) ); kdDebug() << "KFindPart::KFindPart " << this << endl; - m_kfindWidget = new Kfind( tqparentWidget, widgetName ); - m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height()); + m_kfindWidget = new Kfind( parentWidget, widgetName ); + m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height()); const KFileItem *item = ((KonqDirPart*)parent)->currentItem(); kdDebug() << "Kfind: currentItem: " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl; TQDir d; diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h index f9a0d6cde..47d75a53c 100644 --- a/kfind/kfindpart.h +++ b/kfind/kfindpart.h @@ -44,7 +44,7 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart Q_OBJECT Q_PROPERTY( bool showsResult READ showsResult ) public: - KFindPart( TQWidget * tqparentWidget, const char *widgetName, + KFindPart( TQWidget * parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & /*args*/ ); virtual ~KFindPart(); diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 9068fd895..3d7615afd 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -60,11 +60,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[0] = new TQWidget( this, "page1" ); nameBox = new KComboBox(TRUE, pages[0], "combo1"); - nameBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named"); TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") ); dirBox = new KComboBox(TRUE, pages[0], "combo2"); - dirBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named"); subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]); caseSensCb = new TQCheckBox(i18n("Case s&ensitive search"), pages[0]); @@ -158,7 +158,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) betweenType->setCurrentItem(1); - TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::tqcurrentDate(), -1); + TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1); fromDate = new KDateCombo(dt, pages[1], "fromDate"); toDate = new KDateCombo(pages[1], "toDate"); @@ -187,7 +187,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) sizeUnitBox ->setCurrentItem(1); int tmp = sizeEdit->fontMetrics().width(" 000000000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); m_usernameBox->setDuplicatesEnabled(FALSE); m_groupBox->setDuplicatesEnabled(FALSE); @@ -245,7 +245,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[2] = new TQWidget( this, "page3" ); typeBox =new KComboBox(FALSE, pages[2], "typeBox"); - typeBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry + typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type"); textEdit=new KLineEdit(pages[2], "textEdit" ); TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text"); @@ -315,7 +315,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) // Layout tmp = sizeEdit->fontMetrics().width(" 00000 "); - sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height()); + sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4, KDialog::marginHint(), @@ -522,10 +522,10 @@ void KfindTabWidget::slotSizeBoxChanged(int index) void KfindTabWidget::setDefaults() { - TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::tqcurrentDate(), -1); + TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1); fromDate ->setDate(dt); - toDate ->setDate(TQDate::tqcurrentDate()); + toDate ->setDate(TQDate::currentDate()); timeBox->setValue(1); betweenType->setCurrentItem(1); @@ -563,7 +563,7 @@ bool KfindTabWidget::isDateValid() str = i18n("The date is not valid."); else if ( hi1 > hi2 ) str = i18n("Invalid date range."); - else if ( TQDate::tqcurrentDate() < hi1 ) + else if ( TQDate::currentDate() < hi1 ) str = i18n("Unable to search dates in the future."); if (!str.isNull()) { @@ -854,15 +854,15 @@ static void save_pattern(TQComboBox *obj, conf->writePathEntry(entry, sl); } -TQSize KfindTabWidget::tqsizeHint() const +TQSize KfindTabWidget::sizeHint() const { // #44662: avoid a huge default size when the comboboxes have very large items // Like in minicli, we changed the combobox size policy so that they can resize down, // and then we simply provide a reasonable size hint for the whole window, depending // on the screen width. - TQSize sz = TQTabWidget::tqsizeHint(); + TQSize sz = TQTabWidget::sizeHint(); KfindTabWidget* me = const_cast<KfindTabWidget*>( this ); - const int screenWidth = tqApp->desktop()->screenGeometry(me).width(); + const int screenWidth = qApp->desktop()->screenGeometry(me).width(); if ( sz.width() > screenWidth / 2 ) sz.setWidth( screenWidth / 2 ); return sz; diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h index 0c913e6f0..157a1fa44 100644 --- a/kfind/kftabdlg.h +++ b/kfind/kftabdlg.h @@ -49,7 +49,7 @@ public: void setURL( const KURL & url ); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void setFocus(); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index 4d4b12856..2ee69aa14 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -215,14 +215,14 @@ void KfindWindow::saveResults() TQFile file(filename); if ( !file.open(IO_WriteOnly) ) - KMessageBox::error(tqparentWidget(), + KMessageBox::error(parentWidget(), i18n("Unable to save results.")); else { TQTextStream stream( &file ); stream.setEncoding( TQTextStream::Locale ); if ( mimeType->name() == "text/html") { - stream << TQString::tqfromLatin1("<HTML><HEAD>\n" + stream << TQString::fromLatin1("<HTML><HEAD>\n" "<!DOCTYPE %1>\n" "<TITLE>%2</TITLE></HEAD>\n" "<BODY><H1>%3</H1>" @@ -236,13 +236,13 @@ void KfindWindow::saveResults() { TQString path=((KfFileLVI*)item)->fileitem.url().url(); TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL(); - stream << TQString::tqfromLatin1("<DT><A HREF=\"") << path - << TQString::tqfromLatin1("\">") << pretty - << TQString::tqfromLatin1("</A>\n"); + stream << TQString::fromLatin1("<DT><A HREF=\"") << path + << TQString::fromLatin1("\">") << pretty + << TQString::fromLatin1("</A>\n"); item = item->nextSibling(); } - stream << TQString::tqfromLatin1("</DL><P></BODY></HTML>\n"); + stream << TQString::fromLatin1("</DL><P></BODY></HTML>\n"); } else { item = firstChild(); @@ -255,7 +255,7 @@ void KfindWindow::saveResults() } file.close(); - KMessageBox::information(tqparentWidget(), + KMessageBox::information(parentWidget(), i18n("Results were saved to file\n")+ filename); } @@ -287,7 +287,7 @@ void KfindWindow::deleteFiles() { TQString tmp = i18n("Do you really want to delete the selected file?", "Do you really want to delete the %n selected files?",selectedItems().count()); - if (KMessageBox::warningContinueCancel(tqparentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel) return; // Iterate on all selected elements @@ -335,7 +335,7 @@ void KfindWindow::resizeEvent(TQResizeEvent *e) { KListView::resizeEvent(e); resetColumns(false); - clipper()->tqrepaint(); + clipper()->repaint(); } TQDragObject * KfindWindow::dragObject() @@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init) { setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15); TQString sampleDate = - KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15); setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15); setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15); diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index a51d2dc2f..4231f1aab 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -242,7 +242,7 @@ void KQuery::processQuery( KFileItem* file) return; break; default: - if (!m_mimetype.isEmpty() && !m_mimetype.tqcontains(file->mimetype())) + if (!m_mimetype.isEmpty() && !m_mimetype.contains(file->mimetype())) return; } @@ -334,7 +334,7 @@ void KQuery::processQuery( KFileItem* file) } } else if( !m_search_binary && !file->mimetype().startsWith("text/") && file->url().isLocalFile() ) { - KMimeType::Format f = KMimeType::tqfindFormatByFileContent(file->url().path()); + KMimeType::Format f = KMimeType::findFormatByFileContent(file->url().path()); if ( !f.text ) { kdDebug() << "ignoring, not a text file: " << file->url() << endl; return; @@ -359,7 +359,7 @@ void KQuery::processQuery( KFileItem* file) if (str.isNull()) break; if(isZippedOfficeDocument) - str.tqreplace(xmlTags, ""); + str.replace(xmlTags, ""); if (m_regexpForContent) { @@ -458,7 +458,7 @@ void KQuery::setRegExp(const TQString ®exp, bool caseSensitive) // m_regexpsContainsGlobs.clear(); for ( TQStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { regExp = new TQRegExp((*it),caseSensitive,true); -// m_regexpsContainsGlobs.append(regExp->pattern().tqcontains(globChars)); +// m_regexpsContainsGlobs.append(regExp->pattern().contains(globChars)); m_regexps.append(regExp); } } diff --git a/khelpcenter/COPYING b/khelpcenter/COPYING index 9d29098e2..0b84a43fd 100644 --- a/khelpcenter/COPYING +++ b/khelpcenter/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN index 17496f234..003423f5a 100644 --- a/khelpcenter/DESIGN +++ b/khelpcenter/DESIGN @@ -78,7 +78,7 @@ KHC::ContentsTab object and a KHC::SearchTab object. # Alright, after some talk on IRC this structure evolved: # -# - Tasks - tqcontains short, three to four paragraph documents about how to +# - Tasks - contains short, three to four paragraph documents about how to # solve an everyday task, examples: # Browsing the web # Send and receive email @@ -185,15 +185,15 @@ regexp' or 'Search case sensitive'. # I think this means that we have to create a 'DataCollection' class which # gets inherited by all classes which are "searchable". DataCollections should -# also be able to tqcontains multiple child DataCollection, so that we have e.g. +# also be able to contains multiple child DataCollection, so that we have e.g. # one DataCollection per application manual, and one "Manuals" collection -# which tqcontains all the application manual collections. +# which contains all the application manual collections. # We'd probably also need a DataCollection for the info pages and man pages. # And later, in the far future, we might extent this concept to web searches, # so that e.g. Google represents a DataCollection which we can query. # I'm not yet decided how to do that properly, perhaps using multiple # inheritance, so that each TOCBuilder is a DataCollection - naw, we'd rather -# have a "TableOfContents" class which tqcontains a TOCBuilder, and is a +# have a "TableOfContents" class which contains a TOCBuilder, and is a # datacollection? Hm, not sure. # In any case DataCollections should some sort of plugins, so that we can add # e.g. new web search interfaces lateron. @@ -218,7 +218,7 @@ regexp' or 'Search case sensitive'. # from the enhanced browsing thing and treat those as plugin .desktop files. # We could show them in a listview on the Search tab, each found search engine # being represented by a checkable listview item. So, we just let the user -# enter a term, tqreplace the \{@} placeholder in the URIs specified in the +# enter a term, replace the \{@} placeholder in the URIs specified in the # selected .desktop files with that term, send out a request via KIO and show # the results in our KHTMLPart (after all KHC::View is a KHTMLPart already). A # problem with this: How to display the multiple HTML pages returned by the @@ -250,7 +250,7 @@ regexp' or 'Search case sensitive'. # A problem with this would be that we cannot tell how a particular search # engine treats boolean expressions (e.g. some search engines use 'foo AND bar', # others use '+foo +bar', a third variation is '"foo bar"'). We thus cannot -# tqreplace the placeholder in the URI but first have to translate the syntax +# replace the placeholder in the URI but first have to translate the syntax # entered by the user into a syntax which is appropriate for each single news # engine. Right now I don't know how we could do this with just a .desktop/.xslt # pair. We could always use fullblown C++ plugins which hold code which is able diff --git a/khelpcenter/Help.desktop b/khelpcenter/Help.desktop index 4b73bf67c..26f21f011 100644 --- a/khelpcenter/Help.desktop +++ b/khelpcenter/Help.desktop @@ -53,14 +53,14 @@ Name[nn]=Hjelp Name[nso]=Thuso Name[oc]=Ajuda Name[pa]=ਸਹਾਇਤਾ -Name[pl]=Potqmoc +Name[pl]=Pomoc Name[pt]=Ajuda Name[pt_BR]=Ajuda Name[ro]=Ajutor Name[ru]=Справка Name[rw]=Ifashayobora Name[se]=Veahkki -Name[sk]=PotqmocnÃk +Name[sk]=PomocnÃk Name[sl]=PomoÄ Name[sr]=Помоћ Name[sr@Latn]=Pomoć diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata index 2f3f37757..733bb5ef2 100644 --- a/khelpcenter/README.metadata +++ b/khelpcenter/README.metadata @@ -3,12 +3,12 @@ KHelpCenter documentation meta data structure KHelpCenter uses meta data files which describe the documentation available in the system. Each document is represented by a meta data file and shown as an -entry in the KHelpCenter navigation tree view. The meta data tqcontains +entry in the KHelpCenter navigation tree view. The meta data contains information about title and short description of the document, the location of the document and some more information like how to search the document and translations of title and description. Document hierarchy is represented as hierarchy of the meta data files. Directories are also described by a meta data -file which tqcontains the same information as a document meta data file. +file which contains the same information as a document meta data file. Format of the meta data files ----------------------------- @@ -46,7 +46,7 @@ X-DOC-Identifier string Unique identifier for document, if this file is used as identifier X-DOC-Indexer command Command used for creating a search index for the document. - The following symbols are tqreplaced by the + The following symbols are replaced by the corresponding values: %f - Filename X-DOC-IndexTestFile filename Name of file whose existence indicates @@ -55,7 +55,7 @@ X-DOC-Search command Command used for searching, the output of the command should be HTML which is shown in KHelpCenter. The following symbols in the command are - tqreplaced by the corresponding values: + replaced by the corresponding values: %k - Words to be searched for %n - Maximum number of results %m - Method for combining search words, diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index 96747696b..716c4d99e 100644 --- a/khelpcenter/docentry.cpp +++ b/khelpcenter/docentry.cpp @@ -219,7 +219,7 @@ bool DocEntry::readFromFile( const TQString &fileName ) mIdentifier = fi.baseName( true ); } mIndexer = file.readEntry( "X-DOC-Indexer" ); - mIndexer.tqreplace( "%f", fileName ); + mIndexer.replace( "%f", fileName ); mIndexTestFile = file.readEntry( "X-DOC-IndexTestFile" ); mSearchEnabledDefault = file.readBoolEntry( "X-DOC-SearchEnabledDefault", false ); diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp index 862e2211b..4d6dd6fad 100644 --- a/khelpcenter/docmetainfo.cpp +++ b/khelpcenter/docmetainfo.cpp @@ -77,7 +77,7 @@ DocEntry *DocMetaInfo::addDocEntry( const TQString &fileName ) mHtmlSearch->setupDocEntry( entry ); } TQString indexer = entry->indexer(); - indexer.tqreplace( "%f", fileName ); + indexer.replace( "%f", fileName ); entry->setIndexer( indexer ); addDocEntry( entry ); return entry; @@ -108,7 +108,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode ) if ( langcode == "en" ) return i18n("English"); TQString cfgfile = locate( "locale", - TQString::tqfromLatin1( "%1/entry.desktop" ).arg( langcode ) ); + TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) ); kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl; diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index d652b68a9..7aa25aa36 100644 --- a/khelpcenter/fontdialog.cpp +++ b/khelpcenter/fontdialog.cpp @@ -58,21 +58,21 @@ void FontDialog::setupFontSizesBox() { TQGroupBox *gb = new TQGroupBox( i18n( "Sizes" ), mainWidget() ); - TQGridLayout *tqlayout = new TQGridLayout( gb ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() * 2 ); + TQGridLayout *layout = new TQGridLayout( gb ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() * 2 ); TQLabel *lMinFontSize = new TQLabel( i18n( "M&inimum font size:" ), gb ); - tqlayout->addWidget( lMinFontSize, 0, 0 ); + layout->addWidget( lMinFontSize, 0, 0 ); m_minFontSize = new KIntNumInput( gb ); - tqlayout->addWidget( m_minFontSize, 0, 1 ); + layout->addWidget( m_minFontSize, 0, 1 ); m_minFontSize->setRange( 1, 20 ); lMinFontSize->setBuddy( m_minFontSize ); TQLabel *lMedFontSize = new TQLabel( i18n( "M&edium font size:" ), gb ); - tqlayout->addWidget( lMedFontSize, 1, 0 ); + layout->addWidget( lMedFontSize, 1, 0 ); m_medFontSize = new KIntNumInput( gb ); - tqlayout->addWidget( m_medFontSize, 1, 1 ); + layout->addWidget( m_medFontSize, 1, 1 ); m_medFontSize->setRange( 4, 28 ); lMedFontSize->setBuddy( m_medFontSize ); } @@ -81,44 +81,44 @@ void FontDialog::setupFontTypesBox() { TQGroupBox *gb = new TQGroupBox( i18n( "Fonts" ), mainWidget() ); - TQGridLayout *tqlayout = new TQGridLayout( gb ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() * 2 ); + TQGridLayout *layout = new TQGridLayout( gb ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() * 2 ); TQLabel *lStandardFont = new TQLabel( i18n( "S&tandard font:" ), gb ); - tqlayout->addWidget( lStandardFont, 0, 0 ); + layout->addWidget( lStandardFont, 0, 0 ); m_standardFontCombo = new KFontCombo( gb ); - tqlayout->addWidget( m_standardFontCombo, 0, 1 ); + layout->addWidget( m_standardFontCombo, 0, 1 ); lStandardFont->setBuddy( m_standardFontCombo ); TQLabel *lFixedFont = new TQLabel( i18n( "F&ixed font:" ), gb ); - tqlayout->addWidget( lFixedFont, 1, 0 ); + layout->addWidget( lFixedFont, 1, 0 ); m_fixedFontCombo = new KFontCombo( gb ); - tqlayout->addWidget( m_fixedFontCombo, 1, 1 ); + layout->addWidget( m_fixedFontCombo, 1, 1 ); lFixedFont->setBuddy( m_fixedFontCombo ); TQLabel *lSerifFont = new TQLabel( i18n( "S&erif font:" ), gb ); - tqlayout->addWidget( lSerifFont, 2, 0 ); + layout->addWidget( lSerifFont, 2, 0 ); m_serifFontCombo = new KFontCombo( gb ); - tqlayout->addWidget( m_serifFontCombo, 2, 1 ); + layout->addWidget( m_serifFontCombo, 2, 1 ); lSerifFont->setBuddy( m_serifFontCombo ); TQLabel *lSansSerifFont = new TQLabel( i18n( "S&ans serif font:" ), gb ); - tqlayout->addWidget( lSansSerifFont, 3, 0 ); + layout->addWidget( lSansSerifFont, 3, 0 ); m_sansSerifFontCombo = new KFontCombo( gb ); - tqlayout->addWidget( m_sansSerifFontCombo, 3, 1 ); + layout->addWidget( m_sansSerifFontCombo, 3, 1 ); lSansSerifFont->setBuddy( m_sansSerifFontCombo ); TQLabel *lItalicFont = new TQLabel( i18n( "&Italic font:" ), gb ); - tqlayout->addWidget( lItalicFont, 4, 0 ); + layout->addWidget( lItalicFont, 4, 0 ); m_italicFontCombo = new KFontCombo( gb ); - tqlayout->addWidget( m_italicFontCombo, 4, 1 ); + layout->addWidget( m_italicFontCombo, 4, 1 ); lItalicFont->setBuddy( m_italicFontCombo ); TQLabel *lFantasyFont = new TQLabel( i18n( "&Fantasy font:" ), gb ); - tqlayout->addWidget( lFantasyFont, 5, 0 ); + layout->addWidget( lFantasyFont, 5, 0 ); m_fantasyFontCombo = new KFontCombo( gb ); - tqlayout->addWidget( m_fantasyFontCombo, 5, 1 ); + layout->addWidget( m_fantasyFontCombo, 5, 1 ); lFantasyFont->setBuddy( m_fantasyFontCombo ); } @@ -126,23 +126,23 @@ void FontDialog::setupFontEncodingBox() { TQGroupBox *gb = new TQGroupBox( i18n( "Encoding" ), mainWidget() ); - TQGridLayout *tqlayout = new TQGridLayout( gb ); - tqlayout->setSpacing( KDialog::spacingHint() ); - tqlayout->setMargin( KDialog::marginHint() * 2 ); + TQGridLayout *layout = new TQGridLayout( gb ); + layout->setSpacing( KDialog::spacingHint() ); + layout->setMargin( KDialog::marginHint() * 2 ); TQLabel *lDefaultEncoding = new TQLabel( i18n( "&Default encoding:" ), gb ); - tqlayout->addWidget( lDefaultEncoding, 0, 0 ); + layout->addWidget( lDefaultEncoding, 0, 0 ); m_defaultEncoding = new KComboBox( false, gb ); - tqlayout->addWidget( m_defaultEncoding, 0, 1 ); + layout->addWidget( m_defaultEncoding, 0, 1 ); TQStringList encodings = KGlobal::charsets()->availableEncodingNames(); encodings.prepend( i18n( "Use Language Encoding" ) ); m_defaultEncoding->insertStringList( encodings ); lDefaultEncoding->setBuddy( m_defaultEncoding ); TQLabel *lFontSizeAdjustement = new TQLabel( i18n( "&Font size adjustment:" ), gb ); - tqlayout->addWidget( lFontSizeAdjustement, 1, 0 ); + layout->addWidget( lFontSizeAdjustement, 1, 0 ); m_fontSizeAdjustement = new TQSpinBox( -5, 5, 1, gb ); - tqlayout->addWidget( m_fontSizeAdjustement, 1, 1 ); + layout->addWidget( m_fontSizeAdjustement, 1, 1 ); lFontSizeAdjustement->setBuddy( m_fontSizeAdjustement ); } diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp index 6c3411fd7..b9f394289 100644 --- a/khelpcenter/formatter.cpp +++ b/khelpcenter/formatter.cpp @@ -120,7 +120,7 @@ bool Formatter::readTemplates() bool success = true; TQStringList::ConstIterator it2; for( it2 = requiredSymbols.begin(); it2 != requiredSymbols.end(); ++it2 ) { - if ( !mSymbols.tqcontains( *it2 ) ) { + if ( !mSymbols.contains( *it2 ) ) { success = false; kdError() << "Symbol '" << *it2 << "' is missing from main template file." << endl; @@ -137,7 +137,7 @@ TQString Formatter::header( const TQString &title ) TQString s; if ( mHasTemplate ) { s = mSymbols[ "HEADER" ]; - s.tqreplace( "--TITLE:--", title ); + s.replace( "--TITLE:--", title ); } else { s = "<html><head><title>" + title + "</title></head>\n<body>\n"; } diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index 7aebdbea7..dc596372e 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -49,7 +49,7 @@ class SectionItem : public KListViewItem { KListViewItem::setOpen(open); - setPixmap( 0, SmallIcon( TQString::tqfromLatin1( open ? "contents" : "contents2" ) ) ); + setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) ); } }; @@ -92,7 +92,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent ) m_cacheFile = locateLocal( "cache", "help/glossary.xml" ); - m_sourceFile = View::View::langLookup( TQString::tqfromLatin1( "khelpcenter/glossary/index.docbook" ) ); + m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) ); m_config = kapp->config(); m_config->setGroup( "Glossary" ); @@ -102,7 +102,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent ) void Glossary::show() { if ( !m_initialized ) { - if ( cachetqStatus() == NeedRebuild ) + if ( cacheStatus() == NeedRebuild ) rebuildGlossaryCache(); else buildGlossaryTree(); @@ -122,7 +122,7 @@ const GlossaryEntry &Glossary::entry( const TQString &id ) const return *m_glossEntries[ id ]; } -Glossary::CachetqStatus Glossary::cachetqStatus() const +Glossary::CacheStatus Glossary::cacheStatus() const { if ( !TQFile::exists( m_cacheFile ) || m_config->readPathEntry( "CachedGlossary" ) != m_sourceFile || @@ -150,10 +150,10 @@ void Glossary::rebuildGlossaryCache() connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ), this, TQT_SLOT( meinprocExited( KProcess * ) ) ); - *meinproc << locate( "exe", TQString::tqfromLatin1( "meinproc" ) ); - *meinproc << TQString::tqfromLatin1( "--output" ) << m_cacheFile; - *meinproc << TQString::tqfromLatin1( "--stylesheet" ) - << locate( "data", TQString::tqfromLatin1( "khelpcenter/glossary.xslt" ) ); + *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) ); + *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile; + *meinproc << TQString::fromLatin1( "--stylesheet" ) + << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) ); *meinproc << m_sourceFile; meinproc->start( KProcess::NotifyOnExit ); @@ -189,21 +189,21 @@ void Glossary::buildGlossaryTree() if ( !doc.setContent( &cacheFile ) ) return; - TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::tqfromLatin1( "section" ) ); + TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::fromLatin1( "section" ) ); for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) { TQDomElement sectionElement = sectionNodes.item( i ).toElement(); - TQString title = sectionElement.attribute( TQString::tqfromLatin1( "title" ) ); + TQString title = sectionElement.attribute( TQString::fromLatin1( "title" ) ); SectionItem *topicSection = new SectionItem( m_byTopicItem, title ); - TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::tqfromLatin1( "entry" ) ); + TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::fromLatin1( "entry" ) ); for ( unsigned int j = 0; j < entryNodes.count(); j++ ) { TQDomElement entryElement = entryNodes.item( j ).toElement(); - TQString entryId = entryElement.attribute( TQString::tqfromLatin1( "id" ) ); + TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) ); if ( entryId.isNull() ) continue; - TQDomElement termElement = childElement( entryElement, TQString::tqfromLatin1( "term" ) ); + TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) ); TQString term = termElement.text().simplifyWhiteSpace(); EntryItem *entry = new EntryItem(topicSection, term, entryId ); @@ -221,19 +221,19 @@ void Glossary::buildGlossaryTree() new EntryItem( alphabSection, term, entryId ); - TQDomElement definitionElement = childElement( entryElement, TQString::tqfromLatin1( "definition" ) ); + TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) ); TQString definition = definitionElement.text().simplifyWhiteSpace(); GlossaryEntryXRef::List seeAlso; - TQDomElement referencesElement = childElement( entryElement, TQString::tqfromLatin1( "references" ) ); - TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::tqfromLatin1( "reference" ) ); + TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) ); + TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) ); if ( referenceNodes.count() > 0 ) for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) { TQDomElement referenceElement = referenceNodes.item( k ).toElement(); - TQString term = referenceElement.attribute( TQString::tqfromLatin1( "term" ) ); - TQString id = referenceElement.attribute( TQString::tqfromLatin1( "id" ) ); + TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) ); + TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) ); seeAlso += GlossaryEntryXRef( term, id ); } @@ -279,10 +279,10 @@ TQString Glossary::entryToHtml( const GlossaryEntry &entry ) GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin(); GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end(); for (; it != end; ++it) { - seeAlso += TQString::tqfromLatin1("<a href=\"glossentry:"); + seeAlso += TQString::fromLatin1("<a href=\"glossentry:"); seeAlso += (*it).id(); - seeAlso += TQString::tqfromLatin1("\">") + (*it).term(); - seeAlso += TQString::tqfromLatin1("</a>, "); + seeAlso += TQString::fromLatin1("\">") + (*it).term(); + seeAlso += TQString::fromLatin1("</a>, "); } seeAlso = seeAlso.left(seeAlso.length() - 2); } diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h index 409670796..79ed7fb93 100644 --- a/khelpcenter/glossary.h +++ b/khelpcenter/glossary.h @@ -121,9 +121,9 @@ class Glossary : public KListView void treeItemSelected( TQListViewItem *item ); private: - enum CachetqStatus { NeedRebuild, CacheOk }; + enum CacheStatus { NeedRebuild, CacheOk }; - CachetqStatus cachetqStatus() const; + CacheStatus cacheStatus() const; int glossaryCTime() const; void rebuildGlossaryCache(); void buildGlossaryTree(); @@ -134,7 +134,7 @@ class Glossary : public KListView TQListViewItem *m_alphabItem; TQString m_sourceFile; TQString m_cacheFile; - CachetqStatus m_status; + CacheStatus m_status; TQDict<GlossaryEntry> m_glossEntries; TQDict<EntryItem> m_idDict; bool m_initialized; diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index d03e899b5..9a90831f7 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -257,7 +257,7 @@ void History::fillForwardMenu() void History::fillGoMenu() { KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu || m_goMenuIndex == -1 ) return; @@ -290,7 +290,7 @@ void History::fillGoMenu() void History::goMenuActivated( int id ) { KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() ); - TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) ); + TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) ); if ( !goMenu ) return; @@ -324,7 +324,7 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw { TQString text = it.current()->title; text = KStringHandler::csqueeze(text, 50); //CT: squeeze - text.tqreplace( "&", "&&" ); + text.replace( "&", "&&" ); if ( checkCurrentItem && it.current() == current ) { int id = popup->insertItem( text ); // no pixmap if checked diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index ff5effffe..c47300190 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -43,7 +43,7 @@ void HTMLSearch::scanDir(const TQString& dir) for (it=list.begin(); it != list.end(); ++it) { file = adir + *it; - if ( !_files.tqcontains( file ) ) { + if ( !_files.contains( file ) ) { _files.append(file); progress->setFilesScanned(++_filesScanned); } @@ -117,7 +117,7 @@ bool HTMLSearch::createConfig(const TQString& _lang) return false; images = images.left(images.length() - 8); - // This is an example tqreplacement for the default bad_words file + // This is an example replacement for the default bad_words file // distributed with ht://Dig. It was compiled by Marjolein Katsma // <HSH@taxon.demon.nl>. TQString bad_words = i18n( "List of words to exclude from index", @@ -467,8 +467,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int delete _proc; // modify the search result - _searchResult = _searchResult.tqreplace("http://localhost/", "file:/"); - _searchResult = _searchResult.tqreplace("Content-type: text/html", TQString::null); + _searchResult = _searchResult.replace("http://localhost/", "file:/"); + _searchResult = _searchResult.replace("Content-type: text/html", TQString::null); // dump the search result TQFile f(result); diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop index 866aa649a..1879ae742 100644 --- a/khelpcenter/htmlsearch/htmlsearch.desktop +++ b/khelpcenter/htmlsearch/htmlsearch.desktop @@ -211,13 +211,13 @@ Keywords[nl]=help,html,zoeken,index,htdig,htsearch,htmerge,scope,taal Keywords[nn]=hjelp,HTML,søk,indeks,htdig,htmerge,omrÃ¥de,sprÃ¥k Keywords[nso]=Thuso,HTML,Nyako,Palo ya Bangwadi,htdig,htnyako,htmerge,Scope,Leleme Keywords[pa]=ਸਹਾਇਤਾ,HTML,Index,htdig,htsearch,htmerge,Scope,à¨à¨¾à¨¸à¨¼à¨¾,ਖੋਜ -Keywords[pl]=potqmoc,HTML,szukaj,indeks,htdig,htsearch,htmerge,zakres,jÄ™zyk +Keywords[pl]=pomoc,HTML,szukaj,indeks,htdig,htsearch,htmerge,zakres,jÄ™zyk Keywords[pt]=ajuda,html,procura,Ãndice,htdig,htsearch,htmerge,âmbito,lÃngua Keywords[pt_BR]=Ajuda,HTML,Procurar,Ãndice,htdig,htsearch,htmerge,escopo,idioma Keywords[ro]=ajutor,HTML,căutare,index,htdig,htsearch,htmerge,domeniu,limbaj Keywords[rw]=Ifashayobora,HTML,Ishakisha,htgucukura,htgushakisha,htgukomatanya,Igishushanyombonera,Ururimi Keywords[se]=veahkki,HTML,ohcan,indeaksa,indeksa,htdig,htmerge,gaska,giella -Keywords[sk]=Potqmoc,HTML,HľadaÅ¥,Katalóg,Index,htdig,htsearch,htmerge,rozsah,jazyk,PotqmocnÃk +Keywords[sk]=Pomoc,HTML,HľadaÅ¥,Katalóg,Index,htdig,htsearch,htmerge,rozsah,jazyk,PomocnÃk Keywords[sl]=PomoÄ,HTML,iskanje,indeks,htdig,htsearch,htmerge,doseg,jezik Keywords[sr]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,помоћ,претрага,индекÑ,језик,опÑег Keywords[sr@Latn]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,pomoć,pretraga,indeks,jezik,opseg diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 64a301be7..9dfc5e350 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -50,15 +50,15 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " "ht://dig HTML search engine. " "You can get ht://dig at the"), gb); - l->tqsetAlignment(TQLabel::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(TQLabel::WordBreak); + l->setMinimumSize(l->sizeHint()); grid->addMultiCellWidget(l, 1, 1, 0, 1); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); KURLLabel *url = new KURLLabel(gb); url->setURL("http://www.htdig.org"); url->setText(i18n("ht://dig home page")); - url->tqsetAlignment(TQLabel::AlignHCenter); + url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(urlClicked(const TQString&))); @@ -157,7 +157,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name) runButton = new TQPushButton(i18n("Generate Index..."), this); TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) ); - runButton->setFixedSize(runButton->tqsizeHint()); + runButton->setFixedSize(runButton->sizeHint()); vbox->addWidget(runButton, AlignRight); connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex())); @@ -179,14 +179,14 @@ void KHTMLSearchConfig::loadLanguages() // add all languages to the list TQStringList langs = KGlobal::dirs()->findAllResources("locale", - TQString::tqfromLatin1("*/entry.desktop")); + TQString::fromLatin1("*/entry.desktop")); langs.sort(); for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name")); TQString path = *it; int index = path.findRev('/'); diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp index 6f4b01c42..308109d12 100644 --- a/khelpcenter/htmlsearch/klangcombo.cpp +++ b/khelpcenter/htmlsearch/klangcombo.cpp @@ -39,14 +39,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name) void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index) { - TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")"); - TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png"))); + TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")"); + TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png"))); insertItem(TQIconSet(flag), output, path, submenu, index); } void KLanguageCombo::changeLanguage(const TQString& name, int i) { if (i < 0 || i >= count()) return; - TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")"); + TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")"); changeItem(output, i); } diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index 900077c54..6bb74c860 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -83,7 +83,7 @@ void KTagComboBox::internalActivate( int index ) if (current == index) return; current = index; emit activated( index ); - tqrepaint(); + repaint(); } void KTagComboBox::internalHighlight( int index ) @@ -192,7 +192,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) TQRect clip(2, 2, width() - 4, height() - 4); #if 0 if ( hasFocus() && style().guiStyle() != MotifStyle ) - p.setPen( tqcolorGroup().highlightedText() ); + p.setPen( colorGroup().highlightedText() ); #endif p.drawText(clip, AlignCenter | SingleLine, popup->text( current )); @@ -204,9 +204,9 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev) } } -bool KTagComboBox::tqcontainsTag( const TQString &str ) const +bool KTagComboBox::containsTag( const TQString &str ) const { - return tags->tqcontains(str) > 0; + return tags->contains(str) > 0; } TQString KTagComboBox::currentTag() const @@ -233,7 +233,7 @@ void KTagComboBox::setCurrentItem(int i) { if (i < 0 || i >= count()) return; current = i; - tqrepaint(); + repaint(); } void KTagComboBox::setCurrentItem(const TQString &code) diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h index f184b14d7..df58120ce 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.h +++ b/khelpcenter/htmlsearch/ktagcombobox.h @@ -56,7 +56,7 @@ public: */ TQString currentTag() const; TQString tag ( int i ) const; - bool tqcontainsTag (const TQString &str ) const; + bool containsTag (const TQString &str ) const; /* * Set the current item diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index 8581b25c8..ea6dff669 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/khelpcenter/htmlsearchconfig.cpp @@ -51,15 +51,15 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the " "ht://dig HTML search engine. " "You can get ht://dig at the"), gb); - l->tqsetAlignment(TQLabel::WordBreak); - l->setMinimumSize(l->tqsizeHint()); + l->setAlignment(TQLabel::WordBreak); + l->setMinimumSize(l->sizeHint()); grid->addMultiCellWidget(l, 1, 1, 0, 1); TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) ); KURLLabel *url = new KURLLabel(gb); url->setURL("http://www.htdig.org"); url->setText(i18n("ht://dig home page")); - url->tqsetAlignment(TQLabel::AlignHCenter); + url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), this, TQT_SLOT(urlClicked(const TQString&))); diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index 65ce72c80..aadce700a 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -101,7 +101,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent ) topLayout->setSpacing( spacingHint() ); mLabel = new TQLabel( this ); - mLabel->tqsetAlignment( AlignHCenter ); + mLabel->setAlignment( AlignHCenter ); topLayout->addWidget( mLabel ); mProgressBar = new TQProgressBar( this ); @@ -215,7 +215,7 @@ void IndexProgressDialog::hideDetails() mLogLabel->hide(); mLogView->hide(); mDetailsButton->setText( i18n("Details >>") ); - tqlayout()->activate(); + layout()->activate(); adjustSize(); } @@ -276,7 +276,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent ) mListView = new KListView( parent ); mListView->setFullWidth( true ); mListView->addColumn( i18n("Search Scope") ); - mListView->addColumn( i18n("tqStatus") ); + mListView->addColumn( i18n("Status") ); mListView->setColumnAlignment( 1, AlignCenter ); topLayout->addWidget( mListView ); connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), @@ -337,10 +337,10 @@ void KCMHelpCenter::load() } } - updatetqStatus(); + updateStatus(); } -void KCMHelpCenter::updatetqStatus() +void KCMHelpCenter::updateStatus() { TQListViewItemIterator it( mListView ); while ( it.current() != 0 ) { @@ -417,9 +417,9 @@ bool KCMHelpCenter::buildIndex() .arg( entry->documentType() ) ); hasError = true; } else { - indexer.tqreplace( TQRegExp( "%i" ), entry->identifier() ); - indexer.tqreplace( TQRegExp( "%d" ), Prefs::indexDirectory() ); - indexer.tqreplace( TQRegExp( "%p" ), entry->url() ); + indexer.replace( TQRegExp( "%i" ), entry->identifier() ); + indexer.replace( TQRegExp( "%d" ), Prefs::indexDirectory() ); + indexer.replace( TQRegExp( "%p" ), entry->url() ); kdDebug() << "INDEXER: " << indexer << endl; *ts << indexer << endl; @@ -574,7 +574,7 @@ void KCMHelpCenter::slotIndexProgress() kdDebug() << "KCMHelpCenter::slotIndexProgress()" << endl; - updatetqStatus(); + updateStatus(); advanceProgress(); } diff --git a/khelpcenter/kcmhelpcenter.desktop b/khelpcenter/kcmhelpcenter.desktop index 8712c56a1..54ae1c7e3 100644 --- a/khelpcenter/kcmhelpcenter.desktop +++ b/khelpcenter/kcmhelpcenter.desktop @@ -60,14 +60,14 @@ Name[nl]=Documentatie-index Name[nn]=Hjelpindeks Name[nso]=Palo ya Thuso Name[pa]=ਸਹਾਇਤਾ ਤਤਕਰਾ -Name[pl]=Indeks potqmocy +Name[pl]=Indeks pomocy Name[pt]=Ãndice da Ajuda Name[pt_BR]=Ãndice de Ajuda Name[ro]=Index ajutor Name[ru]=Ð˜Ð½Ð´ÐµÐºÑ Ñправки Name[rw]=Umubarendanga w'Ifashayobora Name[se]=Veahkkeindeaksa -Name[sk]=Index potqmocnÃka +Name[sk]=Index pomocnÃka Name[sl]=Seznam pomoÄi Name[sr]=Ð˜Ð½Ð´ÐµÐºÑ Ð¿Ð¾Ð¼Ð¾Ñ›Ð¸ Name[sr@Latn]=Indeks pomoći @@ -136,14 +136,14 @@ Comment[nl]=Zoekindex van het documentatiecentrum instellen en genereren Comment[nn]=Oppsett og generering av søkjeindeks for hjelpesenteret Comment[nso]=Thlagiso le peakanyo ya palo ya bangwadi le ya nyako ya bogare bja thuso Comment[pa]=ਸਹਾਇਤਾ ਕੇਂਦਰ ਖੋਜ ਤਤਕਰਾ ਸੰਰਚਨਾ ਅਤੇ ਨਿਰਮਾਣ -Comment[pl]=Konfiguracja i generowanie indeksu potqmocy +Comment[pl]=Konfiguracja i generowanie indeksu pomocy Comment[pt]=Configuração e geração do Ãndice de pesquisa do centro de ajuda Comment[pt_BR]=Configuração e geração do Ãndice de busca do centro de ajuda Comment[ro]=Generează È™i configurează indexul de căutare pentru Centrul de Ajutor Comment[ru]=ÐаÑтройка индекÑов Ñправочной ÑиÑтемы KDE Comment[rw]=Iboneza n'irema umubarendanga w'ishakisha ifashayobora hagati Comment[se]=Veahkkeguovddáža ohcanindeavssa heiveheapmi ja ráhkadeapmi -Comment[sk]=Nastavenie a generovanie indexu pre potqmocnÃka +Comment[sk]=Nastavenie a generovanie indexu pre pomocnÃka Comment[sl]=Nastavitve in ustvarjanje iskalnega indeksa za SrediÅ¡Äe za pomoÄ Comment[sr]=Подешавање и генериÑање индекÑа за претрагу Центра за помоћ Comment[sr@Latn]=PodeÅ¡avanje i generisanje indeksa za pretragu Centra za pomoć @@ -208,13 +208,13 @@ Keywords[nl]=khelpcenter,help,index,search,hulp,zoeken,documentatie,handboek Keywords[nn]=KHelpCenter,hjelp,indeks,søk Keywords[nso]=kbogare bja thuso,thuso,palo ya bangwadi,nyako Keywords[pa]=ਸਹਾਇਤਾ ਕੇਂਦਰ,ਸਹਾਇਤਾ,ਤਤਕਰਾ,ਖੋਜ -Keywords[pl]=centrum potqmocy,potqmoc,indeks,szukanie +Keywords[pl]=centrum pomocy,pomoc,indeks,szukanie Keywords[pt]=khelpcenter,ajuda,Ãndice,procura Keywords[pt_BR]=centro de ajuda,ajuda,Ãndice,busca Keywords[ro]=centrul de ajutor,khelpcenter,ajutor,index,căutare Keywords[rw]=k-ifashayoborahagati,ifashayobora,umubarendanga,ishakisha Keywords[se]=KHelpCenter,veahkki,indeaksa,indeksa,ohcan -Keywords[sk]=khelpcenter,help,index,potqmocnÃk,hľadanie +Keywords[sk]=khelpcenter,help,index,pomocnÃk,hľadanie Keywords[sl]=khelpcenter,pomoÄ,indeks,iskanje Keywords[sr]=khelpcenter,помоћ,Ñадржај,претрага Keywords[sr@Latn]=khelpcenter,pomoć,sadržaj,pretraga diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h index 3c3443ed3..8bf2f3b6c 100644 --- a/khelpcenter/kcmhelpcenter.h +++ b/khelpcenter/kcmhelpcenter.h @@ -138,7 +138,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface protected: void setupMainWidget( TQWidget *parent ); - void updatetqStatus(); + void updateStatus(); void startIndexProcess(); void deleteProcess(); diff --git a/khelpcenter/khelpcenter.desktop b/khelpcenter/khelpcenter.desktop index f14461039..5dad26cfe 100644 --- a/khelpcenter/khelpcenter.desktop +++ b/khelpcenter/khelpcenter.desktop @@ -24,7 +24,7 @@ Name[nds]=Trinity-Hülpzentrum Name[ne]=केडीई मदà¥à¤¦à¤¤ केनà¥à¤¦à¥à¤° Name[nso]=KBogare bja Thuso Name[pa]=ਕੇਸਹਾਇਤਾਕੇਂਦਰ -Name[pl]=Centrum Potqmocy +Name[pl]=Centrum Pomocy Name[pt_BR]=Centro de Ajuda Name[ro]=Centrul de ajutor Trinity Name[ru]=Центр Ñправки @@ -95,14 +95,14 @@ Comment[nn]=Trinity Hjelpesenter Comment[nso]=Bogare bja Thuso ya Trinity Comment[oc]=Lo centre d'ajuda Trinity Comment[pa]=ਕੇਡੀਈ ਸਹਾਇਤਾ ਕੇਂਦਰ -Comment[pl]=Centrum Potqmocy Trinity +Comment[pl]=Centrum Pomocy Trinity Comment[pt]=O Centro de Ajuda do Trinity Comment[pt_BR]=Centro de Ajuda do Trinity Comment[ro]=Centrul de ajutor al Trinity Comment[ru]=Центр Ñправки Trinity Comment[rw]=Trinity Ifashayobora Hagati Comment[se]=Trinity veahkkeguovddáš -Comment[sk]=Trinity Centrum potqmoci +Comment[sk]=Trinity Centrum pomoci Comment[sl]=SrediÅ¡Äe pomoÄi za Trinity Comment[sr]=Trinity центар за помоћ Comment[sr@Latn]=Trinity centar za pomoć diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index 7b9f9c27f..633bf0085 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -310,7 +310,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) proto == "ghelp" ) own = true; else if ( url.isLocalFile() ) { - KMimeMagicResult *res = KMimeMagic::self()->tqfindFileType( url.path() ); + KMimeMagicResult *res = KMimeMagic::self()->findFileType( url.path() ); if ( res->isValid() && res->accuracy() > 40 && res->mimeType() == "text/html" ) own = true; @@ -325,7 +325,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) mDoc->browserExtension()->setURLArgs( args ); - if ( proto == TQString::tqfromLatin1("glossentry") ) { + if ( proto == TQString::fromLatin1("glossentry") ) { TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() ); slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) ); mNavigator->slotSelectGlossEntry( decodedEntryId ); diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 2285cd069..ad308cfc6 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -262,8 +262,8 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem void Navigator::insertAppletDocs( NavigatorItem *topItem ) { - TQDir appletDir( locate( "data", TQString::tqfromLatin1( "kicker/applets/" ) ) ); - appletDir.setNameFilter( TQString::tqfromLatin1( "*.desktop" ) ); + TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) ); + appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) ); TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable ); TQStringList::ConstIterator it = files.begin(); @@ -409,7 +409,7 @@ void Navigator::slotItemSelected( TQListViewItem *currentItem ) if ( !doc.isNull() ) { int pos = doc.find( ".html" ); if ( pos >= 0 ) { - doc.tqreplace( pos, 5, ".docbook" ); + doc.replace( pos, 5, ".docbook" ); } kdDebug( 1400 ) << "slotItemSelected(): doc = " << doc << endl; @@ -563,7 +563,7 @@ void Navigator::slotSearch() void Navigator::slotShowSearchResult( const TQString &url ) { TQString u = url; - u.tqreplace( "%k", mSearchEdit->text() ); + u.replace( "%k", mSearchEdit->text() ); emit itemSelected( u ); } diff --git a/khelpcenter/plugins/kioslaves.desktop b/khelpcenter/plugins/kioslaves.desktop index 5b4586200..452ecd502 100644 --- a/khelpcenter/plugins/kioslaves.desktop +++ b/khelpcenter/plugins/kioslaves.desktop @@ -2,7 +2,7 @@ Name=Kioslaves Name[bg]=СиÑтема за вход-изход -Name[cs]=Potqmocné protokoly KDE +Name[cs]=Pomocné protokoly KDE Name[csb]=Pluginsë wéńdzeniô/wiÅ„dzeniô Name[da]=Kioslaver Name[de]=Ein-/Ausgabemodule diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index 4ee28d21d..20a4b0851 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/khelpcenter/scrollkeepertreebuilder.cpp @@ -180,7 +180,7 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent, if ( url.left( 5 ) == "file:" ) url = url.mid( 5 ); url.prepend( "ghelp:" ); #if 0 - url.tqreplace( TQRegExp( ".xml$" ), ".html" ); + url.replace( TQRegExp( ".xml$" ), ".html" ); #endif } else if ( mimeType == "text/sgml" ) { // GNOME docs use this type. We don't have a real viewer for this. diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index 12117712d..b779afc8e 100644 --- a/khelpcenter/searchengine.cpp +++ b/khelpcenter/searchengine.cpp @@ -325,16 +325,16 @@ bool SearchEngine::search( TQString words, TQString method, int matches, if ( lang.lower() == "c" || lang.lower() == "posix" ) lang = "en"; - // if the string tqcontains '&' tqreplace with a '+' and set search method to and + // if the string contains '&' replace with a '+' and set search method to and if (mWords.find("&") != -1) { - mWords.tqreplace("&", " "); + mWords.replace("&", " "); method = "and"; } - // tqreplace whitespace with a '+' + // replace whitespace with a '+' mWords = mWords.stripWhiteSpace(); mWords = mWords.simplifyWhiteSpace(); - mWords.tqreplace(TQRegExp("\\s"), "+"); + mWords.replace(TQRegExp("\\s"), "+"); commonSearchProgram = substituteSearchQuery( commonSearchProgram ); @@ -379,7 +379,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches, delete mProc; // modify the search result - mSearchResult = mSearchResult.tqreplace("http://localhost/", "file:/"); + mSearchResult = mSearchResult.replace("http://localhost/", "file:/"); mSearchResult = mSearchResult.mid( mSearchResult.find( '<' ) ); mView->beginSearchResult(); @@ -395,11 +395,11 @@ bool SearchEngine::search( TQString words, TQString method, int matches, TQString SearchEngine::substituteSearchQuery( const TQString &query ) { TQString result = query; - result.tqreplace( "%k", mWords ); - result.tqreplace( "%n", TQString::number( mMatches ) ); - result.tqreplace( "%m", mMethod ); - result.tqreplace( "%l", mLang ); - result.tqreplace( "%s", mScope ); + result.replace( "%k", mWords ); + result.replace( "%n", TQString::number( mMatches ) ); + result.replace( "%m", mMethod ); + result.replace( "%l", mLang ); + result.replace( "%s", mScope ); return result; } @@ -409,15 +409,15 @@ TQString SearchEngine::substituteSearchQuery( const TQString &query, Operation operation, const TQString &lang ) { TQString result = query; - result.tqreplace( "%i", identifier ); - result.tqreplace( "%w", words.join( "+" ) ); - result.tqreplace( "%m", TQString::number( maxResults ) ); + result.replace( "%i", identifier ); + result.replace( "%w", words.join( "+" ) ); + result.replace( "%m", TQString::number( maxResults ) ); TQString o; if ( operation == Or ) o = "or"; else o = "and"; - result.tqreplace( "%o", o ); - result.tqreplace( "%d", Prefs::indexDirectory() ); - result.tqreplace( "%l", lang ); + result.replace( "%o", o ); + result.replace( "%d", Prefs::indexDirectory() ); + result.replace( "%l", lang ); return result; } diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp index 465c2bc80..9c34d7399 100644 --- a/khelpcenter/searchhandler.cpp +++ b/khelpcenter/searchhandler.cpp @@ -62,9 +62,9 @@ TQStringList SearchHandler::documentTypes() const TQString SearchHandler::indexCommand( const TQString &identifier ) { TQString cmd = mIndexCommand; - cmd.tqreplace( "%i", identifier ); - cmd.tqreplace( "%d", Prefs::indexDirectory() ); - cmd.tqreplace( "%l", mLang ); + cmd.replace( "%i", identifier ); + cmd.replace( "%d", Prefs::indexDirectory() ); + cmd.replace( "%l", mLang ); return cmd; } diff --git a/khelpcenter/searchhandlers/README.searchhandlers b/khelpcenter/searchhandlers/README.searchhandlers index f888217ac..cbbfbbbd7 100644 --- a/khelpcenter/searchhandlers/README.searchhandlers +++ b/khelpcenter/searchhandlers/README.searchhandlers @@ -6,7 +6,7 @@ handlers. Each searchable document provides provides a document type in its meta data and if a corresponding handler is found, it can be searched. Search handlers are described by a desktop file which is put in the khelpcenter -app directory in a "searchhandlers" directory. The desktop file tqcontains the +app directory in a "searchhandlers" directory. The desktop file contains the information about which document types the handler covers, how to do a search query and how to create a search index. @@ -21,7 +21,7 @@ Search Query KHelpcenter reads the command to execute for submitting a search query from the search handler's desktop file ("SearchCommand"). The search command can contain -some symbols which are tqreplaced by KHelpcenter with the data for the concrete +some symbols which are replaced by KHelpcenter with the data for the concrete search request: %i Identifier of document (usually the name of the document's desktop file) @@ -44,7 +44,7 @@ Building a Search Index KHelpcenter reads the command to build a search index from the search handler's desktop file ("IndexCommand"). The indexing command can contain some symbols -which are tqreplaced by KHelpcenter with the data for the concrete index creation +which are replaced by KHelpcenter with the data for the concrete index creation call: %i Identifier of document (usually the name of the document's desktop file) diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index 852dc09a1..7bda95b8c 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -88,17 +88,17 @@ void TOC::build( const TQString &file ) } } - TQString cacheFile = fileName.tqreplace( TQDir::separator(), "__" ); + TQString cacheFile = fileName.replace( TQDir::separator(), "__" ); m_cacheFile = locateLocal( "cache", "help/" + cacheFile ); m_sourceFile = file; - if ( cachetqStatus() == NeedRebuild ) + if ( cacheStatus() == NeedRebuild ) buildCache(); else fillTree(); } -TOC::CachetqStatus TOC::cachetqStatus() const +TOC::CacheStatus TOC::cacheStatus() const { if ( !TQFile::exists( m_cacheFile ) || sourceFileCTime() != cachedCTime() ) @@ -188,9 +188,9 @@ void TOC::fillTree() TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" ); for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) { TQDomElement chapElem = chapters.item( chapterCount ).toElement(); - TQDomElement chapTitleElem = childElement( chapElem, TQString::tqfromLatin1( "title" ) ); + TQDomElement chapTitleElem = childElement( chapElem, TQString::fromLatin1( "title" ) ); TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace(); - TQDomElement chapRefElem = childElement( chapElem, TQString::tqfromLatin1( "anchor" ) ); + TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) ); TQString chapRef = chapRefElem.text().stripWhiteSpace(); chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef ); @@ -199,9 +199,9 @@ void TOC::fillTree() TQDomNodeList sections = chapElem.elementsByTagName( "section" ); for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) { TQDomElement sectElem = sections.item( sectCount ).toElement(); - TQDomElement sectTitleElem = childElement( sectElem, TQString::tqfromLatin1( "title" ) ); + TQDomElement sectTitleElem = childElement( sectElem, TQString::fromLatin1( "title" ) ); TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace(); - TQDomElement sectRefElem = childElement( sectElem, TQString::tqfromLatin1( "anchor" ) ); + TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) ); TQString sectRef = sectRefElem.text().stripWhiteSpace(); sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef ); diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h index 321a97253..6d01fd2ba 100644 --- a/khelpcenter/toc.h +++ b/khelpcenter/toc.h @@ -50,9 +50,9 @@ class TOC : public QObject void meinprocExited( KProcess *meinproc ); private: - enum CachetqStatus { NeedRebuild, CacheOk }; + enum CacheStatus { NeedRebuild, CacheOk }; - CachetqStatus cachetqStatus() const; + CacheStatus cacheStatus() const; int sourceFileCTime() const; int cachedCTime() const; TQDomElement childElement( const TQDomElement &e, const TQString &name ); diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 381584d6a..64e6238ed 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -20,9 +20,9 @@ using namespace KHC; -View::View( TQWidget *tqparentWidget, const char *widgetName, +View::View( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col ) - : KHTMLPart( tqparentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col) + : KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col) { setJScriptEnabled(false); setJavaEnabled(false); diff --git a/khelpcenter/view.h b/khelpcenter/view.h index 1c5a2bf66..3af2a15b8 100644 --- a/khelpcenter/view.h +++ b/khelpcenter/view.h @@ -20,7 +20,7 @@ class View : public KHTMLPart { Q_OBJECT public: - View( TQWidget *tqparentWidget, const char *widgetName, + View( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col ); diff --git a/khotkeys/README b/khotkeys/README index 658309674..c490cbc5d 100644 --- a/khotkeys/README +++ b/khotkeys/README @@ -38,7 +38,7 @@ at least snapshot 20020108. I haven't tested it with any older versions, so I don't know if it will work with them or not. - During installation, the files will tqreplace the ones that are part + During installation, the files will replace the ones that are part of the simple version in kdebase. Shortcuts assigned using KMenuEdit should still work, and the config file will be converted to the new format. However, you should backup all files before removing them ( including diff --git a/khotkeys/TODO b/khotkeys/TODO index 1ef563c13..7db646b66 100644 --- a/khotkeys/TODO +++ b/khotkeys/TODO @@ -18,7 +18,7 @@ class Condition + tab 'Windows' -> 'Conditions' hlaska o uz prirazene kl.kombinaci pro makro se opakuje i vicekrat ( pro kazde uz existujici ) rucni smazani radku nemaze makro pro editaci v dialogu ted uz ten timeout u spusteni funguje ok, ale zase kdyz chci pustit neco 2x naraz, tak se musi cekat ??? -taky to pri jeho rucni editaci neni obcas videt ( je to tqmoc vpravo ) +taky to pri jeho rucni editaci neni obcas videt ( je to moc vpravo ) grrr, to setSelected()/setCurrent() me stve, vsechny ty listboxy a listview obcas spatne detekuji vybrany :( - asi si zkratka udelat vlastni tridy, ktere budou nutit selected==current ve windowdef widgetu mit moznost autodetekce, tj. defaultni, kdyz neni nastaven spousteci prikaz @@ -70,13 +70,13 @@ electric borders u KWin zere jen okraje, ale ne primo rohy - pujde to udelat jak - pujdou i okraje, kdyz to bude vypnute u WM ( nebo se budou fackovat ? ) akce : transformace klavesy ( def. Key_Menu ) na RMB do keyboard focusu ( pro kontext menu ) akce : kdyz se objevi okno, aplikovat na nej veci, ktere dela kstart ( sticky, atd. ) -strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za tqmoc nestoji +strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za moc nestoji paste pri MMB volitelne jen kdyz MMB neni stisknuto napr. pres 500ms ( kvuli strokes ) akce : kdyz se stiskne nejaka shortcut a nejaka aplikace nebezi, tak se spusti a pak se ji ta shortcut preda ( napr. pro klipper ? ) odstranit tu KAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to ma nebo nema byt i18n, tak at je aspon default skupine akci 'KMenuedit entries' by asi nemelo jit zmenit jmeno kdyz se v KMenuEdit udela polozka a pak se ten menuentry smaze, asi by se ta shortcut mela aspon disablovat ?! at dokaze zvetsovat vsechna 'File Open Dialog' okna -pamatovat si menuentries i s polohou v K-Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi tqmoc nezvlada ) +pamatovat si menuentries i s polohou v K-Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi moc nezvlada ) neudelat to prirazeni klavesy k menuentry nejak jednodussi ? nebo zkratka doporucovat kmenuedit ? i18n("","") pro veci jako "New" diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index 0faf71002..e600e1730 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -95,7 +95,7 @@ Sound SoundRecorderArts::sound() Sound s; uint BytePS=BITS/8; uint length=m_data.size()/BytePS; - TQMemArray<TQ_INT32> da(length); + TQMemArray<Q_INT32> da(length); s.max=0; s._fs=FS; for(uint f=0;f<length; f++) diff --git a/khotkeys/data/kde32b1.khotkeys b/khotkeys/data/kde32b1.khotkeys index 2ee6f15d7..46db7521d 100644 --- a/khotkeys/data/kde32b1.khotkeys +++ b/khotkeys/data/kde32b1.khotkeys @@ -2,7 +2,7 @@ DataCount=1 [Data_1] -Comment=This group tqcontains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.) +Comment=This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.) Comment[bg]=Тази група Ñъдържа различни примери, демонÑтриращи повечето от функциите на горещите клавиши. (Имайте предвид, че групата по подразбиране е изключена.) Comment[ca]=Aquest grup té varis exemples que demostren la majoria de les funcionalitats del KHotkeys. (Tingueu en compte que aquest grup i totes les seves accions estan deshabilitades per defecte.) Comment[csb]=Ta grëpa zamëkô w se różny przëmiôrë pòkazujÄ…cë wikszy dzél mòżlewòtów KHotkeys. (Bôczë, że ta grëpa ë ji wszëtczé dzejania sÄ… domëslno wëłączoné.) @@ -584,7 +584,7 @@ Comment[pt]=Leia o comentário sobre a acção "Escrever 'Olá'" primeiro.\n\nO Comment[pt_BR]=Leia o comentário sobre a ação "Digitar 'Hello'" primeiro.\n\nO Qt Designer usa Ctrl+F4 para fechar as janelas (talvez porque é assim no MS Windows). Mas Ctrl+F4 no KDE significa ir para a área de trabalho virtual 4, portanto não funciona no Qt Designer, e também, o Qt Designer não usa o Ctrl+W padrão do KDE para fechar a janela.\n\nMas o problema pode ser resolvido remapeando Ctrl+W para Ctrl+F4 quando a janela ativa é o Qt Designer. Quanto o Qt Designer está ativo, toda vez que Ctrl+W é pressionado, Ctrl+F4 será enviado para o Qt Designer. Em outros aplicativos, Ctrl+W continua funcionando da maneira usual é claro.\n\nAgora precisamos especificar três coisas: Um novo atalho para o 'Ctrl+W', uma nova ação de entrada do teclado que envia o Ctrl+F4, e uma nova condição de que a janela ativa é o Qt Designer.\nO Qt Designer parece sempre ter o tÃtulo 'Qt Designer by Trolltech', portanto a condição irá checar se a janela ativa tem aquele tÃtulo. Comment[ro]=CitiÈ›i mai întâi comentariul la acÈ›iunea "TastaÈ›i 'Hello'". \n\nQt Designer foloseÈ™te Ctrl+F4 pentru închiderea ferestrelor (poate pentru că MS Windows o face astfel). Dar Ctrl+F4 în KDE este o scurtătură către desktop-ul virtual nr. 4, aÈ™a că nu merge în Qt Designer, iar în plus Qt Designer nu foloseÈ™te standardul KDE Ctrl+W pentru închiderea ferestrei.\n\nDar problema poate fi rezolvată reasociind Ctrl+W la Ctrl+F4 când fereastra activă este Qt Designer. Când Qt Designer este activ, de fiecare dată dată când este apăsat Ctrl+W, la Qt Designer va fi trimis Ctrl+F4. ÃŽn alte aplicaÈ›ii Ctrl+W va continua să funcÈ›ioneze ca de obicei.\n\nAcum trebuie să specificăm trei lucruri: o nouă scurtătură pentru 'Ctrl+W', o nouă acÈ›iune trimițând Ctrl+F4 È™i o nouă condiÈ›ie cum că fereastra activă este Qt Designer.\nQt Designer pare să aibă întotdeauna titlul 'Qt Designer by Trolltech', aÈ™a că condiÈ›ia va verifica dacă fereastra activă are acest titlu. Comment[ru]=По Ctrl+W будет Ñмулировано нажатие Ctrl+F4 Ð´Ð»Ñ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ñ Ð¾ÐºÐ½Ð° Qt Designer.\nПоиÑк окна Qt Designer оÑущеÑтвлÑетÑÑ Ð¿Ð¾ заголовку "Qt Designer by Trolltech". -Comment[sk]=Najprv si preÄÃtajte komentár k akcii "Typ 'Hello'".\n\nQt Designer použÃva na zatváranie okien Ctrl+F4 (možno preto, že to tak robà MS Windows (?)). Ale Ctrl+F4 v KDE znamená prechod na virtuálnu plochu 4, takže to nefunguje v Qt Designerovi a tiež, Qt Designer nepoužÃva KDE Å¡tandardné zatváranie okien potqmocou Ctrl+W.\n\nProblém vÅ¡ak môžete vyrieÅ¡iÅ¥ premapovanÃm Ctrl+W na Ctrl+F4, keÄ je aktÃvnym oknom okno Qt Designera. KeÄ je Qt Designer aktÃvny, vždy, keÄ stlaÄÃte Ctrl+W, poÅ¡le sa Qt Designeru Ctrl+F4. V iných aplikáciach bude samozrejme Ctrl+W pracovaÅ¥ ako obvykle.\n\nTeraz potrebujeme nastaviÅ¥ tri veci: nový spúštaÄ klávesovej skratky 'Ctrl+W', novú vstupnú akciu klávesnice posielajúcu Ctrl+F4 a novú podmienku, že aktÃvne okno je Qt Designer.\nVyzerá, že Qt Designer má vždy titulok 'Qt Designer by Trolltech', takže podmienka bude kontrolovaÅ¥, Äi má aktÃvne okno tento titul. +Comment[sk]=Najprv si preÄÃtajte komentár k akcii "Typ 'Hello'".\n\nQt Designer použÃva na zatváranie okien Ctrl+F4 (možno preto, že to tak robà MS Windows (?)). Ale Ctrl+F4 v KDE znamená prechod na virtuálnu plochu 4, takže to nefunguje v Qt Designerovi a tiež, Qt Designer nepoužÃva KDE Å¡tandardné zatváranie okien pomocou Ctrl+W.\n\nProblém vÅ¡ak môžete vyrieÅ¡iÅ¥ premapovanÃm Ctrl+W na Ctrl+F4, keÄ je aktÃvnym oknom okno Qt Designera. KeÄ je Qt Designer aktÃvny, vždy, keÄ stlaÄÃte Ctrl+W, poÅ¡le sa Qt Designeru Ctrl+F4. V iných aplikáciach bude samozrejme Ctrl+W pracovaÅ¥ ako obvykle.\n\nTeraz potrebujeme nastaviÅ¥ tri veci: nový spúštaÄ klávesovej skratky 'Ctrl+W', novú vstupnú akciu klávesnice posielajúcu Ctrl+F4 a novú podmienku, že aktÃvne okno je Qt Designer.\nVyzerá, že Qt Designer má vždy titulok 'Qt Designer by Trolltech', takže podmienka bude kontrolovaÅ¥, Äi má aktÃvne okno tento titul. Comment[sr]=Прочитајте прво коментар за радњу â€žÐ£Ð½Ð¾Ñ â€˜Hello’“.\n\nQt Designer кориÑти Ctrl+F4 за затварање прозора (можда зато што је иÑто тако у MS Windows-у). Ðли Ctrl+F4 у KDE-у означава одлазак на виртуелну радну површину 4, тако да не ради у Qt Designer-у. Такође, Qt Designer не кориÑти KDE-ово Ñтандардно Ctrl+W за затварање прозора.\n\nОви проблеми могу бити решени другачијим мапирањем за Ctrl+W и Ctrl+F4 када је активан прозор Qt Designer-а. Тада, Ñваки пут када Ñе притиÑне Ctrl+W, умеÑто тога ће Ctrl+F4 бити поÑлато Qt Designer-у. У другим програмима, Ctrl+W наравно наÑтавља да ради као и обично.\n\nЗа ово морамо навеÑти три Ñтвари: Ðови окидач пречице за „Ctrl+W“, нову радњу улаза Ñа таÑтатуре која даје Ctrl+F4, и нови уÑлов да је активан прозор онај Qt Designer-а.\nИзгледа да његов прозор увек има у наÑлову „Qt Designer by Trolltech“, тако да ће Ñе то проверавати у уÑлову за активан прозор. Comment[sr@Latn]=ProÄitajte prvo komentar za radnju „Unos ‘Hello’“.\n\nQt Designer koristi Ctrl+F4 za zatvaranje prozora (možda zato Å¡to je isto tako u MS Windows-u). Ali Ctrl+F4 u KDE-u oznaÄava odlazak na virtuelnu radnu povrÅ¡inu 4, tako da ne radi u Qt Designer-u. TakoÄ‘e, Qt Designer ne koristi KDE-ovo standardno Ctrl+W za zatvaranje prozora.\n\nOvi problemi mogu biti reÅ¡eni drugaÄijim mapiranjem za Ctrl+W i Ctrl+F4 kada je aktivan prozor Qt Designer-a. Tada, svaki put kada se pritisne Ctrl+W, umesto toga će Ctrl+F4 biti poslato Qt Designer-u. U drugim programima, Ctrl+W naravno nastavlja da radi kao i obiÄno.\n\nZa ovo moramo navesti tri stvari: Novi okidaÄ preÄice za „Ctrl+W“, novu radnju ulaza sa tastature koja daje Ctrl+F4, i novi uslov da je aktivan prozor onaj Qt Designer-a.\nIzgleda da njegov prozor uvek ima u naslovu „Qt Designer by Trolltech“, tako da će se to proveravati u uslovu za aktivan prozor. Comment[sv]=Läs kommentaren om Ã¥tgärden "Skriv 'Hej'" först.\n\nQt Designer använder Ctrl+F4 för att stänga fönster (kanske för att MS Windows gör det). Men Ctrl+F4 i KDE betyder att gÃ¥ till virtuellt skrivbord 4, sÃ¥ det fungerar inte i Qt Designer, och dessutom använder inte Qt Designer KDE:s standard för att stänga fönster, Ctrl+W.\n\nProblemet kan lösas genom att ändra Ctrl+W till Ctrl+F4 när det aktiva fönstret är Qt Designer. När Qt Designer är aktiverat, skickas Ctrl+F4 till Qt Designer istället, varje gÃ¥ng Ctrl+W trycks ner. Ctrl+W fortsätter förstÃ¥s att fungera som vanligt i andra program.\n\nNu mÃ¥ste vi ange tre saker: En ny snabbtangent som utlöses med 'Ctrl+W', en ny inmatningsÃ¥tgärd för tangentbordet som skickar Ctrl+F4, och ett nytt villkor att det aktiva fönstret är Qt Designer.\nQt Designer verkar alltid ha titeln 'Qt Designer by Trolltech', sÃ¥ villkoret kontrollerar att det aktiva fönstret har den titeln. @@ -703,7 +703,7 @@ Comment[km]=ដោយ​ចុច​ជំនួស(Alt)+បញ្ជា(Ctrl)+W Comment[nb]=Ved Ã¥ taste Alt+Ctrl+W et DCOP-kall vil utføres som viser minicli. Man kan bruke hvilken som helst DCOP-kalle, akkurat som Ã¥ kjøre kommandolinja i 'dcop'-verktøyet. Comment[nds]=Dat Drücken vun Strg+Alt+W föhrt en DCOP-Oproop ut, de den Dialoog "Befehl utföhren" opröppt. Du kannst all DCOP-Oprööp bruken, jüst as mit dat Konsool-Programm "dcop". Comment[nl]=Door Alt+Ctrl+W in te drukken zal er een DCOP-aanroep uitgevoerd worden dat venster "Commando uitvoeren" laat zien. U kunt iedere andere DCOP-aanroep gebruiken, net zoals met de commandoregelvariant 'dcop'. -Comment[pl]=NaciÅ›niÄ™cie Alt+Ctrl+W spowoduje wykonanie polecenia DCOP pokazujÄ…cego mini liniÄ™ poleceÅ„. Można użyć dowolnego wywoÅ‚ania DCOP, tak jak za potqmocÄ… programu 'dcop' w konsoli. +Comment[pl]=NaciÅ›niÄ™cie Alt+Ctrl+W spowoduje wykonanie polecenia DCOP pokazujÄ…cego mini liniÄ™ poleceÅ„. Można użyć dowolnego wywoÅ‚ania DCOP, tak jak za pomocÄ… programu 'dcop' w konsoli. Comment[pt]=Ao carregar em Alt+Ctrl+W, será efectuada uma chamada DCOP que irá mostrar a mini-linha de comandos. Poderá usar qualquer tipo de chamada de DCOP, como se usasse a ferramenta 'dcop' da linha de comandos. Comment[pt_BR]=Ao pressionar Alt+Ctrl+W uma chamada DCOP será executada que irá mostrar o diálogo 'Executar Comando...'. Você pode usar qualquer chamada do DCOP, como quando usa a ferramenta 'dcop' na linha de comando. Comment[ro]=Apăsând Alt+Ctrl+W va iniÈ›ia un apel DCOP care va arăta minicli-urile. PuteÈ›i folosi orice tip de apel DCOP, ca È™i cum am folosi utilitarul 'dcop'. @@ -1037,7 +1037,7 @@ Key=Alt+Ctrl+B Type=SHORTCUT [Data_1_7] -Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures tqshapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your numeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class tqcontains 'konqueror'). +Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures shapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your numeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror'). Comment[bg]=Konqi в KDE3.1 има подпрозорци, а Ñега вече има и жеÑтове. ÐÑма нужда от други браузъри >;).\n\nПроÑто натиÑнете ÑредниÑÑ‚ бутон на мишката и започнете да правите жеÑтове, а Ñлед като Ñвършите проÑто пуÑнете мишката. Ðко Ñамо Ñ‚Ñ€Ñбва да извършите операциÑта "поÑтавÑне", пак ще работи - проÑто натиÑнете ÑÑ€ÐµÐ´Ð½Ð¸Ñ Ð±ÑƒÑ‚Ð¾Ð½. Comment[ca]=Bé, el Konqi en el KDE3.1 tenia pestanyes, i ara podeu tenir gestos de ratolÃ., No hi ha necessitat d'usar altres navegadors >;).\n\nNomés premeu el botó central del ratolà i comenceu a dibuixar un dels gestos, un cop hageu acabat, allibereu el botó. Si només us cal enganxar la selecció, encara funciona; simplement feu un clic amb el botó central del ratolà (podeu canviar el botó del ratolà a usar a l'arranjament global).\n\nPer ara, hi ha disponibles aquests gestos:\nmoviment a la dreta i retorn a l'esquerra - endavant (Alt+Dreta)\nmoviment a l'esquerra i retorn a la dreta - enrere (Alt+Esquerra)\nmoviment amunt i retorn avall - amunt (Alt+Amunt)\ncercle antihorari - actualitzar (F5)\n (Tant aviat com trobi quins hi ha a l'Opera o al Mozilla, n'afegiré més i asseguraré que són els mateixos. O si voleu fer-ho vós mateix, preneu-vos la llibertat d'ajudar-me i envieu-me el vostre khotkeysrc.) \n\nLes formes dels gestos (alguns dels dià legs són del KGesture, grà cies a Mike Pilone) es poden introduir simplement executant-los en el dià leg de configuració. També podeu mirar el teclat numèric per ajudar-vos, els gestos es poden assimilar a una graella de 3x3 camps, numerats d'1 a 9.\n\nTingueu en compte que heu d'executar exactament el gest per activar l'acció. Degut a això, és possible introduir més gestos per l'acció. HaurÃeu d'intentar evitar gestos complicats quan canvieu la direcció del ratolà més d'una vegada (p.ex. fer 45654 o 74123 és més senzill que fer 1236987, que és força més difÃcil).\n\nLes condicions de tots els gestos es defineixen en aquest grup. Tots aquests gestos són actius només si la finestra activa és el Konqueror (la classe conté 'konqueror'). Comment[da]=Ja, Konqueror i KDE3.1 har faneblade, og nu kan du ogsÃ¥ fÃ¥ gester. Ingen grund til at bruge andre browsere.\n\nTryk blot pÃ¥ musens midterste knap og begynde at tegne en gestus. Slip museknappen nÃ¥r du er færdig. Hvis du kun behøver at indsætte markeringen, fungerer dette ogsÃ¥. Klik blot kun med musens midterste knap. (Du kan ændre den museknap som bruges i de generelle indstillinger.)\n\nFor øjeblikket findes følgende gester tilgængelige:\nFlyt til højre og tilbage til venstre - Fremad (Alt+Højrepil)\nFlyt til venstre og tilbage til højre - Tilbage (Alt+Vensterepil)\nFlyt opad og tilbage nedad - Op (Alt+Opadpil)\nCirkel mod uret - Opdatér (F5)\n(SÃ¥ snart jeg finder ud af hvilke som findes i Opera og Mozilla, vil jeg tilføje flere, og sørge for at de er ligesÃ¥dan. Eller hvis du gør det selv, sÃ¥ hjælp mig gerne og send mig din khotkeysrc.)\n\nGesternes form kan helt enkelt indtastes ved at udføre dem i indstillingsdialogen (nogle af dialogruterne kommer fra Kgesture, takket være Mike Pilone). Du kan ogsÃ¥ kigge pÃ¥ det numeriske tastatur for hjælp. Gester genkendes som et 3x3 gitter af felter, nummererede fra 1 til 9.\n\nBemærk at du skal udføre gesterne nøjagtigt for at handlingen skal udløses. PÃ¥ grund af dette er det muligt at indtaste flere gester for en handling. Du bør forsøge at undgÃ¥ komplicerede gester hvor musens retning ændres mere end en gang (dvs. brug for eksempel 45654 eller 74123 efter som de er enkle at udføre, mens for eksempel 1236987 kan allerede være ganske svær).\n\nBetingelsen for alle gester defineres i denne gruppe. Alle gester er kun aktive hvis det aktive vindue er Konqueror (klassen indeholder 'konqueror'). diff --git a/khotkeys/data/printscreen.khotkeys b/khotkeys/data/printscreen.khotkeys index 38e22f0dc..66af14462 100644 --- a/khotkeys/data/printscreen.khotkeys +++ b/khotkeys/data/printscreen.khotkeys @@ -2,7 +2,7 @@ DataCount=1 [Data_1] -Comment=This group tqcontains actions that are set up by default. +Comment=This group contains actions that are set up by default. Comment[bg]=Тази група Ñъдържа дейÑтвиÑ, които Ñа зададени по подразбирани. Comment[ca]=Aquest grup conté accions que s'han establert per omissió. Comment[csb]=Na grëpa zamëkô dzejania jaczé sÄ… ùstôwióné domëslno. diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index 80d9d2031..95aa7db89 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -222,7 +222,7 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P ) { item_P->set_action( new_action ); item_P->widthChanged( 0 ); - actions_listview->tqrepaintItem( item_P ); + actions_listview->repaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index 093b7c7ca..5048289df 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -49,7 +49,7 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char void Actions_listview_widget::action_name_changed( const TQString& ) { current_action()->widthChanged( 0 ); - actions_listview->tqrepaintItem( current_action()); + actions_listview->repaintItem( current_action()); } void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool recent_action_P ) diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 5c7574a80..86ff8f47c 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -328,7 +328,7 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P ) conditions.insert( pos, new_condition ); } item_P->widthChanged( 0 ); - conditions_listview->tqrepaintItem( item_P ); + conditions_listview->repaintItem( item_P ); } #ifdef KHOTKEYS_DEBUG kdDebug( 1217 ) << "Condition_list_widget::edit_listview_item():" << endl; diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index d0d144382..817eeab89 100644 --- a/khotkeys/kcontrol/gesturedrawer.cpp +++ b/khotkeys/kcontrol/gesturedrawer.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureDrawer::GestureDrawer(TQWidget *parent, const char *name) : TQFrame(parent, name), _data(TQString::null) { - setBackgroundColor( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMinimumSize(30, 30); } @@ -33,14 +33,14 @@ void GestureDrawer::setData(const TQString &data) { _data = data; - tqrepaint(); + repaint(); } void GestureDrawer::paintEvent(TQPaintEvent *ev) { // Iterate through the data points and draw a line to each of them - TQ_UINT32 startCell = 0; - TQ_UINT32 endCell = 0; + Q_UINT32 startCell = 0; + Q_UINT32 endCell = 0; TQPoint startPoint; TQPoint endPoint; @@ -51,7 +51,7 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) startCell = TQString(_data[0]).toUInt(); } - for (TQ_UINT32 index = 1; index < _data.length(); ++index) + for (Q_UINT32 index = 1; index < _data.length(); ++index) { endCell = TQString(_data[index]).toUInt(); @@ -77,14 +77,14 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) TQFrame::paintEvent(ev); } -TQPoint GestureDrawer::lookupCellCoords(TQ_UINT32 cell) +TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell) { // First divide the widget into thirds, horizontally and vertically - TQ_UINT32 w = width(); - TQ_UINT32 h = height(); + Q_UINT32 w = width(); + Q_UINT32 h = height(); - TQ_UINT32 wThird = w / 3; - TQ_UINT32 hThird = h / 3; + Q_UINT32 wThird = w / 3; + Q_UINT32 hThird = h / 3; switch(cell) { diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index 236c65ae3..50fe5db67 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -31,13 +31,13 @@ class GestureDrawer : public QFrame void setData(const TQString &data); - virtual TQSize tqsizeHint() const { return TQSize(30, 30); } + virtual TQSize sizeHint() const { return TQSize(30, 30); } protected: void paintEvent(TQPaintEvent *ev); private: - TQPoint lookupCellCoords(TQ_UINT32 cell); + TQPoint lookupCellCoords(Q_UINT32 cell); void drawArrowHead(TQPoint &start, TQPoint &end, TQPainter &p); diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index df5cf8940..58a177910 100644 --- a/khotkeys/kcontrol/gesturerecorder.cpp +++ b/khotkeys/kcontrol/gesturerecorder.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureRecorder::GestureRecorder(TQWidget *parent, const char *name) : TQFrame(parent, name), _mouseButtonDown(false) { - setBackgroundColor( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setLineWidth(2); setMidLineWidth(0); diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index ef59a4a99..af2fb8cdc 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, "button below.\n\nDraw here:"); TQLabel *label = new TQLabel(message, this, "label"); - label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _recorder = new GestureRecorder(this, "recorder"); diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h index 36e0350ae..99242c518 100644 --- a/khotkeys/kcontrol/gesturerecordpage.h +++ b/khotkeys/kcontrol/gesturerecordpage.h @@ -53,7 +53,7 @@ class GestureRecordPage : public QVBox TQString _gest; - TQ_UINT32 _tryCount; + Q_UINT32 _tryCount; }; } // namespace KHotKeys diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 264bfd032..5d540d4c9 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows ) void Module::import() { - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(), + TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(), i18n( "Select File with Actions to Be Imported" )); if( file.isEmpty()) return; KSimpleConfig cfg( file, true ); if( !settings.import( cfg, true )) { - KMessageBox::error( tqtopLevelWidget(), + KMessageBox::error( topLevelWidget(), i18n( "Import of the specified file failed. Most probably the file is not a valid " "file with actions." )); return; diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop index 3b433608e..f5781da2b 100644 --- a/khotkeys/kcontrol/khotkeys.desktop +++ b/khotkeys/kcontrol/khotkeys.desktop @@ -153,7 +153,7 @@ Keywords[cs]=Klávesy,Globálnà klávesové zkratky,Schéma kláves,Klávesové Keywords[csb]=klawisze,globalné klawiszowé skrodzënë,schemë skrodzënów,gestë,mësz Keywords[cy]=Bysyll,Bysellau,Rhwymiadau bysell eang,Ystumiau,Ystumiau llygoden Keywords[da]=Taster,Globale tastebindinger,Tastebindinger,Gester,Muse-gester -Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturtqlayout,Gesten,Mausgesten +Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout,Gesten,Mausgesten Keywords[el]=ΠλήκτÏα,Καθολικοί συνδυασμοί πλήκτÏων,Συνδυασμοί πλήκτÏων,Gestures,Mouse gestures Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj,muzo Keywords[es]=Teclas,Asociaciones de teclas globales,Asociaciones de teclas,Gestos,Gestos del ratón diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index ec0671e40..3532cc13f 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P module, TQT_SLOT( changed())); connect( delete_action_button, TQT_SIGNAL( clicked()), module, TQT_SLOT( changed())); - setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why + setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why } void Main_buttons_widget::enable_delete( bool enable_P ) diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 203a32edf..199f59750 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -279,7 +279,7 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, } else { - // erase the trigger, i.e. tqreplace with a copy with no trigger and no parent yet + // erase the trigger, i.e. replace with a copy with no trigger and no parent yet Menuentry_shortcut_action_data* entry_tmp = new Menuentry_shortcut_action_data( NULL, entry->name(), entry->comment(), entry->enabled( false )); entry_tmp->set_action( new Menuentry_action( entry_tmp, entry_P )); diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index 7f8aa1396..243543519 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -434,7 +434,7 @@ const char* const Tab_widget::tab_labels[ Tab_widget::TAB_END ] = { void Tab_widget::show_pages( const Pages_set& pages_P ) { - hide(); // this seems to be necessary, otherwise it's not tqrepainter properly + hide(); // this seems to be necessary, otherwise it's not repainter properly for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 12cd12452..2533b58a0 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data() void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P ) { - if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget())) return; // KHotKeys::Module::changed() module->changed(); diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index 398827bbd..ad4bcceaf 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Action_group_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -101,7 +101,7 @@ <slots> <slot access="protected" specifier="pure virtual">action_group_name_changed( const QString& )</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui index a56ca10a4..696b5106a 100644 --- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Action_list_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -166,6 +166,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui index d5646acba..7c0a88a6f 100644 --- a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui +++ b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Actions_listview_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -78,6 +78,6 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">config.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui index c88e7247e..266dd90d9 100644 --- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui +++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Command_url_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -24,7 +24,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -56,8 +56,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui index c5ca0f0e7..a64ef33c1 100644 --- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Condition_list_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -165,6 +165,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index d4a55cdee..ed6e90337 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Dcop_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -203,7 +203,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -268,6 +268,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index d7db19733..60dc34237 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>General_settings_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -109,8 +109,8 @@ <slots> <slot access="protected" specifier="pure virtual">import_clicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index f386b30d6..93f3a6a2c 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>General_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -140,8 +140,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 8a4dc33f4..29f8f88d5 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Gesture_triggers_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -46,7 +46,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -121,7 +121,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -257,7 +257,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -318,7 +318,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -349,7 +349,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>100</height> @@ -410,7 +410,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -454,7 +454,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -514,6 +514,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui index 6798d5d6e..3bee7daf0 100644 --- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Gestures_settings_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -26,7 +26,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -152,8 +152,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index f8c4fa6a7..9f82ccdcc 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Info_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <string><p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -59,6 +59,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui index 4f82823b0..f3947dd54 100644 --- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Keyboard_input_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -185,8 +185,8 @@ <slots> <slot access="protected" specifier="pure virtual">modify_pressed()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui index c88fb04b9..a46ee0a0f 100644 --- a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui +++ b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Main_buttons_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -81,6 +81,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index 2c97b461d..ae6c613f3 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Menuentry_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -95,6 +95,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui index ae4450be8..13ac0530b 100644 --- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Triggers_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -166,6 +166,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index 4be6d001f..007610fca 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -95,7 +95,7 @@ <slot access="protected" specifier="pure virtual">slotPlayPressed()</slot> <slot access="protected" specifier="pure virtual">slotStopPressed()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index a9fa76b94..2c254dcc8 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Voice_settings_tab_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -23,13 +23,13 @@ <property name="text"> <string>In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>241</width> <height>21</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>90</height> @@ -100,7 +100,7 @@ make sure <i>Full duplex</i> is checked in your <i>Sound Syste </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kkeybutton.h</includehint> </includehints> diff --git a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui index c49cced98..58d15e3cf 100644 --- a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui +++ b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Window_trigger_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -126,6 +126,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui index 12a802be8..5e9007e9e 100644 --- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Windowdef_list_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -165,6 +165,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index bc67b8efb..01d54da98 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Windowdef_simple_widget_ui</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -315,7 +315,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -390,7 +390,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -488,6 +488,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index fa103e6b1..fec07e22f 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -31,7 +31,7 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice."); _label = new TQLabel(_message, this, "label"); - _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index cad3437ec..471aab743 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -192,7 +192,7 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P ) { item_P->set_window( new_window ); item_P->widthChanged( 0 ); // SELI tohle i u dalsich listview? - windows_listview->tqrepaintItem( item_P ); + windows_listview->repaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index f58c7e308..e37ef395f 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -391,7 +391,7 @@ void Keyboard_input_action::execute() TQString Keyboard_input_action::description() const { TQString tmp = input(); - tmp.tqreplace( '\n', ' ' ); + tmp.replace( '\n', ' ' ); tmp.truncate( 30 ); return i18n( "Keyboard input : " ) + tmp; } diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp index 28560e03d..60b1d93b4 100644 --- a/khotkeys/shared/gestures.cpp +++ b/khotkeys/shared/gestures.cpp @@ -105,7 +105,7 @@ void Gesture::active_window_changed( WId ) void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) { - if( handlers.tqcontains( receiver_P )) + if( handlers.contains( receiver_P )) return; handlers[ receiver_P ] = true; connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), @@ -116,7 +116,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P ) { - if( !handlers.tqcontains( receiver_P )) + if( !handlers.contains( receiver_P )) return; handlers.remove( receiver_P ); disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), @@ -197,7 +197,7 @@ void Gesture::grab_mouse( bool grab_P ) if( grab_P ) { KXErrorHandler handler; - static int tqmask[] = { 0, Button1MotionMask, Button2MotionMask, Button3MotionMask, + static int mask[] = { 0, Button1MotionMask, Button2MotionMask, Button3MotionMask, Button4MotionMask, Button5MotionMask, ButtonMotionMask, ButtonMotionMask, ButtonMotionMask, ButtonMotionMask }; #define XCapL KKeyNative::modXLock() @@ -216,7 +216,7 @@ void Gesture::grab_mouse( bool grab_P ) i < 8; ++i ) XGrabButton( qt_xdisplay(), button, mods[ i ], qt_xrootwin(), False, - ButtonPressMask | ButtonReleaseMask | tqmask[ button ], GrabModeAsync, GrabModeAsync, + ButtonPressMask | ButtonReleaseMask | mask[ button ], GrabModeAsync, GrabModeAsync, None, None ); bool err = handler.error( true ); kdDebug( 1217 ) << "Gesture grab:" << err << endl; diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 90e789282..f9bfec6d3 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -55,7 +55,7 @@ Kbd::~Kbd() void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.append( shortcut_P ); if( rcv.active ) grab_shortcut( shortcut_P ); @@ -63,17 +63,17 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); if( rcv.active ) ungrab_shortcut( shortcut_P ); if( rcv.shortcuts.count() == 0 ) - tqreceivers.remove( receiver_P ); + receivers.remove( receiver_P ); } void Kbd::activate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( rcv.active ) return; rcv.active = true; @@ -85,7 +85,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P ) void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( !rcv.active ) return; rcv.active = false; @@ -97,7 +97,7 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) void Kbd::grab_shortcut( const KShortcut& shortcut_P ) { - if( grabs.tqcontains( shortcut_P )) + if( grabs.contains( shortcut_P )) ++grabs[ shortcut_P ]; else { @@ -117,7 +117,7 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P ) void Kbd::ungrab_shortcut( const KShortcut& shortcut_P ) { - if( !grabs.tqcontains( shortcut_P )) + if( !grabs.contains( shortcut_P )) return; if( --grabs[ shortcut_P ] == 0 ) { @@ -142,12 +142,12 @@ void Kbd::key_slot( TQString key_P ) { kdDebug( 1217 ) << "Key pressed:" << key_P << endl; KShortcut shortcut( key_P ); - if( !grabs.tqcontains( shortcut )) + if( !grabs.contains( shortcut )) return; - for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin(); - it != tqreceivers.end(); + for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); + it != receivers.end(); ++it ) - if( ( *it ).shortcuts.tqcontains( shortcut ) && ( *it ).active + if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active && it.key()->handle_key( shortcut )) return; } diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index eff131c44..22df89284 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -58,7 +58,7 @@ class Kbd TQValueList< KShortcut > shortcuts; bool active; }; - TQMap< Kbd_receiver*, Receiver_data > tqreceivers; + TQMap< Kbd_receiver*, Receiver_data > receivers; TQMap< KShortcut, int > grabs; KGlobalAccel* kga; }; diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index a6434be06..fdab2be56 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -63,7 +63,7 @@ bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportTyp TQString import_id = cfg_P.readEntry( "ImportId" ); if( !import_id.isEmpty()) { - if( already_imported.tqcontains( import_id )) + if( already_imported.contains( import_id )) { if( import_P == ImportSilent || KMessageBox::warningContinueCancel( NULL, diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp index ddaec44b8..c90eb2e02 100644 --- a/khotkeys/shared/sound.cpp +++ b/khotkeys/shared/sound.cpp @@ -50,7 +50,7 @@ Sound::~Sound() void Sound::load(const TQString& filename) { kdDebug() << k_funcinfo << filename << endl; - data=TQMemArray<TQ_INT32>(); + data=TQMemArray<Q_INT32>(); TQFile file(filename); if(!file.open(IO_ReadOnly)) { @@ -59,20 +59,20 @@ void Sound::load(const TQString& filename) } TQDataStream stream(&file); stream.setByteOrder( TQDataStream::LittleEndian ); - TQ_INT32 magic; + Q_INT32 magic; MAGIC("RIFF"); - READ_FROM_STREAM(TQ_UINT32,ChunkSize); + READ_FROM_STREAM(Q_UINT32,ChunkSize); MAGIC("WAVE"); MAGIC("fmt "); - READ_FROM_STREAM(TQ_UINT32,ChunkSize2); - READ_FROM_STREAM(TQ_INT16,AudioFormat); - READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); - READ_FROM_STREAM(TQ_UINT32,SampleRate); + READ_FROM_STREAM(Q_UINT32,ChunkSize2); + READ_FROM_STREAM(Q_INT16,AudioFormat); + READ_FROM_STREAM(Q_UINT16,NumberOfChannels); + READ_FROM_STREAM(Q_UINT32,SampleRate); _fs=SampleRate; - READ_FROM_STREAM(TQ_UINT32,ByteRate); - READ_FROM_STREAM(TQ_UINT16,BlockAlign); - READ_FROM_STREAM(TQ_UINT16,BitsPerSample); + READ_FROM_STREAM(Q_UINT32,ByteRate); + READ_FROM_STREAM(Q_UINT16,BlockAlign); + READ_FROM_STREAM(Q_UINT16,BitsPerSample); MAGIC("data"); READ_FROM_STREAM(TQByteArray,SoundData); NumberOfChannels=1; //Wav i play are broken @@ -90,7 +90,7 @@ void Sound::load(const TQString& filename) max=0; for(unsigned long int f=0;f<NumberOfSamples;f++) { - TQ_INT32 nb=0; + Q_INT32 nb=0; for(uint k=0;k<BytePS;k++) { nb |= (SoundData[f*BytePS+k]&0x000000FF) << (k*8); @@ -110,7 +110,7 @@ void Sound::load(const TQString& filename) } -#define SMAGIC(CH) { stream << ( TQ_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; } +#define SMAGIC(CH) { stream << ( Q_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; } void Sound::save(const TQString& filename) const { @@ -129,35 +129,35 @@ void Sound::save(const TQString& filename) const for(unsigned long int f=0;f<data.size();f++) { - TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); + Q_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); SoundData[ 2*f ]= val & 0x00FF; SoundData[2*f+1]= (val & 0xFF00) >> 8; // kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; } - TQ_UINT16 NumberOfChannels=2; - TQ_UINT32 SampleRate=_fs; + Q_UINT16 NumberOfChannels=2; + Q_UINT32 SampleRate=_fs; SMAGIC("RIFF"); - //READ_FROM_STREAM(TQ_UINT32,ChunkSize); - stream << (TQ_UINT32)(36+ SoundData.size()); + //READ_FROM_STREAM(Q_UINT32,ChunkSize); + stream << (Q_UINT32)(36+ SoundData.size()); SMAGIC("WAVE"); SMAGIC("fmt "); - //READ_FROM_STREAM(TQ_UINT32,ChunkSize2); - stream << (TQ_UINT32)(16); - //READ_FROM_STREAM(TQ_INT16,AudioFormat); - stream << (TQ_INT16)(1); - //READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); - stream << (TQ_UINT16)(NumberOfChannels); - //READ_FROM_STREAM(TQ_UINT32,SampleRate); - stream << (TQ_UINT32)(SampleRate); - //READ_FROM_STREAM(TQ_UINT32,ByteRate); - stream << (TQ_UINT32)(NumberOfChannels*SampleRate*16/8); - //READ_FROM_STREAM(TQ_UINT16,BlockAlign); - stream << (TQ_UINT16)(16/8 *NumberOfChannels); - //READ_FROM_STREAM(TQ_UINT16,BitsPerSample); - stream << (TQ_UINT16)(16); + //READ_FROM_STREAM(Q_UINT32,ChunkSize2); + stream << (Q_UINT32)(16); + //READ_FROM_STREAM(Q_INT16,AudioFormat); + stream << (Q_INT16)(1); + //READ_FROM_STREAM(Q_UINT16,NumberOfChannels); + stream << (Q_UINT16)(NumberOfChannels); + //READ_FROM_STREAM(Q_UINT32,SampleRate); + stream << (Q_UINT32)(SampleRate); + //READ_FROM_STREAM(Q_UINT32,ByteRate); + stream << (Q_UINT32)(NumberOfChannels*SampleRate*16/8); + //READ_FROM_STREAM(Q_UINT16,BlockAlign); + stream << (Q_UINT16)(16/8 *NumberOfChannels); + //READ_FROM_STREAM(Q_UINT16,BitsPerSample); + stream << (Q_UINT16)(16); SMAGIC("data"); //READ_FROM_STREAM(TQByteArray,SoundData); stream << SoundData; diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 6453563de..2c2d97d93 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -50,8 +50,8 @@ public: return _fs; } - TQMemArray<TQ_INT32> data; - TQ_UINT32 max; + TQMemArray<Q_INT32> data; + Q_UINT32 max; uint _fs; }; diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index b3042f00f..7cac2b98c 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -225,7 +225,7 @@ void Window_trigger::window_added( WId window_P ) void Window_trigger::window_removed( WId window_P ) { - if( existing_windows.tqcontains( window_P )) + if( existing_windows.contains( window_P )) { bool matches = existing_windows[ window_P ]; kdDebug( 1217 ) << "Window_trigger::w_removed() : " << matches << endl; @@ -244,7 +244,7 @@ void Window_trigger::window_removed( WId window_P ) void Window_trigger::active_window_changed( WId window_P ) { bool was_match = false; - if( existing_windows.tqcontains( last_active_window )) + if( existing_windows.contains( last_active_window )) was_match = existing_windows[ last_active_window ]; if( active && was_match && ( window_actions & WINDOW_DEACTIVATES )) { @@ -253,7 +253,7 @@ void Window_trigger::active_window_changed( WId window_P ) } /* bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches;*/ - bool matches = existing_windows.tqcontains( window_P ) + bool matches = existing_windows.contains( window_P ) ? existing_windows[ window_P ] : false; if( active && matches && ( window_actions & WINDOW_ACTIVATES )) { @@ -272,7 +272,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P ) return; kdDebug( 1217 ) << "Window_trigger::w_changed()" << endl; bool was_match = false; - if( existing_windows.tqcontains( window_P )) + if( existing_windows.contains( window_P )) was_match = existing_windows[ window_P ]; bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches; diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index e19f66eec..a6515fecf 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -79,7 +79,7 @@ void Voice::enable( bool enabled_P ) void Voice::register_handler( Voice_trigger *trigger_P ) { - if( !_references.tqcontains( trigger_P )) + if( !_references.contains( trigger_P )) _references.append(trigger_P); } @@ -179,7 +179,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P) //kdDebug(1217) << k_funcinfo << keyNative.key().toString() << endl; - if(_shortcut.tqcontains(keyNative)) + if(_shortcut.contains(keyNative)) { if(pEvent->type == XKeyPress && !_recording ) { diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp index 4f4266b7e..773f28731 100644 --- a/khotkeys/shared/voicesignature.cpp +++ b/khotkeys/shared/voicesignature.cpp @@ -154,14 +154,14 @@ static TQMemArray<double> fft(const Sound& sound, unsigned int start, unsigned i { samples[f]=sound.at(start2+rev_carry)* hamming(rev_carry, size); // KDEBUG(rev_carry); - int tqmask = size>>1; // N / 2 + int mask = size>>1; // N / 2 // add 1 backwards - while (rev_carry >= tqmask) + while (rev_carry >= mask) { - rev_carry -= tqmask; // turn off this bit - tqmask >>= 1; + rev_carry -= mask; // turn off this bit + mask >>= 1; } - rev_carry += tqmask; + rev_carry += mask; } samples[size-1]=sound.at(start2+size-1)*hamming(size-1, size); diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index a1394b731..b8e86f694 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -339,7 +339,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& case NOT_IMPORTANT : return true; case CONTAINS : - return str1_P.tqcontains( str2_P ) > 0; + return str1_P.contains( str2_P ) > 0; case IS : return str1_P == str2_P; case REGEXP : @@ -348,7 +348,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& return rg.search( str1_P ) >= 0; } case CONTAINS_NOT : - return str1_P.tqcontains( str2_P ) == 0; + return str1_P.contains( str2_P ) == 0; case IS_NOT : return str1_P != str2_P; case REGEXP_NOT : diff --git a/kicker/ChangeLog b/kicker/ChangeLog index dedec11d6..6ba662f7e 100644 --- a/kicker/ChangeLog +++ b/kicker/ChangeLog @@ -1,13 +1,13 @@ 2004-06-10 Dan Bullok <dan.kde@bullok.com> - * Fixed Bug 42278 - Strange tqlayout with Kicker and custom size. Now buttons are never wider (for horizontal) or taller (for vertical) than 58 pixels. + * Fixed Bug 42278 - Strange layout with Kicker and custom size. Now buttons are never wider (for horizontal) or taller (for vertical) than 58 pixels. * Added some symbolic constants for some kicker values (max size, min size, default custom size), that were previously hard-coded in a few places. 2002-01-03 John Firebaugh <jfirebaugh@kde.org> * Use mouse polling instead of enter/leave events to trigger auto-unhiding. Much more reliable and will allow us to do things like only unhide at the corners or when the mouse hits the edge of the screen with a certain velocity. Also fixes #27660. - * New class core/panelmanager.cpp. For now, just has code for auto-hide, but will soon handle the screen tqlayout of the panels. + * New class core/panelmanager.cpp. For now, just has code for auto-hide, but will soon handle the screen layout of the panels. 2002-01-02 John Firebaugh <jfirebaugh@kde.org> - * Now you can set the tqalignment by dnd. + * Now you can set the alignment by dnd. 2002-01-01 John Firebaugh <jfirebaugh@kde.org> * Make the action taken for each mouse button on a task container configurable. * Add Task::lower() method. diff --git a/kicker/TODO b/kicker/TODO index 2ef26260f..cf43fa146 100644 --- a/kicker/TODO +++ b/kicker/TODO @@ -7,7 +7,7 @@ Issues Of Import Layout management autoexpending panels on the same side of the screen need to stop expanding at the point they run into each other. - make autohiding panels respect tqlayout tqgeometry too? e.g. don't overlap + make autohiding panels respect layout geometry too? e.g. don't overlap autounhiding panels should not obscure other panels ContainerArea completness doesn't autoscroll when moving a container @@ -45,7 +45,7 @@ libkicker poor name =/ shouldn't be so menu-centric either Optimize! - hiding: it seems there are more tqgeometry calls made than really needed + hiding: it seems there are more geometry calls made than really needed get rid of movies (which nobody really uses) in PanelButton Code clean ups remove pseudo transparency in favour of composite @@ -89,7 +89,7 @@ Unnasigned ++++ Floating panels **** When a panel is set to "floating" the following entries are added to the [General] config group: - FloatingPosition <-- tqgeometry.topLeft(); + FloatingPosition <-- geometry.topLeft(); FloatingOrientation <-- horizontal or vertical ++++ Drag and drop enhancements @@ -100,8 +100,8 @@ Unnasigned There are many DnD reports on bugs.kde.org which can provide further inspiration. -++++ Systray icon tqlayout -**** The systray applet does a very basic homebrew tqlayout of the icons +++++ Systray icon layout +**** The systray applet does a very basic homebrew layout of the icons that currently has several flawed assumptions that break when used with certain applications. These assumptions include that all icons in a given row will be approximately the same width and that things diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui index db20618b1..4a20312ec 100644 --- a/kicker/applets/clock/analog.ui +++ b/kicker/applets/clock/analog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AnalogWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -97,7 +97,7 @@ </property> <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -241,7 +241,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>310</width> <height>20</height> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -334,8 +334,8 @@ <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">kfontrequester.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 096b0301b..26f1ae4c0 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -134,7 +134,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent, connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)), TQT_SLOT(dateToggled())); - addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings")); + addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } void KConfigDialogSingle::updateSettings() @@ -253,7 +253,7 @@ void PlainClock::updateClock() void PlainClock::loadSettings() { setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame); - tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine); + setAlignment(AlignVCenter | AlignHCenter | SingleLine); setFont(_prefs->plainFont()); } @@ -837,8 +837,8 @@ void FuzzyClock::drawContents(TQPainter *p) // so we only have to update phStart } if (phStart >= 0) - newTimeStr.tqreplace(phStart, phLength, hourNames[realHour]); - newTimeStr.tqreplace(0, 1, TQString(newTimeStr.at(0).upper())); + newTimeStr.replace(phStart, phLength, hourNames[realHour]); + newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper())); } } else if (_prefs->fuzzyness() == 3) { newTimeStr = dayTime[_time.hour() / 3]; @@ -902,8 +902,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, _disableCalendar(false), _clock(0), _timer(new TQTimer(this, "ClockApplet::_timer")), - m_tqlayoutTimer(new TQTimer(this, "m_tqlayoutTimer")), - m_tqlayoutDelay(0), + m_layoutTimer(new TQTimer(this, "m_layoutTimer")), + m_layoutDelay(0), m_followBackgroundSetting(true), m_dateFollowBackgroundSetting(true), TZoffset(0), @@ -919,16 +919,16 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, setBackgroundOrigin(AncestorOrigin); _dayOfWeek = new TQLabel(this); - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _dayOfWeek->setBackgroundOrigin(AncestorOrigin); _dayOfWeek->installEventFilter(this); // catch mouse clicks _date = new TQLabel(this); - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks - connect(m_tqlayoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); + connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); @@ -991,18 +991,18 @@ int ClockApplet::widthForHeight(int h) const bool mustShowDate = showDate || (zone->zoneIndex() != 0); if (mustShowDate) { - _date->tqsetAlignment(AlignVCenter | AlignHCenter); + _date->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDateHeight = _date->tqsizeHint().height(); + shareDateHeight = _date->sizeHint().height(); } } if (showDayOfWeek) { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter); if (!dateToSide) { - shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height(); + shareDayOfWeekHeight = _dayOfWeek->sizeHint().height(); } } @@ -1018,8 +1018,8 @@ int ClockApplet::widthForHeight(int h) const } else { - int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0; - int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0; + int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0; + int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0; if (dateToSide) { @@ -1075,13 +1075,13 @@ int ClockApplet::widthForHeight(int h) const _clock->widget()->move(0, 0); if (showDayOfWeek) { - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height()); _dayOfWeek->move(0, _clock->widget()->height()); } if (mustShowDate) { - _date->setFixedSize(w, _date->tqsizeHint().height()); + _date->setFixedSize(w, _date->sizeHint().height()); _date->move(0, _clock->widget()->height() + shareDayOfWeekHeight); } } @@ -1105,16 +1105,16 @@ int ClockApplet::heightForWidth(int w) const // add 4 pixels in height for each of date+dayOfWeek, if visible if (showDayOfWeek) { - if (_dayOfWeek->tqminimumSizeHint().width() > w) + if (_dayOfWeek->minimumSizeHint().width() > w) { - _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | WordBreak); } else { - _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } - _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height()); + _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height()); _dayOfWeek->move(0, clockHeight); clockHeight += _dayOfWeek->height(); @@ -1127,10 +1127,10 @@ int ClockApplet::heightForWidth(int w) const // display on panel that is too narrow and then they made it wider const_cast<ClockApplet*>(this)->updateDateLabel(false); - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { TQString dateStr = _date->text(); - // if we're too wide to fit, tqreplace the first non-digit from the end with a space + // if we're too wide to fit, replace the first non-digit from the end with a space int p = dateStr.findRev(TQRegExp("[^0-9]")); if (p > 0) { @@ -1138,13 +1138,13 @@ int ClockApplet::heightForWidth(int w) const } } - if (_date->tqminimumSizeHint().width() > w) + if (_date->minimumSizeHint().width() > w) { - _date->tqsetAlignment(AlignVCenter | WordBreak); + _date->setAlignment(AlignVCenter | WordBreak); } else { - _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak); + _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak); } _date->setFixedSize(w, _date->heightForWidth(w)); _date->move(0, clockHeight); @@ -1283,7 +1283,7 @@ void ClockApplet::reconfigure() _clock->widget()->installEventFilter(this); // catch mouse clicks _clock->widget()->show(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ if (showDayOfWeek) { @@ -1552,7 +1552,7 @@ void ClockApplet::aboutToShowContextMenu() menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) ); KLocale *loc = KGlobal::locale(); - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); dt = dt.addSecs(TZoffset); KPopupMenu *copyMenu = new KPopupMenu( menu ); @@ -1579,7 +1579,7 @@ void ClockApplet::aboutToShowContextMenu() } else { - zoneMenu->insertItem(i18n(zone->zone(i).utf8()).tqreplace("_", " "), 500 + i); + zoneMenu->insertItem(i18n(zone->zone(i).utf8()).replace("_", " "), 500 + i); } } zoneMenu->setItemChecked(500 + zone->zoneIndex(),true); @@ -1626,7 +1626,7 @@ TQTime ClockApplet::clockGetTime() TQDate ClockApplet::clockGetDate() { - return TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date(); + return TQDateTime::currentDateTime().addSecs(TZoffset).date(); } void ClockApplet::showZone(int z) @@ -1634,7 +1634,7 @@ void ClockApplet::showZone(int z) zone->setZone(z); TZoffset = zone->calc_TZ_offset( zone->zone() ); updateDateLabel(); - _clock->forceUpdate(); /* force tqrepaint */ + _clock->forceUpdate(); /* force repaint */ } void ClockApplet::nextZone() @@ -1710,7 +1710,7 @@ void ClockApplet::updateDateLabel(bool reLayout) if (zone->zoneIndex() != 0) { TQString zone_s = i18n(zone->zone().utf8()); - _date->setText(zone_s.mid(zone_s.find('/') + 1).tqreplace("_", " ")); + _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " ")); _date->setShown(true); } else @@ -1727,8 +1727,8 @@ void ClockApplet::updateDateLabel(bool reLayout) _calendar->setDate(_lastDate); } - m_tqlayoutTimer->stop(); - m_tqlayoutTimer->start(m_tqlayoutDelay, true); + m_layoutTimer->stop(); + m_layoutTimer->start(m_layoutDelay, true); } } @@ -1748,7 +1748,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) if (!activeZone.isEmpty()) { activeZone = i18n(activeZone.utf8()); - data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).tqreplace("_", " ")); + data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).replace("_", " ")); } } else @@ -1771,7 +1771,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) if (activeIndex == i) { - data.message = m_zone.mid(m_zone.find('/') + 1).tqreplace("_", " "); + data.message = m_zone.mid(m_zone.find('/') + 1).replace("_", " "); data.message += " " + _time + "<br>" + _date; } else @@ -1782,7 +1782,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) } else { - data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).tqreplace("_", " ") + "</b>"; + data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).replace("_", " ") + "</b>"; } data.subtext += " " + _time + ", " + _date + "<br>"; } @@ -1798,7 +1798,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data) void ClockApplet::fixupLayout() { - m_tqlayoutDelay = 0; + m_layoutDelay = 0; // ensure we have the right widget line up in horizontal mode // when we are showing date beside the clock @@ -1851,7 +1851,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) (m_clock->type() == Prefs::EnumType::Analog) ) { // show full time (incl. hour) as tooltip for Fuzzy clock - tipText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset)); + tipText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)); } else { @@ -1863,7 +1863,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ ) tipText += "\n" + i18n("Showing time for %1").arg(i18n(m_clock->timezones()->zone().utf8()), false); } - tip(m_clock->tqgeometry(), tipText); + tip(m_clock->geometry(), tipText); } //************************************************************ diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h index 753598e18..144fb50c6 100644 --- a/kicker/applets/clock/clock.h +++ b/kicker/applets/clock/clock.h @@ -326,8 +326,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb TQLabel *_dayOfWeek; TQDate _lastDate; TQTimer *_timer; - TQTimer *m_tqlayoutTimer; - int m_tqlayoutDelay; + TQTimer *m_layoutTimer; + int m_layoutDelay; bool m_followBackgroundSetting; bool m_dateFollowBackgroundSetting; int TZoffset; diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui index f63b783c1..256bca99b 100644 --- a/kicker/applets/clock/digital.ui +++ b/kicker/applets/clock/digital.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DigitalWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -116,7 +116,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -295,8 +295,8 @@ <slots> <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui index e67bf0c7a..04e910340 100644 --- a/kicker/applets/clock/fuzzy.ui +++ b/kicker/applets/clock/fuzzy.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FuzzyWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -126,7 +126,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <grid> <property name="name"> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -277,8 +277,8 @@ <include location="local" impldecl="in implementation">kdialog.h</include> <include location="local" impldecl="in implementation">kfontrequester.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui index 02baca77b..215aa5433 100644 --- a/kicker/applets/clock/settings.ui +++ b/kicker/applets/clock/settings.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SettingsWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -306,7 +306,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>343</width> <height>20</height> @@ -380,7 +380,7 @@ </spacer> <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -421,7 +421,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>100</height> @@ -501,8 +501,8 @@ <slots> <slot>configureType()</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp index b44ba0de5..320d84b4c 100644 --- a/kicker/applets/clock/zone.cpp +++ b/kicker/applets/clock/zone.cpp @@ -105,7 +105,7 @@ void Zone::readZoneList(KListView *listView ) if (!comment.isEmpty()) comment = i18n(comment.utf8()); - const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).tqreplace("_", " ")); + const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " ")); TQListViewItem* Kontinent = KontinentMap[KontCity[0]]; if (!Kontinent) { KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]); diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui index 7a2ded479..bfb1bc4e6 100644 --- a/kicker/applets/launcher/configdlgbase.ui +++ b/kicker/applets/launcher/configdlgbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigDlgBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>332</width> <height>20</height> @@ -97,7 +97,7 @@ </property> <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <grid> <property name="name"> @@ -130,7 +130,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -144,7 +144,7 @@ <property name="text"> <string>Short Term</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -155,7 +155,7 @@ <property name="text"> <string>Long Term</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -265,7 +265,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kicker/applets/launcher/flowgridmanager.h b/kicker/applets/launcher/flowgridmanager.h index 5aaa814bb..521490c51 100644 --- a/kicker/applets/launcher/flowgridmanager.h +++ b/kicker/applets/launcher/flowgridmanager.h @@ -13,8 +13,8 @@ class FlowGridManager { -// Determine if two FlowGridManager objs have the same tqlayout. They may or -// may not have the same input parameters, but the resulting tqlayout is identical. +// Determine if two FlowGridManager objs have the same layout. They may or +// may not have the same input parameters, but the resulting layout is identical. friend bool operator== ( const FlowGridManager & gp1, const FlowGridManager & gp2 ); public: diff --git a/kicker/applets/launcher/popularity.cpp b/kicker/applets/launcher/popularity.cpp index e446a2ec7..a22a98c99 100644 --- a/kicker/applets/launcher/popularity.cpp +++ b/kicker/applets/launcher/popularity.cpp @@ -182,7 +182,7 @@ void PopularityStatistics::moveToTop(const TQStringList& newTopServiceList) //kdDebug() << "->Re-Added service " << //ranking[serviceIndex].popularity // << " " << *servIt << endl; - //kdDebug() << "...was tqreplaced by " << *servIt << endl; + //kdDebug() << "...was replaced by " << *servIt << endl; } else { diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index 7dcb16098..0eebec315 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -53,7 +53,7 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS void QuickAddAppsMenu::slotExec(int id) { - if (!entryMap_.tqcontains(id)) return; + if (!entryMap_.contains(id)) return; KSycocaEntry * e = entryMap_[id]; KService::Ptr service = static_cast<KService *>(e); emit addAppBefore(locate("apps", service->desktopEntryPath()),_sender); diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index d002b56ce..2ac0742ca 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -140,7 +140,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction, TQToolTip::add(this, _qurl->name()); resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM)); - TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background)); + TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background)); QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu( parent, this, _qurl->url()); diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 6b56032aa..a278b39c9 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -438,11 +438,11 @@ void QuickLauncher::addApp(TQString url, int index, bool manuallyAdded) } } - updateInsertionPosTotqStatusQuo(); + updateInsertionPosToStatusQuo(); saveConfig(); } -void QuickLauncher::updateInsertionPosTotqStatusQuo() +void QuickLauncher::updateInsertionPosToStatusQuo() { // Update the app ordering map, so that next time, // addApp(url,manAdded) (without index) will insert the @@ -633,7 +633,7 @@ void QuickLauncher::dropEvent(TQDropEvent *e) clearTempButtons(); refreshContents(); saveConfig(); - updateInsertionPosTotqStatusQuo(); + updateInsertionPosToStatusQuo(); } // insert dragbuttons at index in m_newButtons. Put result in m_buttons @@ -828,7 +828,7 @@ void QuickLauncher::loadConfig() for (n=0; n<int(m_buttons->size()); ++n) { QuickButton* button = (*m_buttons)[n]; - if (volatileButtons.tqcontains(button->menuId()) == false) + if (volatileButtons.contains(button->menuId()) == false) { button->setSticky(true); } @@ -912,7 +912,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto QuickURL url = QuickURL(locate("apps", service->desktopEntryPath())); TQString desktopMenuId(url.menuId()); kdDebug() << "storageId=" << storageId << " desktopURL=" << desktopMenuId << endl; - // A service was started somwhere else. If the quicklauncher tqcontains + // A service was started somwhere else. If the quicklauncher contains // this service too, we flash the icon QuickButton *startedButton = 0; std::set<TQString> buttonIdSet; @@ -1040,19 +1040,19 @@ void QuickLauncher::updateStickyHighlightLayer() m_stickyHighlightLayer = TQImage(width(), height(), 32); m_stickyHighlightLayer.setAlphaBuffer(true); int pix, tlPix, brPix, w(width()), h(height()); - QRgb transparent(tqRgba(0, 0, 0, 0)); + QRgb transparent(qRgba(0, 0, 0, 0)); for (int y = h-1; y >= 0; --y) { for (int x = w-1; x >= 0; --x) { - pix = tqRed(areaLayer.pixel(x, y)); + pix = qRed(areaLayer.pixel(x, y)); if (pix == 0) { - tlPix = (y>0 && x>0) ? tqRed(areaLayer.pixel(x-1,y-1)) : 255; - brPix = (y<h-1 && x<w-1) ? tqRed(areaLayer.pixel(x+1,y+1)) : 255; + tlPix = (y>0 && x>0) ? qRed(areaLayer.pixel(x-1,y-1)) : 255; + brPix = (y<h-1 && x<w-1) ? qRed(areaLayer.pixel(x+1,y+1)) : 255; int c = tlPix-brPix < 0 ? 255 : 0; int alpha = abs(tlPix-brPix)/2; - m_stickyHighlightLayer.setPixel(x, y, tqRgba(c, c, c, alpha)); + m_stickyHighlightLayer.setPixel(x, y, qRgba(c, c, c, alpha)); } else { @@ -1060,7 +1060,7 @@ void QuickLauncher::updateStickyHighlightLayer() } } } - tqrepaint(); + repaint(); } void QuickLauncher::paintEvent(TQPaintEvent* e) diff --git a/kicker/applets/launcher/quicklauncher.h b/kicker/applets/launcher/quicklauncher.h index 709904858..2dadf6344 100644 --- a/kicker/applets/launcher/quicklauncher.h +++ b/kicker/applets/launcher/quicklauncher.h @@ -111,7 +111,7 @@ protected slots: void slotStickyToggled(); protected: - void updateInsertionPosTotqStatusQuo(); + void updateInsertionPosToStatusQuo(); void updateStickyHighlightLayer(); QuickButton* createButton(TQString url); virtual void paintEvent(TQPaintEvent* e); diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index c0f0f30c8..3bc53efae 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -63,13 +63,13 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name setBackgroundOrigin( AncestorOrigin ); if ( orientation() == Horizontal ) - tqlayout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); + layout = new TQBoxLayout( this, TQBoxLayout::TopToBottom ); else - tqlayout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); + layout = new TQBoxLayout( this, TQBoxLayout::LeftToRight ); - tqlayout->setAutoAdd( true ); - tqlayout->setMargin( 0 ); - tqlayout->setSpacing( 0 ); + layout->setAutoAdd( true ); + layout->setMargin( 0 ); + layout->setSpacing( 0 ); lockButton = new SimpleButton( this, "lock"); logoutButton = new SimpleButton( this, "logout"); @@ -94,8 +94,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name if (!kapp->authorize("logout")) logoutButton->hide(); - lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); + logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -113,31 +113,31 @@ Lockout::~Lockout() // direction and wasting a lot of space. void Lockout::checkLayout( int height ) const { - TQSize s = tqminimumSizeHint(); - TQBoxLayout::Direction direction = tqlayout->direction(); + TQSize s = minimumSizeHint(); + TQBoxLayout::Direction direction = layout->direction(); if ( direction == TQBoxLayout::LeftToRight && ( ( orientation() == Vertical && s.width() - 2 >= height ) || ( orientation() == Horizontal && s.width() - 2 < height ) ) ) { - tqlayout->setDirection( TQBoxLayout::TopToBottom ); + layout->setDirection( TQBoxLayout::TopToBottom ); } else if ( direction == TQBoxLayout::TopToBottom && ( ( orientation() == Vertical && s.height() - 2 < height ) || ( orientation() == Horizontal && s.height() - 2 >= height ) ) ) { - tqlayout->setDirection( TQBoxLayout::LeftToRight ); + layout->setDirection( TQBoxLayout::LeftToRight ); } } int Lockout::widthForHeight( int height ) const { checkLayout( height ); - return tqsizeHint().width(); + return sizeHint().width(); } int Lockout::heightForWidth( int width ) const { checkLayout( width ); - return tqsizeHint().height(); + return sizeHint().height(); } void Lockout::lock() @@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e) void Lockout::propagateMouseEvent(TQMouseEvent* e) { if ( !isTopLevel() ) { - TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ), + TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( tqtopLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } diff --git a/kicker/applets/lockout/lockout.h b/kicker/applets/lockout/lockout.h index e93a35d50..6be995790 100644 --- a/kicker/applets/lockout/lockout.h +++ b/kicker/applets/lockout/lockout.h @@ -44,7 +44,7 @@ private: void checkLayout( int height ) const; SimpleButton *lockButton, *logoutButton; - TQBoxLayout *tqlayout; + TQBoxLayout *layout; bool bTransparent; }; diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 774724609..b137b5d5c 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -285,7 +285,7 @@ void MediaApplet::slotNewItems(const KFileItemList &entries) } } - if(!found && !mExcludedList.tqcontains(it.current()->url().url()) ) + if(!found && !mExcludedList.contains(it.current()->url().url()) ) { MediumButton *button = new MediumButton(this, *it.current()); button->show(); @@ -336,7 +336,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries) if(button->fileItem().url()==(*it.current()).url()) { - if(mExcludedTypesList.tqcontains(mimetype)) + if(mExcludedTypesList.contains(mimetype)) { mButtonList.remove(button); delete button; @@ -350,7 +350,7 @@ void MediaApplet::slotRefreshItems(const KFileItemList &entries) } } - if(!found && !mExcludedTypesList.tqcontains(mimetype) && !mExcludedList.tqcontains(it.current()->url().url()) ) + if(!found && !mExcludedTypesList.contains(mimetype) && !mExcludedList.contains(it.current()->url().url()) ) { MediumButton *button = new MediumButton(this, *it.current()); button->show(); diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index b52aad034..8d9cdcc94 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -125,7 +125,7 @@ void PreferencesDialog::setExcludedMediumTypes(TQStringList excludedTypesList) { if ((*it)->name().startsWith("media/")) { - bool ok=excludedTypesList.tqcontains((*it)->name())==0; + bool ok=excludedTypesList.contains((*it)->name())==0; MediumTypeItem *item = new MediumTypeItem(mpMediumTypesListView, (*it)->comment(), (*it)->name()); item->setOn(ok); } @@ -156,7 +156,7 @@ void PreferencesDialog::setExcludedMedia(TQStringList excludedList) { ++it; - bool ok = excludedList.tqcontains(file->url().url())==0; + bool ok = excludedList.contains(file->url().url())==0; MediumItem *item = new MediumItem(mpMediaListView, file->text(), *file); item->setOn(ok); diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 662859bd5..472f3bd0d 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. This is because TQMenuBar tries really hard to keep its preffered size, se even if the X window for the menubar has the size enforced by this applet, Qt thinks it has the size Qt wants. This results in parts - of the menubar not being tqrepainted. Also, old KMenuBar always forced + of the menubar not being repainted. Also, old KMenuBar always forced with to be the width of the screen, so even if the menubar has only few entries, this applet will still indicate the menubar doesn't fit completely in it. There's no way to fix this, besides upgrading @@ -266,7 +266,7 @@ void Applet::positionChange( Position ) // Kicker's frame). void Applet::updateTopEdgeOffset() { - TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); + TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); if( p.y() <= 2 ) // 2 = work also when running in appletproxy topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); else @@ -489,12 +489,12 @@ void MenuEmbed::setMinimumSize( int w, int h ) void MenuEmbed::setBackground() { - const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); + const TQPixmap *pbg = parentWidget()->backgroundPixmap(); if (pbg) { TQPixmap bg(width(), height()); - bg.fill(tqparentWidget(), pos()); + bg.fill(parentWidget(), pos()); setPaletteBackgroundPixmap(bg); setBackgroundOrigin(WidgetOrigin); } diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 6f67cbed4..5ba54cd66 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -51,11 +51,11 @@ class MenuEmbed; * * @description All status change, such as when an window is activated, * a new window popped up, etc, is received via @ref KWin::WindowInfo and @ref - * NETWinInfo. tqStatus changes for X selections are done via KSelectionWatcher. + * NETWinInfo. Status changes for X selections are done via KSelectionWatcher. * * How it works in broad terms: KickerMenuApplet gets notified as soon a window * changes(a new pops up etc.) and accordingly updates the list @ref menus, - * which tqcontains all known menus. When a new window gains focus, it looks up the + * which contains all known menus. When a new window gains focus, it looks up the * correct MenuEmbed in @ref menus, and then switches to that one. * * The documentation is a bit rusty -- read it with a critical eye. diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index ecdcd4509..dc2431e15 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -83,7 +83,7 @@ extern "C" KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) : KPanelApplet( configFile, type, actions, parent, name ), - m_tqlayout(0), + m_layout(0), m_desktopLayoutOwner( NULL ), m_shadowEngine(0), m_contextMenu(0), @@ -363,7 +363,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y) if( y == -1 ) y = 0; if( m_desktopLayoutOwner == NULL ) - { // must own manager selection before setting global desktop tqlayout + { // must own manager selection before setting global desktop layout int screen = DefaultScreen( qt_xdisplay()); m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(), screen, this ); @@ -397,10 +397,10 @@ void KMiniPager::resizeEvent(TQResizeEvent*) if(deskNum == 0 || deskNum % rowNum != 0) deskCols += 1; - if (m_tqlayout) + if (m_layout) { - delete m_tqlayout; - m_tqlayout = 0; + delete m_layout; + m_layout = 0; } int nDX, nDY; @@ -418,7 +418,7 @@ void KMiniPager::resizeEvent(TQResizeEvent*) } // 1 pixel spacing. - m_tqlayout = new TQGridLayout(this, nDX, nDY, 0, 1); + m_layout = new TQGridLayout(this, nDX, nDY, 0, 1); TQValueList<KMiniPagerButton*>::Iterator it = m_desktops.begin(); TQValueList<KMiniPagerButton*>::Iterator itEnd = m_desktops.end(); @@ -427,14 +427,14 @@ void KMiniPager::resizeEvent(TQResizeEvent*) while( it != itEnd ) { c = 0; while( (it != itEnd) && (c < nDY) ) { - m_tqlayout->addWidget( *it, r, c ); + m_layout->addWidget( *it, r, c ); ++it; ++c; } ++r; } - m_tqlayout->activate(); + m_layout->activate(); updateGeometry(); } @@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged() { TQString name = m_kwin->desktopName(i); (*it)->setDesktopName(name); - (*it)->tqrepaint(); + (*it)->repaint(); TQToolTip::remove((*it)); TQToolTip::add((*it), name); } diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index 2a9f7f313..e72f44588 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -121,7 +121,7 @@ private: TQButtonGroup *m_group; - TQGridLayout *m_tqlayout; + TQGridLayout *m_layout; bool m_useViewports; int desktopLayoutOrientation; int desktopLayoutX; diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 3d7f06985..10a5aa8c9 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -106,7 +106,7 @@ TQRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) con if (!m_useViewports) return info.frameGeometry(); - // ### fix vertically tqlayouted viewports + // ### fix vertically layouted viewports TQRect _r(info.frameGeometry()); TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); @@ -129,7 +129,7 @@ TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); - // ### fix vertically tqlayouted viewports + // ### fix vertically layouted viewports TQPoint p(_p); p.setX(p.x() + (m_desktop - vx.x()) * TQApplication::desktop()->width()); return p; @@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const TQRect r = mapGeometryToViewport(*info); if (!info->hasState(NET::Sticky) && - !TQApplication::desktop()->tqgeometry().tqcontains(r.topLeft()) && - !TQApplication::desktop()->tqgeometry().tqcontains(r.topRight())) + !TQApplication::desktop()->geometry().contains(r.topLeft()) && + !TQApplication::desktop()->geometry().contains(r.topRight())) return false; } @@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // transparent windows get an 1 pixel frame... if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else if (down) { - bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight())); + bp->setPen(KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight())); } else { - bp->setPen(tqcolorGroup().dark()); + bp->setPen(colorGroup().dark()); } bp->drawRect(0, 0, w, h); @@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (on) { - background = tqcolorGroup().brush(TQColorGroup::Midlight); + background = colorGroup().brush(TQColorGroup::Midlight); } else if (down) { - background = KickerLib::blendColors(tqcolorGroup().mid(), - tqcolorGroup().midlight()); + background = KickerLib::blendColors(colorGroup().mid(), + colorGroup().midlight()); } else { - background = tqcolorGroup().brush(TQColorGroup::Mid); + background = colorGroup().brush(TQColorGroup::Mid); } bp->fillRect(0, 0, w, h, background); @@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (kwin->activeWindow() == info->win()) { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); - qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); + TQBrush brush = colorGroup().brush(TQColorGroup::Highlight); + qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush); } else { - TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button); + TQBrush brush = colorGroup().brush(TQColorGroup::Button); if (on) { @@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } bp->fillRect(r, brush); - qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0); + qDrawShadeRect(bp, r, colorGroup(), true, 1, 0); } if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15) @@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // makes it look a bit more finished. if (on) { - bp->setPen(tqcolorGroup().midlight()); + bp->setPen(colorGroup().midlight()); } else { - bp->setPen(tqcolorGroup().mid()); + bp->setPen(colorGroup().mid()); } bp->drawRect(0, 0, w, h); @@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) if (transparent || liveBkgnd) { - bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText()); + bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText()); m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size()); } else @@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) } if (m_inside) - KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground()); } void KMiniPagerButton::mousePressEvent(TQMouseEvent * e) @@ -578,7 +578,7 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) if (m_currentWindow && !m_pager->clickPos.isNull() && (m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay()) { - TQRect r = m_currentWindow->tqgeometry(); + TQRect r = m_currentWindow->geometry(); // preview window height, window width int ww = r.width() * w / dw; @@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e) TQPixmap windowImage(ww, wh); TQPainter bp(&windowImage, this); - bp.setPen(tqcolorGroup().foreground()); + bp.setPen(colorGroup().foreground()); bp.drawRect(0, 0, ww, wh); - bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background()); + bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background()); Task::List tasklist; tasklist.append(m_currentWindow); diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 9033ff668..44f2229ec 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -69,8 +69,8 @@ NaughtyApplet::NaughtyApplet button_ = new SimpleButton(this); button_->setFixedSize(20, 20); - TQVBoxLayout * tqlayout = new TQVBoxLayout(this); - tqlayout->addWidget(button_); + TQVBoxLayout * layout = new TQVBoxLayout(this); + layout->addWidget(button_); monitor_ = new NaughtyProcessMonitor(2, 20, this); @@ -105,7 +105,7 @@ NaughtyApplet::~NaughtyApplet() void NaughtyApplet::slotWarn(ulong pid, const TQString & name) { - if (ignoreList_.tqcontains(name)) + if (ignoreList_.contains(name)) return; TQString s = i18n("A program called '%1' is slowing down the others " diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h index 23bdf62c9..beb70552d 100644 --- a/kicker/applets/naughty/NaughtyApplet.h +++ b/kicker/applets/naughty/NaughtyApplet.h @@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet signals: - void tqlayoutChanged(); + void layoutChanged(); protected slots: diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 1acd64f09..6228cfba1 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -164,7 +164,7 @@ NaughtyProcessMonitor::slotTimeout() void NaughtyProcessMonitor::_process(ulong pid, uint load) { - if (!d->loadMap_.tqcontains(pid)) + if (!d->loadMap_.contains(pid)) { d->loadMap_.insert(pid, load); return; @@ -172,12 +172,12 @@ NaughtyProcessMonitor::_process(ulong pid, uint load) uint oldLoad = d->loadMap_[pid]; bool misbehaving = (load - oldLoad) > 40 * (d->interval_ / 1000); - bool wasMisbehaving = d->scoreMap_.tqcontains(pid); + bool wasMisbehaving = d->scoreMap_.contains(pid); if (misbehaving) if (wasMisbehaving) { - d->scoreMap_.tqreplace(pid, d->scoreMap_[pid] + 1); + d->scoreMap_.replace(pid, d->scoreMap_[pid] + 1); if (canKill(pid)) emit(runawayProcess(pid, processName(pid))); } @@ -187,7 +187,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load) if (wasMisbehaving) d->scoreMap_.remove(pid); - d->loadMap_.tqreplace(pid, load); + d->loadMap_.replace(pid, load); } // Here begins the set of system-specific methods. @@ -221,7 +221,7 @@ NaughtyProcessMonitor::canKill(ulong pid) const return geteuid() == a; #elif defined(__OpenBSD__) // simply check if entry exists in the uid map and use it - if (!d->uidMap_.tqcontains(pid)) + if (!d->uidMap_.contains(pid)) return false ; return geteuid () == d->uidMap_[pid] ; @@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'kdeinit:' prefix. - TQString tqunicode(TQString::fromLocal8Bit(s)); + TQString unicode(TQString::fromLocal8Bit(s)); #elif defined(__OpenBSD__) int mib[4] ; @@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const } // Now strip 'kdeinit:' prefix. - TQString tqunicode(TQString::fromLocal8Bit(argv[0])); + TQString unicode(TQString::fromLocal8Bit(argv[0])); free (argv) ; #endif - TQStringList parts(TQStringList::split(' ', tqunicode)); + TQStringList parts(TQStringList::split(' ', unicode)); TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0]; @@ -449,7 +449,7 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const return true; #elif defined(__OpenBSD__) // use cache - if (!d->cacheLoadMap_.tqcontains(pid)) + if (!d->cacheLoadMap_.contains(pid)) return false ; load = d->cacheLoadMap_[pid] ; diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index cfab6d751..94f30f33a 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -121,14 +121,14 @@ void RunApplet::resizeEvent(TQResizeEvent*) _input->reparent(this, TQPoint(0,0), true); _label->setGeometry(0,0, width(), _label->height()); - if(height() >= _input->tqsizeHint().height() + _label->height()) + if(height() >= _input->sizeHint().height() + _label->height()) { - int inputVOffset = height() - _input->tqsizeHint().height() - 2; - int labelHeight = _label->tqsizeHint().height(); + int inputVOffset = height() - _input->sizeHint().height() - 2; + int labelHeight = _label->sizeHint().height(); _label->setGeometry(0, inputVOffset - labelHeight, width(), labelHeight); _input->setGeometry(0, inputVOffset, - width(), _input->tqsizeHint().height()); + width(), _input->sizeHint().height()); _label->show(); } else @@ -138,7 +138,7 @@ void RunApplet::resizeEvent(TQResizeEvent*) // make it as high as the combobox naturally wants to be // but no taller than the panel is! // don't forget to center it vertically either. - int newHeight = _input->tqsizeHint().height(); + int newHeight = _input->sizeHint().height(); if (newHeight > height()) newHeight = height(); _input->setGeometry(0, (height() - newHeight) / 2, @@ -184,7 +184,7 @@ void RunApplet::setButtonText() int RunApplet::widthForHeight(int ) const { - return _label->tqsizeHint().width(); + return _label->sizeHint().width(); } int RunApplet::heightForWidth(int ) const diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui index 8fb2b4278..bd2673efa 100644 --- a/kicker/applets/swallow/prefwidgetbase.ui +++ b/kicker/applets/swallow/prefwidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PreferencesWidgetBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -122,8 +122,8 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>keditlistbox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index cdc312bc5..7112c706a 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -76,8 +76,8 @@ SwallowApplet::SwallowApplet( const TQString& configFile, TQBoxLayout::Direction d = (orientation() == Horizontal) ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom; - m_tqlayout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable? - m_tqlayout->setAutoAdd( false ); + m_layout = new TQBoxLayout( this, d, 0, 2 ); // make stretch configurable? + m_layout->setAutoAdd( false ); // read the config file and start all the configured apps createApps( readConfig() ); @@ -164,7 +164,7 @@ void SwallowApplet::createApps( SwallowCommandList* list ) kapp->processEvents(); } - m_tqlayout->activate(); + m_layout->activate(); } @@ -189,7 +189,7 @@ void SwallowApplet::embedded( SwallowApp *app ) else resize( width(), heightForWidth( width() )); - m_tqlayout->addWidget( app ); + m_layout->addWidget( app ); app->show(); updateGeometry(); emit updateLayout(); @@ -206,7 +206,7 @@ int SwallowApplet::widthForHeight(int he) { kdDebug() << "**** width for h: " << he << endl; int w = embeddedList->isEmpty() ? 30 : 0; - tqlayoutApps(); + layoutApps(); SwallowAppListIterator it( *embeddedList ); while ( it.current() ) { kdDebug() << "current: " << it.current()->width() << endl; @@ -222,7 +222,7 @@ int SwallowApplet::widthForHeight(int he) int SwallowApplet::heightForWidth(int) { int h = embeddedList->isEmpty() ? 30 : 0; - tqlayoutApps(); + layoutApps(); SwallowAppListIterator it( *embeddedList ); while ( it.current() ) { h += (it.current())->height(); @@ -233,12 +233,12 @@ int SwallowApplet::heightForWidth(int) return h; } -void SwallowApplet::tqlayoutApps() +void SwallowApplet::layoutApps() { if ( KPanelApplet::orientation() == Horizontal ) - m_tqlayout->setDirection( TQBoxLayout::LeftToRight ); + m_layout->setDirection( TQBoxLayout::LeftToRight ); else - m_tqlayout->setDirection( TQBoxLayout::TopToBottom ); + m_layout->setDirection( TQBoxLayout::TopToBottom ); } @@ -286,7 +286,7 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, parseCommand(process, swc->cmdline); // move window out of sight - // *process << "-tqgeometry"; + // *process << "-geometry"; // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); connect(process, TQT_SIGNAL(processExited(KProcess*)), @@ -320,7 +320,7 @@ void SwallowApp::windowAdded(WId win) if (winTitle == names[0]) { kdDebug()<< "embedding window with title: "<<winTitle.latin1() << endl; - TQRect r = KWin::windowInfo(win).tqgeometry(); + TQRect r = KWin::windowInfo(win).geometry(); int h = r.height(); if ( h == 0 ) h = 1; wh_ratio = (float) r.width() / (float) h; diff --git a/kicker/applets/swallow/swallow.h b/kicker/applets/swallow/swallow.h index 4162ec0ba..437c3fa8b 100644 --- a/kicker/applets/swallow/swallow.h +++ b/kicker/applets/swallow/swallow.h @@ -70,7 +70,7 @@ private slots: void embedded( SwallowApp * ); private: - void tqlayoutApps(); + void layoutApps(); SwallowCommandList* readConfig(); void createApps( SwallowCommandList * ); @@ -81,7 +81,7 @@ private: static KWinModule *wModule; SwallowCommandList * m_swcList; - TQBoxLayout *m_tqlayout; + TQBoxLayout *m_layout; }; diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 0850d6998..ad44b640f 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -78,7 +78,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac m_autoRetractTimer(0), m_autoRetract(false), m_iconSize(24), - m_tqlayout(0) + m_layout(0) { DCOPObject::setObjId("SystemTrayApplet"); loadSettings(); @@ -112,7 +112,7 @@ void SystemTrayApplet::initialize() if (existing) { updateVisibleWins(); - tqlayoutTray(); + layoutTray(); } // the KWinModule notifies us when tray windows are added or removed @@ -190,7 +190,7 @@ bool SystemTrayApplet::x11Event( XEvent *e ) return true; embedWindow( e->xclient.data.l[2], false ); updateVisibleWins(); - tqlayoutTray(); + layoutTray(); return true; } } @@ -288,7 +288,7 @@ void SystemTrayApplet::applySettings() item; item = item->next()) { - if( windowNameToClass.tqcontains(item->text())) + if( windowNameToClass.contains(item->text())) m_sortOrderIconList.append(windowNameToClass[item->text()]); else m_sortOrderIconList.append(item->text()); @@ -301,7 +301,7 @@ void SystemTrayApplet::applySettings() item; item = item->next()) { - if( windowNameToClass.tqcontains(item->text())) + if( windowNameToClass.contains(item->text())) m_hiddenIconList.append(windowNameToClass[item->text()]); else m_hiddenIconList.append(item->text()); @@ -340,7 +340,7 @@ void SystemTrayApplet::applySettings() showExpandButton(!m_hiddenWins.isEmpty()); updateVisibleWins(); - tqlayoutTray(); + layoutTray(); } void SystemTrayApplet::checkAutoRetract() @@ -350,7 +350,7 @@ void SystemTrayApplet::checkAutoRetract() return; } - if (!tqgeometry().tqcontains(mapFromGlobal(TQCursor::pos()))) + if (!geometry().contains(mapFromGlobal(TQCursor::pos()))) { m_autoRetractTimer->stop(); if (m_autoRetract) @@ -389,12 +389,12 @@ void SystemTrayApplet::showExpandButton(bool show) if (orientation() == Vertical) { m_expandButton->setFixedSize(width() - 4, - m_expandButton->tqsizeHint() + m_expandButton->sizeHint() .height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint() + m_expandButton->setFixedSize(m_expandButton->sizeHint() .width(), height() - 4); } @@ -426,7 +426,7 @@ void SystemTrayApplet::orientationChange( Orientation /*orientation*/ ) void SystemTrayApplet::iconSizeChanged() { loadSettings(); updateVisibleWins(); - tqlayoutTray(); + layoutTray(); TrayEmbedList::iterator emb = m_shownWins.begin(); while (emb != m_shownWins.end()) { @@ -477,7 +477,7 @@ void SystemTrayApplet::systemTrayWindowAdded( WId w ) embedWindow(w, true); updateVisibleWins(); - tqlayoutTray(); + layoutTray(); if (m_showFrame && frameStyle() == NoFrame) { @@ -642,7 +642,7 @@ void SystemTrayApplet::expand() refreshExpandButton(); updateVisibleWins(); - tqlayoutTray(); + layoutTray(); if (m_autoRetractTimer) { @@ -661,7 +661,7 @@ void SystemTrayApplet::retract() refreshExpandButton(); updateVisibleWins(); - tqlayoutTray(); + layoutTray(); } void SystemTrayApplet::updateTrayWindows() @@ -672,7 +672,7 @@ void SystemTrayApplet::updateTrayWindows() WId wid = (*emb)->embeddedWinId(); if ((wid == 0) || ((*emb)->kdeTray() && - !kwin_module->systemTrayWindows().tqcontains(wid))) + !kwin_module->systemTrayWindows().contains(wid))) { (*emb)->deleteLater(); emb = m_shownWins.erase(emb); @@ -689,7 +689,7 @@ void SystemTrayApplet::updateTrayWindows() WId wid = (*emb)->embeddedWinId(); if ((wid == 0) || ((*emb)->kdeTray() && - !kwin_module->systemTrayWindows().tqcontains(wid))) + !kwin_module->systemTrayWindows().contains(wid))) { (*emb)->deleteLater(); emb = m_hiddenWins.erase(emb); @@ -702,7 +702,7 @@ void SystemTrayApplet::updateTrayWindows() showExpandButton(!m_hiddenWins.isEmpty()); updateVisibleWins(); - tqlayoutTray(); + layoutTray(); } int SystemTrayApplet::maxIconWidth() const @@ -830,7 +830,7 @@ int SystemTrayApplet::widthForHeight(int h) const me->setFixedHeight(h); } - return tqsizeHint().width(); + return sizeHint().width(); } int SystemTrayApplet::heightForWidth(int w) const @@ -849,7 +849,7 @@ int SystemTrayApplet::heightForWidth(int w) const me->setFixedWidth(w); } - return tqsizeHint().height(); + return sizeHint().height(); } void SystemTrayApplet::moveEvent( TQMoveEvent* ) @@ -860,12 +860,12 @@ void SystemTrayApplet::moveEvent( TQMoveEvent* ) void SystemTrayApplet::resizeEvent( TQResizeEvent* ) { - tqlayoutTray(); + layoutTray(); // we need to give ourselves a chance to adjust our size before calling this TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout())); } -void SystemTrayApplet::tqlayoutTray() +void SystemTrayApplet::layoutTray() { setUpdatesEnabled(false); @@ -881,18 +881,18 @@ void SystemTrayApplet::tqlayoutTray() * line = what line to draw an icon in */ int i = 0, line, nbrOfLines, heightWidth; bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this); - delete m_tqlayout; - m_tqlayout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN); + delete m_layout; + m_layout = new TQGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN); if (m_expandButton) { if (orientation() == Vertical) { - m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height()); + m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height()); } else { - m_expandButton->setFixedSize(m_expandButton->tqsizeHint().width(), height() - 4); + m_expandButton->setFixedSize(m_expandButton->sizeHint().width(), height() - 4); } } @@ -901,18 +901,18 @@ void SystemTrayApplet::tqlayoutTray() int col = 0; // - // The margin and spacing specified in the tqlayout implies that: + // The margin and spacing specified in the layout implies that: // [-- ICON_MARGIN pixels --] [-- first icon --] [-- ICON_MARGIN pixels --] ... [-- ICON_MARGIN pixels --] [-- last icon --] [-- ICON_MARGIN pixels --] // // So, if we say that iconWidth is the icon width plus the ICON_MARGIN pixels spacing, then the available width for the icons - // is the widget width minus ICON_MARGIN pixels margin. Forgetting these ICON_MARGIN pixels broke the tqlayout algorithm in KDE <= 3.5.9. + // is the widget width minus ICON_MARGIN pixels margin. Forgetting these ICON_MARGIN pixels broke the layout algorithm in KDE <= 3.5.9. // // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded. // if (orientation() == Vertical) { - int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the tqlayout + int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout heightWidth = width() - ICON_MARGIN; // to avoid nbrOfLines=0 we ensure heightWidth >= iconWidth! heightWidth = heightWidth < iconWidth ? iconWidth : heightWidth; @@ -920,7 +920,7 @@ void SystemTrayApplet::tqlayoutTray() if (showExpandButton) { - m_tqlayout->addMultiCellWidget(m_expandButton, + m_layout->addMultiCellWidget(m_expandButton, 0, 0, 0, nbrOfLines - 1, Qt::AlignHCenter | Qt::AlignVCenter); @@ -935,7 +935,7 @@ void SystemTrayApplet::tqlayoutTray() { line = i % nbrOfLines; (*emb)->show(); - m_tqlayout->addWidget((*emb), col, line, + m_layout->addWidget((*emb), col, line, Qt::AlignHCenter | Qt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -953,7 +953,7 @@ void SystemTrayApplet::tqlayoutTray() { line = i % nbrOfLines; (*emb)->show(); - m_tqlayout->addWidget((*emb), col, line, + m_layout->addWidget((*emb), col, line, Qt::AlignHCenter | Qt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -966,14 +966,14 @@ void SystemTrayApplet::tqlayoutTray() } else // horizontal { - int iconHeight = maxIconHeight() + ICON_MARGIN; // +2 for the margins that implied by the tqlayout + int iconHeight = maxIconHeight() + ICON_MARGIN; // +2 for the margins that implied by the layout heightWidth = height() - ICON_MARGIN; heightWidth = heightWidth < iconHeight ? iconHeight : heightWidth; // to avoid nbrOfLines=0 nbrOfLines = heightWidth / iconHeight; if (showExpandButton) { - m_tqlayout->addMultiCellWidget(m_expandButton, + m_layout->addMultiCellWidget(m_expandButton, 0, nbrOfLines - 1, 0, 0, Qt::AlignHCenter | Qt::AlignVCenter); @@ -987,7 +987,7 @@ void SystemTrayApplet::tqlayoutTray() { line = i % nbrOfLines; (*emb)->show(); - m_tqlayout->addWidget((*emb), line, col, + m_layout->addWidget((*emb), line, col, Qt::AlignHCenter | Qt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -1005,7 +1005,7 @@ void SystemTrayApplet::tqlayoutTray() { line = i % nbrOfLines; (*emb)->show(); - m_tqlayout->addWidget((*emb), line, col, + m_layout->addWidget((*emb), line, col, Qt::AlignHCenter | Qt::AlignVCenter); if ((line + 1) == nbrOfLines) @@ -1051,7 +1051,7 @@ TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent ) void TrayEmbed::getIconSize(int defaultIconSize) { - TQSize minSize = tqminimumSizeHint(); + TQSize minSize = minimumSizeHint(); int width = minSize.width(); int height = minSize.height(); @@ -1067,12 +1067,12 @@ void TrayEmbed::getIconSize(int defaultIconSize) void TrayEmbed::setBackground() { - const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); + const TQPixmap *pbg = parentWidget()->backgroundPixmap(); if (pbg) { TQPixmap bg(width(), height()); - bg.fill(tqparentWidget(), pos()); + bg.fill(parentWidget(), pos()); setPaletteBackgroundPixmap(bg); setBackgroundOrigin(WidgetOrigin); } diff --git a/kicker/applets/systemtray/systemtrayapplet.desktop b/kicker/applets/systemtray/systemtrayapplet.desktop index d054f9a4c..ab737d83c 100644 --- a/kicker/applets/systemtray/systemtrayapplet.desktop +++ b/kicker/applets/systemtray/systemtrayapplet.desktop @@ -12,7 +12,7 @@ Name[ca]=Safata del sistema Name[cs]=Systémová Äást panelu Name[csb]=Systemòwi zabiérnik Name[cy]=Bar Tasgau -Name[da]=tqStatusfelt +Name[da]=Statusfelt Name[de]=Systemabschnitt der Kontrollleiste Name[el]=Πλαίσιο συστήματος Name[eo]=Sistempleto @@ -92,7 +92,7 @@ Comment[ca]=L'applet per al plafó de la safata del sistema Comment[cs]=Systémová Äást panelu urÄená pro applety Comment[csb]=Aplet systemòwégò zabiérnika dlô panelu Comment[cy]=Rhaglennig bar tasgau i'r panel -Comment[da]=tqStatusfelt-panelprogrammet +Comment[da]=Statusfelt-panelprogrammet Comment[de]=Systemabschnitt der Kontrollleiste Comment[el]=ΜικÏοεφαÏμογή του πίνακα για το πλαίσιο συστήματος Comment[eo]=La sistempleta panelaplikaĵeto diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index d74c2ccf7..f66e0caa5 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -76,7 +76,7 @@ protected slots: void initialize(); void systemTrayWindowAdded( WId ); void updateTrayWindows(); - void tqlayoutTray(); + void layoutTray(); void paletteChange(const TQPalette & /* oldPalette */); void toggleExpanded(); void settingsDialogFinished(); @@ -110,7 +110,7 @@ private: TQTimer* m_autoRetractTimer; bool m_autoRetract; int m_iconSize; - TQGridLayout* m_tqlayout; + TQGridLayout* m_layout; }; class TrayEmbed : public QXEmbed diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index a8a952962..55e5d113f 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -56,11 +56,11 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions : KPanelApplet( configFile, type, actions, parent, name ) { setBackgroundOrigin( AncestorOrigin ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); + TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, this ); container->setBackgroundOrigin( AncestorOrigin ); connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); - tqlayout->addWidget( container, 1 ); + layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } @@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(200, h)).width(); + return container->sizeHint(d, TQSize(200, h)).width(); } int TaskbarApplet::heightForWidth(int w) const @@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const KPanelExtension::Position d = orientation() == Qt::Horizontal ? KPanelExtension::Top : KPanelExtension::Left; - return container->tqsizeHint(d, TQSize(w, 200)).height(); + return container->sizeHint(d, TQSize(w, 200)).height(); } void TaskbarApplet::preferences() diff --git a/kicker/data/kickoff/kmenu_vertical.mng b/kicker/data/kickoff/kmenu_vertical.mng Binary files differindex 69eb7c99e..7f7047d11 100644 --- a/kicker/data/kickoff/kmenu_vertical.mng +++ b/kicker/data/kickoff/kmenu_vertical.mng diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 5ebce58c4..d3b625f80 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -60,7 +60,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, kwin_module = new KWinModule(this); connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); } @@ -77,7 +77,7 @@ DockBarExtension::~DockBarExtension() if (dragging_container) delete dragging_container; } -TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const +TQSize DockBarExtension::sizeHint(Position p, TQSize) const { if (p == Left || p == Right) return TQSize(DockContainer::sz(), DockContainer::sz() * containers.count()); @@ -87,7 +87,7 @@ TQSize DockBarExtension::tqsizeHint(Position p, TQSize) const void DockBarExtension::resizeEvent(TQResizeEvent*) { - tqlayoutContainers(); + layoutContainers(); } @@ -167,7 +167,7 @@ void DockBarExtension::windowAdded(WId win) saveContainerConfig(); } -void DockBarExtension::tqlayoutContainers() +void DockBarExtension::layoutContainers() { int i = 0; for (DockContainer::Vector::const_iterator it = containers.constBegin(); @@ -212,7 +212,7 @@ void DockBarExtension::embedWindow(WId win, TQString command, TQString resName, } container->embed(win); - tqlayoutContainers(); + layoutContainers(); emit updateLayout(); if (ncmd) container->askNewCommand(); @@ -246,7 +246,7 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) void DockBarExtension::removeContainer(DockContainer* c) { - DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), c); + DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), c); if (it == containers.end()) { @@ -255,7 +255,7 @@ void DockBarExtension::removeContainer(DockContainer* c) containers.erase(it); delete c; - tqlayoutContainers(); + layoutContainers(); } void DockBarExtension::embeddedWindowDestroyed(DockContainer* c) @@ -335,7 +335,7 @@ int DockBarExtension::findContainerAtPoint(const TQPoint& p) it != containers.constEnd(); ++it, ++i) { - if ((*it)->tqgeometry().tqcontains(p)) + if ((*it)->geometry().contains(p)) { return i; } @@ -360,7 +360,7 @@ void DockBarExtension::mouseReleaseEvent(TQMouseEvent *e ) { releaseMouse(); original_container->embed(dragging_container->embeddedWinId()); delete dragging_container; dragging_container = 0; - tqlayoutContainers(); + layoutContainers(); saveContainerConfig(); } } @@ -387,7 +387,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { if (dragging_container) { dragging_container->move(e->globalPos() - mclic_dock_pos); - // change tqlayout of other containers + // change layout of other containers TQPoint dragpos(dragging_container->pos()), barpos(mapToGlobal(pos())); int pdrag1,pdrag2,psz; @@ -403,7 +403,7 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { pdrag1 = dragged_container_original_pos; - DockContainer::Vector::iterator it = tqFind(containers.begin(), containers.end(), original_container); + DockContainer::Vector::iterator it = qFind(containers.begin(), containers.end(), original_container); if (it == containers.end()) { @@ -418,6 +418,6 @@ void DockBarExtension::mouseMoveEvent(TQMouseEvent *e) { containers.erase(it); containers.insert(target, original_container); - tqlayoutContainers(); + layoutContainers(); } } diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index 5c0263586..e735ec708 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -40,7 +40,7 @@ public: virtual ~DockBarExtension(); - TQSize tqsizeHint(Position, TQSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Right; } protected slots: @@ -55,7 +55,7 @@ protected: void removeContainer(DockContainer*); void saveContainerConfig(); void loadContainerConfig(); - void tqlayoutContainers(); + void layoutContainers(); int findContainerAtPoint(const TQPoint&); void mousePressEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *); diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index ce43d0ba1..09408fc4a 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -26,7 +26,7 @@ - Improved the about dialog. - - Made tqmasking of the containing toplevel optional. + - Made masking of the containing toplevel optional. - Fixed positioning of the clock display in small mode. @@ -149,7 +149,7 @@ 2004-09-03 Friday 22:32 rich * - Added support for the XShape extension, the unused space is now - tqmasked so that when you have a non-rectangular bar (by using + masked so that when you have a non-rectangular bar (by using the 'Boxes per line' setting) the unused space is truly unused. To make this better, I need to make it so that the box is always populated from the screen edge outwards. @@ -164,7 +164,7 @@ - Added a context menu item to attach and detach the bar. - - Improved tqrepaint performance. + - Improved repaint performance. - Increased version number. @@ -211,7 +211,7 @@ * - Improved the handling of inactive desktop grouping. - Fixed a problem with popups not being deleted when their - associated item was tqinvalidated. + associated item was invalidated. 2004-08-07 Saturday 03:00 rich @@ -436,7 +436,7 @@ 2003-10-23 Thursday 21:41 bwalter - * Use tqtopLevelWidget() instead of parent()->parent()... + * Use topLevelWidget() instead of parent()->parent()... 2003-10-22 Wednesday 22:15 bwalter @@ -481,11 +481,11 @@ 2003-09-30 Tuesday 22:25 rich - * - More improvements to bg tqrepainting (much more efficient). + * - More improvements to bg repainting (much more efficient). - Fixed startup animation problem #39582 - - Fixed erase problem introduced by the tqrepaint changes in my + - Fixed erase problem introduced by the repaint changes in my last commit. CCMAIL: 39582-done@bugs.kde.org @@ -498,7 +498,7 @@ - Removed redundant reload of configuration info. - Reworked painting - Double buffering is now handled by KasBar - not the items. - Items now longer force an immediate tqrepaint, + not the items. - Items now longer force an immediate repaint, they use update instead. - Fixes #53735 CCMAIL: 53735-done@bugs.kde.org @@ -531,7 +531,7 @@ 2003-03-29 Saturday 20:29 binner - * Fixed a tqlayout problem and solution for "only drawing last icon + * Fixed a layout problem and solution for "only drawing last icon from a group". 2003-02-09 Sunday 09:51 mfranz @@ -608,7 +608,7 @@ 2002-08-09 Friday 23:57 rich - * - Fixed tqrepaint problem with startup items + * - Fixed repaint problem with startup items 2002-07-29 Monday 22:03 coolo @@ -743,11 +743,11 @@ 2001-07-17 Tuesday 19:59 rich * Added some extra guards around KRootPixmap calls and readded the - tqrepaint I removed earlier + repaint I removed earlier 2001-07-17 Tuesday 17:03 rich - * Remove redundant tqrepaint + * Remove redundant repaint 2001-07-17 Tuesday 16:47 rich @@ -818,7 +818,7 @@ 2001-05-14 Monday 00:40 rich * Added new about dialog Fixed some flicker problems Improved - thumbnail heuristics Improved transparent mode tqrepaints + thumbnail heuristics Improved transparent mode repaints 2001-04-27 Friday 19:07 rich @@ -916,7 +916,7 @@ 2001-03-06 Tuesday 12:32 faure - * ran includetqmocs to get this to compile (am_edit was trying to + * ran includemocs to get this to compile (am_edit was trying to compile a .moc.cpp into a .moc ... there's still something fishy in am_edit...) @@ -929,7 +929,7 @@ 2000-12-17 Sunday 12:00 elter - * Fixed totally broken kasbar tqsizeHint. + * Fixed totally broken kasbar sizeHint. 2000-12-17 Sunday 11:53 elter diff --git a/kicker/extensions/kasbar/DESIGN b/kicker/extensions/kasbar/DESIGN index c107a4cb6..6d2de25e6 100644 --- a/kicker/extensions/kasbar/DESIGN +++ b/kicker/extensions/kasbar/DESIGN @@ -13,7 +13,7 @@ The division of labour between the classes is like this: * KasBar, KasItem, KasPopup These classes implement the KasBar widget. KasBar provides the - tqlayout and smart redraws while the KasItem class is an abstract + layout and smart redraws while the KasItem class is an abstract interface for the items forming the bars contents. The KasPopup class provides a self positioning widget that should be subclassed to provide useful information. diff --git a/kicker/extensions/kasbar/Doxyfile b/kicker/extensions/kasbar/Doxyfile index f0db9df8b..8c82cae8b 100644 --- a/kicker/extensions/kasbar/Doxyfile +++ b/kicker/extensions/kasbar/Doxyfile @@ -227,7 +227,7 @@ SORT_MEMBER_DOCS = YES DISTRIBUTE_GROUP_DOC = NO # The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to tqreplace tabs by spaces in code fragments. +# Doxygen uses this value to replace tabs by spaces in code fragments. TAB_SIZE = 8 @@ -329,7 +329,7 @@ WARN_IF_DOC_ERROR = YES # The WARN_FORMAT tag determines the format of the warning messages that # doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be tqreplaced by the file and line number from which the +# tags, which will be replaced by the file and line number from which the # warning originated and the warning text. WARN_FORMAT = "$file:$line: $text" @@ -351,7 +351,7 @@ WARN_LOGFILE = INPUT = . ../../taskmanager -# If the value of the INPUT tag tqcontains directories, you can use the +# If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: @@ -370,14 +370,14 @@ RECURSIVE = NO # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = *tqmoc* +EXCLUDE = *moc* # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories # that are symbolic links (a Unix filesystem feature) are excluded from the input. EXCLUDE_SYMLINKS = NO -# If the value of the INPUT tag tqcontains directories, you can use the +# If the value of the INPUT tag contains directories, you can use the # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude # certain files from those directories. @@ -389,7 +389,7 @@ EXCLUDE_PATTERNS = EXAMPLE_PATH = -# If the value of the EXAMPLE_PATH tag tqcontains directories, you can use the +# If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank all files are included. @@ -468,7 +468,7 @@ VERBATIM_HEADERS = YES # If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index # of all compounds will be generated. Enable this if the project -# tqcontains a lot of classes, structs, unions or interfaces. +# contains a lot of classes, structs, unions or interfaces. ALPHABETICAL_INDEX = NO @@ -704,7 +704,7 @@ RTF_HYPERLINKS = NO # Load stylesheet definitions from file. Syntax is similar to doxygen's # config file, i.e. a series of assigments. You only have to provide -# tqreplacements, missing definitions are set to their default value. +# replacements, missing definitions are set to their default value. RTF_STYLESHEET_FILE = diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 4175f01b7..bf2b64ba3 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -93,7 +93,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( tqcolorGroup().mid() ), + tintColour_( colorGroup().mid() ), useMask_( true ), res(0) { @@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); + connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) @@ -122,7 +122,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam rootPix( 0 ), enableTint_( false ), tintAmount_( 0.1 ), - tintColour_( tqcolorGroup().mid() ), + tintColour_( colorGroup().mid() ), useMask_( true ), res(0) { @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( tqrepaint() ) ); + connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -255,7 +255,7 @@ void KasBar::setTint( bool enable ) } emit configChanged(); - tqrepaint( true ); + repaint( true ); } } @@ -269,7 +269,7 @@ void KasBar::setTint( double amount, TQColor color ) emit configChanged(); if ( rootPix->isAvailable() ) - rootPix->tqrepaint( true ); + rootPix->repaint( true ); } } @@ -375,7 +375,7 @@ void KasBar::setDetached( bool detach ) emit detachedChanged( detached ); } -TQSize KasBar::tqsizeHint( Orientation o, TQSize sz ) +TQSize KasBar::sizeHint( Orientation o, TQSize sz ) { if ( o == Horizontal ) setBoxesPerLine( sz.width() / itemExtent() ); @@ -416,7 +416,7 @@ void KasBar::updateLayout() bool updates = isUpdatesEnabled(); setUpdatesEnabled( false ); -// This is for testing a rectangular tqlayout +// This is for testing a rectangular layout // boxesPerLine_ = (uint) ceil(sqrt( items.count() )); // Work out the number of rows and columns @@ -445,8 +445,8 @@ void KasBar::updateLayout() setUpdatesEnabled( updates ); - TQWidget *top = tqtopLevelWidget(); - TQRegion tqmask; + TQWidget *top = topLevelWidget(); + TQRegion mask; KasItem *i; if ( orient == Horizontal ) { @@ -458,7 +458,7 @@ void KasBar::updateLayout() i->setPos( x, (items.at() / c) * itemExtent() ); i->update(); - tqmask = tqmask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } else { @@ -470,12 +470,12 @@ void KasBar::updateLayout() i->setPos( (items.at() % r) * itemExtent(), y ); i->update(); - tqmask = tqmask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); + mask = mask.unite( TQRegion( TQRect( i->pos(), TQSize(itemExtent(),itemExtent()) ) ) ); } } if ( useMask_ ) - top->setMask( tqmask ); + top->setMask( mask ); else top->clearMask(); update(); @@ -622,7 +622,7 @@ void KasBar::resizeEvent(TQResizeEvent *ev) TQPainter p( &offscreen ); paintBackground( &p, TQRect(TQPoint(0,0),size()) ); TQWidget::resizeEvent(ev); - emit tqlayoutChanged(); + emit layoutChanged(); } @@ -646,7 +646,7 @@ void KasBar::updateItem( KasItem *i ) update( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); } -void KasBar::tqrepaintItem(KasItem *i, bool erase ) +void KasBar::repaintItem(KasItem *i, bool erase ) { if ( !i ) return; @@ -658,7 +658,7 @@ void KasBar::tqrepaintItem(KasItem *i, bool erase ) paintBackground( &p, TQRect( pos, TQSize( itemExtent(), itemExtent() ) ) ); i->paint( &p, pos.x(), pos.y() ); - tqrepaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); + repaint( TQRect( pos, TQSize( itemExtent(), itemExtent() ) ), transparent_ || erase ); } KasItem* KasBar::itemAt(const TQPoint &p) @@ -670,7 +670,7 @@ KasItem* KasBar::itemAt(const TQPoint &p) cr.setTopLeft( i->pos() ); cr.setSize( TQSize( itemExtent(), itemExtent() ) ); - if(cr.tqcontains(p)) + if(cr.contains(p)) return i; } @@ -687,12 +687,12 @@ void KasBar::setBackground( const TQPixmap &newBg ) updateLayout(); } -void KasBar::setMasked( bool tqmask ) +void KasBar::setMasked( bool mask ) { - if ( useMask_ == tqmask ) + if ( useMask_ == mask ) return; - useMask_ = tqmask; + useMask_ = mask; } void KasBar::setPaintInactiveFrames( bool enable ) diff --git a/kicker/extensions/kasbar/kasbar.h b/kicker/extensions/kasbar/kasbar.h index 4cd10dc7c..8ff745475 100644 --- a/kicker/extensions/kasbar/kasbar.h +++ b/kicker/extensions/kasbar/kasbar.h @@ -84,7 +84,7 @@ class KDE_EXPORT KasBar : public QWidget Q_PROPERTY( uint boxesPerLine READ boxesPerLine ) Q_PROPERTY( Direction direction READ direction ) Q_PROPERTY( Orientation orientation READ orientation ) - Q_PROPERTY( bool tqmasked READ isMasked ) + Q_PROPERTY( bool masked READ isMasked ) Q_ENUMS( Direction ) friend class KasItem; @@ -152,7 +152,7 @@ public: bool isDrag() const { return inDrag; } - TQSize tqsizeHint( Orientation, TQSize max ); + TQSize sizeHint( Orientation, TQSize max ); // // Look and feel options @@ -188,7 +188,7 @@ public: void updateItem( KasItem *i ); /** Redraws the specified item. */ - void tqrepaintItem(KasItem *i, bool erase = true ); + void repaintItem(KasItem *i, bool erase = true ); /** Returns the item at p or 0. */ KasItem* itemAt(const TQPoint &p); @@ -229,7 +229,7 @@ public slots: void setBackground( const TQPixmap &pix ); - void setMasked( bool tqmask ); + void setMasked( bool mask ); void setPaintInactiveFrames( bool enable ); @@ -251,7 +251,7 @@ signals: void directionChanged(); /** Emitted when kasbar wants to resize. This happens when a new window is added. */ - void tqlayoutChanged(); + void layoutChanged(); /** Emitted when the item size is changed. */ void itemSizeChanged( int ); @@ -279,7 +279,7 @@ protected: /** Calls the paint methods for the items in the rectangle specified by the event. */ void paintEvent(TQPaintEvent *ev); - /** Forces the widget to re-tqlayout it's contents. */ + /** Forces the widget to re-layout it's contents. */ void resizeEvent(TQResizeEvent *ev); private: diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 14f1b02f1..3bc3dcd1b 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -97,7 +97,7 @@ KasBarExtension::KasBarExtension( const TQString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); + connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); @@ -141,7 +141,7 @@ void KasBarExtension::showEvent( TQShowEvent */*se*/ ) { updateGeometry(); resize( kasbar->size() ); - tqrepaint( true ); + repaint( true ); } TQSize KasBarExtension::detachedSize() @@ -153,7 +153,7 @@ TQSize KasBarExtension::detachedSize() } -TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const +TQSize KasBarExtension::sizeHint(Position p, TQSize maxSize ) const { Orientation o = Horizontal; @@ -167,7 +167,7 @@ TQSize KasBarExtension::tqsizeHint(Position p, TQSize maxSize ) const return TQSize( 0, kasbar->itemExtent()/2 ); } - return kasbar->tqsizeHint( o, maxSize ); + return kasbar->sizeHint( o, maxSize ); } void KasBarExtension::positionChange( Position /* position */) diff --git a/kicker/extensions/kasbar/kasbarextension.h b/kicker/extensions/kasbar/kasbarextension.h index e5e3142df..7fbb4fbc6 100644 --- a/kicker/extensions/kasbar/kasbarextension.h +++ b/kicker/extensions/kasbar/kasbarextension.h @@ -76,7 +76,7 @@ public: virtual ~KasBarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Right; } virtual void positionChange( Position position ); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index f5fbe25b0..f025af857 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -45,7 +45,7 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd = new LCD( parent ); lcd->hide(); - lcd->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); + lcd->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ); lcd->setBackgroundMode( NoBackground ); lcd->setFrameStyle( TQFrame::NoFrame ); lcd->setSegmentStyle( TQLCDNumber::Flat ); @@ -75,7 +75,7 @@ KasPopup *KasClockItem::createPopup() void KasClockItem::updateTime() { - setText( KGlobal::locale()->formatDate( TQDate::tqcurrentDate(), true /* shortFormat */ ) ); + setText( KGlobal::locale()->formatDate( TQDate::currentDate(), true /* shortFormat */ ) ); lcd->display( KGlobal::locale()->formatTime( TQTime::currentTime(), false /* includeSecs */, false /* isDuration */) ); update(); @@ -89,7 +89,7 @@ void KasClockItem::paint( TQPainter *p ) p->save(); p->translate( 3, 15 ); - lcd->setPaletteForegroundColor( kasbar()->tqcolorGroup().mid() ); + lcd->setPaletteForegroundColor( kasbar()->colorGroup().mid() ); lcd->draw( p ); p->restore(); diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index a86c08303..6e03e8e3c 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,8 +83,8 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( hidePopup() ) ); - connect( parent, TQT_SIGNAL( tqlayoutChanged() ), this, TQT_SLOT( update() ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); + connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 1ed9b2ed9..8fd795363 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -301,7 +301,7 @@ void KasItem::paintFrame( TQPainter *p ) if ( !frame ) return; - qDrawShadePanel(p, 0, 0, extent(), extent(), tqcolorGroup(), false, 2); + qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2); TQPen pen; @@ -547,15 +547,15 @@ void KasItem::paint( TQPainter *p, int x, int y ) p->restore(); } -void KasItem::tqrepaint() +void KasItem::repaint() { - tqrepaint( true ); + repaint( true ); } -void KasItem::tqrepaint( bool erase ) +void KasItem::repaint( bool erase ) { if ( kas->isVisible() ) - kas->tqrepaintItem( this, erase ); + kas->repaintItem( this, erase ); } void KasItem::update() diff --git a/kicker/extensions/kasbar/kasitem.h b/kicker/extensions/kasbar/kasitem.h index 61efc85e9..c16a5f6d3 100644 --- a/kicker/extensions/kasbar/kasitem.h +++ b/kicker/extensions/kasbar/kasitem.h @@ -170,8 +170,8 @@ public: void paintModified( TQPainter *p ); public slots: - void tqrepaint(); - void tqrepaint( bool erase ); + void repaint(); + void repaint( bool erase ); void update(); void setActive( bool yes ); @@ -217,7 +217,7 @@ protected: TQFontMetrics fontMetrics() const { return kas->fontMetrics(); } /** Gets the color group from the parent. */ - const TQColorGroup &tqcolorGroup() const { return kas->tqcolorGroup(); } + const TQColorGroup &colorGroup() const { return kas->colorGroup(); } /** Factory method that creates a popup widget for the item. */ virtual KasPopup *createPopup(); diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index e36d2d18d..7b6939760 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -95,7 +95,7 @@ void KasLoadItem::paint( TQPainter *p ) KasItem::paint( p ); - TQColor light = kasbar()->tqcolorGroup().highlight(); + TQColor light = kasbar()->colorGroup().highlight(); TQColor dark = light.dark(); KPixmap pix; @@ -103,7 +103,7 @@ void KasLoadItem::paint( TQPainter *p ) KPixmapEffect::gradient( pix, light, dark, KPixmapEffect::DiagonalGradient ); p->drawPixmap( 2, extent()-2-h, pix ); - p->setPen( kasbar()->tqcolorGroup().mid() ); + p->setPen( kasbar()->colorGroup().mid() ); for ( double pos = 0.2 ; pos < 1.0 ; pos += 0.2 ) { int ypos = (int) floor((extent()-2) - (dh*maxValue*pos)); p->drawLine( 2, ypos, extent()-3, ypos ); diff --git a/kicker/extensions/kasbar/kaspopup.cpp b/kicker/extensions/kasbar/kaspopup.cpp index 9dfe480f2..7538dfbb2 100644 --- a/kicker/extensions/kasbar/kaspopup.cpp +++ b/kicker/extensions/kasbar/kaspopup.cpp @@ -96,21 +96,21 @@ TQPoint KasPopup::calcPosition( KasItem *item, int w, int h ) int y = pos.y(); if ( kasbar->orientation() == Horizontal ) { - if ( y < ( tqApp->desktop()->height() / 2 ) ) + if ( y < ( qApp->desktop()->height() / 2 ) ) y = y + kasbar->itemExtent(); else y = y - h; - if ( (x + w) > tqApp->desktop()->width() ) + if ( (x + w) > qApp->desktop()->width() ) x = x - w + kasbar->itemExtent(); } else { - if ( x < ( tqApp->desktop()->width() / 2 ) ) + if ( x < ( qApp->desktop()->width() / 2 ) ) x = x + kasbar->itemExtent(); else x = x - w; - if ( (y + h) > tqApp->desktop()->height() ) + if ( (y + h) > qApp->desktop()->height() ) y = y - h + kasbar->itemExtent(); } diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 8886f671d..e81b0aacb 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -408,7 +408,7 @@ void KasPrefsDialog::addAdvancedPage() notifierCheck->setChecked( kasbar->notifierEnabled() ); connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); - // tqStatus advanced + // Status advanced modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); TQWhatsThis::add( modifiedCheck, i18n( "Enables the display of a floppy disk state icon for windows containing " diff --git a/kicker/extensions/kasbar/kasresources.cpp b/kicker/extensions/kasbar/kasresources.cpp index 3450b1549..78b25e8c0 100644 --- a/kicker/extensions/kasbar/kasresources.cpp +++ b/kicker/extensions/kasbar/kasresources.cpp @@ -308,7 +308,7 @@ KPixmap KasResources::activeBg() if ( actBg.isNull() ) { actBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( actBg, - kasbar->tqcolorGroup().light(), kasbar->tqcolorGroup().mid(), + kasbar->colorGroup().light(), kasbar->colorGroup().mid(), KPixmapEffect::DiagonalGradient ); } @@ -320,7 +320,7 @@ KPixmap KasResources::inactiveBg() if ( inactBg.isNull() ) { inactBg.resize( kasbar->itemExtent(), kasbar->itemExtent() ); KPixmapEffect::gradient( inactBg, - kasbar->tqcolorGroup().mid(), kasbar->tqcolorGroup().dark(), + kasbar->colorGroup().mid(), kasbar->colorGroup().dark(), KPixmapEffect::DiagonalGradient ); } diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index bb36ae522..a087f40ff 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -207,7 +207,7 @@ KPopupMenu *KasTasker::contextMenu() if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("exit"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("exit"), i18n("&Quit"), qApp, TQT_SLOT( quit() ) ); } } diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 121e0f1eb..c9ec7bdd0 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -165,9 +165,9 @@ void KasTaskItem::checkAttention() setAttention( task_->demandsAttention() ); } -void KasTaskItem::updateTask(bool tqgeometryChangeOnly) +void KasTaskItem::updateTask(bool geometryChangeOnly) { - if (tqgeometryChangeOnly) + if (geometryChangeOnly) { return; } @@ -422,7 +422,7 @@ TQWidget *KasTaskItem::createTaskProps( TQObject *target, TQWidget *parent, bool taskprops->addColumn( i18n("Value") ); // Create List Items - TQMetaObject *mo = target->tqmetaObject(); + TQMetaObject *mo = target->metaObject(); for ( int i = 0; i < mo->numProperties( recursive ); i++ ) { const TQMetaProperty *p = mo->property(i, recursive); @@ -445,7 +445,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) if ( pos >= 0 ) { TQVariant val = data->property( re.cap(1).latin1() ); TQString v = val.asString(); - s.tqreplace( pos, re.matchedLength(), v ); + s.replace( pos, re.matchedLength(), v ); pos = pos + v.length(); } } @@ -456,7 +456,7 @@ TQString KasTaskItem::expandMacros( const TQString &format, TQObject *data ) TQWidget *KasTaskItem::createX11Props( TQWidget *parent ) { TQVBox *vb2 = new TQVBox( parent ); - vb2->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + vb2->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); vb2->setSpacing( KDialog::spacingHint() ); vb2->setMargin( KDialog::marginHint() ); diff --git a/kicker/extensions/kasbar/kastaskitem.h b/kicker/extensions/kasbar/kastaskitem.h index 5118a4263..b2b166ef5 100644 --- a/kicker/extensions/kasbar/kastaskitem.h +++ b/kicker/extensions/kasbar/kastaskitem.h @@ -90,7 +90,7 @@ class KasTaskItem : public KasItem TQString expandMacros( const TQString &format, TQObject *data ); public slots: - void updateTask(bool tqgeometryChangeOnly); + void updateTask(bool geometryChangeOnly); /** Create a thumbnail for this task (does nothing if they're disabled). */ void refreshThumbnail(); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 9a59e1603..25c096a65 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -91,7 +91,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) } KPixmapEffect::gradient( titleBg, - Qt::black, tqcolorGroup().mid(), + Qt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index 424414a3a..401c67fbd 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -50,8 +50,8 @@ SidebarExtension::SidebarExtension( const TQString& configFile, { kdDebug() << "SidebarExtension: Created '" << name << "', '" << configFile << "'" << endl; new KonqHistoryManager(0,"SidebarExtensionHistoryManager"); - m_tqlayout=new TQHBoxLayout(this); - m_tqlayout->activate(); + m_layout=new TQHBoxLayout(this); + m_layout->activate(); m_sbWrapper=new TQVBox(this); KParts::ReadOnlyPart *p=KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>( "konq_sidebar", @@ -94,7 +94,7 @@ void SidebarExtension::needLayoutUpdate(bool exp) { m_currentWidth=24; m_resizeHandle->hide(); } - tqtopLevelWidget()->setFixedWidth(m_currentWidth); + topLevelWidget()->setFixedWidth(m_currentWidth); emit updateLayout(); } @@ -117,7 +117,7 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { return true; } else if (e->type()==TQEvent::MouseButtonRelease) { m_resizing=false; - m_expandedSize=tqtopLevelWidget()->width(); + m_expandedSize=topLevelWidget()->width(); needLayoutUpdate(true); return true; } else if (e->type()==TQEvent::MouseMove) { @@ -126,14 +126,14 @@ bool SidebarExtension::eventFilter( TQObject *, TQEvent *e ) { if (p==Left) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()+diff); + topLevelWidget()->setFixedWidth(topLevelWidget()->width()+diff); m_x=((TQMouseEvent*)e)->globalX(); } } else if (p==Right) { int diff=((TQMouseEvent*)e)->globalX()-m_x; if (abs(diff)>3) { - tqtopLevelWidget()->setFixedWidth(tqtopLevelWidget()->width()-diff); - tqtopLevelWidget()->move(tqtopLevelWidget()->x()+diff,tqtopLevelWidget()->y()); + topLevelWidget()->setFixedWidth(topLevelWidget()->width()-diff); + topLevelWidget()->move(topLevelWidget()->x()+diff,topLevelWidget()->y()); m_x=((TQMouseEvent*)e)->globalX(); } } @@ -148,24 +148,24 @@ KPanelExtension::Position SidebarExtension::preferedPosition() const { return KPanelExtension::Left; } -TQSize SidebarExtension::tqsizeHint(Position, TQSize maxSize ) const +TQSize SidebarExtension::sizeHint(Position, TQSize maxSize ) const { return TQSize(m_currentWidth,maxSize.height()); } void SidebarExtension::positionChange( Position position ) { if (position == Right) { - m_tqlayout->remove(m_sbWrapper); - m_tqlayout->remove(m_resizeHandle); + m_layout->remove(m_sbWrapper); + m_layout->remove(m_resizeHandle); - m_tqlayout->add(m_resizeHandle); - m_tqlayout->add(m_sbWrapper); + m_layout->add(m_resizeHandle); + m_layout->add(m_sbWrapper); } else if (position == Left) { - m_tqlayout->remove(m_sbWrapper); - m_tqlayout->remove(m_resizeHandle); + m_layout->remove(m_sbWrapper); + m_layout->remove(m_resizeHandle); - m_tqlayout->add(m_sbWrapper); - m_tqlayout->add(m_resizeHandle); + m_layout->add(m_sbWrapper); + m_layout->add(m_resizeHandle); } diff --git a/kicker/extensions/sidebar/sidebarextension.h b/kicker/extensions/sidebar/sidebarextension.h index 7dea6b0fb..4d0d1646b 100644 --- a/kicker/extensions/sidebar/sidebarextension.h +++ b/kicker/extensions/sidebar/sidebarextension.h @@ -36,7 +36,7 @@ public: virtual ~SidebarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const; virtual void positionChange( Position position ); @@ -55,7 +55,7 @@ private: TQFrame *m_resizeHandle; bool m_resizing; int m_expandedSize; - TQHBoxLayout *m_tqlayout; + TQHBoxLayout *m_layout; TQVBox *m_sbWrapper; }; diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index 99a131926..e0deb768e 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -57,11 +57,11 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, m_bgFilename(0), m_rootPixmap(0) { - TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + TQHBoxLayout *layout = new TQHBoxLayout(this); m_container = new TaskBarContainer(false, this); m_container->setBackgroundOrigin(AncestorOrigin); positionChange(position()); - tqlayout->addWidget(m_container); + layout->addWidget(m_container); connect(m_container, TQT_SIGNAL(containerCountChanged()), TQT_SIGNAL(updateLayout())); @@ -123,17 +123,17 @@ void TaskBarExtension::preferences() m_container->preferences(); } -TQSize TaskBarExtension::tqsizeHint(Position p, TQSize maxSize) const +TQSize TaskBarExtension::sizeHint(Position p, TQSize maxSize) const { if (p == Left || p == Right) maxSize.setWidth(sizeInPixels()); else maxSize.setHeight(sizeInPixels()); -// kdDebug(1210) << "TaskBarExtension::tqsizeHint( Position, TQSize )" << endl; +// kdDebug(1210) << "TaskBarExtension::sizeHint( Position, TQSize )" << endl; // kdDebug(1210) << " width: " << size.width() << endl; // kdDebug(1210) << "height: " << size.height() << endl; - return m_container->tqsizeHint(p, maxSize); + return m_container->sizeHint(p, maxSize); } void TaskBarExtension::configure() @@ -155,7 +155,7 @@ void TaskBarExtension::setBackgroundTheme() } else { - m_rootPixmap->tqrepaint(true); + m_rootPixmap->repaint(true); } double tint = double(KickerSettings::tintValue()) / 100; diff --git a/kicker/extensions/taskbar/taskbarextension.h b/kicker/extensions/taskbar/taskbarextension.h index 92c065beb..2848e80c7 100644 --- a/kicker/extensions/taskbar/taskbarextension.h +++ b/kicker/extensions/taskbar/taskbarextension.h @@ -49,7 +49,7 @@ public: int actions = 0, TQWidget *parent = 0, const char *name = 0 ); ~TaskBarExtension(); - TQSize tqsizeHint( Position, TQSize maxSize ) const; + TQSize sizeHint( Position, TQSize maxSize ) const; Position preferedPosition() const { return Bottom; } protected: diff --git a/kicker/kicker/buttons/bookmarksbutton.h b/kicker/kicker/buttons/bookmarksbutton.h index d150688f0..3d8518519 100644 --- a/kicker/kicker/buttons/bookmarksbutton.h +++ b/kicker/kicker/buttons/bookmarksbutton.h @@ -32,7 +32,7 @@ class KActionCollection; class KBookmarkOwner; /** - * Button that tqcontains a bookmark menu + * Button that contains a bookmark menu */ class BookmarksButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 4a8c9a7af..2e2cb5a2d 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -103,7 +103,7 @@ void BrowserButton::dropEvent( TQDropEvent *ev ) { KURL path ( topMenu->path() ); _menuTimer->stop(); - KFileItem item( path, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( path, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, path, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/browserbutton.h b/kicker/kicker/buttons/browserbutton.h index cd64b3539..bb08801d9 100644 --- a/kicker/kicker/buttons/browserbutton.h +++ b/kicker/kicker/buttons/browserbutton.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelBrowserMenu; /** - * Button that tqcontains a Browser directory menu + * Button that contains a Browser directory menu */ class BrowserButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index 71bcaa2e5..9f23741e5 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -77,7 +77,7 @@ void DesktopButton::dragEnterEvent( TQDragEnterEvent *ev ) void DesktopButton::dropEvent( TQDropEvent *ev ) { KURL dPath ( KGlobalSettings::desktopPath() ); - KFileItem item( dPath, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( dPath, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, dPath, ev, this ); PanelButton::dropEvent(ev); } diff --git a/kicker/kicker/buttons/kbutton.h b/kicker/kicker/buttons/kbutton.h index 469b0fab5..bf98e74f8 100644 --- a/kicker/kicker/buttons/kbutton.h +++ b/kicker/kicker/buttons/kbutton.h @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "panelbutton.h" /** - * Button that tqcontains the PanelKMenu and client menu manager. + * Button that contains the PanelKMenu and client menu manager. */ class KButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index a395b3cb6..9c9f438ac 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -70,7 +70,7 @@ KNewButton::KNewButton( TQWidget* parent ) m_movie = new TQMovie(locate("data", "kicker/pics/kmenu_basic.mng")); m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connecttqStatus(this, TQT_SLOT(slottqStatus(int))); + m_movie->connectStatus(this, TQT_SLOT(slotStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); TQApplication::desktop()->screen()->installEventFilter(this); @@ -85,7 +85,7 @@ KNewButton::~KNewButton() delete m_movie; } -void KNewButton::slottqStatus(int status) +void KNewButton::slotStatus(int status) { if(status == TQMovie::EndOfLoop) slotStopAnimation(); @@ -99,7 +99,7 @@ TQColor KNewButton::borderColor() const QRgb rgb = img.pixel(orientation() == Qt::Horizontal ? img.width() - i - 1 : i, 2); - if (tqGreen(rgb) > 0x50) + if (qGreen(rgb) > 0x50) return rgb; } @@ -151,7 +151,7 @@ void KNewButton::setPopupDirection(KPanelApplet::Direction d) } m_movie->connectUpdate(this, TQT_SLOT(updateMovie())); - m_movie->connecttqStatus(this, TQT_SLOT(slottqStatus(int))); + m_movie->connectStatus(this, TQT_SLOT(slotStatus(int))); m_movie->connectResize(this, TQT_SLOT(slotSetSize(const TQSize&))); } @@ -215,7 +215,7 @@ bool KNewButton::eventFilter(TQObject *o, TQEvent *e) e->type() == TQEvent::MouseButtonDblClick ) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().tqcontains(mapFromGlobal(me->globalPos()))) + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup && m_openTimer != -1 && (me->button() & Qt::LeftButton) ) @@ -286,7 +286,7 @@ void KNewButton::drawEye() } m_active_pixmap = pixmap.xForm(matrix); - tqrepaint(false); + repaint(false); } #undef eye_x #undef eye_y @@ -355,9 +355,9 @@ void KNewButton::mouseMoveEvent(TQMouseEvent* e) { KButton::mouseMoveEvent(e); - m_mouseInside = m_sloppyRegion.tqcontains(e->pos()); + m_mouseInside = m_sloppyRegion.contains(e->pos()); - if ( m_sloppyRegion.tqcontains(e->pos())) + if ( m_sloppyRegion.contains(e->pos())) { if (m_hoverTimer == -1 && KickerSettings::openOnHover()) m_hoverTimer = startTimer(kMax(200,TQApplication::doubleClickInterval()/2)); diff --git a/kicker/kicker/buttons/knewbutton.h b/kicker/kicker/buttons/knewbutton.h index 8be1a8600..bcb8b8743 100644 --- a/kicker/kicker/buttons/knewbutton.h +++ b/kicker/kicker/buttons/knewbutton.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqpoint.h> /** - * Button that tqcontains the PanelKMenu and client menu manager. + * Button that contains the PanelKMenu and client menu manager. */ class KNewButton : public KButton { @@ -57,7 +57,7 @@ public: virtual void setPopupDirection(KPanelApplet::Direction d); private slots: - void slottqStatus(int); + void slotStatus(int); void slotSetSize(const TQSize&); void slotStopAnimation(); void rewindMovie(); diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index e91a06f37..29b7ddb2e 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nonkdeappbutton.cpp @@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // our own definition #include "nonkdeappbutton.h" -// we include the "tqmoc" file so that the KDE build system knows to create it +// we include the "moc" file so that the KDE build system knows to create it #include "nonkdeappbutton.moc" // this is one of the two constructors. gets called when creating a new button diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nonkdeappbutton.h index 44cbb2f0d..217f2c22c 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.h +++ b/kicker/kicker/buttons/nonkdeappbutton.h @@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelExeDialog; /** - * Button that tqcontains a non-KDE application + * Button that contains a non-KDE application * subclass of PanelButton */ class NonKDEAppButton : public PanelButton diff --git a/kicker/kicker/buttons/servicemenubutton.h b/kicker/kicker/buttons/servicemenubutton.h index dda61dab6..0bd05b8ee 100644 --- a/kicker/kicker/buttons/servicemenubutton.h +++ b/kicker/kicker/buttons/servicemenubutton.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class PanelServiceMenu; /** - * Button that tqcontains a Service menu + * Button that contains a Service menu */ class ServiceMenuButton : public PanelPopupButton { diff --git a/kicker/kicker/buttons/windowlistbutton.h b/kicker/kicker/buttons/windowlistbutton.h index 19032083b..d8b57c62e 100644 --- a/kicker/kicker/buttons/windowlistbutton.h +++ b/kicker/kicker/buttons/windowlistbutton.h @@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class KWindowListMenu; /** - * Button that tqcontains a windowlist menu + * Button that contains a windowlist menu */ class WindowListButton : public PanelPopupButton { diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 5d4bb57f2..f5f398136 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -52,17 +52,17 @@ AppletHandle::AppletHandle(AppletContainer* parent) { setBackgroundOrigin(AncestorOrigin); setMinimumSize(widthForHeight(0), heightForWidth(0)); - m_tqlayout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0); + m_layout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0); m_dragBar = new AppletHandleDrag(this); m_dragBar->installEventFilter(this); - m_tqlayout->addWidget(m_dragBar); + m_layout->addWidget(m_dragBar); if (kapp->authorizeKAction("kicker_rmb")) { m_menuButton = new AppletHandleButton( this ); m_menuButton->installEventFilter(this); - m_tqlayout->addWidget(m_menuButton); + m_layout->addWidget(m_menuButton); connect(m_menuButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed())); @@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent) int AppletHandle::heightForWidth( int /* w */ ) const { - int size = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } int AppletHandle::widthForHeight( int /* h */ ) const { - int size = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); return size; } @@ -101,25 +101,25 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d) switch (m_popupDirection) { case KPanelApplet::Up: - m_tqlayout->setDirection(TQBoxLayout::BottomToTop); + m_layout->setDirection(TQBoxLayout::BottomToTop); a = Qt::UpArrow; break; case KPanelApplet::Down: - m_tqlayout->setDirection(TQBoxLayout::TopToBottom); + m_layout->setDirection(TQBoxLayout::TopToBottom); a = Qt::DownArrow; break; case KPanelApplet::Left: - m_tqlayout->setDirection(TQBoxLayout::RightToLeft); + m_layout->setDirection(TQBoxLayout::RightToLeft); a = Qt::LeftArrow; break; case KPanelApplet::Right: - m_tqlayout->setDirection(TQBoxLayout::LeftToRight); + m_layout->setDirection(TQBoxLayout::LeftToRight); a = Qt::RightArrow; break; } m_menuButton->setArrowType(a); - m_tqlayout->activate(); + m_layout->activate(); } void AppletHandle::resetLayout() @@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e) // a hack for applets that have out-of-process // elements (e.g the systray) so that the handle // doesn't flicker when moving over those elements - if (w->rect().tqcontains(w->mapFromGlobal(TQCursor::pos()))) + if (w->rect().contains(w->mapFromGlobal(TQCursor::pos()))) { nowDrawIt = true; } @@ -269,7 +269,7 @@ void AppletHandle::checkHandleHover() { if (!m_handleHoverTimer || (m_menuButton && m_menuButton->isOn()) || - m_applet->tqgeometry().tqcontains(m_applet->mapToParent( + m_applet->geometry().contains(m_applet->mapToParent( m_applet->mapFromGlobal(TQCursor::pos())))) { return; @@ -282,7 +282,7 @@ void AppletHandle::checkHandleHover() bool AppletHandle::onMenuButton(const TQPoint& point) const { - return m_menuButton && (tqchildAt(mapFromGlobal(point)) == m_menuButton); + return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton); } void AppletHandle::toggleMenuButtonOff() @@ -308,9 +308,9 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent) setBackgroundOrigin( AncestorOrigin ); } -TQSize AppletHandleDrag::tqminimumSizeHint() const +TQSize AppletHandleDrag::minimumSizeHint() const { - int wh = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); if (m_parent->orientation() == Horizontal) { @@ -368,7 +368,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *) TQRect r = rect(); style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r, - tqcolorGroup(), flags); + colorGroup(), flags); } else { @@ -382,9 +382,9 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent) { } -TQSize AppletHandleButton::tqminimumSizeHint() const +TQSize AppletHandleButton::minimumSizeHint() const { - int height = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this); + int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this); int width = height; if (m_parent->orientation() == Horizontal) diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h index ad80e2ee6..5eff46717 100644 --- a/kicker/kicker/core/applethandle.h +++ b/kicker/kicker/core/applethandle.h @@ -76,7 +76,7 @@ class AppletHandle : public QWidget private: AppletContainer* m_applet; - TQBoxLayout* m_tqlayout; + TQBoxLayout* m_layout; AppletHandleDrag* m_dragBar; AppletHandleButton* m_menuButton; bool m_drawHandle; @@ -92,9 +92,9 @@ class AppletHandleDrag : public QWidget public: AppletHandleDrag(AppletHandle* parent); - TQSize tqminimumSizeHint() const; - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } TQSizePolicy sizePolicy() const; protected: @@ -113,9 +113,9 @@ class AppletHandleButton : public SimpleArrowButton public: AppletHandleButton(AppletHandle *parent); - TQSize tqminimumSizeHint() const; - TQSize tqminimumSize() const { return tqminimumSizeHint(); } - TQSize tqsizeHint() const { return tqminimumSize(); } + TQSize minimumSizeHint() const; + TQSize minimumSize() const { return minimumSizeHint(); } + TQSize sizeHint() const { return minimumSize(); } TQSizePolicy sizePolicy() const; private: diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 764c66846..77c6d1912 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -65,7 +65,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, TQString(info.library() + "container").latin1()), _info(info), _handle(0), - _tqlayout(0), + _layout(0), _type(KPanelApplet::Normal), _widthForHeightHint(0), _heightForWidthHint(0), @@ -81,24 +81,24 @@ AppletContainer::AppletContainer(const AppletInfo& info, if (orientation() == Horizontal) { - _tqlayout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); + _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0); } else { - _tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0); + _layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0); } - _tqlayout->setResizeMode( TQLayout::FreeResize ); + _layout->setResizeMode( TQLayout::FreeResize ); - _tqlayout->addSpacing(APPLET_MARGIN); + _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); - _tqlayout->addWidget(_handle, 0); + _layout->addWidget(_handle, 0); connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), this, TQT_SLOT(moveApplet(const TQPoint&))); connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); - _tqlayout->addWidget(_appletframe, 1); - _tqlayout->activate(); + _layout->addWidget(_appletframe, 1); + _layout->activate(); _deskFile = info.desktopFile(); _configFile = info.configFile(); @@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info, _valid = true; _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection())); - _applet->tqsetAlignment((KPanelApplet::Alignment)tqalignment()); + _applet->setAlignment((KPanelApplet::Alignment)alignment()); _actions = _applet->actions(); _type = _applet->type(); @@ -193,14 +193,14 @@ void AppletContainer::resetLayout() if (orientation() == Horizontal) { - _tqlayout->setDirection( TQBoxLayout::LeftToRight ); + _layout->setDirection( TQBoxLayout::LeftToRight ); } else { - _tqlayout->setDirection( TQBoxLayout::TopToBottom ); + _layout->setDirection( TQBoxLayout::TopToBottom ); } - _tqlayout->activate(); + _layout->activate(); } void AppletContainer::moveApplet( const TQPoint& moveOffset ) @@ -275,14 +275,14 @@ void AppletContainer::slotRemoved(KConfig* config) void AppletContainer::activateWindow() { - KWin::forceActiveWindow(tqtopLevelWidget()->winId()); + KWin::forceActiveWindow(topLevelWidget()->winId()); } void AppletContainer::focusRequested(bool focus) { if (focus) { - KWin::forceActiveWindow(tqtopLevelWidget()->winId()); + KWin::forceActiveWindow(topLevelWidget()->winId()); } emit maintainFocus(focus); @@ -295,7 +295,7 @@ void AppletContainer::doLoadConfiguration( KConfigGroup& config ) } void AppletContainer::doSaveConfiguration( KConfigGroup& config, - bool tqlayoutOnly ) const + bool layoutOnly ) const { // immutability is checked by ContainerBase if (orientation() == Horizontal) @@ -307,7 +307,7 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config, config.writeEntry( "HeightForWidthHint", heightForWidth(width()) ); } - if (!tqlayoutOnly) + if (!layoutOnly) { config.writePathEntry( "ConfigFile", _configFile ); config.writePathEntry( "DesktopFile", _deskFile ); @@ -354,14 +354,14 @@ void AppletContainer::slotDelayedDestruct() delete this; } -void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a) +void AppletContainer::alignmentChange(KPanelExtension::Alignment a) { if (!_applet) { return; } - _applet->tqsetAlignment( (KPanelApplet::Alignment)a ); + _applet->setAlignment( (KPanelApplet::Alignment)a ); } int AppletContainer::widthForHeight(int h) const diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 12f5c2c7d..019e52c96 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -83,15 +83,15 @@ public slots: protected: virtual void doLoadConfiguration( KConfigGroup& ); - virtual void doSaveConfiguration( KConfigGroup&, bool tqlayoutOnly ) const; - virtual void tqalignmentChange(KPanelExtension::Alignment a); + virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; + virtual void alignmentChange(KPanelExtension::Alignment a); virtual TQPopupMenu* createOpMenu(); AppletInfo _info; AppletHandle *_handle; TQHBox *_appletframe; - TQBoxLayout *_tqlayout; + TQBoxLayout *_layout; KPanelApplet::Type _type; int _widthForHeightHint; int _heightForWidthHint; diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp index 957262b34..bb3d7d984 100644 --- a/kicker/kicker/core/container_base.cpp +++ b/kicker/kicker/core/container_base.cpp @@ -38,7 +38,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const : TQWidget( parent, name ) , _dir(KPanelApplet::Up) , _orient(Horizontal) - , _tqalignment(KPanelExtension::LeftTop) + , _alignment(KPanelExtension::LeftTop) , _fspace(0) , _moveOffset(TQPoint(0,0)) , _aid(TQString::null) @@ -77,7 +77,7 @@ void BaseContainer::loadConfiguration( KConfigGroup& group ) } void BaseContainer::saveConfiguration(KConfigGroup& group, - bool tqlayoutOnly) const + bool layoutOnly) const { if (isImmutable()) { @@ -87,7 +87,7 @@ void BaseContainer::saveConfiguration(KConfigGroup& group, // write positioning info group.writeEntry( "FreeSpace2", freeSpace() ); // write type specific info - doSaveConfiguration( group, tqlayoutOnly ); + doSaveConfiguration( group, layoutOnly ); } void BaseContainer::configure(KPanelExtension::Orientation o, @@ -110,15 +110,15 @@ void BaseContainer::slotRemoved(KConfig* config) config->sync(); } -void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a) +void BaseContainer::setAlignment(KPanelExtension::Alignment a) { - if (_tqalignment == a) + if (_alignment == a) { return; } - _tqalignment = a; - tqalignmentChange(a); + _alignment = a; + alignmentChange(a); } TQPopupMenu* BaseContainer::opMenu() diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h index bdf965f8d..1c218b103 100644 --- a/kicker/kicker/core/container_base.h +++ b/kicker/kicker/core/container_base.h @@ -73,7 +73,7 @@ public: KPanelApplet::Direction popupDirection() const { return _dir; } KPanelExtension::Orientation orientation() const { return _orient; } - KPanelExtension::Alignment tqalignment() const { return _tqalignment; } + KPanelExtension::Alignment alignment() const { return _alignment; } virtual void setBackground() {} @@ -81,7 +81,7 @@ public: void clearOpMenu(); void loadConfiguration( KConfigGroup& ); - void saveConfiguration( KConfigGroup&, bool tqlayoutOnly = false ) const; + void saveConfiguration( KConfigGroup&, bool layoutOnly = false ) const; void configure(KPanelExtension::Orientation, KPanelApplet::Direction); virtual void configure() {} @@ -97,7 +97,7 @@ public slots: virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; } virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; } - void tqsetAlignment(KPanelExtension::Alignment a); + void setAlignment(KPanelExtension::Alignment a); signals: void removeme(BaseContainer*); @@ -110,15 +110,15 @@ signals: protected: virtual void doLoadConfiguration( KConfigGroup& ) {} virtual void doSaveConfiguration( KConfigGroup&, - bool /* tqlayoutOnly */ ) const {} - virtual void tqalignmentChange(KPanelExtension::Alignment) {} + bool /* layoutOnly */ ) const {} + virtual void alignmentChange(KPanelExtension::Alignment) {} virtual TQPopupMenu* createOpMenu() = 0; TQPopupMenu *appletOpMenu() const { return _appletOpMnu; } KPanelApplet::Direction _dir; KPanelExtension::Orientation _orient; - KPanelExtension::Alignment _tqalignment; + KPanelExtension::Alignment _alignment; double _fspace; TQPoint _moveOffset; TQString _aid; diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index bd1045d84..bb0249843 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ButtonContainer::ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent) : BaseContainer(opMenu, parent) , _button(0) - , _tqlayout(0) + , _layout(0) , _oldpos(0,0) { setBackgroundOrigin(AncestorOrigin); @@ -114,10 +114,10 @@ void ButtonContainer::configure() } } -void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool tqlayoutOnly) const +void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool layoutOnly) const { // immutability is checked by ContainerBase - if (_button && !tqlayoutOnly) + if (_button && !layoutOnly) { _button->saveConfig(config); } @@ -145,12 +145,12 @@ void ButtonContainer::embedButton(PanelButton* b) { if (!b) return; - delete _tqlayout; - _tqlayout = new TQVBoxLayout(this); + delete _layout; + _layout = new TQVBoxLayout(this); _button = b; _button->installEventFilter(this); - _tqlayout->add(_button); + _layout->add(_button); connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h index 7050f9cb6..78b4d4ab1 100644 --- a/kicker/kicker/core/container_button.h +++ b/kicker/kicker/core/container_button.h @@ -68,14 +68,14 @@ protected slots: void dragButton(const TQPixmap icon); protected: - virtual void doSaveConfiguration( KConfigGroup&, bool tqlayoutOnly ) const; + virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const; void embedButton(PanelButton* p); TQPopupMenu* createOpMenu(); void checkImmutability(const KConfigGroup&); protected: PanelButton *_button; - TQLayout *_tqlayout; + TQLayout *_layout; TQPoint _oldpos; }; diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 6a1455f3e..52e85bd7e 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -139,11 +139,11 @@ void ExtensionContainer::init() _popupWidgetFilter = new PopupWidgetFilter( this ); connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); - // tqlayout - _tqlayout = new TQGridLayout(this, 3, 3, 0, 0); - _tqlayout->setResizeMode(TQLayout::FreeResize); - _tqlayout->setRowStretch(1,10); - _tqlayout->setColStretch(1,10); + // layout + _layout = new TQGridLayout(this, 3, 3, 0, 0); + _layout->setResizeMode(TQLayout::FreeResize); + _layout->setRowStretch(1,10); + _layout->setColStretch(1,10); // instantiate the autohide timer _autohideTimer = new TQTimer(this, "_autohideTimer"); @@ -198,7 +198,7 @@ void ExtensionContainer::init() connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), TQT_SLOT(maintainFocus(bool))); - _tqlayout->addWidget(m_extension, 1, 1); + _layout->addWidget(m_extension, 1, 1); } if (!m_settings.iExist()) @@ -212,7 +212,7 @@ ExtensionContainer::~ExtensionContainer() { } -TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize &maxSize) const +TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const { int width = 0; int height = 0; @@ -234,7 +234,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize } // don't forget we might have a border! - width += _tqlayout->colSpacing(0) + _tqlayout->colSpacing(2); + width += _layout->colSpacing(0) + _layout->colSpacing(2); } else { @@ -254,7 +254,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize } // don't forget we might have a border! - height += _tqlayout->rowSpacing(0) + _tqlayout->rowSpacing(2); + height += _layout->rowSpacing(0) + _layout->rowSpacing(2); } TQSize size(width, height); @@ -262,7 +262,7 @@ TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize if (m_extension) { - size = m_extension->tqsizeHint(p, maxSize - size) + size; + size = m_extension->sizeHint(p, maxSize - size) + size; } return size.boundedTo(maxSize); @@ -293,7 +293,7 @@ void ExtensionContainer::readConfig() } positionChange(position()); - tqalignmentChange(tqalignment()); + alignmentChange(alignment()); setSize(static_cast<KPanelExtension::Size>(m_settings.size()), m_settings.customSize()); @@ -471,7 +471,7 @@ void ExtensionContainer::moveMe() KPanelExtension::Right, KPanelExtension::Top, KPanelExtension::Bottom }; - KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop, + KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop, KPanelExtension::Center, KPanelExtension::RightBottom }; @@ -482,26 +482,26 @@ void ExtensionContainer::moveMe() for (int j = 0; j < 3; j++) { // FIXME: - // asking for initial tqgeometry here passes bogus heightForWidth + // asking for initial geometry here passes bogus heightForWidth // and widthForHeight requests to applets and buttons. if they - // need to make tqlayout adjustments or need to calculate based + // need to make layout adjustments or need to calculate based // on other parameters this can lead to Bad Things(tm) // // we need to find a way to do this that doesn't result in - // tqsizeHint's getting called on the extension =/ + // sizeHint's getting called on the extension =/ // // or else we need to change the semantics for applets so that // they don't get their "you're changing position" signals through // heightForWidth/widthForHeight rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i], - tqalignments[j], s), - s, positions[i], tqalignments[j])); + alignments[j], s), + s, positions[i], alignments[j])); } } } UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor); - arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen); + arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen); _is_lmb_down = false; @@ -532,7 +532,7 @@ void ExtensionContainer::updateLayout() return; } - // don't update our tqlayout more than once every half a second... + // don't update our layout more than once every half a second... if (_in_autohide) { // ... unless we are autohiding @@ -556,12 +556,12 @@ void ExtensionContainer::enableMouseOverEffects() KickerTip::enableTipping(true); TQPoint globalPos = TQCursor::pos(); TQPoint localPos = mapFromGlobal(globalPos); - TQWidget* child = tqchildAt(localPos); + TQWidget* child = childAt(localPos); if (child) { TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0); - tqApp->sendEvent(child, e); + qApp->sendEvent(child, e); } } @@ -657,16 +657,16 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama // Otherwise hide mode is automatic. The code below is slightly // complex so as to keep the same behavior as it has always had: - // only unhide when the cursor position is within the widget tqgeometry. - // We can't just do tqgeometry().tqcontains(TQCursor::pos()) because + // only unhide when the cursor position is within the widget geometry. + // We can't just do geometry().contains(TQCursor::pos()) because // now we hide the panel completely off screen. int x = TQCursor::pos().x(); int y = TQCursor::pos().y(); - int t = tqgeometry().top(); - int b = tqgeometry().bottom(); - int r = tqgeometry().right(); - int l = tqgeometry().left(); + int t = geometry().top(); + int b = geometry().bottom(); + int r = geometry().right(); + int l = geometry().left(); if (((tr == UnhideTrigger::Top || tr == UnhideTrigger::TopLeft || tr == UnhideTrigger::TopRight) && @@ -730,9 +730,9 @@ void ExtensionContainer::autoHideTimeout() return; } - TQRect r = tqgeometry(); + TQRect r = geometry(); TQPoint p = TQCursor::pos(); - if (!r.tqcontains(p) && + if (!r.contains(p) && (m_settings.unhideLocation() == UnhideTrigger::None || !shouldUnhideForTrigger(m_unhideTriggeredAt))) { @@ -766,7 +766,7 @@ void ExtensionContainer::autoHide(bool hide) blockUserInput(true); TQPoint oldpos = pos(); - TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden ); + TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden ); TQPoint newpos = newextent.topLeft(); if (hide) @@ -781,7 +781,7 @@ void ExtensionContainer::autoHide(bool hide) * letting them show reveal buttons onscreen */ TQRect desktopGeom = TQApplication::desktop()->screenGeometry(s); if (desktopGeom.intersects(newextent) && - !desktopGeom.intersects(tqgeometry())) + !desktopGeom.intersects(geometry())) { blockUserInput( false ); return; @@ -821,8 +821,8 @@ void ExtensionContainer::autoHide(bool hide) move(oldpos.x() - i, newpos.y()); } - tqApp->syncX(); - tqApp->processEvents(); + qApp->syncX(); + qApp->processEvents(); } } else @@ -839,8 +839,8 @@ void ExtensionContainer::autoHide(bool hide) move(newpos.x(), oldpos.y() - i); } - tqApp->syncX(); - tqApp->processEvents(); + qApp->syncX(); + qApp->processEvents(); } } } @@ -878,7 +878,7 @@ void ExtensionContainer::animatedHide(bool left) } TQPoint oldpos = pos(); - TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState); + TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState); TQPoint newpos(newextent.topLeft()); if (newState != Unhidden) @@ -891,7 +891,7 @@ void ExtensionContainer::animatedHide(bool left) * panels from hiding by sliding onto other screens, while still * letting them show reveal buttons onscreen */ if (TQApplication::desktop()->screenGeometry(s).intersects(newextent) && - !TQApplication::desktop()->screenGeometry(s).intersects(tqgeometry())) + !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) { blockUserInput(false); TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); @@ -920,8 +920,8 @@ void ExtensionContainer::animatedHide(bool left) { move(newpos.x(), oldpos.y() - i); } - tqApp->syncX(); - tqApp->processEvents(); + qApp->syncX(); + qApp->processEvents(); } } else @@ -937,8 +937,8 @@ void ExtensionContainer::animatedHide(bool left) { move(oldpos.x() - i, newpos.y()); } - tqApp->syncX(); - tqApp->processEvents(); + qApp->syncX(); + qApp->processEvents(); } } } @@ -948,8 +948,8 @@ void ExtensionContainer::animatedHide(bool left) _userHidden = newState; actuallyUpdateLayout(); - tqApp->syncX(); - tqApp->processEvents(); + qApp->syncX(); + qApp->processEvents(); // save our hidden status so that when kicker starts up again // we'll come back in the same state @@ -965,11 +965,11 @@ bool ExtensionContainer::reserveStrut() const return !m_extension || m_extension->reserveStrut(); } -KPanelExtension::Alignment ExtensionContainer::tqalignment() const +KPanelExtension::Alignment ExtensionContainer::alignment() const { // KConfigXT really needs to get support for vars that are enums that // are defined in other classes - return static_cast<KPanelExtension::Alignment>(m_settings.tqalignment()); + return static_cast<KPanelExtension::Alignment>(m_settings.alignment()); } void ExtensionContainer::updateWindowManager() @@ -983,8 +983,8 @@ void ExtensionContainer::updateWindowManager() int w = 0; int h = 0; - TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen()); - TQRect virtRect(TQApplication::desktop()->tqgeometry()); + TQRect geom = initialGeometry(position(), alignment(), xineramaScreen()); + TQRect virtRect(TQApplication::desktop()->geometry()); TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen())); if (m_hideMode == ManualHide && !userHidden()) @@ -1087,7 +1087,7 @@ void ExtensionContainer::strutChanged() //kdDebug(1210) << "PanelContainer::strutChanged()" << endl; TQRect ig = currentGeometry(); - if (ig != tqgeometry()) + if (ig != geometry()) { setGeometry(ig); updateLayout(); @@ -1106,11 +1106,11 @@ void ExtensionContainer::blockUserInput( bool block ) // eventfilter discard those events. if ( block ) { - tqApp->installEventFilter( this ); + qApp->installEventFilter( this ); } else { - tqApp->removeEventFilter( this ); + qApp->removeEventFilter( this ); } _block_user_input = block; @@ -1170,11 +1170,11 @@ void ExtensionContainer::maintainFocus(bool maintain) int ExtensionContainer::arrangeHideButtons() { - bool tqlayoutEnabled = _tqlayout->isEnabled(); + bool layoutEnabled = _layout->isEnabled(); - if (tqlayoutEnabled) + if (layoutEnabled) { - _tqlayout->setEnabled(false); + _layout->setEnabled(false); } if (orientation() == Vertical) @@ -1190,16 +1190,16 @@ int ExtensionContainer::arrangeHideButtons() { _ltHB->setMaximumWidth(maxWidth); _ltHB->setMaximumHeight(14); - _tqlayout->remove(_ltHB); - _tqlayout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft); + _layout->remove(_ltHB); + _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft); } if (_rbHB) { _rbHB->setMaximumWidth(maxWidth); _rbHB->setMaximumHeight(14); - _tqlayout->remove(_rbHB); - _tqlayout->addWidget(_rbHB, 2, 1); + _layout->remove(_rbHB); + _layout->addWidget(_rbHB, 2, 1); } } else @@ -1218,14 +1218,14 @@ int ExtensionContainer::arrangeHideButtons() { _ltHB->setMaximumHeight(maxHeight); _ltHB->setMaximumWidth(14); - _tqlayout->remove(_ltHB); + _layout->remove(_ltHB); if (kapp->reverseLayout()) { - _tqlayout->addWidget(_ltHB, 1, 2, vertAlignment); + _layout->addWidget(_ltHB, 1, 2, vertAlignment); } else { - _tqlayout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment); + _layout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment); } } @@ -1233,57 +1233,57 @@ int ExtensionContainer::arrangeHideButtons() { _rbHB->setMaximumHeight(maxHeight); _rbHB->setMaximumWidth(14); - _tqlayout->remove(_rbHB); + _layout->remove(_rbHB); if (kapp->reverseLayout()) { - _tqlayout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment); + _layout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment); } else { - _tqlayout->addWidget(_rbHB, 1, 2, vertAlignment); + _layout->addWidget(_rbHB, 1, 2, vertAlignment); } } } - int tqlayoutOffset = setupBorderSpace(); - if (tqlayoutEnabled) + int layoutOffset = setupBorderSpace(); + if (layoutEnabled) { - _tqlayout->setEnabled(true); + _layout->setEnabled(true); } - return tqlayoutOffset; + return layoutOffset; } int ExtensionContainer::setupBorderSpace() { - _tqlayout->setRowSpacing(0, 0); - _tqlayout->setRowSpacing(2, 0); - _tqlayout->setColSpacing(0, 0); - _tqlayout->setColSpacing(2, 0); + _layout->setRowSpacing(0, 0); + _layout->setRowSpacing(2, 0); + _layout->setColSpacing(0, 0); + _layout->setColSpacing(2, 0); if (!needsBorder()) { return 0; } - int tqlayoutOffset = 0; + int layoutOffset = 0; TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen()); - TQRect h = tqgeometry(); + TQRect h = geometry(); if (orientation() == Vertical) { if (h.top() > 0) { int topHeight = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->height() + 1 : 1; - _tqlayout->setRowSpacing(0, topHeight); - ++tqlayoutOffset; + _layout->setRowSpacing(0, topHeight); + ++layoutOffset; } if (h.bottom() < r.bottom()) { int bottomHeight = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->height() + 1 : 1; - _tqlayout->setRowSpacing(1, bottomHeight); - ++tqlayoutOffset; + _layout->setRowSpacing(1, bottomHeight); + ++layoutOffset; } } else @@ -1291,39 +1291,39 @@ int ExtensionContainer::setupBorderSpace() if (h.left() > 0) { int leftWidth = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->width() + 1 : 1; - _tqlayout->setColSpacing(0, leftWidth); - ++tqlayoutOffset; + _layout->setColSpacing(0, leftWidth); + ++layoutOffset; } if (h.right() < r.right()) { int rightWidth = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->width() + 1 : 1; - _tqlayout->setColSpacing(1, rightWidth); - ++tqlayoutOffset; + _layout->setColSpacing(1, rightWidth); + ++layoutOffset; } } switch (position()) { case KPanelExtension::Left: - _tqlayout->setColSpacing(2, 1); + _layout->setColSpacing(2, 1); break; case KPanelExtension::Right: - _tqlayout->setColSpacing(0, 1); + _layout->setColSpacing(0, 1); break; case KPanelExtension::Top: - _tqlayout->setRowSpacing(2, 1); + _layout->setRowSpacing(2, 1); break; case KPanelExtension::Bottom: default: - _tqlayout->setRowSpacing(0, 1); + _layout->setRowSpacing(0, 1); break; } - return tqlayoutOffset; + return layoutOffset; } void ExtensionContainer::positionChange(KPanelExtension::Position p) @@ -1368,14 +1368,14 @@ void ExtensionContainer::leaveEvent(TQEvent*) maybeStartAutoHideTimer(); } -void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a) +void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a) { if (!m_extension) { return; } - m_extension->tqsetAlignment(a); + m_extension->setAlignment(a); } void ExtensionContainer::setSize(KPanelExtension::Size size, int custom) @@ -1437,8 +1437,8 @@ void ExtensionContainer::setHideButtons(bool showLeft, bool showRight) bool ExtensionContainer::event(TQEvent* e) { - // Update the tqlayout when we receive a LayoutHint. This way we can adjust - // to changes of the tqlayout of the main widget. + // Update the layout when we receive a LayoutHint. This way we can adjust + // to changes of the layout of the main widget. if (e->type() == TQEvent::LayoutHint) { updateLayout(); @@ -1458,7 +1458,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, int XineramaScreen) { if (p == m_settings.position() && - a == m_settings.tqalignment() && + a == m_settings.alignment() && XineramaScreen == xineramaScreen()) { return; @@ -1471,18 +1471,18 @@ void ExtensionContainer::arrange(KPanelExtension::Position p, } else if (!needsBorder()) { - // this ensures that the tqlayout gets rejigged + // this ensures that the layout gets rejigged // even if position doesn't change - _tqlayout->setRowSpacing(0, 0); - _tqlayout->setRowSpacing(2, 0); - _tqlayout->setColSpacing(0, 0); - _tqlayout->setColSpacing(2, 0); + _layout->setRowSpacing(0, 0); + _layout->setRowSpacing(2, 0); + _layout->setColSpacing(0, 0); + _layout->setColSpacing(2, 0); } - if (a != m_settings.tqalignment()) + if (a != m_settings.alignment()) { - m_settings.tqsetAlignment(a); - tqsetAlignment(a); + m_settings.setAlignment(a); + setAlignment(a); } if (XineramaScreen != xineramaScreen()) @@ -1521,22 +1521,22 @@ KPanelExtension::Position ExtensionContainer::position() const void ExtensionContainer::resetLayout() { - TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(), + TQRect g = initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); - // Disable the tqlayout while we rearrange the panel. + // Disable the layout while we rearrange the panel. // Necessary because the children may be - // retqlayouted with the wrong size. + // relayouted with the wrong size. - _tqlayout->setEnabled(false); + _layout->setEnabled(false); - if (tqgeometry() != g) + if (geometry() != g) { setGeometry(g); ExtensionManager::the()->extensionSizeChanged(this); } - // tqlayout + // layout bool haveToArrangeButtons = false; bool showLeftHideButton = m_settings.showLeftHideButton() || userHidden() == RightBottom; bool showRightHideButton = m_settings.showRightHideButton() || userHidden() == LeftTop; @@ -1685,7 +1685,7 @@ void ExtensionContainer::resetLayout() } } - _tqlayout->setEnabled(true); + _layout->setEnabled(true); } bool ExtensionContainer::needsBorder() const @@ -1700,7 +1700,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() << ", " << workArea.bottomRight().y() << ")" << endl;*/ - TQSize hint = tqsizeHint(p, workArea.size()).boundedTo(workArea.size()); + TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size()); int width = 0; int height = 0; @@ -1739,7 +1739,7 @@ TQPoint ExtensionContainer::initialLocation(KPanelExtension::Position p, TQRect wholeScreen; if (XineramaScreen == XineramaAllScreens) { - wholeScreen = TQApplication::desktop()->tqgeometry(); + wholeScreen = TQApplication::desktop()->geometry(); } else { @@ -1920,12 +1920,12 @@ void ExtensionContainer::setXineramaScreen(int screen) return; } - arrange(position(),tqalignment(), screen); + arrange(position(),alignment(), screen); } TQRect ExtensionContainer::currentGeometry() const { - return initialGeometry(position(), tqalignment(), xineramaScreen(), + return initialGeometry(position(), alignment(), xineramaScreen(), autoHidden(), userHidden()); } @@ -1937,7 +1937,7 @@ TQRect ExtensionContainer::initialGeometry(KPanelExtension::Position p, { //RESEARCH: is there someway to cache the results of the repeated calls to this method? - /*kdDebug(1210) << "initialGeometry() Computing tqgeometry for " << name() << + /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() << " on screen " << XineramaScreen << endl;*/ TQRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this); TQSize size = initialSize(p, workArea); diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h index 2da239d7b..8eedd4e6f 100644 --- a/kicker/kicker/core/container_extension.h +++ b/kicker/kicker/core/container_extension.h @@ -66,7 +66,7 @@ public: TQWidget *parent = 0); virtual ~ExtensionContainer(); - virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const; + virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const; const AppletInfo& info() const { return _info; } @@ -86,7 +86,7 @@ public: KPanelExtension::Orientation orientation() const; KPanelExtension::Position position() const; - void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); } + void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); } int xineramaScreen() const; void setXineramaScreen(int screen); @@ -100,8 +100,8 @@ public: void unhideIfHidden(int showForHowManyMS = 0); bool reserveStrut() const; - KPanelExtension::Alignment tqalignment() const; - void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } + KPanelExtension::Alignment alignment() const; + void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); } TQRect currentGeometry() const; TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a, @@ -159,7 +159,7 @@ private: int XineramaScreen, const TQSize &s, TQRect workArea, bool autohidden = false, UserHidden userHidden = Unhidden) const; void positionChange(KPanelExtension::Position p); - void tqalignmentChange(KPanelExtension::Alignment a); + void alignmentChange(KPanelExtension::Alignment a); void xineramaScreenChange(int /*XineramaScreen*/) {} int arrangeHideButtons(); int setupBorderSpace(); @@ -190,7 +190,7 @@ private: // Widgets HideButton *_ltHB; // Left Hide Button HideButton *_rbHB; // Right Hide Button - TQGridLayout *_tqlayout; + TQGridLayout *_layout; KPanelExtension *m_extension; int m_maintainFocus; diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index bd596f214..8fd839a20 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -88,7 +88,7 @@ ContainerArea::ContainerArea(KConfig* _c, m_canAddContainers(true), m_immutable(_c->isImmutable()), m_updateBackgroundsCalled(false), - m_tqlayout(0), + m_layout(0), m_addAppletDialog(0), _autoScrollTimer(0, "ContainerArea::autoScrollTimer") { @@ -96,9 +96,9 @@ ContainerArea::ContainerArea(KConfig* _c, m_contents = viewport(); - m_tqlayout = new ContainerAreaLayout(m_contents); + m_layout = new ContainerAreaLayout(m_contents); - // Install an event filter to propagate tqlayout hints coming from m_contents. + // Install an event filter to propagate layout hints coming from m_contents. m_contents->installEventFilter(this); setBackground(); @@ -123,7 +123,7 @@ void ContainerArea::initialize(bool useDefaultConfig) // do we really need to do this? removeAllContainers(); - // restore applet tqlayout or load a default panel tqlayout + // restore applet layout or load a default panel layout _config->setGroup("General"); if (_config->hasKey("Applets2")) { @@ -380,7 +380,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); } -void ContainerArea::saveContainerConfig(bool tqlayoutOnly) +void ContainerArea::saveContainerConfig(bool layoutOnly) { if (!canAddContainers()) { @@ -389,14 +389,14 @@ void ContainerArea::saveContainerConfig(bool tqlayoutOnly) // Save the applet list TQStringList alist; - TQLayoutIterator it2 = m_tqlayout->iterator(); + TQLayoutIterator it2 = m_layout->iterator(); for (; it2.current(); ++it2) { BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget()); if (a) { KConfigGroup group(_config, a->appletId().latin1()); - a->saveConfiguration(group, tqlayoutOnly); + a->saveConfiguration(group, layoutOnly); alist.append(a->appletId()); } } @@ -700,22 +700,22 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) if (arrange) { - TQWidget* w = m_tqlayout->widgetAt(index); + TQWidget* w = m_layout->widgetAt(index); TQPoint oldInsertionPoint = Kicker::the()->insertionPoint(); if (w) { // let's set the insertion point to where the widget asked to be // put in front of is - Kicker::the()->setInsertionPoint(w->tqgeometry().topLeft()); + Kicker::the()->setInsertionPoint(w->geometry().topLeft()); } if (Kicker::the()->insertionPoint().isNull()) { - m_tqlayout->insertIntoFreeSpace(a, TQPoint()); + m_layout->insertIntoFreeSpace(a, TQPoint()); } else { - m_tqlayout->insertIntoFreeSpace(a, mapFromGlobal(Kicker::the()->insertionPoint())); + m_layout->insertIntoFreeSpace(a, mapFromGlobal(Kicker::the()->insertionPoint())); } if (w) @@ -725,7 +725,7 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) } else { - m_tqlayout->add(a); + m_layout->add(a); } connect(a, TQT_SIGNAL(moveme(BaseContainer*)), @@ -758,7 +758,7 @@ bool ContainerArea::removeContainer(BaseContainer *a) a->slotRemoved(_config); m_containers.remove(a); - m_tqlayout->remove(a); + m_layout->remove(a); a->deleteLater(); saveContainerConfig(true); resizeContents(); @@ -772,7 +772,7 @@ bool ContainerArea::removeContainer(int index) return false; } - BaseContainer* a = dynamic_cast<BaseContainer*>(m_tqlayout->widgetAt(index)); + BaseContainer* a = dynamic_cast<BaseContainer*>(m_layout->widgetAt(index)); if (!a || a->isImmutable()) { return false; @@ -780,7 +780,7 @@ bool ContainerArea::removeContainer(int index) a->slotRemoved(_config); m_containers.remove(a); - m_tqlayout->remove(a); + m_layout->remove(a); a->deleteLater(); saveContainerConfig(true); resizeContents(); @@ -794,7 +794,7 @@ void ContainerArea::removeContainers(BaseContainer::List containers) return; } - m_tqlayout->setEnabled(false); + m_layout->setEnabled(false); for (BaseContainer::List::const_iterator it = containers.constBegin(); it != containers.constEnd(); @@ -808,11 +808,11 @@ void ContainerArea::removeContainers(BaseContainer::List containers) a->slotRemoved(_config); m_containers.remove(a); - m_tqlayout->remove(a); + m_layout->remove(a); a->deleteLater(); } - m_tqlayout->setEnabled(true); + m_layout->setEnabled(true); saveContainerConfig(true); resizeContents(); } @@ -840,7 +840,7 @@ void ContainerArea::takeContainer(BaseContainer* a) _config->deleteGroup(a->appletId().latin1()); _config->sync(); m_containers.remove(a); - m_tqlayout->remove(a); + m_layout->remove(a); saveContainerConfig(true); resizeContents(); } @@ -852,7 +852,7 @@ void ContainerArea::resizeContents() if (orientation() == Qt::Horizontal) { - int newWidth = m_tqlayout->widthForHeight(h); + int newWidth = m_layout->widthForHeight(h); if (newWidth > w) { resizeContents(newWidth, h); @@ -864,7 +864,7 @@ void ContainerArea::resizeContents() } else { - int newHeight = m_tqlayout->heightForWidth(w); + int newHeight = m_layout->heightForWidth(w); if (newHeight > h) { @@ -925,7 +925,7 @@ void ContainerArea::startContainerMove(BaseContainer *a) setMouseTracking(true); grabMouse(sizeAllCursor); - m_tqlayout->setStretchEnabled(false); + m_layout->setStretchEnabled(false); a->raise(); } @@ -949,7 +949,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *) _moveAC = 0; emit maintainFocus(false); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); updateContainersBackground(); saveContainerConfig(true); } @@ -962,7 +962,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) return; } - if (ev->state() == LeftButton && !rect().tqcontains(ev->pos())) + if (ev->state() == LeftButton && !rect().contains(ev->pos())) { // leaveEvent() doesn't work, while grabbing the mouse _autoScrollTimer.stop(); @@ -974,7 +974,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) KickerTip::enableTipping(true); emit maintainFocus(false); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); updateContainersBackground(); saveContainerConfig(true); @@ -992,19 +992,19 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) int x = ev->pos().x() + contentsX(); if (ev->state() & ShiftButton) { - m_tqlayout->moveContainerPush(_moveAC, x - oldX); + m_layout->moveContainerPush(_moveAC, x - oldX); } else { - m_tqlayout->moveContainerSwitch(_moveAC, x - oldX); + m_layout->moveContainerSwitch(_moveAC, x - oldX); /* FIXME: Scrolling when the container moves out of the viewport bool scroll = false; if (rtl) if (newPos - 80 <= 0) scroll = true; else - if (newPos + 80 >= (horizontal ? tqgeometry().width() - moving->tqgeometry().width() - : tqgeometry().height() - moving->tqgeometry().height())) + if (newPos + 80 >= (horizontal ? geometry().width() - moving->geometry().width() + : geometry().height() - moving->geometry().height())) scroll = true; [...] if (scroll) { @@ -1025,11 +1025,11 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev) int y = ev->pos().y() + contentsY(); if (ev->state() & ShiftButton) { - m_tqlayout->moveContainerPush(_moveAC, y - oldY); + m_layout->moveContainerPush(_moveAC, y - oldY); } else { - m_tqlayout->moveContainerSwitch(_moveAC, y - oldY); + m_layout->moveContainerSwitch(_moveAC, y - oldY); // TODO: Scrolling } } @@ -1066,7 +1066,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev) return; } - m_tqlayout->setStretchEnabled(false); + m_layout->setStretchEnabled(false); if (!_dragIndicator) { @@ -1139,17 +1139,17 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev) TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0); TQApplication::sendEvent(this, &fakedKeyPress); TQApplication::sendEvent(this, &fakedKeyRelease); - tqApp->processEvents(); + qApp->processEvents(); startContainerMove(_moveAC); // Align the container to the mouse position. if (orientation() == Horizontal) { - m_tqlayout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); + m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x()); } else { - m_tqlayout->moveContainerSwitch(_moveAC, ev->pos().y() + contentsY() - _moveAC->y()); + m_layout->moveContainerSwitch(_moveAC, ev->pos().y() + contentsY() - _moveAC->y()); } return; } @@ -1175,7 +1175,7 @@ void ContainerArea::dragLeaveEvent(TQDragLeaveEvent*) { _dragIndicator->hide(); } - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); _dragMoveAC = 0; } @@ -1196,7 +1196,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { _dragMoveAC = 0; _dragIndicator->hide(); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); return; } @@ -1213,19 +1213,19 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { int oldX = a->x(); int x = _dragIndicator->x(); - m_tqlayout->moveContainerSwitch(a, x - oldX); + m_layout->moveContainerSwitch(a, x - oldX); } else if (orientation() == Vertical) { int oldY = a->y(); int y = _dragIndicator->y(); - m_tqlayout->moveContainerSwitch(a, y - oldY); + m_layout->moveContainerSwitch(a, y - oldY); } _dragMoveAC = 0; _dragIndicator->hide(); - m_tqlayout->setEnabled(true); - m_tqlayout->setStretchEnabled(true); + m_layout->setEnabled(true); + m_layout->setStretchEnabled(true); saveContainerConfig(true); return; } @@ -1236,10 +1236,10 @@ void ContainerArea::dropEvent(TQDropEvent *ev) a->setAppletId(createUniqueId(a->appletType())); addContainer(a, true); Kicker::the()->setInsertionPoint(TQPoint()); - m_tqlayout->updateFreeSpaceValues(); + m_layout->updateFreeSpaceValues(); _dragMoveAC = 0; _dragIndicator->hide(); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); saveContainerConfig(); return; } @@ -1250,7 +1250,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { Kicker::the()->setInsertionPoint(_dragIndicator->pos()); _dragIndicator->hide(); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); if (info.type() & AppletInfo::Button) { @@ -1271,7 +1271,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { _dragMoveAC = 0; _dragIndicator->hide(); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); return; } @@ -1366,32 +1366,32 @@ void ContainerArea::dropEvent(TQDropEvent *ev) { _dragIndicator->hide(); Kicker::the()->setInsertionPoint(TQPoint()); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); return; } addContainer(a, true); - m_tqlayout->updateFreeSpaceValues(); + m_layout->updateFreeSpaceValues(); } saveContainerConfig(); _dragMoveAC = 0; _dragIndicator->hide(); Kicker::the()->setInsertionPoint(TQPoint()); - m_tqlayout->setStretchEnabled(true); + m_layout->setStretchEnabled(true); } bool ContainerArea::eventFilter(TQObject* o, TQEvent* e) { - // Propagate the tqlayout hints which m_contents receives. This way widgets - // which contain a ContainerArea can react to tqlayout changes of its + // Propagate the layout hints which m_contents receives. This way widgets + // which contain a ContainerArea can react to layout changes of its // contents. For example: If an applets grows, the top level widget may // want to grow as well. if (o == m_contents) { if (e->type() == TQEvent::LayoutHint) { - updateGeometry(); // Posts a new tqlayout hint to our parent. + updateGeometry(); // Posts a new layout hint to our parent. } return false; } @@ -1430,7 +1430,7 @@ void ContainerArea::setBackground() if (KickerSettings::transparent() && (KickerSettings::menubarPanelTransparent() || - !ExtensionManager::the()->isMenuBar(tqtopLevelWidget()))) + !ExtensionManager::the()->isMenuBar(topLevelWidget()))) { if (!_rootPixmap) { @@ -1441,7 +1441,7 @@ void ContainerArea::setBackground() } else { - _rootPixmap->tqrepaint(true); + _rootPixmap->repaint(true); } double tint = double(KickerSettings::tintValue()) / 100; @@ -1633,7 +1633,7 @@ void ContainerArea::moveDragIndicator(int pos) void ContainerArea::updateBackground( const TQPixmap& pm ) { - TQBrush bgBrush(tqcolorGroup().background(), pm); + TQBrush bgBrush(colorGroup().background(), pm); TQPalette pal = kapp->palette(); pal.setBrush(TQColorGroup::Background, bgBrush); setPalette(pal); @@ -1678,12 +1678,12 @@ void ContainerArea::setPosition(KPanelExtension::Position p) p == KPanelExtension::Bottom) ? Qt::Horizontal : Qt::Vertical; bool orientationChanged = (orientation() != o); - m_tqlayout->setEnabled(false); + m_layout->setEnabled(false); if (orientationChanged) { setOrientation(o); - m_tqlayout->setOrientation(o); + m_layout->setOrientation(o); // when we change orientation, we will resize the "width" // component down to 0, forcing a resize in resizeContents() @@ -1712,23 +1712,23 @@ void ContainerArea::setPosition(KPanelExtension::Position p) (*it)->setPopupDirection( popupDirection() ); } - m_tqlayout->setEnabled(true); + m_layout->setEnabled(true); setContentsPos(0, 0); m_contents->move(0, 0); setBackground(); - // container extension tqrepaints for us! - //tqrepaint(); + // container extension repaints for us! + //repaint(); } -void ContainerArea::tqsetAlignment(KPanelExtension::Alignment a) +void ContainerArea::setAlignment(KPanelExtension::Alignment a) { for (BaseContainer::ConstIterator it = m_containers.begin(); it != m_containers.end(); ++it) { - (*it)->tqsetAlignment(a); + (*it)->setAlignment(a); } } @@ -1778,21 +1778,21 @@ void ContainerArea::updateContainersBackground() // A rather ugly hack. The code calls updateContainersBackground() all over // the place even when nothing in fact has changed. Updating the background // on every single unrelated change however means that e.g. the systray - // flickers when a new window is opened/closed (because the taskbar is retqlayouted, - // which triggers updateContainersBackground() even though the tqgeometry + // flickers when a new window is opened/closed (because the taskbar is relayouted, + // which triggers updateContainersBackground() even though the geometry // of the taskbar does not change in fact. I'm apparently unable to fix this - // properly, so just cache the tqgeometry and update background only when - // the tqgeometry changes or when the background really changes (in which + // properly, so just cache the geometry and update background only when + // the geometry changes or when the background really changes (in which // case the cached is cleared). - if( !m_cachedGeometry.tqcontains( *it )) + if( !m_cachedGeometry.contains( *it )) { m_cachedGeometry[ *it ] = TQRect(); connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); } - if( m_cachedGeometry[ *it ] != (*it)->tqgeometry()) + if( m_cachedGeometry[ *it ] != (*it)->geometry()) { (*it)->setBackground(); - m_cachedGeometry[ *it ] = (*it)->tqgeometry(); + m_cachedGeometry[ *it ] = (*it)->geometry(); } } } @@ -1891,12 +1891,12 @@ int ContainerArea::containerCount(const TQString& type) const TQStringList ContainerArea::listContainers() const { - return m_tqlayout->listItems(); + return m_layout->listItems(); } -void ContainerArea::tqrepaint() +void ContainerArea::repaint() { - Panner::tqrepaint(); + Panner::repaint(); } void ContainerArea::showAddAppletDialog() @@ -1932,12 +1932,12 @@ const TQPixmap* ContainerArea::completeBackgroundPixmap() const int ContainerArea::widthForHeight(int h) const { - return m_tqlayout->widthForHeight(h); + return m_layout->widthForHeight(h); } int ContainerArea::heightForWidth(int w) const { - return m_tqlayout->heightForWidth(w); + return m_layout->heightForWidth(w); } @@ -1952,8 +1952,8 @@ void DragIndicator::paintEvent(TQPaintEvent*) { TQPainter painter(this); TQRect rect(0, 0, width(), height()); - style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().base() ); + style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(), + TQStyle::Style_Default, colorGroup().base() ); } void DragIndicator::mousePressEvent(TQMouseEvent*) diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h index fc8d1a402..a43cd8c9c 100644 --- a/kicker/kicker/core/containerarea.h +++ b/kicker/kicker/core/containerarea.h @@ -101,9 +101,9 @@ public slots: void removeContainers(BaseContainer::List containers); void takeContainer(BaseContainer* a); void setPosition(KPanelExtension::Position p); - void tqsetAlignment(KPanelExtension::Alignment a); + void setAlignment(KPanelExtension::Alignment a); void slotSaveContainerConfig(); - void tqrepaint(); + void repaint(); void showAddAppletDialog(); void addAppletDialogDone(); @@ -124,7 +124,7 @@ protected: void defaultContainerConfig(); void loadContainers(const TQStringList& containers); - void saveContainerConfig(bool tqlayoutOnly = false); + void saveContainerConfig(bool layoutOnly = false); TQRect availableSpaceFollowing(BaseContainer*); void moveDragIndicator(int pos); @@ -166,7 +166,7 @@ private: bool m_updateBackgroundsCalled; TQWidget* m_contents; - ContainerAreaLayout* m_tqlayout; + ContainerAreaLayout* m_layout; AddAppletDialog* m_addAppletDialog; TQMap< TQWidget*, TQRect > m_cachedGeometry; }; diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index feed4b59f..4ae63077e 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -58,11 +58,11 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx); if (b != m_list->end()) { - ContainerAreaLayoutItem* tqlayoutItem = *b; - item = tqlayoutItem->item; - tqlayoutItem->item = 0; + ContainerAreaLayoutItem* layoutItem = *b; + item = layoutItem->item; + layoutItem->item = 0; m_list->erase(b); - delete tqlayoutItem; + delete layoutItem; } return item; } @@ -82,7 +82,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const } else { - return item->tqsizeHint().height(); + return item->sizeHint().height(); } } @@ -95,7 +95,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const } else { - return item->tqsizeHint().width(); + return item->sizeHint().width(); } } @@ -125,17 +125,17 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio) Qt::Orientation ContainerAreaLayoutItem::orientation() const { - return m_tqlayout->orientation(); + return m_layout->orientation(); } -TQRect ContainerAreaLayoutItem::tqgeometryR() const +TQRect ContainerAreaLayoutItem::geometryR() const { - return m_tqlayout->transform(tqgeometry()); + return m_layout->transform(geometry()); } void ContainerAreaLayoutItem::setGeometryR(const TQRect& r) { - setGeometry(m_tqlayout->transform(r)); + setGeometry(m_layout->transform(r)); } int ContainerAreaLayoutItem::widthForHeightR(int h) const @@ -154,11 +154,11 @@ int ContainerAreaLayoutItem::widthR() const { if (orientation() == Horizontal) { - return tqgeometry().width(); + return geometry().width(); } else { - return tqgeometry().height(); + return geometry().height(); } } @@ -166,11 +166,11 @@ int ContainerAreaLayoutItem::heightR() const { if (orientation() == Horizontal) { - return tqgeometry().height(); + return geometry().height(); } else { - return tqgeometry().width(); + return geometry().width(); } } @@ -179,13 +179,13 @@ int ContainerAreaLayoutItem::leftR() const if (orientation() == Horizontal) { if (TQApplication::reverseLayout()) - return m_tqlayout->tqgeometry().right() - tqgeometry().right(); + return m_layout->geometry().right() - geometry().right(); else - return tqgeometry().left(); + return geometry().left(); } else { - return tqgeometry().top(); + return geometry().top(); } } @@ -194,13 +194,13 @@ int ContainerAreaLayoutItem::rightR() const if (orientation() == Horizontal) { if (TQApplication::reverseLayout()) - return m_tqlayout->tqgeometry().right() - tqgeometry().left(); + return m_layout->geometry().right() - geometry().left(); else - return tqgeometry().right(); + return geometry().right(); } else { - return tqgeometry().bottom(); + return geometry().bottom(); } } @@ -311,10 +311,10 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio } } - TQRect geom = item->tqgeometryR(); + TQRect geom = item->geometryR(); geom.moveLeft(insPos); item->setGeometryR(geom); - widget->setGeometry(transform(geom)); // widget isn't shown, tqlayout not active yet + widget->setGeometry(transform(geom)); // widget isn't shown, layout not active yet if (current) { @@ -384,7 +384,7 @@ TQWidget* ContainerAreaLayout::widgetAt(int index) const return m_items[index]->item->widget(); } -TQSize ContainerAreaLayout::tqsizeHint() const +TQSize ContainerAreaLayout::sizeHint() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall); @@ -398,7 +398,7 @@ TQSize ContainerAreaLayout::tqsizeHint() const } } -TQSize ContainerAreaLayout::tqminimumSize() const +TQSize ContainerAreaLayout::minimumSize() const { const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny); @@ -566,7 +566,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) break; // Move 'next' to the other side of 'moving'. - TQRect geom = next->tqgeometryR(); + TQRect geom = next->geometryR(); if (forward) geom.moveLeft(geom.left() - moving->widthR()); else @@ -630,7 +630,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) } // Move the container to its new position and prevent it from moving outside the panel. - TQRect geom = moving->tqgeometryR(); + TQRect geom = moving->geometryR(); distance = kClamp(newPos, 0, widthR() - moving->widthR()); geom.moveLeft(distance); moving->setGeometryR(geom); @@ -645,7 +645,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance) if(AppletContainer* applet = dynamic_cast<AppletContainer*>(container)) if( applet->info().desktopFile() == "menuapplet.desktop" ) { - TQRect geom = (*it)->tqgeometryR(); + TQRect geom = (*it)->geometryR(); if( prev != m_items.constEnd()) geom.moveLeft( (*prev)->rightR() + 1 ); else @@ -662,7 +662,7 @@ int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance) const bool horizontal = orientation() == Horizontal; const bool reverseLayout = TQApplication::reverseLayout(); - // Get the iterator 'it' pointing to the tqlayoutitem representing 'a'. + // Get the iterator 'it' pointing to the layoutitem representing 'a'. ItemList::const_iterator it = m_items.constBegin(); while (it != m_items.constEnd() && (*it)->item->widget() != a) { @@ -721,7 +721,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it, moved = forward ? kMin(distance, available) : kMax(distance, available); - TQRect geom = cur->tqgeometryR(); + TQRect geom = cur->geometryR(); geom.moveLeft(geom.left() + moved); cur->setGeometryR(geom); @@ -735,7 +735,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const if (TQApplication::reverseLayout()) { TQRect t = r; - t.moveLeft(tqgeometry().right() - r.right()); + t.moveLeft(geometry().right() - r.right()); return t; } else @@ -765,11 +765,11 @@ int ContainerAreaLayout::widthR() const { if (orientation() == Horizontal) { - return tqgeometry().width(); + return geometry().width(); } else { - return tqgeometry().height(); + return geometry().height(); } } @@ -777,27 +777,27 @@ int ContainerAreaLayout::heightR() const { if (orientation() == Horizontal) { - return tqgeometry().height(); + return geometry().height(); } else { - return tqgeometry().width(); + return geometry().width(); } } int ContainerAreaLayout::leftR() const { if (orientation() == Horizontal) - return tqgeometry().left(); + return geometry().left(); else - return tqgeometry().top(); + return geometry().top(); } int ContainerAreaLayout::rightR() const { if (orientation() == Horizontal) - return tqgeometry().right(); + return geometry().right(); else - return tqgeometry().bottom(); + return geometry().bottom(); } diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h index 01bbb40d5..995497268 100644 --- a/kicker/kicker/core/containerarealayout.h +++ b/kicker/kicker/core/containerarealayout.h @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#ifndef __containerareatqlayout_h__ -#define __containerareatqlayout_h__ +#ifndef __containerarealayout_h__ +#define __containerarealayout_h__ #include <tqlayout.h> @@ -31,10 +31,10 @@ class ContainerAreaLayout; class ContainerAreaLayoutItem : public Qt { public: - ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* tqlayout) + ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout) : item(i), m_freeSpaceRatio(0.0), - m_tqlayout(tqlayout) + m_layout(layout) {} ~ContainerAreaLayoutItem() @@ -45,18 +45,18 @@ class ContainerAreaLayoutItem : public Qt bool isStretch() const; - TQRect tqgeometry() const - { return item->tqgeometry(); } - void setGeometry(const TQRect& tqgeometry) - { item->setGeometry(tqgeometry); } + TQRect geometry() const + { return item->geometry(); } + void setGeometry(const TQRect& geometry) + { item->setGeometry(geometry); } double freeSpaceRatio() const; void setFreeSpaceRatio(double ratio); Orientation orientation() const; - // Relative tqgeometry - TQRect tqgeometryR() const; + // Relative geometry + TQRect geometryR() const; void setGeometryR(const TQRect&); int widthForHeightR(int w) const; int widthR() const; @@ -68,7 +68,7 @@ class ContainerAreaLayoutItem : public Qt private: double m_freeSpaceRatio; - ContainerAreaLayout* m_tqlayout; + ContainerAreaLayout* m_layout; }; class ContainerAreaLayout : public QLayout @@ -83,8 +83,8 @@ class ContainerAreaLayout : public QLayout void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint); TQStringList listItems() const; TQWidget* widgetAt(int index) const; - TQSize tqsizeHint() const; - TQSize tqminimumSize() const; + TQSize sizeHint() const; + TQSize minimumSize() const; TQLayoutIterator iterator(); void setGeometry(const TQRect& rect); @@ -100,7 +100,7 @@ class ContainerAreaLayout : public QLayout void moveContainerSwitch(TQWidget* container, int distance); int moveContainerPush(TQWidget* container, int distance); - // Relative tqgeometry + // Relative geometry TQRect transform(const TQRect&) const; int widthForHeightR(int w) const; int widthR() const; diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg index 19d282088..89d60b05a 100644 --- a/kicker/kicker/core/extensionSettings.kcfg +++ b/kicker/kicker/core/extensionSettings.kcfg @@ -22,7 +22,7 @@ </entry> <entry name="Alignment" type="Int" > - <label>The tqalignment of the panel</label> + <label>The alignment of the panel</label> <default code="true">KPanelExtension::Left</default> <min>0</min> <max>2</max> diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index bec297eb9..e0f68ce8a 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar() KMenuBar tmpmenu; tmpmenu.insertItem("KDE Rocks!"); m_menubarPanel->setSize(KPanelExtension::SizeCustom, - tmpmenu.tqsizeHint().height()); + tmpmenu.sizeHint().height()); m_menubarPanel->writeConfig(); emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()), @@ -403,7 +403,7 @@ void ExtensionManager::addExtension( const TQString& desktopFile ) { e->readConfig(); // as a new panel, the position will be set to the preferred position - // we just need to make sure this works with the rest of the panel tqlayout + // we just need to make sure this works with the rest of the panel layout e->setPosition(initialPanelPosition(e->position())); kdDebug(1210)<<"after e->readConfig(): pos="<<e->position()<<endl; addContainer(e); @@ -527,7 +527,7 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, // 1. Exclude panels not on our Xinerama screen // 2. Exclude panels on the same side of the screen as ourselves that are above us // 3. Exclude panels on the opposite side of the screen. Breaks down if the user - // dabbles in insane tqlayouts where a top/bottom or left/right pair overlap? + // dabbles in insane layouts where a top/bottom or left/right pair overlap? // 4. Exclude panels on adjacent sides of the screen that do not overlap with us if (exclude->winId() == extension->winId()) @@ -554,26 +554,26 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, { // Rule 2 Exclusion if (extension->position() == KPanelExtension::Bottom && - exclude->tqgeometry().bottom() == extension->tqgeometry().bottom() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().bottom() == extension->geometry().bottom() && + !exclude->geometry().intersects(extension->geometry())) { return false; } else if (extension->position() == KPanelExtension::Top && - exclude->tqgeometry().top() == extension->tqgeometry().top() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().top() == extension->geometry().top() && + !exclude->geometry().intersects(extension->geometry())) { return false; } else if (extension->position() == KPanelExtension::Left && - exclude->tqgeometry().left() == extension->tqgeometry().left() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().left() == extension->geometry().left() && + !exclude->geometry().intersects(extension->geometry())) { return false; } else if (extension->position() == KPanelExtension::Right && - exclude->tqgeometry().right() == extension->tqgeometry().right() && - !exclude->tqgeometry().intersects(extension->tqgeometry())) + exclude->geometry().right() == extension->geometry().right() && + !exclude->geometry().intersects(extension->geometry())) { return false; } @@ -591,28 +591,28 @@ bool ExtensionManager::shouldExclude(int XineramaScreen, // Rule 4 exclusion if (extension->position() == KPanelExtension::Bottom) { - if (exclude->tqgeometry().bottom() > extension->tqgeometry().top()) + if (exclude->geometry().bottom() > extension->geometry().top()) { return lowerInStack; } } else if (extension->position() == KPanelExtension::Top) { - if (exclude->tqgeometry().top() < extension->tqgeometry().bottom()) + if (exclude->geometry().top() < extension->geometry().bottom()) { return lowerInStack; } } else if (extension->position() == KPanelExtension::Left) { - if (exclude->tqgeometry().left() < extension->tqgeometry().right()) + if (exclude->geometry().left() < extension->geometry().right()) { return lowerInStack; } } else /* if (extension->position() == KPanelExtension::Right) */ { - if (exclude->tqgeometry().right() > extension->tqgeometry().left()) + if (exclude->geometry().right() > extension->geometry().left()) { return lowerInStack; } @@ -702,7 +702,7 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens return; } - TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(), + TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(), extension->xineramaScreen()); // reduce given area (TQRect) to the space not covered by the given extension @@ -741,7 +741,7 @@ TQRect ExtensionManager::desktopIconsArea(int screen) const // This is pretty broken, mixes Xinerama and non-Xinerama multihead // and generally doesn't seem to be required anyway => ignore screen. // TQRect area = TQApplication::desktop()->screenGeometry(screen); - TQRect area = TQApplication::desktop()->tqgeometry(); + TQRect area = TQApplication::desktop()->geometry(); reduceArea(area, m_mainPanel); reduceArea(area, m_menubarPanel); diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h index 346a3a2f2..6de7b35e1 100644 --- a/kicker/kicker/core/extensionmanager.h +++ b/kicker/kicker/core/extensionmanager.h @@ -51,7 +51,7 @@ public: int nextPanelOrder(); // return the space available for all icons on the desktop - // subtracts all panels from XineramaScreen's tqgeometry + // subtracts all panels from XineramaScreen's geometry TQRect desktopIconsArea(int xineramaScreen) const; public slots: diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui index 133ae1467..1adb59b38 100644 --- a/kicker/kicker/core/kmenubase.ui +++ b/kicker/kicker/core/kmenubase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KMenu</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="name"> <cstring>m_search</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>20</x> <y>40</y> @@ -55,13 +55,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>52</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>52</height> @@ -82,7 +82,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -129,13 +129,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -178,7 +178,7 @@ <property name="name"> <cstring>m_footer</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>20</x> <y>110</y> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>20</height> @@ -241,7 +241,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>90</width> <height>24</height> @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>14</width> <height>20</height> @@ -293,7 +293,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index fad16ac42..61110de14 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -153,11 +153,11 @@ void MenuManager::kmenuAccelActivated() TQDesktopWidget* desktop = KApplication::desktop(); TQRect r; if (desktop->numScreens() < 2) - r = desktop->tqgeometry(); + r = desktop->geometry(); else r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos())); - // kMenu->rect() is not valid before showing, use tqsizeHint() - p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->tqsizeHint()).center(); + // kMenu->rect() is not valid before showing, use sizeHint() + p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center(); m_kmenu->popup(p); // when the cursor is in the area where the menu pops up, @@ -170,8 +170,8 @@ void MenuManager::kmenuAccelActivated() { // We need the kmenu's size to place it at the right position. // We cannot rely on the popup menu's current size(), if it wasn't - // shown before, so we resize it here according to its tqsizeHint(). - const TQSize size = m_kmenu->tqsizeHint(); + // shown before, so we resize it here according to its sizeHint(). + const TQSize size = m_kmenu->sizeHint(); m_kmenu->resize(size.width(),size.height()); PanelPopupButton* button = findKButtonFor(m_kmenu->widget()); @@ -188,7 +188,7 @@ void MenuManager::kmenuAccelActivated() ext->unhideIfHidden(); // make sure it's unhidden before we use it to figure out // where to popup - tqApp->processEvents(); + qApp->processEvents(); break; } diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 0b96d4b1f..2bd70c82b 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -67,12 +67,12 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con setAcceptDrops(!Kicker::the()->isImmutable()); setCustomMenu(opMenu()); - TQVBoxLayout* _tqlayout = new TQVBoxLayout(this); + TQVBoxLayout* _layout = new TQVBoxLayout(this); // container area _containerArea = new ContainerArea( config(), this, opMenu() ); connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); - _tqlayout->addWidget(_containerArea); + _layout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); _containerArea->configure(); @@ -100,7 +100,7 @@ void PanelExtension::populateContainerArea() { _containerArea->show(); - if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget())) + if (ExtensionManager::the()->isMainPanel(topLevelWidget())) { setObjId("Panel"); _containerArea->initialize(true); @@ -139,7 +139,7 @@ void PanelExtension::positionChange(Position p) _containerArea->setPosition(p); } -TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const +TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const { TQSize size; diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h index 61e6c229c..c7882291f 100644 --- a/kicker/kicker/core/panelextension.h +++ b/kicker/kicker/core/panelextension.h @@ -80,7 +80,7 @@ k_dcop: void configure(); // KDE4: remove, moved to Kikcker public: - TQSize tqsizeHint(Position, TQSize maxSize) const; + TQSize sizeHint(Position, TQSize maxSize) const; Position preferedPosition() const { return Bottom; } bool eventFilter( TQObject *, TQEvent * ); diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp index 553f5ad09..d4b54f04a 100644 --- a/kicker/kicker/core/userrectsel.cpp +++ b/kicker/kicker/core/userrectsel.cpp @@ -48,7 +48,7 @@ void UserRectSel::mouseReleaseEvent(TQMouseEvent * e) { if (e->button() == LeftButton) { - tqApp->exit_loop(); + qApp->exit_loop(); } } @@ -138,10 +138,10 @@ UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const TQPoint sel.show(); sel.grabMouse(); sel.paintCurrent(); - tqApp->enter_loop(); + qApp->enter_loop(); sel.paintCurrent(); sel.releaseMouse(); - tqApp->syncX(); + qApp->syncX(); return sel.current; } diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h index b770f7409..63ba47fd5 100644 --- a/kicker/kicker/core/userrectsel.h +++ b/kicker/kicker/core/userrectsel.h @@ -43,17 +43,17 @@ class UserRectSel : public QWidget PanelStrut() : m_screen(-1), m_pos(KPanelExtension::Bottom), - m_tqalignment(KPanelExtension::LeftTop) + m_alignment(KPanelExtension::LeftTop) { } PanelStrut(const TQRect& rect, int XineramaScreen, KPanelExtension::Position pos, - KPanelExtension::Alignment tqalignment) + KPanelExtension::Alignment alignment) : m_rect(rect), m_screen(XineramaScreen), m_pos(pos), - m_tqalignment(tqalignment) + m_alignment(alignment) { } @@ -61,7 +61,7 @@ class UserRectSel : public QWidget { return m_screen == rhs.m_screen && m_pos == rhs.m_pos && - m_tqalignment == rhs.m_tqalignment; + m_alignment == rhs.m_alignment; } bool operator!=(const PanelStrut& rhs) @@ -72,7 +72,7 @@ class UserRectSel : public QWidget TQRect m_rect; int m_screen; KPanelExtension::Position m_pos; - KPanelExtension::Alignment m_tqalignment; + KPanelExtension::Alignment m_alignment; }; typedef TQValueVector<PanelStrut> RectList; diff --git a/kicker/kicker/interfaces/kickoff-search-plugin.h b/kicker/kicker/interfaces/kickoff-search-plugin.h index 497ed0e2b..e91d079e7 100644 --- a/kicker/kicker/interfaces/kickoff-search-plugin.h +++ b/kicker/kicker/interfaces/kickoff-search-plugin.h @@ -82,7 +82,7 @@ public: TQString quotedPath () const { - return uri.path ().tqreplace ('"', "\\\""); + return uri.path ().replace ('"', "\\\""); } }; diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index bc3baa9e1..97a35aff6 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -88,7 +88,7 @@ int main(int argc, char** argv) applets[*it].freeSpace = 1 - applets[*it].freeSpace; // Take care of stretchable applets. - if (stretchableApplets.tqcontains(applets[*it].desktopFile)) + if (stretchableApplets.contains(applets[*it].desktopFile)) { if (it != appletIds.begin()) { diff --git a/kicker/kicker/plugins/beaglesearch.cpp b/kicker/kicker/plugins/beaglesearch.cpp index f75f719ab..9f86c8fbd 100644 --- a/kicker/kicker/plugins/beaglesearch.cpp +++ b/kicker/kicker/plugins/beaglesearch.cpp @@ -347,7 +347,7 @@ BeagleUtil::timestringToBeagleTimestamp(TQString timestring) //kdDebug () << "datetime string:" << timestring << endl; // FIXME: error check timestring format if (timestring.isNull () || timestring.stripWhiteSpace () == "" || timestring.length() != 8 ) - return beagle_timestamp_new_from_unix_time (TQDateTime::tqcurrentDateTime ().toTime_t ()); + return beagle_timestamp_new_from_unix_time (TQDateTime::currentDateTime ().toTime_t ()); //TQDateTime dt = TQDateTime::fromString (timestring, Qt::ISODate); struct tm tm_time; time_t timet_time; diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp index aed74ed43..3cad77ca4 100644 --- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp +++ b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp @@ -315,7 +315,7 @@ HitMenuItem *KickoffBeaglePlugin::hitToHitMenuItem (int category, Hit *hit) case WEBHIST: uri = hit->getUri (); title = (*hit) [dc_title]; - title = title.tqreplace(TQRegExp("\n")," "); + title = title.replace(TQRegExp("\n")," "); mimetype = "text/html"; if (title.isEmpty () || title.stripWhiteSpace ().isEmpty ()) { title = uri.prettyURL (); diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 72c4f6be9..796920ed4 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -289,9 +289,9 @@ void AddAppletDialog::resizeAppletView() for (int i = 0; i < 3; i++) { - m_appletBox->tqlayout()->activate(); + m_appletBox->layout()->activate(); w = v->visibleWidth(); - h = m_appletBox->tqlayout()->tqminimumSize().height(); + h = m_appletBox->layout()->minimumSize().height(); v->resizeContents(w, QMAX(h, v->visibleHeight())); if (w == m_appletBox->width() && h == m_appletBox->height()) break; @@ -314,8 +314,8 @@ void AddAppletDialog::populateApplets() m_appletBox->setPaletteBackgroundColor(KGlobalSettings::baseColor()); m_mainWidget->appletScrollView->addChild(m_appletBox, 0, 0); m_appletBox->show(); - TQVBoxLayout* tqlayout = new TQVBoxLayout(m_appletBox); - tqlayout->setMargin(0); + TQVBoxLayout* layout = new TQVBoxLayout(m_appletBox); + layout->setMargin(0); m_mainWidget->appletScrollView->installEventFilter(this); @@ -367,7 +367,7 @@ void AddAppletDialog::populateApplets() itemWidget->hide(); } - tqlayout->insertWidget(i, itemWidget); + layout->insertWidget(i, itemWidget); m_appletWidgetList.append(itemWidget); setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; @@ -456,7 +456,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet) if (appletContainer) { ExtensionContainer* ec = - dynamic_cast<ExtensionContainer*>(m_containerArea->tqtopLevelWidget()); + dynamic_cast<ExtensionContainer*>(m_containerArea->topLevelWidget()); if (ec) { @@ -484,8 +484,8 @@ bool AddAppletDialog::appletMatchesSearch(const AppletWidget* w, return (m_selectedType == AppletInfo::Undefined || w->info().type() & m_selectedType) && - (w->info().name().tqcontains(s, false) || - w->info().comment().tqcontains(s, false)); + (w->info().name().contains(s, false) || + w->info().comment().contains(s, false)); } void AddAppletDialog::delayedSearch() diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 19bbf0f11..6d5c4482f 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -54,11 +54,11 @@ void PanelAddAppletMenu::slotAboutToShow() if (ai.icon().isEmpty() || ai.icon() == "unknown") { - insertItem(ai.name().tqreplace( "&", "&&" ), i); + insertItem(ai.name().replace( "&", "&&" ), i); } else { - insertItem(SmallIconSet(ai.icon()), ai.name().tqreplace( "&", "&&" ), i); + insertItem(SmallIconSet(ai.icon()), ai.name().replace( "&", "&&" ), i); } if (ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai)) diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 8c6eed625..acd82a066 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -71,7 +71,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, displayInternal(); m_destination = KickerLib::popupPosition(m_direction, this, m_target); - TQPoint startAt = widget->itemPixmap->tqgeometry().topLeft(); + TQPoint startAt = widget->itemPixmap->geometry().topLeft(); startAt = widget->itemPixmap->mapToGlobal(startAt); move(startAt); @@ -107,15 +107,15 @@ void AddAppletVisualFeedback::mousePressEvent(TQMouseEvent *) void AddAppletVisualFeedback::makeMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(Qt::black); + m_mask.fill(Qt::black); - tqmaskPainter.setBrush(Qt::white); - tqmaskPainter.setPen(Qt::white); - tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), - 1600 / m_tqmask.rect().height()); - setMask(m_tqmask); + maskPainter.setBrush(Qt::white); + maskPainter.setPen(Qt::white); + maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), + 1600 / m_mask.rect().height()); + setMask(m_mask); } void AddAppletVisualFeedback::displayInternal() @@ -141,8 +141,8 @@ void AddAppletVisualFeedback::displayInternal() width += textRect.width() + margin; } - // resize pixmap, tqmask and widget - m_tqmask.resize(width, height); + // resize pixmap, mask and widget + m_mask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); @@ -151,13 +151,13 @@ void AddAppletVisualFeedback::displayInternal() move(KickerLib::popupPosition(m_direction, this, m_target)); } - // create and set transparency tqmask + // create and set transparency mask makeMask(); // draw background TQPainter bufferPainter(&m_pixmap); bufferPainter.setPen(Qt::black); - bufferPainter.setBrush(tqcolorGroup().background()); + bufferPainter.setBrush(colorGroup().background()); bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); @@ -175,14 +175,14 @@ void AddAppletVisualFeedback::displayInternal() int textY = (height - textRect.height()) / 2; // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg); } } @@ -194,7 +194,7 @@ void AddAppletVisualFeedback::swoopCloser() return; } - TQPoint loc = tqgeometry().topLeft(); + TQPoint loc = geometry().topLeft(); bool isLeft = m_destination.x() > loc.x(); if (loc.x() != m_destination.x()) { @@ -225,7 +225,7 @@ void AddAppletVisualFeedback::swoopCloser() void AddAppletVisualFeedback::internalUpdate() { m_dirty = true; - tqrepaint(false); + repaint(false); } #include "addappletvisualfeedback.moc" diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h index f4ac90213..02899ee36 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.h +++ b/kicker/kicker/ui/addappletvisualfeedback.h @@ -62,7 +62,7 @@ class AddAppletVisualFeedback : QWidget private: const TQWidget* m_target; KPanelApplet::Direction m_direction; - TQBitmap m_tqmask; + TQBitmap m_mask; TQPixmap m_pixmap; TQPixmap m_icon; TQSimpleRichText* m_richText; diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp index c04a832e6..02c4718d4 100644 --- a/kicker/kicker/ui/addbutton_mnu.cpp +++ b/kicker/kicker/ui/addbutton_mnu.cpp @@ -46,7 +46,7 @@ PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent, void PanelAddButtonMenu::slotExec(int id) { - if (!entryMap_.tqcontains(id)) + if (!entryMap_.contains(id)) return; KSycocaEntry * e = entryMap_[id]; diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index 325897a8c..b22187443 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -44,7 +44,7 @@ void PanelAddExtensionMenu::slotAboutToShow() AppletInfo::List::const_iterator it = extensions.constBegin(); for( int i = 0; it != extensions.constEnd(); ++it, ++i ) { const AppletInfo& ai = (*it); - insertItem( ai.name().tqreplace( "&", "&&" ), i ); + insertItem( ai.name().replace( "&", "&&" ), i ); if ( ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai) ) { setItemEnabled( i, false ); setItemChecked( i, true ); diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui index 32996941b..d9cc2d9b0 100644 --- a/kicker/kicker/ui/appletitem.ui +++ b/kicker/kicker/ui/appletitem.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AppletItem</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -41,7 +41,7 @@ </property> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -65,7 +65,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -87,7 +87,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -95,7 +95,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -105,7 +105,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>64</height> @@ -117,7 +117,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -125,5 +125,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index 2e0d3e405..e0e162d33 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -41,7 +41,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP bool isButton = (parent && parent->inherits("ButtonContainer")); bool isMenu = false; TQString titleText = title; - titleText = titleText.tqreplace('&', "&&"); + titleText = titleText.replace('&', "&&"); if (isButton) { isMenu = static_cast<ButtonContainer*>(parent)->isAMenu(); diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui index 4232b9dcc..a2fa1e91b 100644 --- a/kicker/kicker/ui/appletview.ui +++ b/kicker/kicker/ui/appletview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AppletView</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -125,7 +125,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>284</width> <height>20</height> @@ -195,7 +195,7 @@ <tabstop>appletSearch</tabstop> <tabstop>appletFilter</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>qscrollview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index e62322e35..2250475b4 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -104,7 +104,7 @@ void PanelBrowserMenu::initialize() setInitialized(true); // start watching if not already done - if (!_dirWatch.tqcontains(path())) + if (!_dirWatch.contains(path())) _dirWatch.addDir( path() ); // setup icon map @@ -244,7 +244,7 @@ void PanelBrowserMenu::initialize() title = c.readEntry("Name", title); TQString s = c.readEntry("Icon"); - if(!_icons->tqcontains(s)) { + if(!_icons->contains(s)) { icon = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0, true); @@ -344,7 +344,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, con // avoid &'s being converted to accelerators TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); - newTitle.tqreplace("&", "&&"); + newTitle.replace("&", "&&"); // insert menu item int id = insertItem(pixmap, newTitle); @@ -362,7 +362,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, Pan // avoid &'s being converted to accelerators TQString newTitle = title; newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 ); - newTitle.tqreplace("&", "&&"); + newTitle.replace("&", "&&"); // insert submenu insertItem(pixmap, newTitle, subMenu); @@ -388,7 +388,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) // get id int id = idAt(_lastpress); - if(!_filemap.tqcontains(id)) return; + if(!_filemap.contains(id)) return; // reset _lastpress _lastpress = TQPoint(-1, -1); @@ -429,7 +429,7 @@ void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev) void PanelBrowserMenu::dropEvent( TQDropEvent *ev ) { KURL u( path() ); - KFileItem item( u, TQString::tqfromLatin1( "inode/directory" ), KFileItem::Unknown ); + KFileItem item( u, TQString::fromLatin1( "inode/directory" ), KFileItem::Unknown ); KonqOperations::doDrop( &item, u, ev, this ); KPanelMenu::dropEvent(ev); // ### TODO: Update list @@ -439,7 +439,7 @@ void PanelBrowserMenu::slotExec(int id) { kapp->propagateSessionManager(); - if(!_filemap.tqcontains(id)) return; + if(!_filemap.contains(id)) return; KURL url; url.setPath(path() + "/" + _filemap[id]); @@ -494,9 +494,9 @@ void PanelBrowserMenu::slotMimeCheck() // kdDebug() << url.url() << ": " << icon << endl; file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 ); - file.tqreplace("&", "&&"); + file.replace("&", "&&"); - if(!_icons->tqcontains(icon)) { + if(!_icons->contains(icon)) { TQPixmap pm = SmallIcon(icon); if( pm.height() > 16 ) { @@ -514,7 +514,7 @@ void PanelBrowserMenu::slotMimeCheck() void PanelBrowserMenu::slotClear() { // no need to watch any further - if (_dirWatch.tqcontains(path())) + if (_dirWatch.contains(path())) _dirWatch.removeDir( path() ); // don't change menu if already visible diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp index 79f2eaf1f..52cb8776d 100644 --- a/kicker/kicker/ui/clicklineedit.cpp +++ b/kicker/kicker/ui/clicklineedit.cpp @@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {} void ClickLineEdit::setClickMessage( const TQString &msg ) { mClickMessage = msg; - tqrepaint(); + repaint(); } void ClickLineEdit::setText( const TQString &txt ) { mDrawClickMsg = txt.isEmpty(); - tqrepaint(); + repaint(); KLineEdit::setText( txt ); } @@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev ) if ( mDrawClickMsg == true ) { mDrawClickMsg = false; - tqrepaint(); + repaint(); } TQLineEdit::focusInEvent( ev ); } @@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev ) if ( text().isEmpty() ) { mDrawClickMsg = true; - tqrepaint(); + repaint(); } TQLineEdit::focusOutEvent( ev ); } diff --git a/kicker/kicker/ui/clicklineedit.h b/kicker/kicker/ui/clicklineedit.h index 8f5bacd81..cadafae4c 100644 --- a/kicker/kicker/ui/clicklineedit.h +++ b/kicker/kicker/ui/clicklineedit.h @@ -27,7 +27,7 @@ namespace KPIM { /** - This class provides a KLineEdit which tqcontains a greyed-out hinting + This class provides a KLineEdit which contains a greyed-out hinting text as long as the user didn't enter any text @short LineEdit with customizable "Click here" text diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 4fa39c677..cb0d42c56 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -78,8 +78,8 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio this, TQT_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline - resize(tqsizeHint().width() > 300 ? tqsizeHint().width() : 300, - tqsizeHint().height()); + resize(sizeHint().width() > 300 ? sizeHint().width() : 300, + sizeHint().height()); } void PanelExeDialog::slotOk() @@ -174,7 +174,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str) void PanelExeDialog::slotReturnPressed() { - if (m_partialPath2full.tqcontains(ui->m_exec->url())) + if (m_partialPath2full.contains(ui->m_exec->url())) ui->m_exec->setURL(m_partialPath2full[ui->m_exec->url()]); } diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index fb5cfd422..ae96ebcaa 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -57,7 +57,7 @@ void BackFrame::drawContents( TQPainter *p ) { TQColor gray( 230, 230, 230 ); if ( mouse_inside ) - p->fillRect( 3, 3, width() - 6, height() - 6, tqcolorGroup().color( TQColorGroup::Highlight ) ); + p->fillRect( 3, 3, width() - 6, height() - 6, colorGroup().color( TQColorGroup::Highlight ) ); else p->fillRect( 3, 3, width() - 6, height() - 6, gray ); p->setPen( gray.dark(110) ); @@ -270,7 +270,7 @@ void FlipScrollView::slotScrollTimer() if (!mSelectMenuPath.isEmpty()) { if (mSelectMenuPath=="kicker:/goup/") { currentView()->setSelected(currentView()->firstChild(),true); - currentView()->firstChild()->tqrepaint(); + currentView()->firstChild()->repaint(); } else { TQListViewItem * child = currentView()->firstChild(); @@ -278,8 +278,8 @@ void FlipScrollView::slotScrollTimer() KMenuItem* kitem = dynamic_cast<KMenuItem*>(child); if (kitem && kitem->menuPath()==mSelectMenuPath) { currentView()->setSelected(child,true); - kdDebug() << "child tqrepaint\n"; - child->tqrepaint(); + kdDebug() << "child repaint\n"; + child->repaint(); break; } child = child->nextSibling(); diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index e3325bfe3..a73e0a48d 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -51,22 +51,22 @@ void HideButton::drawButton(TQPainter *p) { if (m_arrow == Qt::LeftArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(width()-1, 0, width()-1, height()); } else if (m_arrow == Qt::RightArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, 0, 0, height()); } else if (m_arrow == Qt::UpArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, height()-1, width(), height()-1); } else if (m_arrow == Qt::DownArrow) { - p->setPen(tqcolorGroup().mid()); + p->setPen(colorGroup().mid()); p->drawLine(0, 0, width(), 0); } @@ -173,14 +173,14 @@ void HideButton::slotIconChanged(int group) } generateIcons(); - tqrepaint(false); + repaint(false); } void HideButton::enterEvent(TQEvent *e) { m_highlight = true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } @@ -188,7 +188,7 @@ void HideButton::leaveEvent(TQEvent *e) { m_highlight = false; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 86033ae98..dcb4760c1 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -99,7 +99,7 @@ static double pointSize( double pixelSize, TQPaintDevice *w ) static int pixelSize( double pixelSize, TQPaintDevice *w ) { - return tqRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. ); + return qRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. ); } void KMenuItem::init() @@ -145,7 +145,7 @@ void KMenuItem::setIcon(const TQString& icon, int size) void KMenuItem::setHasChildren( bool flag ) { m_has_children = flag; - tqrepaint(); + repaint(); } void KMenuItem::setup() @@ -166,7 +166,7 @@ void KMenuItem::setup() void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) { ItemView *listview = static_cast<ItemView*>( listView() ); - int bottom = listView()->tqitemRect( this ).bottom(); + int bottom = listView()->itemRect( this ).bottom(); int diff = bottom - listView()->viewport()->height(); KPixmap pm; @@ -197,7 +197,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int else listview->m_lastOne = static_cast<KMenuItem*>( itemBelow() ); listview->m_old_contentY = -1; - tqrepaint(); + repaint(); } } } @@ -315,7 +315,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column pp.fillRect( 0, 0, off.width(), off.height(), backg ); TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 ); - if ( tqGray( myColor.rgb() ) == 0 ) + if ( qGray( myColor.rgb() ) == 0 ) myColor = TQColor( 100, 100, 110 ); pp.setPen( myColor ); pp.setPen( isSelected() ? cg.color( TQColorGroup::Mid ) : myColor ); @@ -350,7 +350,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column { // the listview caches paint events m_old_width = width; - tqrepaint(); + repaint(); } } @@ -385,7 +385,7 @@ void KMenuItemSeparator::setLink( const TQString &text, const TQString &url ) bool KMenuItemSeparator::hitsLink( const TQPoint &pos ) { - return m_link_rect.tqcontains( pos ); + return m_link_rect.contains( pos ); } void KMenuItemSeparator::preparePixmap( int width ) @@ -424,7 +424,7 @@ void KMenuItemSeparator::paintCell(TQPainter* p, const TQColorGroup & cg, int co f.setPointSize( 8 + KickerSettings::kickoffFontPointSizeOffset() ); p->setFont( f ); TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 ); - if ( tqGray( myColor.rgb() ) == 0 ) + if ( qGray( myColor.rgb() ) == 0 ) myColor = TQColor( 100, 100, 110 ); p->setPen( myColor ); int twidth = p->fontMetrics().width(text(0)); @@ -528,7 +528,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int int r = left_margin + margin * 2; const int min_font_size = 7; - int title_font_pixelSize = tqRound( pixelSize( QMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); + int title_font_pixelSize = qRound( pixelSize( QMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); @@ -608,7 +608,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos ) if ( item->toolTip().isNull() ) return; - TQRect r = view->tqitemRect( item ); + TQRect r = view->itemRect( item ); int headerPos = view->header()->sectionPos( 0 ); r.setLeft( headerPos ); r.setRight( headerPos + view->header()->sectionSize( 0 ) ); @@ -762,7 +762,7 @@ void ItemView::slotMoveContent() TQListViewItemIterator it( this ); while ( it.current() ) { if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() ) { - it.current()->tqinvalidateHeight(); + it.current()->invalidateHeight(); item_height += it.current()->totalHeight(); } ++it; @@ -915,7 +915,7 @@ void ItemView::contentsMousePressEvent ( TQMouseEvent * e ) KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) ); if ( si ) { - if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) ) + if ( si->hitsLink( vp - itemRect(si).topLeft() ) ) emit startURL( si->linkUrl() ); } } @@ -928,7 +928,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e) bool link_cursor = false; KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( i ); if ( si ) - link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() ); + link_cursor = si->hitsLink( vp - itemRect(si).topLeft() ); if (i && !i->isSelectable() && !link_cursor) { unsetCursor(); @@ -965,7 +965,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e ) { KListView::resizeEvent( e ); // if ( m_lastOne ) -// int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height(); +// int diff = itemRect( m_lastOne ).bottom() - viewport()->height(); } void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) @@ -975,7 +975,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe ) if ( m_lastOne && m_old_contentY != contentsY() ) { m_old_contentY = contentsY(); - m_lastOne->tqrepaint(); + m_lastOne->repaint(); } } @@ -1020,17 +1020,17 @@ TQDragObject * ItemView::dragObject() p.drawPixmap(pix.height()-add.height(), pix.width()-add.width(), add); p.end(); - TQBitmap tqmask; + TQBitmap mask; - if (pix.tqmask()) - tqmask = *pix.tqmask(); + if (pix.mask()) + mask = *pix.mask(); else { - tqmask.resize(pix.size()); - tqmask.fill(Qt::color1); + mask.resize(pix.size()); + mask.fill(Qt::color1); } - bitBlt( &tqmask, pix.width()-add.width(), pix.height()-add.height(), add.tqmask(), 0, 0, add.width(), add.height(), OrROP ); - pix.setMask( tqmask ); + bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP ); + pix.setMask( mask ); o->setPixmap(pix); if(kitem->service()) { @@ -1052,7 +1052,7 @@ TQDragObject * ItemView::dragObject() else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) { TQString uri = kitem->path(); - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1103,7 +1103,7 @@ const char * KMenuItemDrag::format(int i) const return 0; } -TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const +TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const { if (TQString("application/kmenuitem") == mimeType) return a; @@ -1138,7 +1138,7 @@ bool ItemView::acceptDrag (TQDropEvent* event) const bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item) { - TQByteArray a = e->tqencodedData("application/kmenuitem"); + TQByteArray a = e->encodedData("application/kmenuitem"); if (a.isEmpty()) { TQStringList l; @@ -1211,7 +1211,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -1219,7 +1219,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==uri) + if (df.readURL().replace("file://",TQString::null)==uri) break; } } @@ -1233,7 +1233,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const TQStringList favs = KickerSettings::favorites(); if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString::null)); + KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); return (p && favs.find(p->storageId())==favs.end()); } else { @@ -1241,7 +1241,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==text) + if (df.readURL().replace("file://",TQString::null)==text) break; } } diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h index 2a6b7e68b..c8b95ee42 100644 --- a/kicker/kicker/ui/itemview.h +++ b/kicker/kicker/ui/itemview.h @@ -248,7 +248,7 @@ class KMenuItemDrag : public TQDragObject ~KMenuItemDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, KMenuItemInfo& item); diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 2b0afad5f..0506201f5 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -94,7 +94,7 @@ PanelKMenu::PanelKMenu() "slotServiceStartedByStorageId(TQString,TQString)", false); displayRepairTimer = new TQTimer( this ); - connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) ); + connect( displayRepairTimer, SIGNAL(timeout()), this, SLOT(repairDisplay()) ); } PanelKMenu::~PanelKMenu() @@ -125,7 +125,7 @@ void PanelKMenu::hideMenu() while (isShown() == true) kapp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); - connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( windowtimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) @@ -138,7 +138,7 @@ void PanelKMenu::hideMenu() // thereby removing a bad shutdown screen artifact while still providing // a somewhat snappy user interface. TQTimer *delaytimer = new TQTimer( this ); - connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( delaytimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) @@ -207,7 +207,7 @@ void PanelKMenu::paletteChanged() if (!loadSidePixmap()) { sidePixmap = sideTilePixmap = TQPixmap(); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } } @@ -415,10 +415,10 @@ void PanelKMenu::repairDisplay(void) { displayRepairTimer->stop(); // Now do a nasty hack to prevent search bar merging into the side image - // This forces a tqlayout/tqrepaint of the qpopupmenu - tqrepaint(); // This ensures that the side bar image was applied + // This forces a layout/repaint of the qpopupmenu + repaint(); // This ensures that the side bar image was applied styleChange(style()); // This forces a call to the private function updateSize(TRUE) inside the qpopupmenu. - update(); // This tqrepaints the entire popup menu to apply the widget size/tqalignment changes made above + update(); // This repaints the entire popup menu to apply the widget size/alignment changes made above } } @@ -579,32 +579,32 @@ void PanelKMenu::showMenu() TQRect PanelKMenu::sideImageRect() { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(), height() - 2*frameWidth() ), this ); } void PanelKMenu::resizeEvent(TQResizeEvent * e) { // kdDebug(1210) << "PanelKMenu::resizeEvent():" << endl; -// kdDebug(1210) << tqgeometry().width() << ", " << tqgeometry().height() << endl; +// kdDebug(1210) << geometry().width() << ", " << geometry().height() << endl; PanelServiceMenu::resizeEvent(e); - setFrameRect( TQStyle::tqvisualRect( TQRect( sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0, width() - sidePixmap.width(), height() ), this ) ); } //Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough. void PanelKMenu::resize(int width, int height) { - width = kMax(width, tqmaximumSize().width()); + width = kMax(width, maximumSize().width()); PanelServiceMenu::resize(width, height); } -TQSize PanelKMenu::tqsizeHint() const +TQSize PanelKMenu::sizeHint() const { - TQSize s = PanelServiceMenu::tqsizeHint(); -// kdDebug(1210) << "PanelKMenu::tqsizeHint()" << endl; + TQSize s = PanelServiceMenu::sizeHint(); +// kdDebug(1210) << "PanelKMenu::sizeHint()" << endl; // kdDebug(1210) << s.width() << ", " << s.height() << endl; return s; } @@ -621,7 +621,7 @@ void PanelKMenu::paintEvent(TQPaintEvent * e) style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); @@ -648,7 +648,7 @@ TQMouseEvent PanelKMenu::translateMouseEvent( TQMouseEvent* e ) { TQRect side = sideImageRect(); - if ( !side.tqcontains( e->pos() ) ) + if ( !side.contains( e->pos() ) ) return *e; TQPoint newpos( e->pos() ); @@ -700,7 +700,7 @@ void PanelKMenu::keyPressEvent(TQKeyEvent* e) // user presses '/'. This is the same shortcut as // konqueror is using, and afaik it's hardcoded both // here and there. This sucks badly for many non-us - // keyboard tqlayouts, but for the sake of consistency + // keyboard layouts, but for the sake of consistency // we follow konqueror. if (!searchEdit) return KPanelMenu::keyPressEvent(e); diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h index d91ddf032..16655bdd6 100644 --- a/kicker/kicker/ui/k_mnu.h +++ b/kicker/kicker/ui/k_mnu.h @@ -59,7 +59,7 @@ public: int insertClientMenu(KickerClientMenu *p); void removeClientMenu(int id); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void setMinimumSize(const TQSize &); virtual void setMaximumSize(const TQSize &); virtual void setMinimumSize(int, int); diff --git a/kicker/kicker/ui/k_mnu_stub.cpp b/kicker/kicker/ui/k_mnu_stub.cpp index 16e755d48..b02d2bcbf 100644 --- a/kicker/kicker/ui/k_mnu_stub.cpp +++ b/kicker/kicker/ui/k_mnu_stub.cpp @@ -97,11 +97,11 @@ void KMenuStub::resize(int w, int h) return m_w.panelkmenu->resize(w, h); } -TQSize KMenuStub::tqsizeHint() const +TQSize KMenuStub::sizeHint() const { if(m_type == t_KMenu) - return m_w.kmenu->tqsizeHint(); - return m_w.panelkmenu->tqsizeHint(); + return m_w.kmenu->sizeHint(); + return m_w.panelkmenu->sizeHint(); } bool KMenuStub::highlightMenuItem( const TQString &menuId ) diff --git a/kicker/kicker/ui/k_mnu_stub.h b/kicker/kicker/ui/k_mnu_stub.h index 17fe92b7c..362d132b2 100644 --- a/kicker/kicker/ui/k_mnu_stub.h +++ b/kicker/kicker/ui/k_mnu_stub.h @@ -53,7 +53,7 @@ public: void popup(const TQPoint &pos, int indexAtPoint = -1); void selectFirstItem(); void resize(int, int); - TQSize tqsizeHint() const; + TQSize sizeHint() const; bool highlightMenuItem( const TQString &menuId ); void clearRecentMenuItems(); void initialize(); diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 2fc18f079..a2a8cb2fc 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -141,12 +141,12 @@ static TQString workaroundStringFreeze(const TQString& str) { TQString s = str; - s.tqreplace("<u>","&"); + s.replace("<u>","&"); TQRegExp re("<[^>]+>"); re.setMinimal(true); re.setCaseSensitive(false); - s.tqreplace(re, ""); + s.replace(re, ""); s = s.simplifyWhiteSpace(); return s; @@ -194,7 +194,7 @@ KMenu::KMenu() m_userInfo->setBackgroundMode( PaletteBase ); TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid ); - if ( tqGray( userInfoColor.rgb() ) > 120 ) + if ( qGray( userInfoColor.rgb() ) > 120 ) userInfoColor = userInfoColor.dark( 200 ); else userInfoColor = userInfoColor.light( 200 ); @@ -302,7 +302,7 @@ KMenu::KMenu() m_searchInternet->setPixmap(0,icon); setTabOrder(m_kcommand, m_searchResultsWidget); - m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty(); + m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty(); m_isShowing = false; if (!m_kerryInstalled) { @@ -421,7 +421,7 @@ void KMenu::setupUi() { m_stacker = new TQWidgetStack( this, "m_stacker" ); m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) ); - m_stacker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); + m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) ); // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); m_stacker->setLineWidth( 0 ); @@ -495,7 +495,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) if(raiseWidget) break; if(receiver->isWidgetType()) - receiver = static_cast<TQWidget*>(receiver)->tqparentWidget(true); + receiver = static_cast<TQWidget*>(receiver)->parentWidget(true); else break; } @@ -517,12 +517,12 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) return false; } - if (m_sloppyRegion.tqcontains(p)) { + if (m_sloppyRegion.contains(p)) { if (e->type() == TQEvent::MouseButtonPress /*&& m_sloppyTimer.isActive()*/) m_sloppySourceClicked = true; if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) { - int timeout= style().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); + int timeout= style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay); if (m_sloppySourceClicked) timeout = 3000; m_sloppyTimer.start(timeout); @@ -682,9 +682,9 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e) void KMenu::slotSloppyTimeout() { - if (m_sloppyRegion.tqcontains(TQCursor::pos()) && !m_sloppySource.isNull()) + if (m_sloppyRegion.contains(TQCursor::pos()) && !m_sloppySource.isNull()) { - if ( m_sloppySource.tqcontains(TQCursor::pos())) + if ( m_sloppySource.contains(TQCursor::pos())) { m_stacker->raiseWidget(m_sloppyWidget); @@ -882,7 +882,7 @@ void KMenu::slotGoExitSubMenu(const TQString& url) m_exitView->rightView()->insertItem( "switchuser", i18n( "Start New Session" ), i18n( "Start a parallel session" ), "kicker:/switchuser", nId++, index++ ); - m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").tqreplace("&&","&"), + m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").replace("&&","&"), i18n( "Lock screen and start a parallel session" ), "kicker:/switchuserafterlock", nId++, index++ ); SessList sess; @@ -1259,7 +1259,7 @@ void KMenu::initialize() if ((*it)[0]=='/') { KDesktopFile df((*it),true); TQString url = df.readURL(); - if (!KURL(url).isLocalFile() || TQFile::exists(url.tqreplace("file://",TQString::null))) + if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString::null))) m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++); } else { @@ -1314,7 +1314,7 @@ void KMenu::insertStaticExitItems() m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ), i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ ); - m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).tqreplace("&",""), + m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""), i18n( "Restart and boot the default system" ), "kicker:/restart", nId++, index++ ); @@ -1556,7 +1556,7 @@ bool KMenu::runCommand() case KURIFilterData::HELP: { // No need for kfmclient, KRun does it all (David) - (void) new KRun( m_filterData->uri(), tqparentWidget()); + (void) new KRun( m_filterData->uri(), parentWidget()); return false; } case KURIFilterData::EXECUTABLE: @@ -1699,14 +1699,14 @@ void KMenu::setOrientation(MenuOrientation orientation) TQWidget *footer = m_footer->mainWidget(); TQPixmap pix( 64, footer->height() ); TQPainter p( &pix ); - p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) ); + p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) ); p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0, 64, 3, KNewButton::self()->borderColor() ); p.end(); footer->setPaletteBackgroundPixmap( pix ); } - resizeEvent(new TQResizeEvent(tqsizeHint(), tqsizeHint())); + resizeEvent(new TQResizeEvent(sizeHint(), sizeHint())); } void KMenu::showMenu() @@ -1762,10 +1762,10 @@ void KMenu::paintEvent(TQPaintEvent * e) const BackgroundMode bgmode = backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - p.setBrush( tqcolorGroup().brush( crole ) ); + p.setBrush( colorGroup().brush( crole ) ); p.drawRect( 0, 0, width(), height() ); - int ypos = m_search->mainWidget()->tqgeometry().bottom(); + int ypos = m_search->mainWidget()->geometry().bottom(); p.drawPixmap( 0, ypos, main_border_tl ); p.drawPixmap( width() - main_border_tr.width(), ypos, main_border_tr ); @@ -1923,7 +1923,7 @@ void KMenu::createNewProgramList() m_seenPrograms = KickerSettings::firstSeenApps(); m_newInstalledPrograms.clear(); - m_tqcurrentDate = TQDate::tqcurrentDate().toString(Qt::ISODate); + m_currentDate = TQDate::currentDate().toString(Qt::ISODate); bool initialize = (m_seenPrograms.count() == 0); @@ -1964,7 +1964,7 @@ void KMenu::createNewProgramList(TQString relPath) } else if(e->isType(KST_KService)) { KService::Ptr s(static_cast<KService *>(e)); if(s->type() == "Application" && !s->noDisplay() ) { - TQString shortStorageId = s->storageId().tqreplace(".desktop",TQString::null); + TQString shortStorageId = s->storageId().replace(".desktop",TQString::null); TQStringList::Iterator it_find = m_seenPrograms.begin(); TQStringList::Iterator it_end = m_seenPrograms.end(); bool found = false; @@ -1978,7 +1978,7 @@ void KMenu::createNewProgramList(TQString relPath) if (!found) { m_seenProgramsChanged=true; m_seenPrograms+=shortStorageId; - m_seenPrograms+=m_tqcurrentDate; + m_seenPrograms+=m_currentDate; if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } @@ -1986,7 +1986,7 @@ void KMenu::createNewProgramList(TQString relPath) ++it_find; if (*(it_find)!="-") { TQDate date = TQDate::fromString(*(it_find),Qt::ISODate); - if (date.daysTo(TQDate::tqcurrentDate())<3) { + if (date.daysTo(TQDate::currentDate())<3) { if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end()) m_newInstalledPrograms+=s->storageId(); } @@ -2540,7 +2540,7 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item) return favicon; } - if (mimetype_iconstore.tqcontains (hit_item->mimetype)) + if (mimetype_iconstore.contains (hit_item->mimetype)) return (mimetype_iconstore [hit_item->mimetype]); else { KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype); @@ -2715,7 +2715,7 @@ void KMenu::slotStartURL(const TQString& u) } kapp->propagateSessionManager(); - (void) new KRun( u, tqparentWidget()); + (void) new KRun( u, parentWidget()); } } @@ -2744,7 +2744,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos m_popupPath.path = kitem->path(); m_popupPath.icon = kitem->icon(); - if (m_popupPath.path.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(m_popupPath.path,true); m_popupPath.path=df.readURL(); } @@ -2779,7 +2779,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==m_popupPath.path) + if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) break; } } @@ -2936,7 +2936,7 @@ void KMenu::slotContextMenu(int selected) case EditMenu: accept(); proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1); proc->start(); break; @@ -2982,7 +2982,7 @@ void KMenu::slotContextMenu(int selected) for (it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==m_popupPath.path) + if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) break; } } @@ -3024,7 +3024,7 @@ void KMenu::slotContextMenu(int selected) for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) { if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==m_popupPath.path) { + if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) { TQFile::remove((*it)); favs.erase(it); break; @@ -3074,24 +3074,24 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // put the search widget at the top of the menu and give it its desired // height m_search->mainWidget()->setGeometry( 0, ypos, width(), - m_search->tqminimumSize().height() ); - left_height -= m_search->tqminimumSize().height(); - ypos += m_search->tqminimumSize().height(); + m_search->minimumSize().height() ); + left_height -= m_search->minimumSize().height(); + ypos += m_search->minimumSize().height(); // place the footer widget at the bottom of the menu and give it its desired // height - m_footer->mainWidget()->setGeometry( 0, height() - m_footer->tqminimumSize().height(), - width(), m_footer->tqminimumSize().height() ); - left_height -= m_footer->tqminimumSize().height(); + m_footer->mainWidget()->setGeometry( 0, height() - m_footer->minimumSize().height(), + width(), m_footer->minimumSize().height() ); + left_height -= m_footer->minimumSize().height(); // place the button box above the footer widget, horizontal placement // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), - height() - m_footer->tqminimumSize().height() - - m_tabBar->tqsizeHint().height(), + height() - m_footer->minimumSize().height() - + m_tabBar->sizeHint().height(), width() - button_box_left.width(), - m_tabBar->tqsizeHint().height() ); - left_height -= m_tabBar->tqsizeHint().height(); + m_tabBar->sizeHint().height() ); + left_height -= m_tabBar->sizeHint().height(); // place the main (stacker) widget below the search widget, // in the remaining vertical space @@ -3105,28 +3105,28 @@ void KMenu::resizeEvent ( TQResizeEvent * e ) // place the 'footer' widget at the top of the menu and give it // its desired height m_footer->mainWidget()->setGeometry( 0, - ypos /*height() - m_footer->tqminimumSize().height()*/, + ypos /*height() - m_footer->minimumSize().height()*/, width(), - m_footer->tqminimumSize().height() ); - ypos += m_footer->tqminimumSize().height(); - left_height -= m_footer->tqminimumSize().height(); + m_footer->minimumSize().height() ); + ypos += m_footer->minimumSize().height(); + left_height -= m_footer->minimumSize().height(); // place the button box next at the top of the menu. // has the width of the edge graphics subtracted m_tabBar->setGeometry(button_box_left.width(), ypos, width() - button_box_left.width(), - m_tabBar->tqsizeHint().height()); + m_tabBar->sizeHint().height()); - ypos += m_tabBar->tqsizeHint().height(); - left_height -= m_tabBar->tqsizeHint().height(); + ypos += m_tabBar->sizeHint().height(); + left_height -= m_tabBar->sizeHint().height(); // put the search widget above the footer widget // height m_search->mainWidget()->setGeometry( 0, - height() - m_search->tqminimumSize().height(), + height() - m_search->minimumSize().height(), width(), - m_search->tqminimumSize().height() + m_search->minimumSize().height() ); - left_height -= m_search->tqminimumSize().height(); + left_height -= m_search->minimumSize().height(); // place the main (stacker) widget below the button box, // in the remaining vertical space @@ -3167,14 +3167,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e ) if ( hasMouseTracking() && m_isresizing ) { m_stacker->setMinimumSize( TQSize(0, 0) ); m_stacker->setMaximumSize( TQSize(32000, 32000) ); - int newWidth = QMAX( e->x() - x(), tqminimumSizeHint().width() ); + int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() ); if ( m_orientation == BottomUp ) { - int newHeight = QMAX( height() - e->y(), tqminimumSizeHint().height() + 10 ); + int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 ); int newY = y() + height() - newHeight; setGeometry( x(), newY, newWidth, newHeight); } else { - setGeometry( x(), y(), newWidth, QMAX( e->y(), tqminimumSizeHint().height() + 10 )); + setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 )); } } } @@ -3277,10 +3277,10 @@ void KMenu::searchActionClicked(TQListViewItem* item) if( !KURIFilter::self()->filterURI(data, list) ) { KDesktopFile file("searchproviders/google.desktop", true, "services"); - data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText())); + data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText())); } - (void) new KRun( data.uri(), tqparentWidget()); + (void) new KRun( data.uri(), parentWidget()); } } @@ -3320,7 +3320,7 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service) TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level - if (!strItem.tqcontains('/')) + if (!strItem.contains('/')) { return; } @@ -3331,36 +3331,36 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service) RecentlyLaunchedApps::the().m_bNeedToUpdate = true; } -TQSize KMenu::tqsizeHint() const +TQSize KMenu::sizeHint() const { #warning FIXME - // this should be only for the inner area so tqlayout changes do not break it + // this should be only for the inner area so layout changes do not break it const int width = kMin(KickerSettings::kMenuWidth(), TQApplication::desktop()->screen()->width()-50); const int height = kMin(KickerSettings::kMenuHeight(), TQApplication::desktop()->screen()->height()-50); TQSize wanted(width, height); - kdDebug() << "show " << tqminimumSizeHint() << " " << m_stacker->tqminimumSizeHint() << " " - << m_searchFrame->tqminimumSizeHint() << " " << wanted << endl; + kdDebug() << "show " << minimumSizeHint() << " " << m_stacker->minimumSizeHint() << " " + << m_searchFrame->minimumSizeHint() << " " << wanted << endl; bool isDefault = wanted.isNull(); - wanted = wanted.expandedTo(tqminimumSizeHint()); + wanted = wanted.expandedTo(minimumSizeHint()); if ( isDefault ) - wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->tqminimumSizeHint().height() ) ); + wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->minimumSizeHint().height() ) ); return wanted; } -TQSize KMenu::tqminimumSizeHint() const +TQSize KMenu::minimumSizeHint() const { TQSize minsize; - minsize.setWidth( minsize.width() + m_tabBar->tqsizeHint().width() ); + minsize.setWidth( minsize.width() + m_tabBar->sizeHint().width() ); minsize.setWidth( QMAX( minsize.width(), - m_search->tqminimumSize().width() ) ); + m_search->minimumSize().width() ) ); minsize.setWidth( QMAX( minsize.width(), - m_search->tqminimumSize().width() ) ); + m_search->minimumSize().width() ) ); minsize.setHeight( minsize.height() + - m_search->tqminimumSize().height() + - m_footer->tqminimumSize().height() + + m_search->minimumSize().height() + + m_footer->minimumSize().height() + 180 ); // 180 is a very rough guess for 32 icon size return minsize; } @@ -3387,7 +3387,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==kitem->path()) + if (df.readURL().replace("file://",TQString::null)==kitem->path()) { addFav = *it; favs.erase(it); @@ -3412,7 +3412,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir if ((*it)[0]=='/' && !kafterNow->service()) { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==kafterNow->path()) + if (df.readURL().replace("file://",TQString::null)==kafterNow->path()) { kdDebug() << "insert after " << kafterNow->path() << endl; favs.insert(++it,addFav); @@ -3558,7 +3558,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) else { TQString uri = item.m_path; - if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) { + if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) { KDesktopFile df(uri,true); uri=df.readURL(); } @@ -3569,7 +3569,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==uri) + if (df.readURL().replace("file://",TQString::null)==uri) break; } } @@ -3597,7 +3597,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if (text.endsWith(".desktop")) { - KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString::null)); + KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null)); if (p && favs.find(p->storageId())==favs.end()) { newItem = m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1); favs+=p->storageId(); @@ -3611,7 +3611,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after ) if ((*it)[0]=='/') { KDesktopFile df((*it),true); - if (df.readURL().tqreplace("file://",TQString::null)==text) + if (df.readURL().replace("file://",TQString::null)==text) break; } } diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h index 73549cfa0..ef45ef815 100644 --- a/kicker/kicker/ui/k_new_mnu.h +++ b/kicker/kicker/ui/k_new_mnu.h @@ -104,8 +104,8 @@ public: enum MaskEffect { Plain, Dissolve }; - virtual TQSize tqsizeHint() const; - virtual TQSize tqminimumSizeHint() const; + virtual TQSize sizeHint() const; + virtual TQSize minimumSizeHint() const; void searchOver(); void initCategoryTitlesUpdate(); @@ -319,7 +319,7 @@ private: TQStringList m_programsInMenu; TQStringList m_newInstalledPrograms, m_seenPrograms; bool m_seenProgramsChanged; - TQString m_tqcurrentDate; + TQString m_currentDate; MenuOrientation m_orientation; bool m_toolTipsEnabled; diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp index de6f3661e..2f0de9aea 100644 --- a/kicker/kicker/ui/kickoff_bar.cpp +++ b/kicker/kicker/ui/kickoff_bar.cpp @@ -56,10 +56,10 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const // else if(t == d->pressed) // flags |= TQStyle::Style_Sunken; //selection flags - if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - style().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), - tqcolorGroup(), flags, TQStyleOption(t) ); + style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), + colorGroup(), flags, TQStyleOption(t) ); paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() ); } @@ -70,7 +70,7 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha TQRect r = br; bool selected = m_tabsActivated && (currentTab() == t->identifier()); - int vframe = style().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); p->setFont( font() ); TQFontMetrics fm = p->fontMetrics(); @@ -114,30 +114,30 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha flags |= TQStyle::Style_Selected; // else if(t == d->pressed) // flags |= TQStyle::Style_Sunken; - if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; - style().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt, - t->isEnabled() ? tqcolorGroup(): palette().disabled(), + style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt, + t->isEnabled() ? colorGroup(): palette().disabled(), flags, TQStyleOption(t) ); } -TQSize KickoffTabBar::tqsizeHint() const +TQSize KickoffTabBar::sizeHint() const { - TQSize s = TQTabBar::tqsizeHint(); + TQSize s = TQTabBar::sizeHint(); return s; } -void KickoffTabBar::tqlayoutTabs() +void KickoffTabBar::layoutTabs() { - TQTabBar::tqlayoutTabs(); + TQTabBar::layoutTabs(); TQFontMetrics fm = fontMetrics(); int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4; - int hframe = style().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this ); - int vframe = style().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this ); - int overlap = style().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this ); + int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this ); + int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this ); + int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this ); TQSize s; for (int t = 0; t < count(); ++t) diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h index 67a7fcdda..2330ffe39 100644 --- a/kicker/kicker/ui/kickoff_bar.h +++ b/kicker/kicker/ui/kickoff_bar.h @@ -32,12 +32,12 @@ public: KickoffTabBar(TQWidget* parent, const char* name); void deactivateTabs(bool b); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; protected: virtual void paint(TQPainter*, TQTab*, bool) const; virtual void paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool has_focus) const; - virtual void tqlayoutTabs(); + virtual void layoutTabs(); virtual void dragEnterEvent(TQDragEnterEvent*); virtual void dragMoveEvent(TQDragMoveEvent*); virtual void mousePressEvent ( TQMouseEvent * ); diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui index 64f598076..0cbea1155 100644 --- a/kicker/kicker/ui/kmenuitembase.ui +++ b/kicker/kicker/ui/kmenuitembase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KMenuItemBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -44,7 +44,7 @@ </property> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -73,7 +73,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -102,7 +102,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -110,7 +110,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -120,7 +120,7 @@ <property name="name"> <cstring>itemPixmap</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>64</height> @@ -129,7 +129,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -137,5 +137,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui index a6b5cb8ae..5c44aca85 100644 --- a/kicker/kicker/ui/nonKDEButtonSettings.ui +++ b/kicker/kicker/ui/nonKDEButtonSettings.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NonKDEButtonSettings</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -140,13 +140,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>58</width> <height>58</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>58</width> <height>58</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>8</height> @@ -216,6 +216,6 @@ <tabstop>m_commandLine</tabstop> <tabstop>m_inTerm</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index f861cbc7e..439fc195f 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/kicker/kicker/ui/popupmenutitle.h @@ -69,11 +69,11 @@ public: m_font.setBold(true); } - TQSize tqsizeHint() + TQSize sizeHint() { TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName); size.setHeight(size.height() + - (kapp->style().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); + (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1)); return size; } diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index 3c14a74aa..2e0543dae 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -63,7 +63,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() } items.append(PanelMenuItemInfo(container->icon(), - container->visibleName().tqreplace("&", "&&"), + container->visibleName().replace("&", "&&"), id)); ++id; ++it; diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index e1d8d62c4..9d5d80d2b 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -57,7 +57,7 @@ void PanelRemoveExtensionMenu::slotAboutToShow() for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it) { const AppletInfo info = (*it)->info(); - TQString name = info.name().tqreplace("&", "&&"); + TQString name = info.name().replace("&", "&&"); switch ((*it)->position()) { case KPanelExtension::Top: diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 2d6287bb9..3042eddfe 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -230,8 +230,8 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root, TQString inlineHeaderName = g->showInlineHeader() ? groupCaption : ""; // Item names may contain ampersands. To avoid them being converted - // to accelerators, tqreplace them with two ampersands. - groupCaption.tqreplace("&", "&&"); + // to accelerators, replace them with two ampersands. + groupCaption.replace("&", "&&"); if ( nbChildCount == 1 && g->allowInline() && g->inlineAlias()) { @@ -411,7 +411,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) { if ((!suppressGenericNames || - !suppressGenericNames->tqcontains(s->untranslatedGenericName())) && + !suppressGenericNames->contains(s->untranslatedGenericName())) && serviceName.find(comment, 0, true) == -1) { if (comment.find(serviceName, 0, true) == -1) @@ -449,8 +449,8 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId, return; // item names may contain ampersands. To avoid them being converted - // to accelerators, tqreplace them with two ampersands. - serviceName.tqreplace("&", "&&"); + // to accelerators, replace them with two ampersands. + serviceName.replace("&", "&&"); TQString icon = s->icon(); if (icon=="unknown") @@ -544,7 +544,7 @@ bool PanelServiceMenu::highlightMenuItem( const TQString &menuItemId ) void PanelServiceMenu::slotExec(int id) { - if (!entryMap_.tqcontains(id)) + if (!entryMap_.contains(id)) { return; } @@ -578,7 +578,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) return; } - if (!entryMap_.tqcontains(id)) + if (!entryMap_.contains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; @@ -695,7 +695,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditItem: proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId(); proc->start(); break; @@ -739,7 +739,7 @@ void PanelServiceMenu::slotContextMenu(int selected) case EditMenu: proc = new KProcess(this); - *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit")); + *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit")); *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath(); proc->start(); break; @@ -769,7 +769,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) if (id < serviceMenuStartId()) return; - if (!entryMap_.tqcontains(id)) { + if (!entryMap_.contains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; } @@ -838,7 +838,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event) void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *) { // see PanelServiceMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().tqcontains(TQCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -932,12 +932,12 @@ void PanelServiceMenu::setSearchString(const TQString &searchString) int id = *menuItemIt; KService* s = dynamic_cast< KService* >( static_cast< KSycocaEntry* >( entryMap_[ id ])); TQString menuText = text(id); - if (menuText.tqcontains(searchString, false) > 0 - || ( s != NULL && ( s->name().tqcontains(searchString, false) > 0 - || s->exec().tqcontains(searchString, false) > 0 - || s->comment().tqcontains(searchString, false) > 0 - || s->genericName().tqcontains(searchString, false) > 0 - || s->exec().tqcontains(searchString, false) > 0 ) + if (menuText.contains(searchString, false) > 0 + || ( s != NULL && ( s->name().contains(searchString, false) > 0 + || s->exec().contains(searchString, false) > 0 + || s->comment().contains(searchString, false) > 0 + || s->genericName().contains(searchString, false) > 0 + || s->exec().contains(searchString, false) > 0 ) )) { setItemEnabled(id, true); foundSomething = true; @@ -951,7 +951,7 @@ void PanelServiceMenu::setSearchString(const TQString &searchString) /*for (int i=count()-1; i>=0; --i) { int id = idAt(i); TQString menuText = text(id); - if (menuText.tqcontains(searchString, false) > 0) { + if (menuText.contains(searchString, false) > 0) { setItemEnabled(id, true); foundSomething = true; nonemptyMenus.insert(id); @@ -995,7 +995,7 @@ void PanelServiceMenu::updateRecentlyUsedApps(KService::Ptr &service) TQString strItem(service->desktopEntryPath()); // don't add an item from root kmenu level - if (!strItem.tqcontains('/')) + if (!strItem.contains('/')) { return; } diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index dcf6ba51f..1e9025e5a 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -161,7 +161,7 @@ int maxButtonDim() int maxDim; //return (2 * KickerSettings::iconMargin()) + KIcon::SizeLarge; - KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" )); + KSimpleConfig *kickerconfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" )); kickerconfig->setGroup("General"); maxDim = (2 * KickerSettings::iconMargin()) + kickerconfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);; delete kickerconfig; @@ -225,7 +225,7 @@ TQPoint popupPosition(KPanelApplet::Direction d, TQRect r; if (source->isTopLevel()) { - r = source->tqgeometry(); + r = source->geometry(); } else { @@ -236,13 +236,13 @@ TQPoint popupPosition(KPanelApplet::Direction d, { case KPanelApplet::Left: case KPanelApplet::Right: - r.setLeft( source->tqtopLevelWidget()->x() ); - r.setWidth( source->tqtopLevelWidget()->width() ); + r.setLeft( source->topLevelWidget()->x() ); + r.setWidth( source->topLevelWidget()->width() ); break; case KPanelApplet::Up: case KPanelApplet::Down: - r.setTop( source->tqtopLevelWidget()->y() ); - r.setHeight( source->tqtopLevelWidget()->height() ); + r.setTop( source->topLevelWidget()->y() ); + r.setHeight( source->topLevelWidget()->height() ); break; } } @@ -347,7 +347,7 @@ void colorize(TQImage& image) // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = tqGray(r, g, b); + int gray = qGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180)); diff --git a/kicker/libkicker/global.h b/kicker/libkicker/global.h index ee385fa34..0a4677914 100644 --- a/kicker/libkicker/global.h +++ b/kicker/libkicker/global.h @@ -74,7 +74,7 @@ KDE_EXPORT TQString newDesktopFile(const KURL&url); /** * Reduces a popup menu * - * When a popup menu tqcontains only 1 sub-menu, it makes no sense to + * When a popup menu contains only 1 sub-menu, it makes no sense to * show this popup-menu but we better show the sub-menu directly. * * This function checks whether that is the case and returns either the @@ -85,7 +85,7 @@ KDE_EXPORT TQPopupMenu *reduceMenu(TQPopupMenu *); /** * Calculate the appropriate position for a popup menu based on the - * direction, the size of the menu, the widget tqgeometry, and a optional + * direction, the size of the menu, the widget geometry, and a optional * point in the local coordinates of the widget. */ KDE_EXPORT TQPoint popupPosition(KPanelApplet::Direction d, diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index 8af29d33d..586360904 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -129,7 +129,7 @@ void KickerTip::display() // Declare interchange object and define defaults. Data data; - data.tqmaskEffect = Dissolve; + data.maskEffect = Dissolve; data.duration = 2000; data.direction = KPanelApplet::Up; data.mimeFactory = m_mimeFactory; @@ -165,7 +165,7 @@ void KickerTip::display() return; } - m_tqmaskEffect = isVisible() ? Plain : data.tqmaskEffect; + m_maskEffect = isVisible() ? Plain : data.maskEffect; m_dissolveSize = 24; m_dissolveDelta = -1; @@ -281,34 +281,34 @@ static void drawRoundRect(TQPainter &p, const TQRect &r) void KickerTip::plainMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(Qt::black); + m_mask.fill(Qt::black); - tqmaskPainter.setBrush(Qt::white); - tqmaskPainter.setPen(Qt::NoPen); - //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); - drawRoundRect(tqmaskPainter, m_tqmask.rect()); - setMask(m_tqmask); + maskPainter.setBrush(Qt::white); + maskPainter.setPen(Qt::NoPen); + //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); + drawRoundRect(maskPainter, m_mask.rect()); + setMask(m_mask); m_frameTimer.stop(); } void KickerTip::dissolveMask() { - TQPainter tqmaskPainter(&m_tqmask); + TQPainter maskPainter(&m_mask); - m_tqmask.fill(Qt::black); + m_mask.fill(Qt::black); - tqmaskPainter.setBrush(Qt::white); - tqmaskPainter.setPen(Qt::NoPen); - //tqmaskPainter.drawRoundRect(m_tqmask.rect(), 1600 / m_tqmask.rect().width(), 1600 / m_tqmask.rect().height()); - drawRoundRect(tqmaskPainter, m_tqmask.rect()); + maskPainter.setBrush(Qt::white); + maskPainter.setPen(Qt::NoPen); + //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height()); + drawRoundRect(maskPainter, m_mask.rect()); m_dissolveSize += m_dissolveDelta; if (m_dissolveSize > 0) { - tqmaskPainter.setRasterOp(Qt::EraseROP); + maskPainter.setRasterOp(Qt::EraseROP); int x, y, s; const int size = 16; @@ -323,7 +323,7 @@ void KickerTip::dissolveMask() { break; } - tqmaskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); + maskPainter.drawEllipse(x - s / 2, y - s / 2, s, s); } } } @@ -333,7 +333,7 @@ void KickerTip::dissolveMask() m_dissolveDelta = 1; } - setMask(m_tqmask); + setMask(m_mask); } void KickerTip::displayInternal() @@ -361,11 +361,11 @@ void KickerTip::displayInternal() int width = textX + textRect.width() + margin; int textY = (height - textRect.height()) / 2; - // resize pixmap, tqmask and widget + // resize pixmap, mask and widget bool firstTime = m_dissolveSize == 24; if (firstTime) { - m_tqmask.resize(width, height); + m_mask.resize(width, height); m_pixmap.resize(width, height); resize(width, height); if (isVisible()) @@ -378,8 +378,8 @@ void KickerTip::displayInternal() } } - // create and set transparency tqmask - switch(m_tqmaskEffect) + // create and set transparency mask + switch(m_maskEffect) { case Plain: plainMask(); @@ -392,8 +392,8 @@ void KickerTip::displayInternal() // draw background TQPainter bufferPainter(&m_pixmap); - bufferPainter.setPen(tqcolorGroup().foreground()); - bufferPainter.setBrush(tqcolorGroup().background()); + bufferPainter.setPen(colorGroup().foreground()); + bufferPainter.setBrush(colorGroup().background()); //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height); drawRoundRect(bufferPainter, TQRect(0, 0, width, height)); @@ -409,13 +409,13 @@ void KickerTip::displayInternal() if (KickerSettings::mouseOversShowText()) { // draw text shadow - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Text, cg.background().dark(115)); int shadowOffset = TQApplication::reverseLayout() ? -1 : 1; m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, TQRect(), cg); // draw text - cg = tqcolorGroup(); + cg = colorGroup(); m_richText->draw(&bufferPainter, textX, textY, rect(), cg); } } @@ -458,7 +458,7 @@ void KickerTip::tipperDestroyed(TQObject* o) void KickerTip::internalUpdate() { m_dirty = true; - tqrepaint(false); + repaint(false); } void KickerTip::enableTipping(bool tip) @@ -519,7 +519,7 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) } if (!mouseGrabber() && - !tqApp->activePopupWidget() && + !qApp->activePopupWidget() && !isTippingFor(widget)) { TQToolTip::setGloballyEnabled(false); diff --git a/kicker/libkicker/kickertip.h b/kicker/libkicker/kickertip.h index 65a28b8c2..14118029b 100644 --- a/kicker/libkicker/kickertip.h +++ b/kicker/libkicker/kickertip.h @@ -50,7 +50,7 @@ public: TQString message; TQString subtext; TQPixmap icon; - KickerTip::MaskEffect tqmaskEffect; + KickerTip::MaskEffect maskEffect; int duration; KPanelApplet::Direction direction; @@ -95,10 +95,10 @@ protected slots: void slotSettingsChanged(); private: - TQBitmap m_tqmask; + TQBitmap m_mask; TQPixmap m_pixmap; TQPixmap m_icon; - MaskEffect m_tqmaskEffect; + MaskEffect m_maskEffect; TQSimpleRichText* m_richText; TQMimeSourceFactory* m_mimeFactory; diff --git a/kicker/libkicker/kshadowengine.cpp b/kicker/libkicker/kshadowengine.cpp index c8be4377c..19ccc669d 100644 --- a/kicker/libkicker/kshadowengine.cpp +++ b/kicker/libkicker/kshadowengine.cpp @@ -114,7 +114,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow; // update the shadow's i,j pixel. - result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); + result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow)); } } return result; @@ -131,15 +131,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j) return 0; double alphaShadow; - alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + - tqGray(source.pixel(i-1,j )) * AXIS_FACTOR + - tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + - tqGray(source.pixel(i ,j-1)) * AXIS_FACTOR + + alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR + + qGray(source.pixel(i-1,j )) * AXIS_FACTOR + + qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR + + qGray(source.pixel(i ,j-1)) * AXIS_FACTOR + 0 + - tqGray(source.pixel(i ,j+1)) * AXIS_FACTOR + - tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + - tqGray(source.pixel(i+1,j )) * AXIS_FACTOR + - tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); + qGray(source.pixel(i ,j+1)) * AXIS_FACTOR + + qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR + + qGray(source.pixel(i+1,j )) * AXIS_FACTOR + + qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor(); return alphaShadow; } @@ -189,7 +189,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j) else sy = j + m; - opacity += tqGray(source.pixel(sx, sy)); + opacity += qGray(source.pixel(sx, sy)); } } alphaShadow += opacity / m_shadowSettings->multiplicationFactor(); diff --git a/kicker/libkicker/kshadowengine.h b/kicker/libkicker/kshadowengine.h index 0c44e1816..041e8faf6 100644 --- a/kicker/libkicker/kshadowengine.h +++ b/kicker/libkicker/kshadowengine.h @@ -94,13 +94,13 @@ private: /* * a slower algorithm where the influence of a pixel - * is tqGray(px)/(abs(dx) + abs(dy) +1). + * is qGray(px)/(abs(dx) + abs(dy) +1). */ double doubleLinearDecay(TQImage& source, int x, int y); /* * a very slow algorithm where the influence of a pixel - * is tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). + * is qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1). */ double radialDecay(TQImage& source, int x, int y); diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index 91a6c6c84..0c36ffea0 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/kicker/libkicker/menuinfo.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. MenuInfo::MenuInfo(const TQString& desktopFile) { - KSimpleConfig df(locate("data", TQString::tqfromLatin1("kicker/menuext/%1").arg(desktopFile))); + KSimpleConfig df(locate("data", TQString::fromLatin1("kicker/menuext/%1").arg(desktopFile))); df.setGroup("Desktop Entry"); TQStringList list = df.readListEntry("X-KDE-AuthorizeAction"); diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index 483763c45..a04e9aee0 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -427,7 +427,7 @@ void PanelButton::enterEvent(TQEvent* e) if (!m_highlight) { m_highlight = true; - tqrepaint(false); + repaint(false); } TQButton::enterEvent(e); @@ -438,7 +438,7 @@ void PanelButton::leaveEvent(TQEvent* e) if (m_highlight) { m_highlight = false; - tqrepaint(false); + repaint(false); } TQButton::leaveEvent(e); @@ -505,7 +505,7 @@ void PanelButton::mouseReleaseEvent(TQMouseEvent *e) TQPixmap pix = labelIcon(); if (KickerSettings::showIconActivationEffect() == true) { - KIconEffect::visualActivate(this, this->tqgeometry(), &pix); + KIconEffect::visualActivate(this, this->geometry(), &pix); } } TQButton::mouseReleaseEvent(e); @@ -528,7 +528,7 @@ void PanelButton::drawButton(TQPainter *p) if (m_tileColor.isValid()) { p->fillRect(rect(), m_tileColor); - style().drawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup()); + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup()); } else if (paletteBackgroundPixmap()) { @@ -547,8 +547,8 @@ void PanelButton::drawButton(TQPainter *p) } else if (isDown() || isOn()) { - // Draw tqshapes to indicate the down state. - style().drawPrimitive(TQStyle::PE_Panel, p, rect(), tqcolorGroup(), TQStyle::Style_Sunken); + // Draw shapes to indicate the down state. + style().drawPrimitive(TQStyle::PE_Panel, p, rect(), colorGroup(), TQStyle::Style_Sunken); } drawButtonLabel(p); @@ -558,8 +558,8 @@ void PanelButton::drawButton(TQPainter *p) int x1, y1, x2, y2; rect().coords(&x1, &y1, &x2, &y2); TQRect r(x1+2, y1+2, x2-x1-3, y2-y1-3); - style().drawPrimitive(TQStyle::PE_FocusRect, p, r, tqcolorGroup(), - TQStyle::Style_Default, tqcolorGroup().button()); + style().drawPrimitive(TQStyle::PE_FocusRect, p, r, colorGroup(), + TQStyle::Style_Default, colorGroup().button()); } } @@ -663,7 +663,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) if (m_drawArrow && (m_highlight || active)) { TQStyle::PrimitiveElement e = TQStyle::PE_ArrowUp; - int arrowSize = style().tqpixelMetric(TQStyle::PM_MenuButtonIndicator); + int arrowSize = style().pixelMetric(TQStyle::PM_MenuButtonIndicator); TQRect r((width() - arrowSize)/2, 0, arrowSize, arrowSize); switch (m_arrowDirection) @@ -707,7 +707,7 @@ void PanelButton::drawButtonLabel(TQPainter *p) { flags |= TQStyle::Style_Down; } - style().drawPrimitive(e, p, r, tqcolorGroup(), flags); + style().drawPrimitive(e, p, r, colorGroup(), flags); } } @@ -771,7 +771,7 @@ void PanelButton::backedByFile(const TQString& localFilePath) disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(checkForDeletion(const TQString&))); - if (!KDirWatch::self()->tqcontains(m_backingFile)) + if (!KDirWatch::self()->contains(m_backingFile)) { KDirWatch::self()->addFile(m_backingFile); } @@ -923,7 +923,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) if (e->type() == TQEvent::MouseMove) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().tqcontains(mapFromGlobal(me->globalPos())) && + if (rect().contains(mapFromGlobal(me->globalPos())) && ((me->state() & ControlButton) != 0 || (me->state() & ShiftButton) != 0)) { @@ -935,7 +935,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) e->type() == TQEvent::MouseButtonDblClick) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().tqcontains(mapFromGlobal(me->globalPos()))) + if (rect().contains(mapFromGlobal(me->globalPos()))) { m_pressedDuringPopup = true; return true; @@ -944,7 +944,7 @@ bool PanelPopupButton::eventFilter(TQObject *, TQEvent *e) else if (e->type() == TQEvent::MouseButtonRelease) { TQMouseEvent *me = static_cast<TQMouseEvent *>(e); - if (rect().tqcontains(mapFromGlobal(me->globalPos()))) + if (rect().contains(mapFromGlobal(me->globalPos()))) { if (m_pressedDuringPopup && m_popup) { diff --git a/kicker/libkicker/paneldrag.cpp b/kicker/libkicker/paneldrag.cpp index 28721d3f7..1fb6b9ce6 100644 --- a/kicker/libkicker/paneldrag.cpp +++ b/kicker/libkicker/paneldrag.cpp @@ -46,7 +46,7 @@ PanelDrag::~PanelDrag() bool PanelDrag::decode(const TQMimeSource* e, BaseContainer** container) { - TQByteArray a = e->tqencodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { @@ -73,7 +73,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return false; } - TQByteArray a = e->tqencodedData("application/basecontainerptr"); + TQByteArray a = e->encodedData("application/basecontainerptr"); if (a.size() != PANELDRAG_BUFSIZE) { return false; @@ -91,7 +91,7 @@ bool PanelDrag::canDecode(const TQMimeSource *e) return true; } -TQByteArray PanelDrag::tqencodedData(const char * mimeType) const +TQByteArray PanelDrag::encodedData(const char * mimeType) const { if (TQString("application/basecontainerptr") == mimeType && a.size() == PANELDRAG_BUFSIZE) @@ -136,7 +136,7 @@ const char * AppletInfoDrag::format(int i) const return 0; } -TQByteArray AppletInfoDrag::tqencodedData(const char* mimeType) const +TQByteArray AppletInfoDrag::encodedData(const char* mimeType) const { if (TQString("application/appletinfo") == mimeType) { @@ -158,7 +158,7 @@ bool AppletInfoDrag::canDecode(const TQMimeSource * e) bool AppletInfoDrag::decode(const TQMimeSource* e, AppletInfo& container) { - TQByteArray a = e->tqencodedData("application/appletinfo"); + TQByteArray a = e->encodedData("application/appletinfo"); if (a.isEmpty()) { diff --git a/kicker/libkicker/paneldrag.h b/kicker/libkicker/paneldrag.h index ad620a192..3d7cbf858 100644 --- a/kicker/libkicker/paneldrag.h +++ b/kicker/libkicker/paneldrag.h @@ -39,7 +39,7 @@ class KDE_EXPORT PanelDrag : public QDragObject ~PanelDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, BaseContainer** container); @@ -55,7 +55,7 @@ class KDE_EXPORT AppletInfoDrag : public QDragObject ~AppletInfoDrag(); virtual const char * format(int i = 0) const; - virtual TQByteArray tqencodedData(const char *) const; + virtual TQByteArray encodedData(const char *) const; static bool canDecode(const TQMimeSource * e); static bool decode(const TQMimeSource* e, AppletInfo& container); diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index ccd40da67..7d11a429e 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -54,9 +54,9 @@ Panner::Panner( TQWidget* parent, const char* name ) _viewport = new TQWidget(_clipper); _viewport->setBackgroundOrigin(AncestorOrigin); - // tqlayout - _tqlayout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); - _tqlayout->addWidget(_clipper, 1); + // layout + _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight); + _layout->addWidget(_clipper, 1); setOrientation(Horizontal); } @@ -77,7 +77,7 @@ void Panner::createScrollButtons() //_luSB->setAutoRepeat(true); _luSB->setMinimumSize(12, 12); _luSB->hide(); - _tqlayout->addWidget(_luSB); + _layout->addWidget(_luSB); connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp())); connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); @@ -87,7 +87,7 @@ void Panner::createScrollButtons() //_rdSB->setAutoRepeat(true); _rdSB->setMinimumSize(12, 12); _rdSB->hide(); - _tqlayout->addWidget(_rdSB); + _layout->addWidget(_rdSB); connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown())); connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); @@ -103,13 +103,13 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::LeftArrow); _rdSB->setArrowType(Qt::RightArrow); - _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); TQToolTip::add(_luSB, i18n("Scroll left")); TQToolTip::add(_rdSB, i18n("Scroll right")); setMinimumSize(24, 0); } - _tqlayout->setDirection(TQBoxLayout::LeftToRight); + _layout->setDirection(TQBoxLayout::LeftToRight); } else { @@ -117,20 +117,20 @@ void Panner::setupButtons() { _luSB->setArrowType(Qt::UpArrow); _rdSB->setArrowType(Qt::DownArrow); - _luSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); - _rdSB->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _luSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + _rdSB->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum)); TQToolTip::add(_luSB, i18n("Scroll up")); TQToolTip::add(_rdSB, i18n("Scroll down")); setMinimumSize(0, 24); } - _tqlayout->setDirection(TQBoxLayout::TopToBottom); + _layout->setDirection(TQBoxLayout::TopToBottom); } if (isVisible()) { - // we need to manually redo the tqlayout if we are visible + // we need to manually redo the layout if we are visible // otherwise let the toolkit decide when to do this - _tqlayout->activate(); + _layout->activate(); } } diff --git a/kicker/libkicker/panner.h b/kicker/libkicker/panner.h index fbce0569f..66ce6cd18 100644 --- a/kicker/libkicker/panner.h +++ b/kicker/libkicker/panner.h @@ -39,7 +39,7 @@ public: Panner( TQWidget* parent, const char* name = 0 ); ~Panner(); - TQSize tqminimumSizeHint() const { return TQWidget::tqminimumSizeHint(); } + TQSize minimumSizeHint() const { return TQWidget::minimumSizeHint(); } Qt::Orientation orientation() const { return _orient; } virtual void setOrientation(Orientation orientation); @@ -99,7 +99,7 @@ private: void updateScrollButtons(); Orientation _orient; - TQBoxLayout *_tqlayout; + TQBoxLayout *_layout; SimpleArrowButton *_luSB; // Left Scroll Button SimpleArrowButton *_rdSB; // Right Scroll Button TQTimer *_updateScrollButtonsTimer; diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index 5d928a6b6..4c28b2101 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -65,22 +65,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation) update(); } -TQSize SimpleButton::tqsizeHint() const +TQSize SimpleButton::sizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqsizeHint(); + return TQButton::sizeHint(); else return TQSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN); } -TQSize SimpleButton::tqminimumSizeHint() const +TQSize SimpleButton::minimumSizeHint() const { const TQPixmap* pm = pixmap(); if (!pm) - return TQButton::tqminimumSizeHint(); + return TQButton::minimumSizeHint(); else return TQSize(pm->width(), pm->height()); } @@ -176,7 +176,7 @@ void SimpleButton::enterEvent( TQEvent *e ) { m_highlight = true; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -184,7 +184,7 @@ void SimpleButton::leaveEvent( TQEvent *e ) { m_highlight = false; - tqrepaint( false ); + repaint( false ); TQButton::enterEvent( e ); } @@ -202,7 +202,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, Qt::ArrowType arrow, cons _inside = false; } -TQSize SimpleArrowButton::tqsizeHint() const +TQSize SimpleArrowButton::sizeHint() const { return TQSize( 12, 12 ); } @@ -236,7 +236,7 @@ void SimpleArrowButton::drawButton( TQPainter *p ) int flags = TQStyle::Style_Default | TQStyle::Style_Enabled; if (isDown() || isOn()) flags |= TQStyle::Style_Down; - style().drawPrimitive(pe, p, r, tqcolorGroup(), flags); + style().drawPrimitive(pe, p, r, colorGroup(), flags); } void SimpleArrowButton::enterEvent( TQEvent *e ) diff --git a/kicker/libkicker/simplebutton.h b/kicker/libkicker/simplebutton.h index d05f556c2..1ea5c7a44 100644 --- a/kicker/libkicker/simplebutton.h +++ b/kicker/libkicker/simplebutton.h @@ -34,8 +34,8 @@ class KDE_EXPORT SimpleButton : public QButton SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; protected: void drawButton( TQPainter *p ); @@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton public: SimpleArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: virtual void enterEvent( TQEvent *e ); diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 634c63d3b..584a345aa 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -124,7 +124,7 @@ void KateSessionMenu::slotExec( int id ) "kate_session_button_create_anonymous" ) == KMessageBox::No ) return; - if ( m_sessions.tqcontains( name ) && + if ( m_sessions.contains( name ) && KMessageBox::warningYesNo( 0, i18n("You allready have a session named %1. Do you want to open that session?").arg( name ), i18n("Session exists") ) == KMessageBox::No ) @@ -147,4 +147,4 @@ void KateSessionMenu::slotExec( int id ) } -// kate: space-indent: on; indent-width 2; tqreplace-tabs on; +// kate: space-indent: on; indent-width 2; replace-tabs on; diff --git a/kicker/menuext/kate/katesessionmenu.h b/kicker/menuext/kate/katesessionmenu.h index bee2ba32d..3d5519496 100644 --- a/kicker/menuext/kate/katesessionmenu.h +++ b/kicker/menuext/kate/katesessionmenu.h @@ -42,4 +42,4 @@ class KateSessionMenu : public KPanelMenu { #endif // _KateSessionMenu_h_ -// kate: space-indent on; indent-width 2; tqreplace-tabs on; +// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 0a0f70feb..1a31fe55c 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -105,14 +105,14 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() } } - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); bool separatorInserted = false; for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) { TQString text = bm.text(); - text.tqreplace( '&', "&&" ); + text.replace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); separatorInserted = true; diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index fc32de55d..0c072e026 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -84,7 +84,7 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription) { if (!suppressGenericNames || - !suppressGenericNames->tqcontains(s->untranslatedGenericName())) + !suppressGenericNames->contains(s->untranslatedGenericName())) { serviceName = TQString("%1 (%2)").arg(serviceName).arg(comment); } @@ -119,8 +119,8 @@ void PrefMenu::insertMenuItem(KService::Ptr& s, } // item names may contain ampersands. To avoid them being converted - // to accelerators, tqreplace them with two ampersands. - serviceName.tqreplace("&", "&&"); + // to accelerators, replace them with two ampersands. + serviceName.replace("&", "&&"); int newId = insertItem(KickerLib::menuIconSet(s->icon()), serviceName, nId, nIndex); m_entryMap.insert(newId, static_cast<KSycocaEntry*>(s)); @@ -155,7 +155,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) return; } - if (!m_entryMap.tqcontains(id)) + if (!m_entryMap.contains(id)) { kdDebug(1210) << "Cannot find service with menu id " << id << endl; return; @@ -224,7 +224,7 @@ void PrefMenu::dragEnterEvent(TQDragEnterEvent *event) void PrefMenu::dragLeaveEvent(TQDragLeaveEvent */*event*/) { // see PrefMenu::dragEnterEvent why this is nescessary - if (!frameGeometry().tqcontains(TQCursor::pos())) + if (!frameGeometry().contains(TQCursor::pos())) { KURLDrag::setTarget(0); } @@ -296,8 +296,8 @@ void PrefMenu::initialize() } // Item names may contain ampersands. To avoid them being converted - // to accelerators, tqreplace each ampersand with two ampersands. - groupCaption.tqreplace("&", "&&"); + // to accelerators, replace each ampersand with two ampersands. + groupCaption.replace("&", "&&"); PrefMenu* m = new PrefMenu(g->name(), g->relPath(), this); m->setCaption(groupCaption); @@ -323,7 +323,7 @@ void PrefMenu::initialize() void PrefMenu::slotExec(int id) { - if (!m_entryMap.tqcontains(id)) + if (!m_entryMap.contains(id)) { return; } diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index bbff5a3f2..b8c3c6d81 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -72,17 +72,17 @@ void RecentDocsMenu::initialize() { // Make sure this entry is not already present in the menu alreadyPresentInMenu = 0; for ( TQStringList::Iterator previt = previousEntries.begin(); previt != previousEntries.end(); ++previt ) { - if (TQString::localeAwareCompare(*previt, f.readName().tqreplace('&', TQString::fromAscii("&&") )) == 0) { + if (TQString::localeAwareCompare(*previt, f.readName().replace('&', TQString::fromAscii("&&") )) == 0) { alreadyPresentInMenu = 1; } } if (alreadyPresentInMenu == 0) { // Add item to menu - insertItem(SmallIconSet(f.readIcon()), f.readName().tqreplace('&', TQString::fromAscii("&&") ), id++); + insertItem(SmallIconSet(f.readIcon()), f.readName().replace('&', TQString::fromAscii("&&") ), id++); // Append to duplicate checking list - previousEntries.append(f.readName().tqreplace('&', TQString::fromAscii("&&") )); + previousEntries.append(f.readName().replace('&', TQString::fromAscii("&&") )); } } @@ -114,7 +114,7 @@ void RecentDocsMenu::mouseMoveEvent(TQMouseEvent* e) { if (!(e->state() & LeftButton)) return; - if (!rect().tqcontains(_mouseDown)) + if (!rect().contains(_mouseDown)) return; int dragLength = (e->pos() - _mouseDown).manhattanLength(); diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index 3547e3f9b..c09f9a825 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -93,7 +93,7 @@ void RemoteMenu::initialize() for(; name!=endf; ++name) { - if (!names_found.tqcontains(*name)) + if (!names_found.contains(*name)) { names_found.append(*name); TQString filename = *dirpath+*name; @@ -124,7 +124,7 @@ void RemoteMenu::openRemoteDir() void RemoteMenu::slotExec(int id) { - if (m_desktopMap.tqcontains(id)) + if (m_desktopMap.contains(id)) { new KRun(m_desktopMap[id]); } diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp index 33eba2558..12ec087d8 100644 --- a/kicker/menuext/system/systemmenu.cpp +++ b/kicker/menuext/system/systemmenu.cpp @@ -77,7 +77,7 @@ void SystemMenu::initialize() void SystemMenu::slotExec(int id) { - if(!m_urlMap.tqcontains(id)) return; + if(!m_urlMap.contains(id)) return; new KRun(m_urlMap[id]); // will delete itself } diff --git a/kicker/menuext/tom/README b/kicker/menuext/tom/README index 8cc07d507..2616c76c5 100644 --- a/kicker/menuext/tom/README +++ b/kicker/menuext/tom/README @@ -58,7 +58,7 @@ What should be the default task entry format be: a) Task Name b) Task Name (App Name) c) App Name (Task Name) <-- silly option =) -Should "Run A Command..." be tqreplaced by an inline combobox? +Should "Run A Command..." be replaced by an inline combobox? Pros: It's more obvious and will work even if kdesktop is gone. The widget is already written (in tom.cc) Cons: It makes it stand out too much over other entries, takes up more room diff --git a/kicker/menuext/tom/TASKGROUPS b/kicker/menuext/tom/TASKGROUPS index 1cb8a41b9..c1aa1ed98 100644 --- a/kicker/menuext/tom/TASKGROUPS +++ b/kicker/menuext/tom/TASKGROUPS @@ -7,7 +7,7 @@ of tasks in the group (NumTasks) and optionally whether or not it is hidden (Hidden). For each task there is a numbered section in the file in the form TaskN. Each -section tqcontains the user visible name for the task (Name), the associated +section contains the user visible name for the task (Name), the associated .desktop file and optionally whether or not it is hidden (Hidden). An example file can be found below. diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 7ec080a8b..3a4ebf4ed 100644 --- a/kicker/menuext/tom/tom.cc +++ b/kicker/menuext/tom/tom.cc @@ -109,7 +109,7 @@ class runMenuWidget : public TQWidget, public QMenuItem l2->setBuddy(this); runLayout->addWidget(l2);*/ m_runEdit = new KHistoryCombo(this); - m_runEdit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); + m_runEdit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred); runLayout->addWidget(m_runEdit, 10); runLayout->addSpacing(KDialog::spacingHint()); @@ -143,7 +143,7 @@ class runMenuWidget : public TQWidget, public QMenuItem TQPainter p(this); TQRect r(rect()); // ew, nasty hack. may result in coredumps due to horrid C-style cast??? - kapp->style().tqdrawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, + kapp->style().drawControl(TQStyle::CE_PopupMenuItem, &p, m_menu, r, palette().active(), TQStyle::Style_Enabled, TQStyleOption(static_cast<TQMenuItem*>(this), 0, KIcon::SizeMedium )); p.drawPixmap(KDialog::spacingHint(), 1, icon); p.drawText((KDialog::spacingHint() * 2) + KIcon::SizeMedium, textRect.height() + ((height() - textRect.height()) / 2), i18n("Run:")); @@ -239,7 +239,7 @@ void TOM::initializeRecentDocs() KDesktopFile f(*it, true /* read only */); m_recentDocsMenu->insertItem(DesktopIcon(f.readIcon(), KIcon::SizeMedium), - f.readName().tqreplace('&', "&&"), id); + f.readName().replace('&', "&&"), id); ++id; } } @@ -301,8 +301,8 @@ int TOM::appendTaskGroup(KConfig& config, bool inSubMenu) } TQString name = config.readEntry("Name"); - // in case the name tqcontains an ampersand, double 'em up - name.tqreplace("&", "&&"); + // in case the name contains an ampersand, double 'em up + name.replace("&", "&&"); TQString desktopfile = config.readPathEntry("DesktopFile"); KService::Ptr pService = KService::serviceByDesktopPath(desktopfile); @@ -655,7 +655,7 @@ bool TOM::loadSidePixmap() // limit max/min brightness int r, g, b; color.rgb(&r, &g, &b); - int gray = tqGray(r, g, b); + int gray = qGray(r, g, b); if (gray > 180) { r = (r - (gray - 180) < 0 ? 0 : r - (gray - 180)); g = (g - (gray - 180) < 0 ? 0 : g - (gray - 180)); @@ -736,13 +736,13 @@ void TOM::setMaximumSize(int w, int h) TQRect TOM::sideImageRect() { - return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), + return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), m_sidePixmap.width(), height() - 2*frameWidth() ), this ); } void TOM::resizeEvent(TQResizeEvent * e) { - setFrameRect( TQStyle::tqvisualRect( TQRect( m_sidePixmap.width(), 0, + setFrameRect( TQStyle::visualRect( TQRect( m_sidePixmap.width(), 0, width() - m_sidePixmap.width(), height() ), this ) ); } @@ -757,7 +757,7 @@ void TOM::paintEvent(TQPaintEvent * e) style().drawPrimitive( TQStyle::PE_PanelPopup, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default, + colorGroup(), TQStyle::Style_Default, TQStyleOption( frameWidth(), 0 ) ); TQRect r = sideImageRect(); @@ -775,7 +775,7 @@ TQMouseEvent TOM::translateMouseEvent( TQMouseEvent* e ) { TQRect side = sideImageRect(); - if ( !side.tqcontains( e->pos() ) ) + if ( !side.contains( e->pos() ) ) return *e; TQPoint newpos( e->pos() ); @@ -824,7 +824,7 @@ void TOM::runCommand() void TOM::runTask(int id) { - if (!m_tasks.tqcontains(id)) return; + if (!m_tasks.contains(id)) return; kapp->propagateSessionManager(); KApplication::startServiceByDesktopPath(m_tasks[id]->desktopEntryPath(), diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index da8508956..0501fcd9a 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -226,9 +226,9 @@ KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) return init_ptr(0, info.configFile()); } -void AppletProxy::tqrepaintApplet(TQWidget* widget) +void AppletProxy::repaintApplet(TQWidget* widget) { - widget->tqrepaint(); + widget->repaint(); const TQObjectList* children = widget->children(); @@ -243,7 +243,7 @@ void AppletProxy::tqrepaintApplet(TQWidget* widget) TQWidget *w = dynamic_cast<TQWidget*>(*it); if (w) { - tqrepaintApplet(w); + repaintApplet(w); } } } @@ -372,14 +372,14 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "tqsetAlignment(int)" ) + else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int tqalignment; - dataStream >> tqalignment; + int alignment; + dataStream >> alignment; if(_applet) { - _applet->tqsetAlignment( (KPanelApplet::Alignment)tqalignment ); + _applet->setAlignment( (KPanelApplet::Alignment)alignment ); } return true; } @@ -435,13 +435,13 @@ bool AppletProxy::process(const TQCString &fun, const TQByteArray &data, if(_applet) if ( _bg.isNull() ) { // no transparency _applet->unsetPalette(); - _applet->tqrepaint(); + _applet->repaint(); } else { //transparency _applet->blockSignals(true); _applet->setBackgroundMode(Qt::FixedPixmap); _applet->setPaletteBackgroundPixmap(_bg); - tqrepaintApplet(_applet); + repaintApplet(_applet); _applet->blockSignals(false); } return true; diff --git a/kicker/proxy/appletproxy.h b/kicker/proxy/appletproxy.h index 40ff78cc4..4c504022f 100644 --- a/kicker/proxy/appletproxy.h +++ b/kicker/proxy/appletproxy.h @@ -56,7 +56,7 @@ protected slots: void slotApplicationRemoved(const TQCString&); private: - void tqrepaintApplet(TQWidget* widget); + void repaintApplet(TQWidget* widget); AppletInfo *_info; KPanelApplet *_applet; diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 73b4052ab..3d931c95b 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -258,7 +258,7 @@ void ExtensionProxy::dock(const TQCString& callbackID) bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, TQCString& replyType, TQByteArray &replyData) { - if ( fun == "tqsizeHint(int,TQSize)" ) + if ( fun == "sizeHint(int,TQSize)" ) { TQDataStream dataStream( data, IO_ReadOnly ); int pos; @@ -272,7 +272,7 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, if(!_extension) reply << maxSize; else - reply << _extension->tqsizeHint((KPanelExtension::Position)pos, maxSize); + reply << _extension->sizeHint((KPanelExtension::Position)pos, maxSize); return true; } @@ -287,14 +287,14 @@ bool ExtensionProxy::process(const TQCString &fun, const TQByteArray &data, } return true; } - else if ( fun == "tqsetAlignment(int)" ) + else if ( fun == "setAlignment(int)" ) { TQDataStream dataStream( data, IO_ReadOnly ); - int tqalignment; - dataStream >> tqalignment; + int alignment; + dataStream >> alignment; if(_extension) { - _extension->tqsetAlignment( (KPanelExtension::Alignment)tqalignment ); + _extension->setAlignment( (KPanelExtension::Alignment)alignment ); } return true; } diff --git a/kicker/rich-ideas.txt b/kicker/rich-ideas.txt index 6b71343ce..afe55f33a 100644 --- a/kicker/rich-ideas.txt +++ b/kicker/rich-ideas.txt @@ -2,7 +2,7 @@ Positioning of extensions ========================= -How about using the tqalignment flags (or similar) for position, and the +How about using the alignment flags (or similar) for position, and the direction flags for how to fill? @@ -32,10 +32,10 @@ Now here's the filling etc. etc. -Essentially, this splits the concept of positioning and tqlayout. Now, lets get +Essentially, this splits the concept of positioning and layout. Now, lets get crazy: -Imagine we're in position a and want to have a triangular corner tqlayout: +Imagine we're in position a and want to have a triangular corner layout: 1247 35 @@ -43,7 +43,7 @@ Imagine we're in position a and want to have a triangular corner tqlayout: So, maybe we need some sort of concept of (one of): 1) multiple linked rectangular blocks - 2) extensions/bars with a tqmask + 2) extensions/bars with a mask 3) each item being considered independently (maybe some sort of magnetic blocks so they can be draggable?) diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index b8bcdcb20..808408fc9 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -60,13 +60,13 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) m_showOnlyIconified(false), m_textShadowEngine(0), m_ignoreUpdates(false), - m_retqlayoutTimer(0, "TaskBar::m_retqlayoutTimer") + m_relayoutTimer(0, "TaskBar::m_relayoutTimer") { arrowType = LeftArrow; - blocktqlayout = true; + blocklayout = true; // init - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); // setup animation frames for (int i = 1; i < 11; i++) @@ -77,7 +77,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) // configure configure(); - connect(&m_retqlayoutTimer, TQT_SIGNAL(timeout()), + connect(&m_relayoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reLayout())); connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); @@ -114,7 +114,7 @@ TaskBar::TaskBar( TQWidget *parent, const char *name ) add((*sIt)); } - blocktqlayout = false; + blocklayout = false; connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); keys = new KGlobalAccel( this ); @@ -160,7 +160,7 @@ KTextShadowEngine *TaskBar::textShadowEngine() } -TQSize TaskBar::tqsizeHint() const +TQSize TaskBar::sizeHint() const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -171,7 +171,7 @@ TQSize TaskBar::tqsizeHint() const return TQSize(BUTTON_MIN_WIDTH, minButtonHeight); } -TQSize TaskBar::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBar::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { // get our minimum height based on the minimum button height or the // height of the font in use, which is largest @@ -246,7 +246,7 @@ void TaskBar::configure() TQApplication::desktop()->isVirtualDesktop() && TQApplication::desktop()->numScreens() > 1) || (TQApplication::desktop()->numScreens() < 2); - // we need to watch tqgeometry issues if we aren't showing windows when we + // we need to watch geometry issues if we aren't showing windows when we // are paying attention to the current Xinerama screen if (m_showOnlyCurrentScreen) { @@ -294,7 +294,7 @@ void TaskBar::resizeEvent( TQResizeEvent* e ) { if (m_showOnlyCurrentScreen) { - TQPoint topLeft = mapToGlobal(this->tqgeometry().topLeft()); + TQPoint topLeft = mapToGlobal(this->geometry().topLeft()); if (m_currentScreen != TQApplication::desktop()->screenNumber(topLeft)) { // we have been moved to another screen! @@ -358,7 +358,7 @@ void TaskBar::add(Startup::Ptr startup) it != containers.end(); ++it) { - if ((*it)->tqcontains(startup)) + if ((*it)->contains(startup)) { return; } @@ -432,7 +432,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) it != m_hiddenContainers.end(); ++it) { - if ((*it)->tqcontains(task)) + if ((*it)->contains(task)) { (*it)->finish(); m_deletableContainers.append(*it); @@ -447,7 +447,7 @@ void TaskBar::remove(Task::Ptr task, TaskContainer* container) it != containers.end(); ++it) { - if ((*it)->tqcontains(task)) + if ((*it)->contains(task)) { container = *it; break; @@ -490,7 +490,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) it != m_hiddenContainers.end(); ++it) { - if ((*it)->tqcontains(startup)) + if ((*it)->contains(startup)) { (*it)->remove(startup); @@ -511,7 +511,7 @@ void TaskBar::remove(Startup::Ptr startup, TaskContainer* container) it != containers.end(); ++it) { - if ((*it)->tqcontains(startup)) + if ((*it)->contains(startup)) { container = *it; break; @@ -551,7 +551,7 @@ void TaskBar::desktopChanged(int desktop) return; } - m_retqlayoutTimer.stop(); + m_relayoutTimer.stop(); m_ignoreUpdates = true; for (TaskContainer::Iterator it = containers.begin(); it != containers.end(); @@ -580,7 +580,7 @@ void TaskBar::windowChanged(Task::Ptr task) { TaskContainer* c = *it; - if (c->tqcontains(task)) + if (c->contains(task)) { container = c; break; @@ -620,7 +620,7 @@ void TaskBar::windowChangedGeometry(Task::Ptr task) ++it) { TaskContainer* c = *it; - if (c->tqcontains(task)) + if (c->contains(task)) { container = c; break; @@ -645,11 +645,11 @@ void TaskBar::windowChangedGeometry(Task::Ptr task) void TaskBar::reLayoutEventually() { - m_retqlayoutTimer.stop(); + m_relayoutTimer.stop(); - if (!blocktqlayout && !m_ignoreUpdates) + if (!blocklayout && !m_ignoreUpdates) { - m_retqlayoutTimer.start(25, true); + m_relayoutTimer.start(25, true); } } @@ -660,7 +660,7 @@ void TaskBar::reLayout() // popup menu is visible. // // To get around this, we collect the containers and delete them manually - // when doing a retqlayout. (kling) + // when doing a relayout. (kling) if (!m_deletableContainers.isEmpty()) { TaskContainer::List::iterator it = m_deletableContainers.begin(); for (; it != m_deletableContainers.end(); ++it) @@ -700,7 +700,7 @@ void TaskBar::reLayout() int minButtonHeight = fm.height() > TaskBarSettings::minimumButtonHeight() ? fm.height() : TaskBarSettings::minimumButtonHeight(); - // horizontal tqlayout + // horizontal layout if (orientation() == Horizontal) { int bwidth = BUTTON_MIN_WIDTH; @@ -743,10 +743,10 @@ void TaskBar::reLayout() } } - // tqlayout containers + // layout containers // for taskbars at the bottom, we need to ensure that the bottom - // buttons touch the bottom of the screen. since we tqlayout from + // buttons touch the bottom of the screen. since we layout from // top to bottom this means seeing if we have any padding and // popping it on the top. this preserves Fitt's Law behaviour // for taskbars on the bottom @@ -784,7 +784,7 @@ void TaskBar::reLayout() c->setBackground(); } } - else // vertical tqlayout + else // vertical layout { // adjust content size if (contentsRect().height() < (int)list.count() * minButtonHeight) @@ -792,7 +792,7 @@ void TaskBar::reLayout() resizeContents(contentsRect().width(), list.count() * minButtonHeight); } - // tqlayout containers + // layout containers int i = 0; for (TaskContainer::Iterator it = list.begin(); it != list.end(); @@ -818,12 +818,12 @@ void TaskBar::reLayout() void TaskBar::setViewportBackground() { - const TQPixmap *bg = tqparentWidget()->backgroundPixmap(); + const TQPixmap *bg = parentWidget()->backgroundPixmap(); if (bg) { - TQPixmap pm(tqparentWidget()->size()); - pm.fill(tqparentWidget(), pos() + viewport()->pos()); + TQPixmap pm(parentWidget()->size()); + pm.fill(parentWidget(), pos() + viewport()->pos()); viewport()->setPaletteBackgroundPixmap(pm); viewport()->setBackgroundOrigin(WidgetOrigin); } @@ -898,9 +898,9 @@ void TaskBar::propagateMouseEvent( TQMouseEvent* e ) { if ( !isTopLevel() ) { - TQMouseEvent me( e->type(), mapTo( tqtopLevelWidget(), e->pos() ), + TQMouseEvent me( e->type(), mapTo( topLevelWidget(), e->pos() ), e->globalPos(), e->button(), e->state() ); - TQApplication::sendEvent( tqtopLevelWidget(), &me ); + TQApplication::sendEvent( topLevelWidget(), &me ); } } @@ -988,7 +988,7 @@ bool TaskBar::shouldGroup() const void TaskBar::reGroup() { isGrouping = shouldGroup(); - blocktqlayout = true; + blocklayout = true; TaskContainer::Iterator lastContainer = m_hiddenContainers.end(); for (TaskContainer::Iterator it = m_hiddenContainers.begin(); @@ -1027,7 +1027,7 @@ void TaskBar::reGroup() add(*sIt); } - blocktqlayout = false; + blocklayout = false; reLayoutEventually(); } @@ -1163,7 +1163,7 @@ int TaskBar::showScreen() const if (m_showOnlyCurrentScreen && m_currentScreen == -1) { const_cast<TaskBar*>(this)->m_currentScreen = - TQApplication::desktop()->screenNumber(mapToGlobal(this->tqgeometry().topLeft())); + TQApplication::desktop()->screenNumber(mapToGlobal(this->geometry().topLeft())); } return m_currentScreen; diff --git a/kicker/taskbar/taskbar.h b/kicker/taskbar/taskbar.h index 0c45657cf..ff160bc92 100644 --- a/kicker/taskbar/taskbar.h +++ b/kicker/taskbar/taskbar.h @@ -47,8 +47,8 @@ public: TaskBar( TQWidget *parent = 0, const char *name = 0 ); ~TaskBar(); - TQSize tqsizeHint() const; - TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize sizeHint() const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setOrientation( Orientation ); void setArrowType( Qt::ArrowType at ); @@ -108,7 +108,7 @@ private: void sortContainersByDesktop(TaskContainer::List& list); void setViewportBackground(); - bool blocktqlayout; + bool blocklayout; bool m_showAllWindows; // The screen to show, -1 for all screens int m_currentScreen; @@ -127,7 +127,7 @@ private: void reGroup(); KGlobalAccel* keys; KTextShadowEngine* m_textShadowEngine; - TQTimer m_retqlayoutTimer; + TQTimer m_relayoutTimer; bool m_ignoreUpdates; TQImage m_blendGradient; }; diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 0101ae59d..661706bdb 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -63,20 +63,20 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQWidget *parent, const ch margin = 0; } - tqlayout = new TQBoxLayout( this, TQApplication::reverseLayout() ? + layout = new TQBoxLayout( this, TQApplication::reverseLayout() ? TQBoxLayout::RightToLeft : TQBoxLayout::LeftToRight ); - tqlayout->setMargin( margin ); + layout->setMargin( margin ); // scrollable taskbar taskBar = new TaskBar(this); - tqlayout->addWidget( taskBar ); + layout->addWidget( taskBar ); connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); setBackground(); - // read settings and setup tqlayout + // read settings and setup layout configure(); connectDCOPSignal("", "", "kdeTaskBarConfigChanged()", @@ -110,7 +110,7 @@ void TaskBarContainer::configure() connect(windowListMenu, TQT_SIGNAL(aboutToHide()), TQT_SLOT(windowListMenuAboutToHide())); - // tqgeometry + // geometry TQString icon; switch (direction) { @@ -135,8 +135,8 @@ void TaskBarContainer::configure() windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->tqsizeHint()); - tqlayout->insertWidget(0, windowListButton); + windowListButton->setMinimumSize(windowListButton->sizeHint()); + layout->insertWidget(0, windowListButton); windowListButton->show(); } } @@ -175,7 +175,7 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setFixedWidth(WINDOWLISTBUTTON_SIZE); windowListButton->setMaximumHeight(BUTTON_MAX_WIDTH); } - tqlayout->setDirection(TQApplication::reverseLayout() ? + layout->setDirection(TQApplication::reverseLayout() ? TQBoxLayout::RightToLeft : TQBoxLayout::LeftToRight); } @@ -186,7 +186,7 @@ void TaskBarContainer::orientationChange(Orientation o) windowListButton->setMaximumWidth(BUTTON_MAX_WIDTH); windowListButton->setFixedHeight(WINDOWLISTBUTTON_SIZE); } - tqlayout->setDirection(TQBoxLayout::TopToBottom); + layout->setDirection(TQBoxLayout::TopToBottom); } taskBar->setOrientation(o); @@ -194,7 +194,7 @@ void TaskBarContainer::orientationChange(Orientation o) { windowListButton->setOrientation(o); } - tqlayout->activate(); + layout->activate(); } void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) @@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d) windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon, KIcon::Panel, 16)); - windowListButton->setMinimumSize(windowListButton->tqsizeHint()); + windowListButton->setMinimumSize(windowListButton->sizeHint()); } } @@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu() pos.setX( pos.x() + width() ); break; case KPanelApplet::Left: - pos.setX( pos.x() - windowListMenu->tqsizeHint().width() ); + pos.setX( pos.x() - windowListMenu->sizeHint().width() ); break; case KPanelApplet::Down: pos.setY( pos.y() + height() ); break; case KPanelApplet::Up: - pos.setY( pos.y() - windowListMenu->tqsizeHint().height() ); + pos.setY( pos.y() - windowListMenu->sizeHint().height() ); default: break; } @@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton() connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); } -TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const +TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const { - TQSize size = taskBar->tqsizeHint( p, maxSize ); + TQSize size = taskBar->sizeHint( p, maxSize ); if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) { return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE ); } diff --git a/kicker/taskbar/taskbarcontainer.h b/kicker/taskbar/taskbarcontainer.h index 61147494a..87a55c2b9 100644 --- a/kicker/taskbar/taskbarcontainer.h +++ b/kicker/taskbar/taskbarcontainer.h @@ -48,7 +48,7 @@ public: void popupDirectionChange( KPanelApplet::Direction ); void preferences(); //FIXME: don't use Position, use Orientation - TQSize tqsizeHint( KPanelExtension::Position, TQSize maxSize ) const; + TQSize sizeHint( KPanelExtension::Position, TQSize maxSize ) const; void setBackground(); k_dcop: @@ -66,7 +66,7 @@ protected slots: private: KPanelApplet::Direction direction; bool showWindowListButton; - TQBoxLayout * tqlayout; + TQBoxLayout * layout; TaskBar * taskBar; SimpleButton * windowListButton; KWindowListMenu * windowListMenu; diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 556e46d17..1e4829a38 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -157,9 +157,9 @@ void TaskContainer::stopTimers() attentionTimer.stop(); } -void TaskContainer::taskChanged(bool tqgeometryOnlyChange) +void TaskContainer::taskChanged(bool geometryOnlyChange) { - if (tqgeometryOnlyChange) + if (geometryOnlyChange) { // we really don't care about those changes, which we may be getting // thanks to the pager, for instance, turning it on in taskmanager. @@ -315,7 +315,7 @@ void TaskContainer::resizeEvent( TQResizeEvent * ) { // calculate the icon rect TQRect br( style().subRect( TQStyle::SR_PushButtonContents, this ) ); - iconRect = TQStyle::tqvisualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); + iconRect = TQStyle::visualRect( TQRect(br.x() + 2, (height() - 16) / 2, 16, 16), this ); } void TaskContainer::add(Task::Ptr task) @@ -390,7 +390,7 @@ void TaskContainer::remove(Startup::Ptr startup) } } -bool TaskContainer::tqcontains(Task::Ptr task) +bool TaskContainer::contains(Task::Ptr task) { if (!task) { @@ -408,12 +408,12 @@ bool TaskContainer::tqcontains(Task::Ptr task) return false; } -bool TaskContainer::tqcontains(Startup::Ptr startup) +bool TaskContainer::contains(Startup::Ptr startup) { return startup && (m_startup == startup); } -bool TaskContainer::tqcontains(WId win) +bool TaskContainer::contains(WId win) { Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) @@ -580,8 +580,8 @@ void TaskContainer::drawButton(TQPainter *p) bool sunken = isDown() || (alwaysDrawButtons && (active || aboutToActivate)); bool reverse = TQApplication::reverseLayout(); TQRect br(style().subRect(TQStyle::SR_PushButtonContents, this)); - TQPoint shift = TQPoint(style().tqpixelMetric(TQStyle::PM_ButtonShiftHorizontal), - style().tqpixelMetric(TQStyle::PM_ButtonShiftVertical)); + TQPoint shift = TQPoint(style().pixelMetric(TQStyle::PM_ButtonShiftHorizontal), + style().pixelMetric(TQStyle::PM_ButtonShiftVertical)); // draw button background if (drawButton) @@ -643,7 +643,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw modified overlay if (!modPixmap.isNull()) { - TQRect r = TQStyle::tqvisualRect(TQRect(br.x() + textPos, + TQRect r = TQStyle::visualRect(TQRect(br.x() + textPos, (height() - 16) / 2, 16, 16), this); @@ -660,7 +660,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw text if (!text.isEmpty()) { - TQRect tr = TQStyle::tqvisualRect(TQRect(br.x() + textPos + 1, 0, + TQRect tr = TQStyle::visualRect(TQRect(br.x() + textPos + 1, 0, width() - textPos, height()), this); int textFlags = AlignVCenter | SingleLine; @@ -772,7 +772,7 @@ void TaskContainer::drawButton(TQPainter *p) } int flags = TQStyle::Style_Enabled; - TQRect ar = TQStyle::tqvisualRect(TQRect(br.x() + br.width() - 8 - 2, + TQRect ar = TQStyle::visualRect(TQRect(br.x() + br.width() - 8 - 2, br.y(), 8, br.height()), this); if (sunken) { @@ -784,7 +784,7 @@ void TaskContainer::drawButton(TQPainter *p) // draw mouse over frame in transparent mode if (m_mouseOver && halo) - KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), tqcolorGroup().foreground()); + KickerLib::drawBlendedRect(p, TQRect(0, 0, width(), height()), colorGroup().foreground()); if (aboutToActivate) { @@ -932,7 +932,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) // This is to avoid the flicker caused by redrawing the // button as unpressed just before it's activated. - if (!rect().tqcontains(e->pos())) + if (!rect().contains(e->pos())) { TQToolButton::mouseReleaseEvent(e); return; @@ -1146,17 +1146,17 @@ void TaskContainer::popupMenu(int action) pos.setX(pos.x() + width()); break; case LeftArrow: - pos.setX(pos.x() - m_menu->tqsizeHint().width()); + pos.setX(pos.x() - m_menu->sizeHint().width()); break; case DownArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); pos.setY( pos.y() + height() ); break; case UpArrow: if ( TQApplication::reverseLayout() ) - pos.setX( pos.x() + width() - m_menu->tqsizeHint().width() ); - pos.setY(pos.y() - m_menu->tqsizeHint().height()); + pos.setX( pos.x() + width() - m_menu->sizeHint().width() ); + pos.setY(pos.y() - m_menu->sizeHint().height()); break; default: break; @@ -1287,7 +1287,7 @@ void TaskContainer::setArrowType( Qt::ArrowType at ) void TaskContainer::publishIconGeometry( TQPoint global ) { - TQPoint p = global + tqgeometry().topLeft(); + TQPoint p = global + geometry().topLeft(); Task::List::const_iterator itEnd = tasks.constEnd(); for (Task::List::const_iterator it = tasks.constBegin(); it != itEnd; ++it) diff --git a/kicker/taskbar/taskcontainer.h b/kicker/taskbar/taskcontainer.h index 8f6dee032..567a74a79 100644 --- a/kicker/taskbar/taskcontainer.h +++ b/kicker/taskbar/taskcontainer.h @@ -57,9 +57,9 @@ public: void remove(Task::Ptr); void remove(Startup::Ptr); - bool tqcontains(Task::Ptr); - bool tqcontains(Startup::Ptr); - bool tqcontains(WId); + bool contains(Task::Ptr); + bool contains(Startup::Ptr); + bool contains(WId); bool isEmpty(); bool onCurrentDesktop(); @@ -120,7 +120,7 @@ protected slots: void dragSwitch(); void iconChanged(); void setLastActivated(); - void taskChanged(bool tqgeometryChangeOnly); + void taskChanged(bool geometryChangeOnly); void showMe(); private: diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index bf3b805ee..864d10f5d 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg, p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text); } -TQSize TaskMenuItem::tqsizeHint() +TQSize TaskMenuItem::sizeHint() { TQFont font = TQFont(); if (m_isActive) @@ -111,7 +111,7 @@ void TaskLMBMenu::fillMenu() { Task::Ptr t = (*it); - TQString text = t->visibleName().tqreplace("&", "&&"); + TQString text = t->visibleName().replace("&", "&&"); TaskMenuItem *menuItem = new TaskMenuItem(text, t->isActive(), diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h index 6f277ad0d..d11091d82 100644 --- a/kicker/taskmanager/tasklmbmenu.h +++ b/kicker/taskmanager/tasklmbmenu.h @@ -38,7 +38,7 @@ public: ~TaskMenuItem(); void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int); - TQSize tqsizeHint(); + TQSize sizeHint(); void setAttentionState(bool state) { m_attentionState = state; } private: diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 9aeb9415b..739c626b5 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -247,7 +247,7 @@ Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p) continue; } - if (t->tqgeometry().tqcontains(p)) + if (t->geometry().contains(p)) { int index = list.findIndex(t->window()); if (index > currentIndex) @@ -295,7 +295,7 @@ void TaskManager::windowAdded(WId w ) WId transient_for = (WId) transient_for_tmp; // check if it's transient for a skiptaskbar window - if( _skiptaskbar_windows.tqcontains( transient_for )) + if( _skiptaskbar_windows.contains( transient_for )) return; // lets see if this is a transient for an existing task @@ -831,7 +831,7 @@ void Task::updateDemandsAttentionState( WId w ) NETWinInfo i( qt_xdisplay(), w, qt_xrootwin(), NET::WMState ); if(i.state() & NET::DemandsAttention) { - if (!_transients_demanding_attention.tqcontains(w)) + if (!_transients_demanding_attention.contains(w)) { _transients_demanding_attention.append(w); } @@ -984,10 +984,10 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 ) if ( id1.isEmpty() || id2.isEmpty() ) return false; - if ( id1.tqcontains( id2 ) > 0 ) + if ( id1.contains( id2 ) > 0 ) return true; - if ( id2.tqcontains( id1 ) > 0 ) + if ( id2.contains( id1 ) > 0 ) return true; return false; @@ -1009,7 +1009,7 @@ void Task::move() KWin::deIconifyWindow(_win); } - TQRect geom = _info.tqgeometry(); + TQRect geom = _info.geometry(); TQCursor::setPos(geom.center()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); @@ -1032,7 +1032,7 @@ void Task::resize() KWin::deIconifyWindow(_win); } - TQRect geom = _info.tqgeometry(); + TQRect geom = _info.geometry(); TQCursor::setPos(geom.bottomRight()); NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize); @@ -1305,8 +1305,8 @@ void Task::updateThumbnail() // by the thumbnail generation. This makes things much smoother // on slower machines. // - TQWidget *rootWin = tqApp->desktop(); - TQRect geom = _info.tqgeometry(); + TQWidget *rootWin = qApp->desktop(); + TQRect geom = _info.geometry(); _grab = TQPixmap::grabWindow(rootWin->winId(), geom.x(), geom.y(), geom.width(), geom.height()); @@ -1329,7 +1329,7 @@ void Task::generateThumbnail() width = width * _thumbSize; height = height * _thumbSize; - img = img.smoothScale( tqRound(width), tqRound(height) ); + img = img.smoothScale( qRound(width), qRound(height) ); _thumb = img; _grab.resize( 0, 0 ); // Makes grab a null image. @@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension) Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format, CPSubwindowMode, &picAttr); - // Get tqshaped windows handled correctly. + // Get shaped windows handled correctly. XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId, WindowRegionBounding); XFixesSetPictureClipRegion(dpy, picture, 0, 0, region); @@ -1386,10 +1386,10 @@ TQPixmap Task::thumbnail(int maxDimension) XRenderComposite(dpy, hasAlpha ? PictOpOver : PictOpSrc, picture, // src - None, // tqmask + None, // mask full.x11RenderHandle(), // dst 0, 0, // src offset - 0, 0, // tqmask offset + 0, 0, // mask offset 0, 0, // dst offset winAttr.width, winAttr.height); @@ -1411,10 +1411,10 @@ TQPixmap Task::thumbnail(int maxDimension) XRenderComposite(TQPaintDevice::x11AppDisplay(), PictOpOver, // we're filtering, alpha values are probable picture, // src - None, // tqmask + None, // mask thumbnail.x11RenderHandle(), // dst 0, 0, // src offset - 0, 0, // tqmask offset + 0, 0, // mask offset 0, 0, // dst offset thumbnailWidth, thumbnailHeight); #endif @@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e) Task::List TaskDrag::decode( const TQMimeSource* e ) { - TQByteArray data(e->tqencodedData("taskbar/task")); + TQByteArray data(e->encodedData("taskbar/task")); Task::List tasks; if (data.size()) diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index dd730e410..8f5876360 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -262,12 +262,12 @@ public: bool showInPager() const { return _info.state() ^ NET::SkipPager; } /** - * Returns the tqgeometry for this window + * Returns the geometry for this window */ - TQRect tqgeometry() const { return _info.tqgeometry(); } + TQRect geometry() const { return _info.geometry(); } /** - * Returns the tqgeometry for the from of this window + * Returns the geometry for the from of this window */ TQRect frameGeometry() const { return _info.frameGeometry(); } @@ -427,7 +427,7 @@ signals: /** * Indicates that this task has changed in some way. */ - void changed(bool tqgeometryChangeOnly); + void changed(bool geometryChangeOnly); /** * Indicates that the icon for this task has changed. @@ -529,7 +529,7 @@ public: /** * The name of the starting task (if known). */ - TQString text() const { return _data.tqfindName(); } + TQString text() const { return _data.findName(); } /** * The name of the executable of the starting task. @@ -539,7 +539,7 @@ public: /** * The name of the icon to be used for the starting task. */ - TQString icon() const { return _data.tqfindIcon(); } + TQString icon() const { return _data.findIcon(); } void update( const KStartupInfoData& data ); const KStartupInfoId& id() const { return _id; } @@ -616,7 +616,7 @@ public: bool isOnTop(const Task*); /** - * Tells the task manager whether or not we care about tqgeometry + * Tells the task manager whether or not we care about geometry * updates. This generates a lot of activity so should only be used * when necessary. */ diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index bb5ee6035..fb4c9ae87 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -236,7 +236,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&")); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); @@ -256,7 +256,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { - TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&")); + TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } diff --git a/kioslave/DEBUG.howto b/kioslave/DEBUG.howto index 581401bda..5275a26eb 100644 --- a/kioslave/DEBUG.howto +++ b/kioslave/DEBUG.howto @@ -5,7 +5,7 @@ How does an io-slave get started? Your application request 'klauncher' via DCOP for a slave. If 'klauncher' does not have an idle slave ready, it will ask kdeinit to start a new one. -kdeinit forks and dlopens the library that tqcontains the io-slave. +kdeinit forks and dlopens the library that contains the io-slave. Then it calls kdemain() or, if that is not present, main() in the library. diff --git a/kioslave/cgi/cgi.cpp b/kioslave/cgi/cgi.cpp index 9dde78140..5f57c3fe8 100644 --- a/kioslave/cgi/cgi.cpp +++ b/kioslave/cgi/cgi.cpp @@ -80,7 +80,7 @@ static TQCString extractQCString( const TQByteArray &ba, uint start, uint len = */ static int qByteArrayFindStr( const TQByteArray &ba, const char *str ) { - int strLen = tqstrlen( str ); + int strLen = qstrlen( str ); int searchLen = ba.size() - strLen; for ( int i = 0; i <= searchLen; ++i ) { diff --git a/kioslave/filter/filter.cc b/kioslave/filter/filter.cc index 8a09e1b7a..8392dd160 100644 --- a/kioslave/filter/filter.cc +++ b/kioslave/filter/filter.cc @@ -56,8 +56,8 @@ int kdemain( int argc, char ** argv) FilterProtocol::FilterProtocol( const TQCString & protocol, const TQCString &pool, const TQCString &app ) : KIO::SlaveBase( protocol, pool, app ) { - TQString mimetype = TQString::tqfromLatin1("application/x-") + TQString::tqfromLatin1(protocol); - filter = KFilterBase::tqfindFilterByMimeType( mimetype ); + TQString mimetype = TQString::fromLatin1("application/x-") + TQString::fromLatin1(protocol); + filter = KFilterBase::findFilterByMimeType( mimetype ); Q_ASSERT(filter); } @@ -117,7 +117,7 @@ void FilterProtocol::get( const KURL & ) } if (bNeedMimetype) { - KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferFileType( outputBuffer, subURL.fileName() ); + KMimeMagicResult * result = KMimeMagic::self()->findBufferFileType( outputBuffer, subURL.fileName() ); kdDebug(7110) << "Emitting mimetype " << result->mimeType() << endl; mimeType( result->mimeType() ); bNeedMimetype = false; @@ -157,7 +157,7 @@ void FilterProtocol::get( const KURL & ) void FilterProtocol::put( const KURL &/*url*/, int, bool /*_overwrite*/, bool /*_resume*/ ) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("put")); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("put")); } void FilterProtocol::setSubURL(const KURL &url) diff --git a/kioslave/finger/kio_finger.cpp b/kioslave/finger/kio_finger.cpp index 54cca9779..8bfc25106 100644 --- a/kioslave/finger/kio_finger.cpp +++ b/kioslave/finger/kio_finger.cpp @@ -112,7 +112,7 @@ void FingerProtocol::get(const KURL& url ) // Check the validity of the query TQRegExp regExp("?refreshRate=[0-9][0-9]*", true, true); - if (query.tqcontains(regExp)) { + if (query.contains(regExp)) { //kdDebug() << "looks like a valid query" << endl; TQRegExp regExp( "([0-9]+)" ); regExp.search(query); diff --git a/kioslave/fish/COPYING b/kioslave/fish/COPYING index 42fdfb04d..2d08eab44 100644 --- a/kioslave/fish/COPYING +++ b/kioslave/fish/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/kioslave/fish/INSTALL b/kioslave/fish/INSTALL index d53db4b2e..02a4a0740 100644 --- a/kioslave/fish/INSTALL +++ b/kioslave/fish/INSTALL @@ -17,7 +17,7 @@ reconfiguring, and a file `config.log' containing compiler output to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' -tqcontains results you don't want to keep, you may remove or edit it. +contains results you don't want to keep, you may remove or edit it. The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need `configure.in' if you want to change diff --git a/kioslave/fish/fish.cpp b/kioslave/fish/fish.cpp index ee22929c3..77533964c 100644 --- a/kioslave/fish/fish.cpp +++ b/kioslave/fish/fish.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ /* - This code tqcontains fragments and ideas from the ftp kioslave + This code contains fragments and ideas from the ftp kioslave done by David Faure <faure@kde.org>. Structure is a bit complicated, since I made the mistake to use @@ -88,7 +88,7 @@ #define connected() do{myDebug( << "_______ emitting connected()" << endl); connected();}while(0) #define dataReq() do{myDebug( << "_______ emitting dataReq()" << endl); dataReq();}while(0) #define needSubURLData() do{myDebug( << "_______ emitting needSubURLData()" << endl); needSubURLData();}while(0) -#define slavetqStatus(x,y) do{myDebug( << "_______ emitting slavetqStatus(" << x << ", " << y << ")" << endl); slavetqStatus(x,y);}while(0) +#define slaveStatus(x,y) do{myDebug( << "_______ emitting slaveStatus(" << x << ", " << y << ")" << endl); slaveStatus(x,y);}while(0) #define statEntry(x) do{myDebug( << "_______ emitting statEntry("<<x.size()<<")" << endl); statEntry(x);}while(0) #define listEntries(x) do{myDebug( << "_______ emitting listEntries(...)" << endl); listEntries(x);}while(0) #define canResume(x) do{myDebug( << "_______ emitting canResume("<<(int)x<<")" << endl); canResume(x);}while(0) @@ -738,11 +738,11 @@ bool fishProtocol::sendCommand(fish_command_type cmd, ...) { TQString arg(va_arg(list, const char *)); int pos = -2; while ((pos = rx.search(arg,pos+2)) >= 0) { - arg.tqreplace(pos,0,TQString("\\")); + arg.replace(pos,0,TQString("\\")); } //myDebug( << "arg " << i << ": " << arg << endl); realCmd.append(" ").append(arg); - realAlt.tqreplace(TQRegExp("%"+TQString::number(i+1)),arg); + realAlt.replace(TQRegExp("%"+TQString::number(i+1)),arg); } TQString s("#"); s.append(realCmd).append("\n ").append(realAlt).append(" 2>&1;echo '### 000'\n"); @@ -774,7 +774,7 @@ int fishProtocol::handleResponse(const TQString &str){ int fishProtocol::makeTimeFromLs(const TQString &monthStr, const TQString &dayStr, const TQString &timeyearStr) { - TQDateTime dt(TQDate::tqcurrentDate(Qt::UTC)); + TQDateTime dt(TQDate::currentDate(Qt::UTC)); int year = dt.date().year(); int month = dt.date().month(); int currentMonth = month; @@ -820,7 +820,7 @@ void fishProtocol::manageConnection(const TQString &l) { case FISH_VER: if (line.startsWith("VER 0.0.3")) { line.append(" "); - hasAppend = line.tqcontains(" append "); + hasAppend = line.contains(" append "); } else { error(ERR_UNSUPPORTED_PROTOCOL,line); shutdownConnection(); @@ -1258,7 +1258,7 @@ int fishProtocol::received(const char *buffer, KIO::fileoffset_t buflen) if ( !mime || mime->name() == KMimeType::defaultMimeType() || !accurate ) { - KMimeType::Ptr p_mimeType = KMimeType::tqfindByContent(mimeBuffer); + KMimeType::Ptr p_mimeType = KMimeType::findByContent(mimeBuffer); if ( p_mimeType && p_mimeType->name() != KMimeType::defaultMimeType() ) mime = p_mimeType; } @@ -1436,7 +1436,7 @@ void fishProtocol::run() { if (rc > 0) { int noff = received(buf,rc+offset); if (noff > 0) memmove(buf,buf+offset+rc-noff,noff); - //myDebug( << "left " << noff << " bytes: " << TQString::tqfromLatin1(buf,offset) << endl); + //myDebug( << "left " << noff << " bytes: " << TQString::fromLatin1(buf,offset) << endl); offset = noff; } else { if (errno == EINTR) @@ -1655,7 +1655,7 @@ void fishProtocol::special( const TQByteArray &data ){ void fishProtocol::slave_status() { myDebug( << "@@@@@@@@@ slave_status" << endl); if (childPid > 0) - slavetqStatus(connectionHost,isLoggedIn); + slaveStatus(connectionHost,isLoggedIn); else - slavetqStatus(TQString::null,false); + slaveStatus(TQString::null,false); } diff --git a/kioslave/fish/fish.protocol b/kioslave/fish/fish.protocol index ca16c6702..c14599d50 100644 --- a/kioslave/fish/fish.protocol +++ b/kioslave/fish/fish.protocol @@ -18,7 +18,7 @@ Description[bn]=ফিশ (FISH) পà§à¦°à§‹à¦Ÿà§‹à¦•à¦²-à¦à¦° জনà§à¦¯ ঠDescription[br]=Ur c'hioslave evit ar c'homenad FISH Description[bs]=kioslave za FISH protokol Description[ca]=Un kioslave pel protocol FISH -Description[cs]=Potqmocný protokol pro FISH +Description[cs]=Pomocný protokol pro FISH Description[csb]=Plugins protokòłu FISH Description[da]=En kioslave for FISH-protokollen Description[de]=Ein-/Ausgabemodul für das FISH-Protokoll diff --git a/kioslave/fish/nxfish.protocol b/kioslave/fish/nxfish.protocol index 16645b05f..f050282af 100644 --- a/kioslave/fish/nxfish.protocol +++ b/kioslave/fish/nxfish.protocol @@ -17,7 +17,7 @@ Description[be]=Kioslave Ð´Ð»Ñ Ð¿Ñ€Ð°Ñ‚Ð°ÐºÐ¾Ð»Ð° NXFISH Description[br]=Ur c'hioslave evit ar c'homenad NXFISH Description[bs]=kioslave za NXFISH protokol Description[ca]=Un kioslave pel protocol NXFISH -Description[cs]=Potqmocný protokol pro NXFISH +Description[cs]=Pomocný protokol pro NXFISH Description[csb]=Plugins protokòłu NXFISH Description[da]=En kioslave for NXFISH-protokollen Description[de]=Ein-/Ausgabemodul für das NXFISH-Protokoll diff --git a/kioslave/home/homeimpl.cpp b/kioslave/home/homeimpl.cpp index 8608aac22..12a692319 100644 --- a/kioslave/home/homeimpl.cpp +++ b/kioslave/home/homeimpl.cpp @@ -90,7 +90,7 @@ bool HomeImpl::listHomes(TQValueList<KIO::UDSEntry> &list) for(; it!=users_end; ++it) { if ((*it).uid()>=MINIMUM_UID - && !uid_list.tqcontains( (*it).uid() ) ) + && !uid_list.contains( (*it).uid() ) ) { uid_list.append( (*it).uid() ); KIO::UDSEntry entry; @@ -185,7 +185,7 @@ void HomeImpl::slotStatResult(KIO::Job *job) m_entryBuffer = stat_job->statResult(); } - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) @@ -195,7 +195,7 @@ KIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) KIO::StatJob *job = KIO::stat(url, false); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( slotStatResult(KIO::Job *) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); KIO::UDSEntry::iterator it = m_entryBuffer.begin(); KIO::UDSEntry::iterator end = m_entryBuffer.end(); diff --git a/kioslave/home/kdedmodule/homedirnotify.cpp b/kioslave/home/kdedmodule/homedirnotify.cpp index f2da9fcf7..823027fe2 100644 --- a/kioslave/home/kdedmodule/homedirnotify.cpp +++ b/kioslave/home/kdedmodule/homedirnotify.cpp @@ -53,7 +53,7 @@ void HomeDirNotify::init() for(; it!=users_end; ++it) { if ((*it).uid()>=MINIMUM_UID - && !uid_list.tqcontains( (*it).uid() ) ) + && !uid_list.contains( (*it).uid() ) ) { uid_list.append( (*it).uid() ); @@ -147,7 +147,7 @@ inline void evil_hack(const KURL::List &list) { KURL url = (*it).upURL(); - if (!notified.tqcontains(url)) + if (!notified.contains(url)) { notifier.FilesAdded(url); notified.append(url); diff --git a/kioslave/info/kde-info2html b/kioslave/info/kde-info2html index f7def60bb..428d65dbb 100755 --- a/kioslave/info/kde-info2html +++ b/kioslave/info/kde-info2html @@ -37,7 +37,7 @@ # March 6 2003 Substitute use of absolute fixed file URLs to images with help:common URLs # for the images and style sheet. By Luis Pedro Coelho # March 9 2003 Add support for browsing by file. by Luis Pedro Coelho -# June 11 2003 Update the tqlayout of the sides to the new infopagestqlayout. +# June 11 2003 Update the layout of the sides to the new infopageslayout. # by Sven Leiber <s.leiber@web.de> # #------------------------------------------------------- @@ -353,7 +353,7 @@ sub Tab2Space { my ($line) = @_; $line =~ s/^\t/ /; # 8 leading spaces if initial tab while ($line =~ s/^([^\t]+)(\t)/$1 . ' ' x (8 - length($1) % 8)/e) { - } # tqreplace each tab with right num of spaces + } # replace each tab with right num of spaces return $line; } @@ -797,7 +797,7 @@ sub InfoNode2HTML { while (<FH2>) { $LineCount++; last if /$NODEBORDER/; - #-- tqreplace meta characters + #-- replace meta characters #s/"`"([^"'"]*)"'"/"<span class=\"option\">"$1"</span>"/g; s/&/&/g; s/>/>/g; diff --git a/kioslave/ldap/kio_ldap.cpp b/kioslave/ldap/kio_ldap.cpp index 1c36f3699..7abc95509 100644 --- a/kioslave/ldap/kio_ldap.cpp +++ b/kioslave/ldap/kio_ldap.cpp @@ -166,8 +166,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls, { TQString oid; bool critical; TQByteArray value; int i = 0; - while ( hasMetaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::tqfromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::fromLatin1("SERVER_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "server ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << @@ -176,8 +176,8 @@ void LDAPProtocol::controlsFromMetaData( LDAPControl ***serverctrls, i++; } i = 0; - while ( hasMetaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ) ) { - TQCString val = metaData( TQString::tqfromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); + while ( hasMetaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ) ) { + TQCString val = metaData( TQString::fromLatin1("CLIENT_CTRL%1").arg(i) ).utf8(); LDIF::splitControl( val, oid, critical, value ); kdDebug(7125) << "client ctrl #" << i << " value: " << val << " oid: " << oid << " critical: " << critical << " value: " << @@ -394,7 +394,7 @@ void LDAPProtocol::LDAPEntry2UDSEntry( const TQString &dn, UDSEntry &entry, name = name.left( pos ); if ( (pos = name.find("=")) > 0 ) name.remove( 0, pos+1 ); - name.tqreplace(' ', "_"); + name.replace(' ', "_"); if ( !dir ) name += ".ldif"; atom.m_str = name; entry.append( atom ); @@ -519,7 +519,7 @@ void LDAPProtocol::fillAuthInfo( AuthInfo &info ) info.url.setPort( mPort ); info.url.setUser( mUser ); info.caption = i18n("LDAP Login"); - info.comment = TQString::tqfromLatin1( mProtocol ) + "://" + mHost + ":" + + info.comment = TQString::fromLatin1( mProtocol ) + "://" + mHost + ":" + TQString::number( mPort ); info.commentLabel = i18n("site:"); info.username = mAuthSASL ? mUser : mBindName; @@ -800,7 +800,7 @@ void LDAPProtocol::get( const KURL &_url ) } /** - * Test if the url tqcontains a directory or a file. + * Test if the url contains a directory or a file. */ void LDAPProtocol::stat( const KURL &_url ) { diff --git a/kioslave/mac/README b/kioslave/mac/README index 6050ef449..bb907dd9c 100644 --- a/kioslave/mac/README +++ b/kioslave/mac/README @@ -2,7 +2,7 @@ From the hfsplus man page: "HFS+, also known as the Macintosh Extended Format, was introduced by Apple Computer in 1998 with the release of - MacOS 8.1. It tqcontains many improvements over the old HFS + MacOS 8.1. It contains many improvements over the old HFS file system, most notably the ability to allocate up to 2^64 blocks, resulting in much more efficient storage of many small files on large disks." diff --git a/kioslave/mac/kio_mac.cpp b/kioslave/mac/kio_mac.cpp index 13c5d761d..e64d22d65 100644 --- a/kioslave/mac/kio_mac.cpp +++ b/kioslave/mac/kio_mac.cpp @@ -157,7 +157,7 @@ void MacProtocol::listDir(const KURL& url) { while (line != NULL) { //1.0.4 puts this funny line in sometimes, we don't want it - if (line.tqcontains("Thread ") == 0) { + if (line.contains("Thread ") == 0) { entry = makeUDS(line); listEntry(entry, false); } @@ -207,11 +207,11 @@ TQValueList<KIO::UDSAtom> MacProtocol::doStat(const KURL& url) { this, TQT_SLOT(slotGetStdOutput(KProcess *, char *, int))); if (standardOutputStream.isEmpty()) { - filename.tqreplace("\\ ", " "); //get rid of escapes - filename.tqreplace("\\&", "&"); //mm, slashes... - filename.tqreplace("\\!", "!"); - filename.tqreplace("\\(", "("); - filename.tqreplace("\\)", ")"); + filename.replace("\\ ", " "); //get rid of escapes + filename.replace("\\&", "&"); //mm, slashes... + filename.replace("\\!", "!"); + filename.replace("\\(", "("); + filename.replace("\\)", ")"); error(ERR_DOES_NOT_EXIST, filename); } else { //remove trailing \n @@ -264,7 +264,7 @@ TQString MacProtocol::prepareHP(const KURL& url) { bool version102 = true; - if (standardOutputStream.tqcontains("options") != 0) { + if (standardOutputStream.contains("options") != 0) { version102 = false; } @@ -297,11 +297,11 @@ TQString MacProtocol::prepareHP(const KURL& url) { //escape any funny characters //TODO are there any more characters to escape? - path.tqreplace(" ", "\\ "); - path.tqreplace("&", "\\&"); - path.tqreplace("!", "\\!"); - path.tqreplace("(", "\\("); - path.tqreplace(")", "\\)"); + path.replace(" ", "\\ "); + path.replace("&", "\\&"); + path.replace("!", "\\!"); + path.replace("(", "\\("); + path.replace(")", "\\)"); //then change to the right directory int s; TQString dir; @@ -455,12 +455,12 @@ int MacProtocol::makeTime(TQString mday, TQString mon, TQString third) { // otherwise it only prints the year TQRegExp hourMin("(..):(..)"); if (hourMin.exactMatch(third)) { - TQDate tqcurrentDate(TQDate::tqcurrentDate()); + TQDate currentDate(TQDate::currentDate()); - if (month > tqcurrentDate.month()) { - year = tqcurrentDate.year() - 1; + if (month > currentDate.month()) { + year = currentDate.year() - 1; } else { - year = tqcurrentDate.year(); + year = currentDate.year(); } TQString h(hourMin.cap(1)); TQString m(hourMin.cap(2)); diff --git a/kioslave/mac/mac.protocol b/kioslave/mac/mac.protocol index 59a98fb81..cef77621d 100644 --- a/kioslave/mac/mac.protocol +++ b/kioslave/mac/mac.protocol @@ -13,7 +13,7 @@ Description[bn]=মà§à¦¯à¦¾à¦•-ও-à¦à¦¸ HFS+ পারà§à¦Ÿà¦¿à¦¶à¦¨-à¦à¦° Description[br]=Ur c'hioslave evit ar parzhadurioù MacOS HFS+ Description[bs]=kioslave za MacOS HFS+ particije Description[ca]=Un kioslave per a particions MacOS HFS+ -Description[cs]=Potqmocný protokol pro diskové oddÃly MacOS HFS+ +Description[cs]=Pomocný protokol pro diskové oddÃly MacOS HFS+ Description[csb]=Plugins protokòłu dlô particëji HFS+ systemë MacOS Description[da]=En kioslave for MacOS HFS+ partitioner Description[de]=Ein-/Ausgabemodul für MacOS HFS+ Partitionen diff --git a/kioslave/man/kio_man.cpp b/kioslave/man/kio_man.cpp index daa54dd33..013a15248 100644 --- a/kioslave/man/kio_man.cpp +++ b/kioslave/man/kio_man.cpp @@ -238,14 +238,14 @@ TQStringList MANProtocol::manDirectories() && S_ISDIR( sbuf.st_mode ) ) { const TQString p = TQDir(dir).canonicalPath(); - if (!man_dirs.tqcontains(p)) man_dirs += p; + if (!man_dirs.contains(p)) man_dirs += p; } } } // Untranslated pages in "<mandir>" const TQString p = TQDir(*it_dir).canonicalPath(); - if (!man_dirs.tqcontains(p)) man_dirs += p; + if (!man_dirs.contains(p)) man_dirs += p; } return man_dirs; } @@ -331,7 +331,7 @@ TQStringList MANProtocol::findPages(const TQString &_section, if (sect.lower()==it_real) it_real = sect; // Only add sect if not already contained, avoid duplicates - if (!sect_list.tqcontains(sect) && _section.isEmpty()) { + if (!sect_list.contains(sect) && _section.isEmpty()) { kdDebug() << "another section " << sect << endl; sect_list += sect; } @@ -425,11 +425,11 @@ static TQString text2html(const TQString& txt) { TQString reply = txt; - reply = reply.tqreplace('&', "&"); - reply = reply.tqreplace('<', "<"); - reply = reply.tqreplace('>', ">"); - reply = reply.tqreplace('"', "&dquot;"); - reply = reply.tqreplace('\'', """); + reply = reply.replace('&', "&"); + reply = reply.replace('<', "<"); + reply = reply.replace('>', ">"); + reply = reply.replace('"', "&dquot;"); + reply = reply.replace('\'', """); return reply; } @@ -534,7 +534,7 @@ char *MANProtocol::readManPage(const char *_filename) * If the path name constains the string sman, assume that it's SGML and * convert it to roff format (used on Solaris). */ //TQString file_mimetype = KMimeType::findByPath(TQString(filename), 0, false)->name(); - if (filename.tqcontains("sman", false)) //file_mimetype == "text/html" || ) + if (filename.contains("sman", false)) //file_mimetype == "text/html" || ) { myStdStream =TQString::null; KProcess proc; @@ -971,7 +971,7 @@ void MANProtocol::constructPath(TQStringList& constr_path, TQStringList constr_c { // What is the default mapping? catmandir = mandir; - catmandir.tqreplace("/usr/share/","/var/cache/"); + catmandir.replace("/usr/share/","/var/cache/"); if ( constr_catmanpath.findIndex( catmandir ) == -1 ) constr_catmanpath += catmandir; } @@ -1001,7 +1001,7 @@ void MANProtocol::checkManPaths() if ( manpath_env.isEmpty() || manpath_env[0] == ':' || manpath_env[manpath_env.length()-1] == ':' - || manpath_env.tqcontains( "::" ) ) + || manpath_env.contains( "::" ) ) { construct_path = true; // need to read config file } @@ -1027,7 +1027,7 @@ void MANProtocol::checkManPaths() // // The merging syntax with ":" and "::" in $MANPATH will be // satisfied if any empty string in path_list_env (there - // should be 1 or 0) is tqreplaced by the constructed path. + // should be 1 or 0) is replaced by the constructed path. const TQStringList path_list_env = TQStringList::split( ':', manpath_env , true ); @@ -1253,7 +1253,7 @@ void MANProtocol::showIndex(const TQString& section) { os << "<tr><td><a href=\"man:" << it.data() << "\">\n" << it.key() << "</a></td><td> </td><td> " - << (indexmap.tqcontains(it.key()) ? indexmap[it.key()] : "" ) + << (indexmap.contains(it.key()) ? indexmap[it.key()] : "" ) << "</td></tr>" << endl; } @@ -1384,12 +1384,12 @@ void MANProtocol::showIndex(const TQString& section) { struct man_index_t *manindex = indexlist[i]; - // tqstrncmp(): + // qstrncmp(): // "last_man" has already a \0 string ending, but // "manindex->manpage_begin" has not, // so do compare at most "manindex->manpage_len" of the strings. if (last_index->manpage_len == manindex->manpage_len && - !tqstrncmp(last_index->manpage_begin, + !qstrncmp(last_index->manpage_begin, manindex->manpage_begin, manindex->manpage_len) ) @@ -1415,7 +1415,7 @@ void MANProtocol::showIndex(const TQString& section) ((char *)manindex->manpage_begin)[manindex->manpage_len] = '\0'; os << manindex->manpage_begin << "</a></td><td> </td><td> " - << (indexmap.tqcontains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) + << (indexmap.contains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) << "</td></tr>" << endl; last_index = manindex; } @@ -1438,12 +1438,12 @@ void MANProtocol::showIndex(const TQString& section) { struct man_index_t *manindex = mit.current(); - // tqstrncmp(): + // qstrncmp(): // "last_man" has already a \0 string ending, but // "manindex->manpage_begin" has not, // so do compare at most "manindex->manpage_len" of the strings. if (last_index->manpage_len == manindex->manpage_len && - !tqstrncmp(last_index->manpage_begin, + !qstrncmp(last_index->manpage_begin, manindex->manpage_begin, manindex->manpage_len) ) @@ -1457,7 +1457,7 @@ void MANProtocol::showIndex(const TQString& section) manindex->manpage_begin[manindex->manpage_len] = '\0'; os << manindex->manpage_begin << "</a></td><td> </td><td> " - << (indexmap.tqcontains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) + << (indexmap.contains(manindex->manpage_begin) ? indexmap[manindex->manpage_begin] : "" ) << "</td></tr>" << endl; last_index = manindex; } diff --git a/kioslave/man/kmanpart.cpp b/kioslave/man/kmanpart.cpp index e48754a55..b52085596 100644 --- a/kioslave/man/kmanpart.cpp +++ b/kioslave/man/kmanpart.cpp @@ -50,10 +50,10 @@ KManPartFactory::~KManPartFactory() delete s_about; } -KParts::Part* KManPartFactory::createPartObject( TQWidget * tqparentWidget, const char* /*widgetName*/, TQObject *, +KParts::Part* KManPartFactory::createPartObject( TQWidget * parentWidget, const char* /*widgetName*/, TQObject *, const char* name, const char* /*className*/,const TQStringList & ) { - KManPart* part = new KManPart(tqparentWidget, name ); + KManPart* part = new KManPart(parentWidget, name ); return part; } diff --git a/kioslave/man/kmanpart.h b/kioslave/man/kmanpart.h index 92d51e18b..f2d9e3891 100644 --- a/kioslave/man/kmanpart.h +++ b/kioslave/man/kmanpart.h @@ -44,7 +44,7 @@ class KManPartFactory: public KParts::Factory KManPartFactory( TQObject * parent = 0, const char * name = 0 ); virtual ~KManPartFactory(); - virtual KParts::Part* createPartObject( TQWidget * tqparentWidget, const char * widgetName , + virtual KParts::Part* createPartObject( TQWidget * parentWidget, const char * widgetName , TQObject* parent, const char* name, const char * classname, const TQStringList &args); diff --git a/kioslave/man/man2html.cpp b/kioslave/man/man2html.cpp index d9e3b5fe9..089ba239b 100644 --- a/kioslave/man/man2html.cpp +++ b/kioslave/man/man2html.cpp @@ -18,7 +18,7 @@ // End of verbatim comment -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; /* * man2html-linux-1.0/1.1 @@ -49,7 +49,7 @@ ** every directory should start and end with the '/' and that the first ** directory should be "/" to allow a full path as an argument. ** -** The program first check if PATH_INFO tqcontains some information. +** The program first check if PATH_INFO contains some information. ** If it does (t.i. man2html/some/thing is used), the program will look ** for a manpage called PATH_INFO in the manpath. ** @@ -58,7 +58,7 @@ ** ** name name of manpage (csh, printf, xv, troff) ** section the section (1 2 3 4 5 6 7 8 9 n l 1v ...) -** -M path an extra directory to look for manpages (tqreplaces "/") +** -M path an extra directory to look for manpages (replaces "/") ** ** If man2html finds multiple manpages that satisfy the options, an index ** is displayed and the user can make a choice. If only one page is @@ -332,7 +332,7 @@ static void InitNumberDefinitions( void ) { // As the date number registers are more for end-users, better choose local time. // Groff seems to support Gregorian dates only - TQDate today( TQDate::tqcurrentDate( Qt::LocalTime ) ); + TQDate today( TQDate::currentDate( Qt::LocalTime ) ); s_numberDefinitionMap.insert( "year", today.year() ); // Y2K-correct year s_numberDefinitionMap.insert( "yr", today.year() - 1900 ); // Y2K-incorrect year s_numberDefinitionMap.insert( "mo", today.month() ); @@ -882,7 +882,7 @@ static void add_links(char *c) if (g-7>=c && g[-1]==':') { // We have perhaps an email address starting with mailto: - if (!tqstrncmp("mailto:",g-7,7)) + if (!qstrncmp("mailto:",g-7,7)) g-=7; } h=f+1; @@ -1958,13 +1958,13 @@ static char *scan_expression(char *c, int *result); static char *scan_format(char *c, TABLEROW **result, int *maxcol) { - TABLEROW *tqlayout, *currow; + TABLEROW *layout, *currow; TABLEITEM *curfield; int i,j; if (*result) { clear_table(*result); } - tqlayout= currow=new TABLEROW(); + layout= currow=new TABLEROW(); curfield=new TABLEITEM(currow); while (*c && *c!='.') { switch (*c) { @@ -2029,13 +2029,13 @@ static char *scan_format(char *c, TABLEROW **result, int *maxcol) } if (*c=='.') while (*c++!='\n'); *maxcol=0; - currow=tqlayout; + currow=layout; while (currow) { i=currow->length(); if (i>*maxcol) *maxcol=i; currow=currow->next; } - *result=tqlayout; + *result=layout; return c; } @@ -2066,7 +2066,7 @@ static char *scan_table(char *c) TQCString oldfont; int oldsize,oldfillout; char itemsep='\t'; - TABLEROW *tqlayout=NULL, *currow; + TABLEROW *layout=NULL, *currow; int curfield = -1; while (*c++!='\n'); h=c; @@ -2085,7 +2085,7 @@ static char *scan_table(char *c) /* scan table options */ while (c<h) { while (isspace(*c)) c++; - for (i=0; tableopt[i] && tqstrncmp(tableopt[i],c,tableoptl[i]);i++); + for (i=0; tableopt[i] && qstrncmp(tableopt[i],c,tableoptl[i]);i++); c=c+tableoptl[i]; switch (i) { case 0: center=1; break; @@ -2104,10 +2104,10 @@ static char *scan_table(char *c) } c=h+1; } - /* scan tqlayout */ - c=scan_format(c,&tqlayout, &maxcol); -// currow=tqlayout; - currow=next_row(tqlayout); + /* scan layout */ + c=scan_format(c,&layout, &maxcol); +// currow=layout; + currow=next_row(layout); curfield=0; i=0; while (!finished && *c) { @@ -2121,7 +2121,7 @@ static char *scan_table(char *c) currow->prev->next->prev=currow->prev; currow->prev=currow->prev->next; } else { - currow->prev=tqlayout=new TABLEROW(); + currow->prev=layout=new TABLEROW(); currow->prev->prev=NULL; currow->prev->next=currow; } @@ -2216,7 +2216,7 @@ static char *scan_table(char *c) } } /* calculate colspan and rowspan */ - currow=tqlayout; + currow=layout; while (currow->next) currow=currow->next; while (currow) { int ti = 0, ti1 = 0, ti2 = -1; @@ -2260,7 +2260,7 @@ static char *scan_table(char *c) if (expand) out_html(" WIDTH=\"100%\""); } out_html(">\n"); - currow=tqlayout; + currow=layout; while (currow) { j=0; out_html("<TR VALIGN=top>"); @@ -2318,7 +2318,7 @@ static char *scan_table(char *c) currow=currow->next; } - clear_table(tqlayout); + clear_table(layout); if (box && !border) out_html("</TABLE>"); out_html("</TABLE>"); @@ -2360,14 +2360,14 @@ static char *scan_expression( char *c, int *result, const unsigned int numLoop ) } c++; h=c; - while (*c!= sep && (!tcmp || tqstrncmp(c,tcmp,4))) c++; + while (*c!= sep && (!tcmp || qstrncmp(c,tcmp,4))) c++; *c='\n'; scan_troff(h, 1, &st1); *c=sep; if (tcmp) c=c+3; c++; h=c; - while (*c!=sep && (!tcmp || tqstrncmp(c,tcmp,4))) c++; + while (*c!=sep && (!tcmp || qstrncmp(c,tcmp,4))) c++; *c='\n'; scan_troff(h,1,&st2); *c=sep; @@ -3032,7 +3032,7 @@ static int get_request(char *req, int len) "%T", "An", "Aq", "Bq", "Qq", "UR", "UE", "UN", "troff", "nroff", "als", "rr", "rnn", "aln", "shift", "while", "do", "Dx", 0 }; int r = 0; - while (requests[r] && tqstrncmp(req, requests[r], len)) r++; + while (requests[r] && qstrncmp(req, requests[r], len)) r++; return requests[r] ? r : REQ_UNKNOWN; } @@ -3237,7 +3237,7 @@ static char *scan_request(char *c) while (*c && *c!='\n') c++; c++; h=c; - while (*c && tqstrncmp(c,".di",3)) while (*c && *c++!='\n'); + while (*c && qstrncmp(c,".di",3)) while (*c && *c++!='\n'); *c='\0'; char* result=0; scan_troff(h,0,&result); @@ -3358,7 +3358,7 @@ static char *scan_request(char *c) { char *line=NULL; c=scan_troff(c,1, &line); - if (line && tqstrncmp(line, "<BR>", 4)) + if (line && qstrncmp(line, "<BR>", 4)) { out_html(line); out_html("<BR>\n"); @@ -3489,7 +3489,7 @@ static char *scan_request(char *c) while (*c && *c!='\n') c++,i++; } c++; - while (*c && tqstrncmp(c,endwith,i)) while (*c++!='\n'); + while (*c && qstrncmp(c,endwith,i)) while (*c++!='\n'); while (*c && *c++!='\n'); break; } @@ -4015,7 +4015,7 @@ static char *scan_request(char *c) out_html("\n<H3>"); else out_html("\n<H2>"); - mandoc_synopsis = tqstrncmp(c, "SYNOPSIS", 8) == 0; + mandoc_synopsis = qstrncmp(c, "SYNOPSIS", 8) == 0; c = mandoc_command ? scan_troff_mandoc(c,1,NULL) : scan_troff(c,1,NULL); if (mode) out_html("</H3>\n"); @@ -4064,8 +4064,8 @@ static char *scan_request(char *c) { if (wordlist[i][0] == '\007') wordlist[i]++; - if (wordlist[i][tqstrlen(wordlist[i])-1] == '\007') - wordlist[i][tqstrlen(wordlist[i])-1] = 0; + if (wordlist[i][qstrlen(wordlist[i])-1] == '\007') + wordlist[i][qstrlen(wordlist[i])-1] = 0; } output_possible=true; out_html( DOCTYPE"<HTML>\n<HEAD>\n"); @@ -4147,7 +4147,7 @@ static char *scan_request(char *c) out_html(set_font("I")); if (words>1) wordlist[1][-1]='\0'; const char *c2=lookup_abbrev(wordlist[0]); - curpos+=tqstrlen(c2); + curpos+=qstrlen(c2); out_html(c2); out_html(set_font("R")); if (words>1) @@ -4293,8 +4293,8 @@ static char *scan_request(char *c) } c = next_line; sl=c; - const int length=tqstrlen(endmacro); - while (*c && tqstrncmp(c,endmacro,length)) + const int length=qstrlen(endmacro); + while (*c && qstrncmp(c,endmacro,length)) c=skip_till_newline(c); TQCString macro; @@ -4401,7 +4401,7 @@ static char *scan_request(char *c) case REQ_It: // mdoc(7) "list ITem" { c=c+j; - if (tqstrncmp(c, "Xo", 2) == 0 && isspace(*(c+2))) + if (qstrncmp(c, "Xo", 2) == 0 && isspace(*(c+2))) c = skip_till_newline(c); if (dl_set[itemdepth] & BL_DESC_LIST) { @@ -5233,7 +5233,7 @@ static char *scan_request(char *c) } case REQ_do: // groff(7) "DO command" { - // HACK: we just tqreplace do by a \n and a . + // HACK: we just replace do by a \n and a . *c = '\n'; c++; *c = '.'; @@ -5303,7 +5303,7 @@ static char *scan_troff(char *c, bool san, char **result) if (result) { if (*result) { buffer=*result; - buffpos=tqstrlen(buffer); + buffpos=qstrlen(buffer); buffmax=buffpos; } else { buffer = stralloc(LARGE_STR_MAX); @@ -5528,7 +5528,7 @@ void scan_man_page(const char *man_page) s_dollarZero = ""; // No macro called yet! output_possible = false; - int strLength = tqstrlen(man_page); + int strLength = qstrlen(man_page); char *buf = new char[strLength + 2]; qstrcpy(buf+1, man_page); buf[0] = '\n'; diff --git a/kioslave/media/kcmodule/main.cpp b/kioslave/media/kcmodule/main.cpp index 8b2479be6..da52ea119 100644 --- a/kioslave/media/kcmodule/main.cpp +++ b/kioslave/media/kcmodule/main.cpp @@ -40,10 +40,10 @@ MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList : KCModule(MediaFactory::instance(), parent, name ) { KGlobal::locale()->insertCatalogue("kio_media"); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); TQTabWidget *tab = new TQTabWidget( this ); - tqlayout->addWidget( tab ); + layout->addWidget( tab ); diff --git a/kioslave/media/kcmodule/managermoduleview.ui b/kioslave/media/kcmodule/managermoduleview.ui index 1463b34af..598718389 100644 --- a/kioslave/media/kcmodule/managermoduleview.ui +++ b/kioslave/media/kcmodule/managermoduleview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ManagerModuleView</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>360</height> @@ -68,5 +68,5 @@ </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kioslave/media/kcmodule/notifiermodule.cpp b/kioslave/media/kcmodule/notifiermodule.cpp index cc698b395..c7871c953 100644 --- a/kioslave/media/kcmodule/notifiermodule.cpp +++ b/kioslave/media/kcmodule/notifiermodule.cpp @@ -34,10 +34,10 @@ NotifierModule::NotifierModule(TQWidget *parent, const char *name) : KCModule(parent, name) { - TQBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); + TQBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); m_view = new NotifierModuleView( this ); - tqlayout->addWidget( m_view ); + layout->addWidget( m_view ); m_view->addButton->setGuiItem( KStdGuiItem::add() ); m_view->editButton->setGuiItem( KStdGuiItem::properties() ); @@ -212,7 +212,7 @@ void NotifierModule::slotToggleAuto() int index = m_view->actionsList->index( action_item ); - if ( action->autoMimetypes().tqcontains( m_mimetype ) ) + if ( action->autoMimetypes().contains( m_mimetype ) ) { m_settings.resetAutoAction( m_mimetype ); } diff --git a/kioslave/media/kcmodule/notifiermoduleview.ui b/kioslave/media/kcmodule/notifiermoduleview.ui index 5b2d6c111..87edc0f36 100644 --- a/kioslave/media/kcmodule/notifiermoduleview.ui +++ b/kioslave/media/kcmodule/notifiermoduleview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NotifierModuleView</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -18,7 +18,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -26,7 +26,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -68,7 +68,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -76,7 +76,7 @@ </property> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -138,7 +138,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>101</height> @@ -159,7 +159,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kioslave/media/kcmodule/serviceconfigdialog.cpp b/kioslave/media/kcmodule/serviceconfigdialog.cpp index 76b342f92..61dd060f2 100644 --- a/kioslave/media/kcmodule/serviceconfigdialog.cpp +++ b/kioslave/media/kcmodule/serviceconfigdialog.cpp @@ -63,7 +63,7 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, { TQListBox *list; - if ( action_mimetypes.tqcontains( *it ) ) + if ( action_mimetypes.contains( *it ) ) { list = m_view->mimetypesSelector->selectedListBox(); } diff --git a/kioslave/media/kcmodule/serviceview.ui b/kioslave/media/kcmodule/serviceview.ui index 90d31f010..938a9bf89 100644 --- a/kioslave/media/kcmodule/serviceview.ui +++ b/kioslave/media/kcmodule/serviceview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ServiceView</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>640</width> <height>480</height> @@ -54,7 +54,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -62,7 +62,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -80,13 +80,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>40</width> <height>40</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>40</width> <height>40</height> @@ -101,7 +101,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -196,7 +196,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -236,7 +236,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kicondialog.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kioslave/media/libmediacommon/actionlistboxitem.cpp b/kioslave/media/libmediacommon/actionlistboxitem.cpp index 42a724c75..271d2e487 100644 --- a/kioslave/media/libmediacommon/actionlistboxitem.cpp +++ b/kioslave/media/libmediacommon/actionlistboxitem.cpp @@ -29,7 +29,7 @@ ActionListBoxItem::ActionListBoxItem(NotifierAction *action, TQString mimetype, { TQString text = m_action->label(); - if ( m_action->autoMimetypes().tqcontains( mimetype ) ) + if ( m_action->autoMimetypes().contains( mimetype ) ) { text += " (" + i18n( "Auto Action" ) + ")"; } diff --git a/kioslave/media/libmediacommon/mediamanagersettings.kcfg b/kioslave/media/libmediacommon/mediamanagersettings.kcfg index 718a17fa0..4c9615ade 100644 --- a/kioslave/media/libmediacommon/mediamanagersettings.kcfg +++ b/kioslave/media/libmediacommon/mediamanagersettings.kcfg @@ -16,7 +16,7 @@ </entry> <entry name="AutostartEnabled" type="Bool"> <label>Enable medium application autostart after mount</label> - <whatsthis>Allows KDE to autostart application after a medium mount if it tqcontains an Autostart or an Autoopen file.</whatsthis> + <whatsthis>Allows KDE to autostart application after a medium mount if it contains an Autostart or an Autoopen file.</whatsthis> <default>true</default> </entry> </group> diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp index 9a6572150..d10314701 100644 --- a/kioslave/media/libmediacommon/notifieraction.cpp +++ b/kioslave/media/libmediacommon/notifieraction.cpp @@ -69,7 +69,7 @@ TQString NotifierAction::label() const void NotifierAction::addAutoMimetype( const TQString &mimetype ) { - if ( !m_autoMimetypes.tqcontains( mimetype ) ) + if ( !m_autoMimetypes.contains( mimetype ) ) { m_autoMimetypes.append( mimetype ); } diff --git a/kioslave/media/libmediacommon/notifieropenaction.cpp b/kioslave/media/libmediacommon/notifieropenaction.cpp index 01c8b010f..4d6d8025c 100644 --- a/kioslave/media/libmediacommon/notifieropenaction.cpp +++ b/kioslave/media/libmediacommon/notifieropenaction.cpp @@ -40,6 +40,6 @@ void NotifierOpenAction::execute(KFileItem &medium) bool NotifierOpenAction::supportsMimetype( const TQString &mimetype ) const { - return !mimetype.tqcontains( "blank" ) && !mimetype.tqcontains( "encrypted" ); + return !mimetype.contains( "blank" ) && !mimetype.contains( "encrypted" ); } diff --git a/kioslave/media/libmediacommon/notifierserviceaction.cpp b/kioslave/media/libmediacommon/notifierserviceaction.cpp index 8cf916848..c7bece4f8 100644 --- a/kioslave/media/libmediacommon/notifierserviceaction.cpp +++ b/kioslave/media/libmediacommon/notifierserviceaction.cpp @@ -99,7 +99,7 @@ void NotifierServiceAction::updateFilePath() if ( !m_filePath.isEmpty() ) return; TQString action_name = m_service.m_strName; - action_name.tqreplace( " ", "_" ); + action_name.replace( " ", "_" ); TQDir actions_dir( locateLocal( "data", "konqueror/servicemenus/", true ) ); @@ -144,7 +144,7 @@ bool NotifierServiceAction::isWritable() const bool NotifierServiceAction::supportsMimetype(const TQString &mimetype) const { - return m_mimetypes.tqcontains(mimetype); + return m_mimetypes.contains(mimetype); } void NotifierServiceAction::save() const diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp index 332832b98..d1ab55d87 100644 --- a/kioslave/media/libmediacommon/notifiersettings.cpp +++ b/kioslave/media/libmediacommon/notifiersettings.cpp @@ -111,7 +111,7 @@ TQValueList<NotifierAction*> NotifierSettings::actionsForMimetype( const TQStrin bool NotifierSettings::addAction( NotifierServiceAction *action ) { - if ( !m_idMap.tqcontains( action->id() ) ) + if ( !m_idMap.contains( action->id() ) ) { m_actions.insert( --m_actions.end(), action ); m_idMap[ action->id() ] = action; @@ -153,7 +153,7 @@ void NotifierSettings::setAutoAction( const TQString &mimetype, NotifierAction * void NotifierSettings::resetAutoAction( const TQString &mimetype ) { - if ( m_autoMimetypesMap.tqcontains( mimetype ) ) + if ( m_autoMimetypesMap.contains( mimetype ) ) { NotifierAction *action = m_autoMimetypesMap[mimetype]; action->removeAutoMimetype( mimetype ); @@ -179,7 +179,7 @@ void NotifierSettings::clearAutoActions() NotifierAction *NotifierSettings::autoActionForMimetype( const TQString &mimetype ) { - if ( m_autoMimetypesMap.tqcontains( mimetype ) ) + if ( m_autoMimetypesMap.contains( mimetype ) ) { return m_autoMimetypesMap[mimetype]; } @@ -238,7 +238,7 @@ void NotifierSettings::reload() TQString mime = auto_it.key(); TQString action_id = auto_it.data(); - if ( m_idMap.tqcontains( action_id ) ) + if ( m_idMap.contains( action_id ) ) { setAutoAction( mime, m_idMap[action_id] ); } @@ -349,7 +349,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString } } } - else if ( types.tqcontains(mimetype) ) + else if ( types.contains(mimetype) ) { return true; } diff --git a/kioslave/media/mediaimpl.cpp b/kioslave/media/mediaimpl.cpp index cb9c22452..b55b37e5d 100644 --- a/kioslave/media/mediaimpl.cpp +++ b/kioslave/media/mediaimpl.cpp @@ -267,7 +267,7 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) if (!m_lastErrorMessage.isEmpty()) m_lastErrorCode = KIO::ERR_SLAVE_DEFINED; else { - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } mp_mounting = 0L; @@ -304,7 +304,7 @@ void MediaImpl::slotMountResult(KIO::Job *job) { m_lastErrorCode = job->error(); m_lastErrorMessage = job->errorText(); - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } } @@ -317,7 +317,7 @@ void MediaImpl::slotMediumChanged(const TQString &name) kdDebug(1219) << "MediaImpl::slotMediumChanged: updating mp_mounting" << endl; bool ok; *mp_mounting = findMediumByName(name, ok); - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } } @@ -351,7 +351,7 @@ void MediaImpl::slotStatResult(KIO::Job *job) m_entryBuffer = stat_job->statResult(); } - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) @@ -364,7 +364,7 @@ KIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) this, TQT_SLOT( slotStatResult(KIO::Job *) ) ); connect( job, TQT_SIGNAL( warning( KIO::Job *, const TQString & ) ), this, TQT_SLOT( slotWarning( KIO::Job *, const TQString & ) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); KIO::UDSEntry::iterator it = m_entryBuffer.begin(); KIO::UDSEntry::iterator end = m_entryBuffer.end(); diff --git a/kioslave/media/mediamanager/fstabbackend.cpp b/kioslave/media/mediamanager/fstabbackend.cpp index 83c870d2f..189f52aee 100644 --- a/kioslave/media/mediamanager/fstabbackend.cpp +++ b/kioslave/media/mediamanager/fstabbackend.cpp @@ -137,7 +137,7 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly) || mount->mountType() == "fdescfs" || mount->mountType() == "kernfs" || mount->mountType() == "usbfs" - || mount->mountType().tqcontains( "proc" ) + || mount->mountType().contains( "proc" ) || mount->mountType() == "unknown" || mount->mountType() == "none" || mount->mountType() == "sunrpc" @@ -187,7 +187,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) nothing has changed, do not stat the mount point. Avoids hang if network shares are stalling */ TQString mtabEntry = dev + "*" + mp + "*" + fs; - if(m_mtabEntries.tqcontains(mtabEntry)) { + if(m_mtabEntries.contains(mtabEntry)) { new_mtabIds += m_mtabEntries[mtabEntry]; continue; } @@ -196,7 +196,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) new_mtabIds+=id; m_mtabEntries[mtabEntry] = id; - if ( !m_mtabIds.tqcontains(id) && m_fstabIds.tqcontains(id) ) + if ( !m_mtabIds.contains(id) && m_fstabIds.contains(id) ) { TQString mime, icon, label; guess(dev, mp, fs, true, mime, icon, label); @@ -204,7 +204,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) mime, icon, label); } #if 0 - else if ( !m_mtabIds.tqcontains(id) ) + else if ( !m_mtabIds.contains(id) ) { TQString name = generateName(dev, fs); @@ -229,7 +229,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) for (; it2!=end2; ++it2) { - if ( !new_mtabIds.tqcontains(*it2) && m_fstabIds.tqcontains(*it2) ) + if ( !new_mtabIds.contains(*it2) && m_fstabIds.contains(*it2) ) { const Medium *medium = m_mediaList.findById(*it2); @@ -248,7 +248,7 @@ void FstabBackend::handleMtabChange(bool allowNotification) mime, icon, label); } #if 0 - else if ( !new_mtabIds.tqcontains(*it2) ) + else if ( !new_mtabIds.contains(*it2) ) { m_mediaList.removeMedium(*it2, allowNotification); } @@ -277,7 +277,7 @@ void FstabBackend::handleFstabChange(bool allowNotification) TQString id = generateId(dev, mp); new_fstabIds+=id; - if ( !m_fstabIds.tqcontains(id) ) + if ( !m_fstabIds.contains(id) ) { TQString name = generateName(dev, fs); @@ -301,7 +301,7 @@ void FstabBackend::handleFstabChange(bool allowNotification) for (; it2!=end2; ++it2) { - if ( !new_fstabIds.tqcontains(*it2) ) + if ( !new_fstabIds.contains(*it2) ) { m_mediaList.removeMedium(*it2, allowNotification); } @@ -317,8 +317,8 @@ TQString FstabBackend::generateId(const TQString &devNode, TQString m = KStandardDirs::realPath(mountPoint); return "/org/kde/mediamanager/fstab/" - +d.tqreplace("/", "") - +m.tqreplace("/", ""); + +d.replace("/", "") + +m.replace("/", ""); } TQString FstabBackend::generateName(const TQString &devNode, const TQString &fsType) @@ -363,7 +363,7 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint, { TQString buf; m.readLine(buf, 1024); - if(buf.tqcontains("cdrom")) + if(buf.contains("cdrom")) isCd=true; m.close(); } diff --git a/kioslave/media/mediamanager/halbackend.cpp b/kioslave/media/mediamanager/halbackend.cpp index d44826590..7b56d46ad 100644 --- a/kioslave/media/mediamanager/halbackend.cpp +++ b/kioslave/media/mediamanager/halbackend.cpp @@ -447,7 +447,7 @@ const char* HALBackend::findMediumUdiFromUdi(const char* udi) void HALBackend::ResetProperties(const char* mediumUdi, bool allowNotification) { kdDebug(1219) << "HALBackend::setProperties" << endl; - if ( TQString::tqfromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) + if ( TQString::fromLatin1( mediumUdi ).startsWith( "/org/kde/" ) ) { const Medium *cmedium = m_mediaList.findById(mediumUdi); if ( cmedium ) @@ -942,7 +942,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << TQString("automount=%1").arg(value ? "true" : "false"); - if (valids.tqcontains("ro")) + if (valids.contains("ro")) { value = config.readBoolEntry("ro", false); tmp = TQString("ro=%1").arg(value ? "true" : "false"); @@ -950,7 +950,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << tmp; } - if (valids.tqcontains("quiet")) + if (valids.contains("quiet")) { value = config.readBoolEntry("quiet", false); tmp = TQString("quiet=%1").arg(value ? "true" : "false"); @@ -958,28 +958,28 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << tmp; } - if (valids.tqcontains("flush")) + if (valids.contains("flush")) { value = config.readBoolEntry("flush", fstype.endsWith("fat")); tmp = TQString("flush=%1").arg(value ? "true" : "false"); result << tmp; } - if (valids.tqcontains("uid")) + if (valids.contains("uid")) { value = config.readBoolEntry("uid", true); tmp = TQString("uid=%1").arg(value ? "true" : "false"); result << tmp; } - if (valids.tqcontains("utf8")) + if (valids.contains("utf8")) { value = config.readBoolEntry("utf8", true); tmp = TQString("utf8=%1").arg(value ? "true" : "false"); result << tmp; } - if (valids.tqcontains("shortname")) + if (valids.contains("shortname")) { TQString svalue = config.readEntry("shortname", "lower").lower(); if (svalue == "winnt") @@ -993,7 +993,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) } // pass our locale to the ntfs-3g driver so it can translate local characters - if (valids.tqcontains("locale") && fstype == "ntfs-3g") + if (valids.contains("locale") && fstype == "ntfs-3g") { // have to obtain LC_CTYPE as returned by the `locale` command // check in the same order as `locale` does @@ -1003,15 +1003,15 @@ TQStringList HALBackend::mountoptions(const TQString &name) } } - if (valids.tqcontains("sync")) + if (valids.contains("sync")) { - value = config.readBoolEntry("sync", ( valids.tqcontains("flush") && !fstype.endsWith("fat") ) && removable); + value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable); tmp = TQString("sync=%1").arg(value ? "true" : "false"); if (fstype != "iso9660") // makes no sense result << tmp; } - if (valids.tqcontains("noatime")) + if (valids.contains("noatime")) { value = config.readBoolEntry("atime", !fstype.endsWith("fat")); tmp = TQString("atime=%1").arg(value ? "true" : "false"); @@ -1031,7 +1031,7 @@ TQStringList HALBackend::mountoptions(const TQString &name) result << TQString("mountpoint=%1").arg(mount_point); result << TQString("filesystem=%1").arg(fstype); - if (valids.tqcontains("data")) + if (valids.contains("data")) { TQString svalue = config.readEntry("journaling").lower(); if (svalue == "ordered") @@ -1058,19 +1058,19 @@ bool HALBackend::setMountoptions(const TQString &name, const TQStringList &optio const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 }; for (int index = 0; names[index]; ++index) - if (valids.tqcontains(names[index])) + if (valids.contains(names[index])) config.writeEntry(names[index], valids[names[index]] == "true"); - if (valids.tqcontains("shortname")) + if (valids.contains("shortname")) config.writeEntry("shortname", valids["shortname"]); - if (valids.tqcontains("journaling")) + if (valids.contains("journaling")) config.writeEntry("journaling", valids["journaling"]); - if (!mountoptions(name).tqcontains(TQString("mountpoint=%1").arg(valids["mountpoint"]))) + if (!mountoptions(name).contains(TQString("mountpoint=%1").arg(valids["mountpoint"]))) config.writeEntry("mountpoint", valids["mountpoint"]); - if (valids.tqcontains("automount")) { + if (valids.contains("automount")) { TQString drive_udi = libhal_device_get_property_QString(m_halContext, name.latin1(), "block.storage_device"); config.setGroup(drive_udi); config.writeEntry("automount", valids["automount"]); @@ -1376,7 +1376,7 @@ TQString HALBackend::isInFstab(const Medium *medium) if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && reald == medium->deviceNode() ) ) { TQStringList opts = (*it)->mountOptions(); - if (opts.tqcontains("user") || opts.tqcontains("users")) + if (opts.contains("user") || opts.contains("users")) return (*it)->mountPoint(); } } @@ -1451,17 +1451,17 @@ TQString HALBackend::mount(const Medium *medium) if (mount_point.startsWith("/media/")) mount_point = mount_point.mid(7); - if (valids.tqcontains("shortname")) + if (valids.contains("shortname")) { soptions << TQString("shortname=%1").arg(valids["shortname"]); } - if (valids.tqcontains("locale")) + if (valids.contains("locale")) { soptions << TQString("locale=%1").arg(valids["locale"]); } - if (valids.tqcontains("journaling")) + if (valids.contains("journaling")) { TQString option = valids["journaling"]; if (option == "data") diff --git a/kioslave/media/mediamanager/linuxcdpolling.cpp b/kioslave/media/mediamanager/linuxcdpolling.cpp index edca30fe4..945fd950a 100644 --- a/kioslave/media/mediamanager/linuxcdpolling.cpp +++ b/kioslave/media/mediamanager/linuxcdpolling.cpp @@ -209,7 +209,7 @@ void LinuxCDPolling::slotMediumAdded(const TQString &id) { kdDebug(1219) << "LinuxCDPolling::slotMediumAdded(" << id << ")" << endl; - if (m_threads.tqcontains(id)) return; + if (m_threads.contains(id)) return; const Medium *medium = m_mediaList.findById(id); @@ -234,7 +234,7 @@ void LinuxCDPolling::slotMediumRemoved(const TQString &id) { kdDebug(1219) << "LinuxCDPolling::slotMediumRemoved(" << id << ")" << endl; - if (!m_threads.tqcontains(id)) return; + if (!m_threads.contains(id)) return; PollingThread *thread = m_threads[id]; m_threads.remove(id); @@ -257,7 +257,7 @@ void LinuxCDPolling::slotMediumStateChanged(const TQString &id) if (mime.find("dvd")==-1 && mime.find("cd")==-1) return; - if (!m_threads.tqcontains(id) && !medium->isMounted()) + if (!m_threads.contains(id) && !medium->isMounted()) { // It is just a mount state change, no need to notify m_excludeNotification.append( id ); @@ -268,7 +268,7 @@ void LinuxCDPolling::slotMediumStateChanged(const TQString &id) thread->start(); m_timer.start(500); } - else if (m_threads.tqcontains(id) && medium->isMounted()) + else if (m_threads.contains(id) && medium->isMounted()) { PollingThread *thread = m_threads[id]; m_threads.remove(id); @@ -360,7 +360,7 @@ void LinuxCDPolling::applyType(DiscType type, const Medium *medium) TQString id = medium->id(); TQString dev = medium->deviceNode(); - bool notify = !m_excludeNotification.tqcontains(id); + bool notify = !m_excludeNotification.contains(id); m_excludeNotification.remove(id); switch (type) diff --git a/kioslave/media/mediamanager/medialist.cpp b/kioslave/media/mediamanager/medialist.cpp index 2e766bb07..bb0de6248 100644 --- a/kioslave/media/mediamanager/medialist.cpp +++ b/kioslave/media/mediamanager/medialist.cpp @@ -38,7 +38,7 @@ const Medium *MediaList::findById(const TQString &id) const { kdDebug(1219) << "MediaList::findById(" << id << ")" << endl; - if ( !m_idMap.tqcontains(id) ) return 0L; + if ( !m_idMap.contains(id) ) return 0L; return m_idMap[id]; } @@ -47,7 +47,7 @@ const Medium *MediaList::findByName(const TQString &name) const { kdDebug(1219) << "MediaList::findByName(" << name << ")" << endl; - if ( !m_nameMap.tqcontains(name) ) return 0L; + if ( !m_nameMap.contains(name) ) return 0L; return m_nameMap[name]; } @@ -70,13 +70,13 @@ TQString MediaList::addMedium(Medium *medium, bool allowNotification) kdDebug(1219) << "MediaList::addMedium(@" << medium->id() << ")" << endl; TQString id = medium->id(); - if ( m_idMap.tqcontains(id) ) return TQString::null; + if ( m_idMap.contains(id) ) return TQString::null; m_media.append( medium ); m_idMap[id] = medium; TQString name = medium->name(); - if ( !m_nameMap.tqcontains(name) ) + if ( !m_nameMap.contains(name) ) { m_nameMap[name] = medium; @@ -90,7 +90,7 @@ TQString MediaList::addMedium(Medium *medium, bool allowNotification) TQString base_name = name+"_"; int i = 1; - while ( m_nameMap.tqcontains(base_name+TQString::number(i)) ) + while ( m_nameMap.contains(base_name+TQString::number(i)) ) { i++; } @@ -109,7 +109,7 @@ bool MediaList::removeMedium(const TQString &id, bool allowNotification) { kdDebug(1219) << "MediaList::removeMedium(" << id << ")" << endl; - if ( !m_idMap.tqcontains(id) ) return false; + if ( !m_idMap.contains(id) ) return false; Medium *medium = m_idMap[id]; TQString name = medium->name(); @@ -126,7 +126,7 @@ bool MediaList::changeMediumState(const Medium &medium, bool allowNotification) { kdDebug(1219) << "MediaList::changeMediumState(const Medium &)" << endl; - if ( !m_idMap.tqcontains(medium.id()) ) return false; + if ( !m_idMap.contains(medium.id()) ) return false; Medium *m = m_idMap[medium.id()]; @@ -177,7 +177,7 @@ bool MediaList::changeMediumState(const TQString &id, << baseURL << ", " << mimeType << ", " << iconName << ")" << endl; - if ( !m_idMap.tqcontains(id) ) return false; + if ( !m_idMap.contains(id) ) return false; Medium *medium = m_idMap[id]; @@ -218,7 +218,7 @@ bool MediaList::changeMediumState(const TQString &id, << mounted << ", " << mimeType << ", " << iconName << ")" << endl; - if ( !m_idMap.tqcontains(id) ) return false; + if ( !m_idMap.contains(id) ) return false; Medium *medium = m_idMap[id]; @@ -255,7 +255,7 @@ bool MediaList::changeMediumState(const TQString &id, bool mounted, << mounted << ", " << mimeType << ", " << iconName << ")" << endl; - if ( !m_idMap.tqcontains(id) ) return false; + if ( !m_idMap.contains(id) ) return false; Medium *medium = m_idMap[id]; @@ -287,7 +287,7 @@ bool MediaList::setUserLabel(const TQString &name, const TQString &label) kdDebug(1219) << "MediaList::setUserLabel(" << name << ", " << label << ")" << endl; - if ( !m_nameMap.tqcontains(name) ) return false; + if ( !m_nameMap.contains(name) ) return false; Medium *medium = m_nameMap[name]; medium->setUserLabel(label); diff --git a/kioslave/media/mediamanager/removablebackend.cpp b/kioslave/media/mediamanager/removablebackend.cpp index 7db497c38..f307ee2f8 100644 --- a/kioslave/media/mediamanager/removablebackend.cpp +++ b/kioslave/media/mediamanager/removablebackend.cpp @@ -60,7 +60,7 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label) TQString name = generateName(devNode); TQString id = generateId(devNode); - if (!m_removableIds.tqcontains(id)) + if (!m_removableIds.contains(id)) { Medium *medium = new Medium(id, name); medium->mountableState(devNode, TQString::null, @@ -95,7 +95,7 @@ bool RemovableBackend::plug(const TQString &devNode, const TQString &label) bool RemovableBackend::unplug(const TQString &devNode) { TQString id = generateId(devNode); - if (m_removableIds.tqcontains(id)) + if (m_removableIds.contains(id)) { m_removableIds.remove(id); return m_mediaList.removeMedium(id); @@ -106,7 +106,7 @@ bool RemovableBackend::unplug(const TQString &devNode) bool RemovableBackend::camera(const TQString &devNode) { TQString id = generateId(devNode); - if (m_removableIds.tqcontains(id)) + if (m_removableIds.contains(id)) { return m_mediaList.changeMediumState(id, TQString("camera:/"), false, "media/gphoto2camera"); @@ -140,8 +140,8 @@ void RemovableBackend::handleMtabChange() TQString id = generateId(dev); new_mtabIds+=id; - if ( !m_mtabIds.tqcontains(id) - && m_removableIds.tqcontains(id) ) + if ( !m_mtabIds.contains(id) + && m_removableIds.contains(id) ) { m_mediaList.changeMediumState(id, dev, mp, fs, true, false, "media/removable_mounted"); @@ -153,8 +153,8 @@ void RemovableBackend::handleMtabChange() for (; it2!=end2; ++it2) { - if ( !new_mtabIds.tqcontains(*it2) - && m_removableIds.tqcontains(*it2) ) + if ( !new_mtabIds.contains(*it2) + && m_removableIds.contains(*it2) ) { m_mediaList.changeMediumState(*it2, false, false, "media/removable_unmounted"); @@ -169,7 +169,7 @@ TQString RemovableBackend::generateId(const TQString &devNode) TQString dev = KStandardDirs::realFilePath(devNode); return "/org/kde/mediamanager/removable/" - +dev.tqreplace("/", ""); + +dev.replace("/", ""); } TQString RemovableBackend::generateName(const TQString &devNode) diff --git a/kioslave/media/medianotifier/medianotifier.cpp b/kioslave/media/medianotifier/medianotifier.cpp index 7e4c44b39..b0596e31d 100644 --- a/kioslave/media/medianotifier/medianotifier.cpp +++ b/kioslave/media/medianotifier/medianotifier.cpp @@ -113,7 +113,7 @@ bool MediaNotifier::autostart( const KFileItem &medium ) TQString mimetype = medium.mimetype(); bool is_cdrom = mimetype.startsWith( "media/cd" ) || mimetype.startsWith( "media/dvd" ); - bool is_mounted = mimetype.tqcontains( "_mounted" ); + bool is_mounted = mimetype.contains( "_mounted" ); // We autorun only on CD/DVD or removable disks (USB, Firewire) if ( !( is_cdrom || is_mounted ) @@ -222,7 +222,7 @@ bool MediaNotifier::execAutoopen( const KFileItem &medium, const TQString &path, // The relative path MUST NOT contain path components that // refer to a parent directory ( ../ ) - if ( relative_path.startsWith( "/" ) || relative_path.tqcontains( "../" ) ) + if ( relative_path.startsWith( "/" ) || relative_path.contains( "../" ) ) { return false; } diff --git a/kioslave/media/medianotifier/notificationdialog.cpp b/kioslave/media/medianotifier/notificationdialog.cpp index 9913f033d..7ba172601 100644 --- a/kioslave/media/medianotifier/notificationdialog.cpp +++ b/kioslave/media/medianotifier/notificationdialog.cpp @@ -53,7 +53,7 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett updateActionsListBox(); - resize( TQSize(400,400).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize(400,400).expandedTo( minimumSizeHint() ) ); m_actionWatcher = new KDirWatch(); diff --git a/kioslave/media/medianotifier/notificationdialogview.ui b/kioslave/media/medianotifier/notificationdialogview.ui index 4cc43a9fe..f37a007b2 100644 --- a/kioslave/media/medianotifier/notificationdialogview.ui +++ b/kioslave/media/medianotifier/notificationdialogview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>NotificationDialogView</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -42,13 +42,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>64</width> <height>64</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>64</width> <height>64</height> @@ -110,7 +110,7 @@ <data format="XPM.GZ" length="55092">789cccbd47b7eb38b2ef397f9fa2d6e5ecae5e7cf266d0035266cb6da7ed77af1ed07b2f1aa9bf7c83883f704c56d5cd7c75bb5f95d6c9ca5f8a22114044202200f0fccffffcdbe7d3fddffef37ffe8fea625c02eb6f966f947ffb4fbb4e92ebfff57fff9fffcffff88fe160f0b7fecf68389bfe6df41fffc7fff80febf96fd6df9401ff5fcff64232ffde36244f7a762ac953fefd56f29cf35cf2a267f3072ff9f733c906e7836493f35eb2c59fd74ab6797b1f243bfcfb46b2cb7fef0a1e72799c5af2907f7f94cce5732cc963fefd483297cf3a8387d43f992999ffde0c25f3dfb79a64de5f662099dfcfe924cf386f24f3fe4a44ff0fd17e5b327f9e772799dfcfb8078fa87d662499cbebbb9249de6fc9bcbd9d2f99dab795ccc7b31a48e6e3b71a4ae6e315ed25f3f1b04f82a93f0dc1636a9ff32999daf32599f757a54ae6fde17e48e6fae23892b97e78a2bd63ea1f438cef849e97e892f9f7652b99b76f3d91cce53763f0947e6f08fd9c1137b664de5e43c83fc7f53bf0022cf475499c8be719c4f113d824de5cc01671fd0eb6895dbaff50d8ab174ae6f2ad3ac9a47f63c924df4832d73f732a99f777f324998fb73993ccfb5f7f96ccc7df3a49e6e3514592b9bd3aa664ae1fd6bd646eaf9a2b98f4ddf52573fdb58e60d89f6d49e6df9b13c97c3c1d45326fbf634826ffb2934cfee40086fdf88164de7ff65232d9eb9b646e1fa607867e9bbe641a8f816092cf14f2423f4d070c7d8b9f25f3e7bbaf60e89fb791ccfb3b15df43ffe22f30f42f13f240ffea1b18fab716bf877ee967b043dc92bf1f0ea16fdd9af3a8f740bc3dbe64f2f70bc9bcbfcd2fc9bcbfbd4432f90b4730f5cff55e3297bfc9c0187f732899f4772099c6e35b321f7f6b0fc6f8daa6649aff7692f9f3724d32d7f7cb4932ef6ffb4e32e9b302c6f86723c9dcdefc50326f9ff32e99f7975382a10fd75c32d7e795906742fdd3bd49e6df67a2bdd09ff20886beb89164fefcd54932ef9ffa2c98fca72bda0b7d6a9f25f3feb0c4f842bf9a07b0d02fd13fd0afe2090cffd6c660e85b24ae87be05a40f63e1df8277c9bc7debab643e5e575732efef6e2799cb1bfcf89ecbdbed2573fd5cfd781e1fcf952d98fa3b91cf277f74cd24f3fe0f3ec08807ba8d64ae9fc54232e98f27993faff9f13df787ae680ff4d57995cce57103c95c7fac3bc97c7c7c5f308d67b8028bf9f72299cbd3dc49e6f2981f92797fd69664de5f7e2499dbb33b92ccdb6f2dc1d067772099fca72e99b7ff6a49a6f946f437f4b9bd48267934b0d0ef77c9bc7dad68df9cee9fee25f3fe69447fcc31df88f1843eaf6e92f9f3da89649a0fee25f3f1cb85be41ff0331bed07f5f8ca7f0a7d43f13a1df9d2a99f777f32899dfffea80111faeae92b93cee41f090f7effa0c463ce77f48a6f9ee51321fafeb4930f547bb01433fecb164fe7cff5b321f2f2f92ccfb3f93d793bd745b30f421ae2593bfd94be6fd1b2692b93cde4e32b79fda164ced8ddec1d017e74332f9dbb564de5e772899e299140c7dcaa692b93db8df92797fe61d18fe3117e303fd59b792e979b164de3f8918ff05f5cf46f40ff4c715e301fdb9bd80e13f57f792797fad4a30fce906bf17f3f51ae331c4fc19a13d43f89780e693a9f0a7ed028cebfd4e321fafe6198c7cc00b2473f9bc77c95cdf4a4ff0908fc75a5c8f78bfb52553fcf02999ebbfdf08a6f10e5ec1c2bfdc49a6f97c2b99e6ff27c9642f3fbee7fab416f2407fc299643efe912f99ec692099cbd3b492b9bc9ab8ff94c63711fd0bfdb2a792c93e2ac9140f689229df5125f3feed5660e85ffd2a99fce34432efdfee00867e5e14c9941f8ec0d0bfcc904cf9572a99b7a76e25f3fe73c760a1afaa646ebf99e85fe86f2ec61bfaea0b79e11f0ba12f2eda8bfb4b7d267b98897c64dd81a1cfeb503297afbd934cf1d45e30fc93f81ef363b896ccefbf3a4a26793dc1149fae7d30f247ff2a99ea1d3fbee7fed68b05a31eb1924cf9c2083ca5f6076bc9542fd948e6fa900e2473fdbbbc09463d630246be1a6692f9f84481643edef95532b73f5df01cfd7993ccdb7be92453beb5924cf3c14432efbf5cfc7e01fffa2999e6bfb1646e5f9b022ce2cba364de3e37114cfec132c0d047f74d32f9e37b30f26b2f05431f5763c9bc7f42c1d04797e6cf99d0c71be41fc21fa52a18fe24207d9f0bfd5a1d04d3f8570fe009d573dca3642e7fbb054f697ca237c1246f3a944cf53a5b32c5a72f60f81bd796ccaf4f2bc994af2d2593be6f2453bea682e7345eed4e32d5ff14c9bcbf2f57c95cff7dd15ef8a35097ccdb93cd25537e2bfa6b3124fffd055ec2bfcc24537c548045fe518331decda7647ebd2eda6ba37fc478c01f6d44ffb8d43e1ded17e3af3960cc97f5022cf481e257a6dd149fd96bf08cc6ffe64aa6f92604c35eec4032b7efab2799e2375b30e94b2aae5f50ff58aa642e6fe148a67ce1065e927fb80d2553bd2494cc9fdf3e49a6fc45c863c07e1dc97cfcd3a3606a5f7d05633e887682497faf4bb08df8e2030cfb2bc9de17a2ff4bf49f886762f4cf10f666bd80618f3e8dff92f5177f5e914be6ed2f36e005c91b5f24533cf22598ecafeec04be467ae64f28757b041bfaf5f040f29fe68c0268d9726da63917e14a2bdd0c7f424998f5f44fdb314fd91bf83a18f8105467fdc4660e86783e789fee94a30e215e3118c78a3a0f9dc60fd45fa34072f491fc329d8a0f685a964aae7dfc0265d5f2f05537f568f60d86bb091ccfbe36248e6fad988dfbba85f8e24533e48f66f88fe892b30fa67634ba6f97508467f6d1cb0a827435ed11f35fa6388f9c9a7f8c814f157fd065e92fe5f6e6083e42f5cb0897ac417d8227dca3fc036f55fb305431fba77c1747f3b02bba4df3ad9ab29e42f669229df46fb647fe460d8d3aa0243fecd2758d4bbefc0a21eb403a33f2a8a772c263f6fff35055ba827d1f85aa2bf2f1a58f4f70a8cfb252a18febdf1c0f02701f58f2dda7f5d48a6fe9b8071fff21d2cfc83603caf51c1b87fb106433f4b1a1f87fd17eebf1b17ec903efbd43e46b0f71a0c79cb2d58c4e72d18cf2f1bb078be0dc6f3339abf5cd11f8906c6f5de1a8cf846e3f6c1cbe724df068cf6548964ae3f1b130c7f9096608c7f7603a3bde90e8ce7bb2f60b4d77e00c39f075c9f98f639e47fa34832d7e7f84c2c9eb7ba80216ffb08c6f3cc042cd64f1a30e42f9760d88fe382d19e1ced19c11e42aebf0cf17cd306435ecb04a33d610e16f20b16f1470a16ed3981457cf9443c82bdae2660e19f79bc341c8be7d70e18cfd71ec022df8ac178feaa05e379d72bf108e3df70ff369cc8fe1d8345bc9c81d1fe60452cfaeb7a03c3be74ba7e2adbd382f1fbcb3b18e3910dc1689f4df24e657fd4603cafb2c168bffb0cc6f32b1ebf0c67e2fe01e9d34cdcef1283e12faa6f30ee67f860e1ffe660a1efdc7f0ee7e2fed58c58b6e70cc6ef8d002cd6173db0a83f2dc0d0b78edbf77021e5bd078bf6aec1f87d41fabd14f2155bb0f8fd108cdfeb2330da93de83f1fc8ac6d310f2ac1a309ed772ff3734c5fdb48d64ee0fb72e58d4e75ec0f87d7202a33f0d713df4a5237bb7e4782a60b11ee681d15eed112cee1782a1cf158f4f86b6b8bf6581c5fa2af5a733823f762d30eed7d2efdd11f2efcd1d18d76bdc5e468311f2a3c007e379f5082cea75f760e8fbfa8d782cf49dfba3d150fcbebc030b7bdc83a17f099faf472371ffe64c2ceed73460e883cefb6b3416f7ab4fc463e10f2c30e46b8927e279b94b2cee6f6cc1d087ec092cec4930c6f342f24f85fc46442caef75660e8cf85fb93d18cfd9ec783f1162ceaa37cfe19cdc5fd3ceabfb990d79d80d13eeb152cd64fe9fa85f8de7c05a33df9188cf66cbec0d0c7f50d0c7df3b8ff1f2d85bcce002ce227078ceb1d0f2cfca54e3c41fb6f74bd21ef5780f17c5d058bf53beeaf46e618ebd77a2299c77f5bba9f25c6b7f4c1c2bfbd80d19eeb07f104fda1933cb678de2603e37eba01c6ef6f57b0a8ff71ff3d72c6a8b7e8d47faee88fb507c6effd188cdf3bdc1ec67d38c739e2e3c5a63393e21723269e60fde4f22c99d677b93e307577285eb7b8fd8f27ecfe9cf50e0c7d8a79ff8ca7ec7bfefb6b412cc627db81c57e823730ead9eb1158d43fb8bce399b8fe7a0716eb5d7330c663c3fb733c67eda1fa484d2cc6c39a83a11fed193ca57a651282b13e16f3f96ebc9860bdc8d880c5fe810c2cf21bae8fe3e544d4cb23c93c5ed30a30ea071b170cff92d0f81813d443d71730eaed9a07c6f53eb7b7b1c9bee7fa117c49a6f5024b30c5b3760cb6b19ec9e3adb13331e8face93ccfbaf3883f13c23013ba8a72e05d3fd0d1b8c7c734df23b53d8df86facf9da03e7e1b80f1fc82f7e76430813e6d63e229fa3be5e333194e4cd40b52b04ded31b8fe4e4653110ff2fa0a73a736f28d9a788afd67fa180cfd6a1db0588fe3fe7f32610accfb77c3f59721f2c77c493cc5fe0aaf00e37eb731788afa4e059ed1f8361f60d48f6dde1f93d914ebc7460a46bd2fe4fd37994fc7940f6cbec1e89f98cf5f93a578def5013c433d86da6f4c51bf09b9bd4dcce982f2b39cebcbc49a22fff6b83e4dec29ea15d95932adb704c433acffebf43c776ad1fd039d7886f5d315bf3f5356f09acf77d3d1d4a5fa65734f3cc3fe035d134cf7372c30ec355b824dc413dc3fb0e9906574dcdf79c4e2f74501c6fa5b74104cdfb73c3e9d4ea6d6887f7fdb10b3e791bef1f9940ddf1ceb078fe005f5b7c5e7e3e96c86f58f8d0246fd3a76c1f311f9b377b043e31bf07c693a9fa1de19df816dec07f804bb584fa3fe5accc47a86069e517b82002cd6f775b043f39bc6e3dde9923d8eeb7332035bd47f3705ec60ff824d3cc7fecf84ebefd498c19e2faf609bfa2be6f9f0d49c2d51cff5c016e5fb2b176c8f78fb8b15d8a5fa99c9e7d7a93543fdab1b831dfafde6287844f5d10e8cf1af49bfac39c63bff024f499e98ee6fb3fb937f7d023bd4fed407bb435aafb124d37e2d5d30b53f03cf87d43eeb0d8cf5dd7803c67cb7e1f63d75587f707df1e9fece7c30a2fd5d7b30f6b3469f9269fdc792cce5594dc1587fba52ffb84c1edebecd5e326f7f41faebceb19f2cda8271bfa6133ca2e727e0118d4fb2164cfa9c2892f978af4c30eca1f1c19321d7bf2bff7e3660e34ff5e53bb043cfaf5dc174bf6c0076a97fdb929805acfcfb6d0446bdbee4ed9f0d857eddd660f89b6e2298da5f05c4ac3f687e6bc0c311ad87e07a263f9f0fda77f094da537f8067245fc5f569369a1963d29f2b31eb5fdabfe20ba6e7a777e0d188ff3eb9815906c29fa78227d04f053ca3f6b65c3f6663260fd553a93d2cfca4fec91bc95cfeea041e517f5fb8fece2662fcdd023c86ff33c1d31167cd06cf21cf5c308d679d8017d41f0df72fb3e9cc1ef3ebab14ec8c69bfc05432ed47d38885fe5d4cc9b4fe37028fc8fecb37c9649f25784cf6ebbf82e7f47dbc042fe87e05f5cf4ce8936b82e7f4fb36113ca6f17a002fe8f986b8de80fe8bef4dd28fc292cce52fa68269fc4d1effb0db2f49decd0c0c7fdc92fe2ce6131a3f6d2d98fcb7bf02cf49bf370330d68fea5a30fdde38831dfabea3fe59b2fea178b0009bd41e4f03db23aeff37713decb5f00593fc2df5a7c1ee47eb6f2330eadd17156c8ea87ff7609bfc45590b267f78d5c02e714bfa6ab2f1207ff80136c87ef22918f34dfe06c67cd186c48b018dafcee3cd99c5ee47faa48217647f99609bf4c7a0f1b2160392afa3f6da6cfc68bcd69279ff949f6093daef4ec1f067f5817831a4e76de8f70ebb9ece177c806d6abfb3235ec0dfba2bc9b4df9bc6d7ed1376ae5f5c3fe703263f6f4f520a1e53fc99102f66d4be8cf7cf7cc8e4e3d7673e784c7cdd82a7d4de5a03c3fe751e9f3265c2fca09be009d94fc2e397394b87c99f186bf08cfa4fe3fd3b9fb0e7717dacc792e97c0b8f5f58f8bb20d6793d613e5f2cc7b49fc5005bd49e35b56fb1c4fcecf1fe9e2fd9f7743dfdde582ca83f8267b049ed59f3f9686eb2eb69fd782699d62fa83de67244f67de1fa3eb79643b237ef2698f4ab9e8347d4feb0008fc99e1c6a8fbd70d05f4762261e6f9f46e3e730a6f3160618fdbbe6f9c6dc5d0ea8bd0df5bf6b88f89aebdfa25f00a5f8ff4e32edd749c0636aff66019ee17939780e7de2f92a73f643e8bb031e537b7c133c237bf5dec073ba7f44f71f1a225ea3e78f447f79dfe011ddcfe3f22dc68c29feff06e379ba0e9ed2ef0b1effb1747d44f3b1fd0d5ed2f78d0236c65cdf367c7e5fb0009858bf07cfd15f7bf082f4a3492473f96f19d8257b6df8f82e66cb05f55fbe223630ff6f797cbc98b3f67079527afe82319d17e1f6b7581a03fafdc693ccc7d7a0fb194b97da7bbb111b63f2af1bae9f0bd31810eb7cbd61612d1dd2bf94da671943c8cfe7af856d8c69be6e0563be594f2573fdd7b8bd2c1c763ded0f53c01392c7bb4ae6fdd3717d5db8c684fa4bbb134cdfa767f094e28180fba3e5c080fff15fc0b309f5ef9764d24ff13dfc43cae7a3e5d0807d6cf8782d47acbdfcfeed0b783ea1fad50ebca0ef6f3ed82079a32f30f2c5644f6c627f5acce7df655fd0e1e3930460a662dc3f1cc14beaaf40133ca178a8069bf47cdf90ccc74ff3c10e8de78dfa676c8afd09b564daff5982b1ff36a6f64c58ffd2fed40b7836a1fac504bc9c50fd6101c6fc97abc426e2b3700fc67911f3018cf33ac99d643e1edd198cf3176e07463da4fa0063bf8826be47bd53e7fe773965e345fded806db217eb1d8c78f29612b3f6923ea9603cbffb0663bf4949d7b38083c663b3022f68fceb7bb043f6118682a9ff8c02ec92bfcbe9fe7dba49f5c30d18fb636c9e2f2ce7ecf7144f2a6097e4bbe5c4ecf7140fcdc0b0b734018bfde03a784af3c53504cfb15f47dc0ffb0bbb8160ecbffc002fa95e58edc1d8bf1a4dc1163d2f36c1a8575495609c5f1a4aa6f3a134febd83e2ed2f376093faafa3e72fcc01f1f50b3c217ddd5660ac37ad63f00cfe5407cf69beef5230ea35c6026c60bfe55532e55b39d8a4eb6f73b0d8df20ee6f637fe04a32cdff03b043fd757b904cf9d9168c7ae7ed2299ce7b3692697fc898d8c2f99ddb128cf3b317f49f85fa6348f75f1a06d9afb604c37ff817b04dfa1c0ec10ee9bb4ef22ecd015d7fdd8047345eb5079e907e598e60d2d7b40363ffe3762598e2d5750e16e703d692297ffc128cf35768af897afb36108cfaee5c32d56b0f9269fe2e24f3f61731d880ff5125d37ed80558ac974c25d37ec09d64de7fe64132f73fea27d8a2f15732c9b4bea008a6f655a23fb1dfb28c24d3fe470d8c7ae1ed5132e95b2099cf8fa6e82fd4e3c32fc9b4bee3125b38ef7723ff641816d99b7d03dbe48fc22bd8a1f9f95a825d9adf4af28706eb1ede5eaf060fe97aaf133ca1fc5605237e6d8ee009e5bbd5198cf58b4efc1efb6fb71730f67bae66e025c5df8a09c6fecae020998fafd248a6f3ba909fd93b6f4f71025bb0af52329ddf9849e6cf533fc036e993924ba6f96726993f2fcec00ef57ff12e99e2c34a32ed7f0cc1f017d5bb649aef7cc9bc3f22f13c97fa4fc3f859388f5a6d25f3f69443c1d86f3b06e37c4be54ae6edd354c9bc7dd791643aefdc4aa67acf2b18e7f134f13dced325a4ef26d3379affc95f9826e2cb952a99c6f7153ca57835fd0463ff691108267fb579028b78c2001b34dee14532bf7f62814df88b4832d52f2ab085f59d0118eba3752899ecff2699eae307c9b43fb405431f9454329d2fbb97ccdb938cc02ee95b2adaebd2f8b590dfc279e448974ce3f12998e67b4d30ce074713c934ff403e0be72d2dba9fc5e607defeca014fc85f5413f094e2313b954cfea0114cfe467901233fd41792a99e6a49a6f527c198afd71bc9549fb9822dea8fba944cf9502799dad782b17e6d7592c9be6782495fea42321fdff8c7f77cbcb477b043fa1deb9229ff4904e37cc697641a7f0decd27828aa647abfc45032ade7b982495f13b25fcbc2fb0c944032d9cb93606abf5949a6f314cf60bc4fc00a24f3f6b79960d29f5a914cf11dfa53d87bf82999d6df303e16ceb755a4cf369b3fc8ff7660ec3f57de04933ff0f760ac5f665bc114df2b67c1a44f57156c507f5f1cc9b49ff3198cfdc69bab60aac7ac4f601be7fd22c1781fc95132ddaf95ccdbabd492b93e794f60e883229e87fd9ef959326fbf3a964cf9e00318fe5d9d4be6fda192fed916ce83a92f92a93dbe64ca8fd11f229e4c6f92f9f3938164ca1f4f82b1fe994ae6df871f60acf79a6bc9bc7f62f49785f3b1b75230d95775914cf30bfacfc279b22df90f47c413a621995f9f7be011f99b6d2b98e2136d021e4f683d63059e4cb83e7ae2fa19dd4f3b83e734df943118f581f22099cba33c8397549f592dc026d69b8f9279fb6f9f60e453d6156c537f5a63c9644f8160aa47695330fc8dee0aa6e7c5b964f28791648a6fe692297e580aa6fa6628da8bf8c3bc974cf9642118fa38954cf58f89649acf1692e93c27e9936361ffbdd149e6df2b9e609c1f7d96ccf549ad24d37974e887d0676721998f8fba924cf1fa9364b247713df687754f92e9fc672399ea45a23d581f35af92f9f7b9f81eef13885ac1181f4b32d5dfa10f16f6a3044bc974dee9158cfd3f892399fcbb2d993fff26fa6786fd3ba23f711ef146d7bbcc7e283f7b944ce7995ec0639aafab25784af671db0a9e52feb200cfc9fe320f2cec650f5e52beae7d49a6f319e2fe4bd457766083f453bf80b11fa878154cf6b2adc1585f37c4fde0af235530f251717fc45b9e90d7c17ca848a67add5530ad1f74a160aa8f76e279c8e7c34630f97f3b174cf2379a645abf247fe35a781f90ff2818f3c1443297571d49a67cfd4930cd87da1b58e8ff5630ece74b32cd1fa564aaef7982697dc87900633f73694ae6faa0be4aa6fd789a648aa724637fd25a32ed3f79924ceb3d3330f6f325ad64de1fd98364927f2598facbd42553fd3594ccafcf311e16cecbdf22c95c5e652a99de7f267e8ff3c9e1bb641a6f4732bf3efb008bfd812f92297eb32473794b31bec87fa30a2ccea3ee0493ff30f79269bfe23718f53e6b2099ea0377609c7f34be2453fc7b914cf91c1f2f63c0e6478a0fb6e019d58be207c1538aff8fe039e503712b99e6eb5c3297a750c04b1afff22618fb1922c1347fc73bc9b47f4630f2f9eda360b2efab2e98fcd1ea158cfd83452598f47f6b48e6cf8feec1a8b7a40bc1f05f3bc9bcffb61918f596f85d32d5e3447fbaa48ff94030f6ffdc24737bf267c416f6a7ac3f2453fe580bc67e99122cceeb9c24533d6b2299f4ad108cfce30773fd500cc9341f7792a9fe6b0ba6f5da6b2399ce372ec1d85f1d9d25f3efd59b60f89f3bc9bc3fd4a364f22f6f60ec97543792797fa8a960d8c74d32f9932918f61ed49269ff832d99e44d24f3f61a23c1d43f96fc1ef1fe1c8cf763448e645a3f16cfc3fe3d632899e2955832cdafd01f0be7d5ad4a32ad9f3792b9fcc64030ced3d792b93e9723c9b41feb02c6fe67732b99f68b7c4aa6faa3180f9c17f6499ffa032dc46bf098ec5d8f24d3fe08133ca1f530ed049e527eb7f50593ffb83c48a6fd570a7846f7d36b30e6fff25b32d5ab73c1145f28ef82299ed1e660d473b64f92a9def92698fcdd5a3cdf46fd24914cfbcd74c9b43e21e445fda611f7437cb1fe124cf65edcc02edd3f7225d3fb001e05d3fc5ebd108b7879bb93ccfbc72f05937e66a9605abf538e92493f56e021d99f6249a6fa5b2b98fc9f72914cedc3785a789f52f12698e42943c964ef17c9e40fe792697e1849e6f2648e60ac470660bc9f243b4aa6fd3fa1647ebda20826f9d24c32ef0ff55e32d5d7447f60fe2f9f25933f5a4aa6f8e62c18f9502299f40ffa61e1fd4b4a2899f6279492495ed19e29e297028cf795048d64dedef05530e29137c9e47fe4efb19f740cc6fed152134ced0f55c9fcfb488c17dedf74b9934cf64dfa3c326754ffab0cc1643f510ac67a78ba04633e77466083ecb309c026cdffa921998f476582b19fa7ba0aa6f93e5e0ba6fca6188051bf4b447bb1bf4aff00237ff60f92e9fd41f792e9bc7d2599e6f717c1d8cf247e8f7a5d160ba6fecf23c1b4bf21a0f86264e13c72f82499f2fd57c1f06727c954bfcec098df755b30d9ef7a2e98ecdf78974cf54cb447d47b3d5330e2cb0fc9b4df47dc0ffbd12ea9647a9fec1e2cde07f92e99f60b1c05239e3e4ba6f9df974cf9d74932ed9ffff17b2e5f70014f90ef288261df8664b25f5332bd6f0ae36be1fc4ef92499f22d4b3297ff593c0fefb7525dc9e4df3c30de5fa53a9229feb12553bc2ec66f46f2565f92c97f37609ca7b4df25d37e825a32adff89fba39eaafb92293fea24f3ebb7627cb13ebbfd944cfbadbf2453fe37154cf287a664d257d15e715e80fa6fcce673f2af117846f94076075e503d2188c1d88f9a9b82c91f2457c954cf38832df2279ba9647adfe70a8cfaecf62098e2ef6e2699ce27ed04533cb2d5c0d8efaa3c09a6fa46f12199ec5d3c0feba51dcd9f63517f5dbd0886bd3f4be6d76f7f30d59b62c164afde5432d5271f2453bdf0118c7abd77124ced4f1ac914afae2553bd5edc0ff3b9f32498ec6d1308a6f66c55c9341fdd83313f9ba23da8ef46a564dabf664aa6fd21f27b8a37e291643abfe249a6f9ce174cfb13a2028cf78b25b9647a1fd4a364f20fdf92c97f0c25d37a512599d607a03f22bf375ac994ffa49229ff78944cf94a2618fe48fe1ef59e4632bd3f270163becf2ac994bf8beb71fe4b0d2453bd27964cf552d13fa807da2f9269ff612499e627d13ed40f424330b55f13d763bfc6ed4332c50f37c1f0f78a64daff3d964cfb43c578637daf7a138cfd39429f719e6745fa30314df21f590ec6fedd32134cfbb10c5d30f98bcb8b64da2f3c01dbd87fbc174cf5c92001e37c4d25eee760fff1b7605a0fc8b792e9fc81b8bf43f149740263ff68fe2a989eb722fb9c8878201849a6f75f9e25d3f37cc974fee15532bdaf752898ecdd0904d37a475080512faf7e30e9432e18e7f56e82914f5482c91e0bf13ce4ff7e2698c627fb924cebcfe2f7d8ff1b3e80719eaa934cfaee3992491e717ff80f6f2699f22ff13dcecfa753c9e4bf0e92293f394aa6fd139660b2cfc8904cf9df4230e68b4a32add78bf1c0feda740ec6fbebcab3648a8f2792c95fd492299e1848a67ccd164cf25b2d58f887ab64f2379d64de3fea4132bd6f4efc7e8e7827944cfb7f1e2553bd4f134cfa6c799269ffb6781eea8df14432b57f2718ebe591645a2f8b05231f15bfc77e0f652699e229f13cbc7faa9a4ba6f361427fb03f5013fa8cf5e2c495ccbfd73dc924af180fec0fd33e24737922f17c9c6f6cc91ea626f69b5e13f082fccfe64d32d547bfc0385f565ec0886fba1cecd07a663394ccfb237b05633d627b144cf6779949a6f75fd682c93f06349f4dc5fa433d154cfaace982697d721b4aa6f3c11918f585742299fce5bd64aa67958229be5ac560ac27ac12c178bfd79b64da0ff1e37b7adf95fc3dcef70592a95ebb174cfe3a10cf47fda01c08c67e1b5f32bdcfb0134cfde12a92493ed17f585fc81f25d378dc49a6f8e253308d57249e3f417c7a904cfbcd7e30c5d382b11e982592797f24df82b1de954ba67aa6907f4af69baec138af6c8d24533d692f99ea733bc1e4ff3c0b2cde37be944cfe712499f2b1b964b2675732c52bd0670bfb45d54832e58fba64da0fb301e3fd8d4a2499d67f857ee0fc72f82d99be5f81713e3e194aa6fd49e27e588fb89ec1884fae13c9d4ffa27fb0bff0229e67537fae481f66e612fb2d776083ec3debc026eaa53618f18a3b0323fe580f04d3f5c98b64da7f63825df217852e99ce77907c33113f6c4dc134df6f1f24d37c9982b17ee04f05537b9a77c9148f88dfa3deb07a92ccfb7f73168cf365778229be48bf25537d19f28bf501e55e309d4fc94f92c97fcec158cf2b12c1e41fbb4fc9b43e3d104cf3f7f6158cf87ebb170cffe448267942c1e47fba05187f1f455049a6f5614330f4ff0d8cf3b88ab83fde3770d94ba6fafc12bca0f6a557c1c80f6dc9644fb964aa7f1492a99eb1934cf3f718bc44fd632199f2ab67c914bfd782518f16e389f78346a23dd8bfa58c25d379ba4030c95b5f2453fc5c824deacfec2299f6eb6c25d37ae74630e2b94632ad170bf9b13fb87b964cf514713df61bd4aa643a9f0f7bb31cecbf10fa28f6e3f89269bd83e2adb9399f52bd33032fa6fcfef9086cd07e8d95f81eeb1b97a964b2bf0dd8a2f958ff02dbb41fbbbb825d9a3f2eb5608a3fe28560caafb6141fcd45fdb11a83b11e180f05d37e5c5f114cfe669d8051ef6f3dc1a40fab108cf3d9e55a30ce3b1a60d4d78bab649a5fe5f7645f978364dededbb360f247452899ea616730d6e7d6779269fdfb4330f9bbd4148cf8e7058cf5b8e44932bdffe25e30f6835c24d3f9d1b964b27f713decdd16ed9b937fd2f792a99ed2082679a247b0380f33964cf3ab18af05c52f57d1df381f5baf2453bcff0046fcacfe60daaf6a4aa6f9ed4b30ce7fce25d3fedd1918f65f8af1c37e6d4f954cf9cf5a32c927fa17fbede254326faf22aec77c1bd582a9fd971d58ecef3524d3fe5ea1bfd84f97d1f82ec47a83be124cf5c8ca07dba4efbab8de9df2dffba44f0b51afeb5cc1747d32154cf61eecc043ccf74f9269ffd3098cf7495c1e25d3f9c14a30ad9f281f92693de2001ee3bcf34430e94f71114cfe259883f17ef6b52599de2f36144cfaa23c4aa6fafd188cfa79d60a267de832c1345f1786649a3f7e30cd97a2bdc86ff55232c54fb9648a6fc4f367e44fbaa1649a5f669269ffb7f87e4ef6915f2453beaf4ba6f9443c1feb655a2c99e47b944cfb532493ff6bef25d3f86ec1e2bc532318ef1712fa82f3cdc55e32b5ff1b0c7b5acd25d3df9fa04ba67ac25e32bd0f44b4cfc0f95ad13f787f759c08c6fb8f34c9141f6e2453fee80b46fe22fac7c2fbafef24933f17fa8efdf9590dc6fb8d4a8a079626ceb3d513b04bfa5a527cb664f645eb65067848f359fd8369bfec063cc27ae45532d5e31f25f3f15c3d83315f5d12c9544f740553fe1e6592a93f3dc158bfb88127145ffb9560b2873a96cce5d75f25537ce90ba6fa62f283a95e2ae49bd2f82b0f82c93ef385645a6f17ed453d39984aa6fac04c32fdfd5607c1a42ff14a30cdb7b74232e5a76f60e483fe5132cdafb960c4fb5f60c4aba52218ebaf7b30d69fb6e27b9c1f0ceec1d82f962b92c95f1d24537da7148cf93d05239f534f92e9bc8bb81fcefb1547c9544fabc1383fe68af1c67e92f807d3fe43213ff6af7662fcb19fdaa37cc410f5ebfc5e30cd1f6b07ecd2f85a347e06332faa8f1cc0d0efdb17784cf6e91a82499ff44ff004eb318f92693fdebd649adf5f05937efa67c1347fe91618e7bb6e7782112faa60ac8736a1601a8fac00a31ee98c05e37d155bc1347ff8aa647a1fc009bca0f1f21682c99f9ae2fe0b6acf360763fd62bb168cfcb0148cf7790879f1be9ad4954cf53cd17fd8bfe49f24533db1164cfdbd7d07e33cd346fc1efb17b789643a4f300423bf303760bcdfec42f669b27885ee47f38169e1bc977e124cf18d3706e3fd11fa163c22fdda9482a7b43e7805c3ff058660ba9f2b9e87f364d14632d5fb4792e9ef37fe02e33cd926028bf364efe039c9b712f747fdd9ad24d3f58231fee58b601affdb9b648a6f7230dedfe12d25d3fa760a467d3817f218145fd99f9269bda1924cefdf93df23fe7e009b349f98623c2c1a5ffb2298ee97d8609c3f32e6609c3f8b2cc9646f0bc914cf3f4aa6786607c6fe958ee20f8bcdafb43f81e20b165e93fe5c3e25d37e30f13dea3ddd093cc27ede2d18f5983804e3fd1d9a25989ed7168269ff61fa089e223f9e8167d47f862699d6f39e25d3fe68152ce2b70318e7c9ec67c9f4fe12138cf70f252918f1932b9e67507caf08f9f1be9938069b648fc15e308dbf32108cf7df88e7637f627c150cff7a0163ff42f000c6f99c88ec9b4d37a867d1fc62b3f1a3fd3c743f5b8c5ff102463cb2da82117fb4df9269bde12498ec510f25d3fef01c8cfcb8b425d37eaa5232bd5f2506235ed85a9269bda4154ce31d89f6cef17ea8037841f76b447b17d84fb6012fa9fd6b211fea49978b608a4f0c156c423f3bc9b49f3602c31e6f7bc1d0bf4a32c50fe44f6c1bfb3be22918e7e93a6287d907adb70ec063eacfd51b784afdb3d1c0c85f8a5232cd97afe0398ddf652d99fcf75130e5879d09c67c961482c97eae7bb049f74b3ac9349e86649a4f2692b93cb978be8df749b88229be509660eca7f39f24d3f922713dd6afaedf8269bcd690c7c6f9d755001e52bc5b533ceb5a63d29fab2199ce63edc1139a9f82083c25f9f5068cf745dd2cf082c6238d25d3fb1d378229bf503ec178dfce6a0946fce9bd0aa6fe5ccf04e37d0af27aca77ac1bd8a2e747df9229fe2dc136f98ffc4530e9f34a934cf9f10fa6e78be739387f48fde9daa8f7273c3e310716f67b260f9269ffde1318efefb91e24537dcd06e3fd79f6156ca0deb1904cf6a080d1fe6a2199e67b5f303d4fbb801dd8fb0a8cf8f9a611db78ff5dac8211df745f60d413133e7e2c389be17ccc183c27ff97459279ffac4b30de27947e0826f94c4532bd7f5d032fa9fd6d2a784af58e21d8a0f9e1aa48a6f53f5b30d58ffd6730de5f94ad89ed01d9ef86eb2b0b2eb0feac6fc04b92af7525d3fbcd8f6093fccde64532d9cb4d30c57fe1128cfd33eb77c1a41feb028cf7355a1f82e9f9ee1cec62ffea9b60f227892918e785f0bd8dfdafe9b3601a4f270463fda81980f17ea59adbbf3966fd41ef472dc14bf2075b1b6c60fdec4132d50f0bc9944f1cc126c693dad7bf5e9ff2075c6f63bd6b45fd33b1e6549fb8adc0580fdc7682c97fdd5ab035a5f74309c67961e50bec523c1de2f736eaf7f11c3ca4feaba8bfa6d664467fffdc080c7f53b492a97e6f08a6f686776013fab4964cf69982717ed224ff30b5b15fe81608c6fbd3ce60c48b2d8dd78cdd8ff2eb5430c5839b5730f2dff60086be74a4af33d6ff148fdd8391ff6a74bf390b30693de808b6917f64c436ce8fdf1230f6bfb7345e0b6b3a27fbe9c0f319bdaf8bfcc782a5f7e43f0f60cc4705f99f256b3fedf71c826d92ef3625b627349f68dcdf9b2c9f9b927f237d3458ffd1fc5b8327f007241f530f1aaf6b00467cad51ffb2f8674efd41fed5b6711ed0e4fac192cf39b57733022fe97ecf977feda32abf7d8c9f3e26ffa7827fa74fcf0afb9da5daaac3fe58ff6a0be8f3df21cb2f72b9ecf3bb5c0afe9b90afff77f7df5116d62247f5d81ffad87ddba87590cbfd87bfb3f1f9779605f20899fa6be8cfffb79fff167b71e9f393743ffadc1663f4e33aa96fbdedf8eccf3f18b9ffff65e16dfbc90e6009240d1fa9bf2b3bc9439ee0df4d1661eb3f64f9313a3f24f3e4e717cbfa7791e5379fecfefa91d758f05a8e94457a8a7f2b590235542335561335553335570b364ea55aa917b5669f86e951ab76ec7365b2de544dd5d99f15ff9dc67eb1fe379365a3aed827652391a85bf6b963d2ecd43dfbec982c07464726dd91fdfb4e3da9f74cce7bf5817d0c76e53ff4daff5b6479e43dfdc446e699fddb597d515fb94ebda9efea87faa906ec9a9449f8c524f85607ea501da96375a24ed5993a67d2fc1bc9c25a7a5637ec9f91ba607f02d8fd92c9f2cafe6929aafaa4284cc7be15431d2ba662b18fad380af31a8aa7f8ff3d92fcf7cc954aa0844aa4c44aa2a44aa6e44ccf5ca63d2dfbf4b6622a059b45064aa954ca45a9954669954eb92a3745537465a5acffe8b5ff37cab251b6ca9db253cf8aa2ec95036bf1513929f7ca83f2a83c29cfca5979515e9537e55df9503e952ff6dfbf9581325446ca589928d37f23596c65a6cc9505d3b393b26413cd83f261288661b044c0b00dc7700dcff08dc0088dc8888dc4488dccc88dc2288dcab8a87746fddf23c99f9345b58ca6ff23a390df6677a3353ae36adc0ccdd08d95b13636c6d6b83376c69efd391847e364dcb3cf897d8e8c1fd8e7d178329e8db3f162bc1a6fc6bbf1c1b4b0cf02685e757f9b797f9aadfe999ff8af6561527c1a5feccfb7313086c6c818315fd4186363624c8d194b9916c6b2370ad3304dd3326de3683aa68b8fc73ebe19b04f684666c465eaa53a9a31936a6726666a66666e16666956e6c5accdc66ccdcebc9a375333757365aecdcd2f33b1f2eb1cfcd764311a736bde3169becd9db9e7b21ccc8379344fe6bdf9603e9a4fe6b379365fcc57f3cd7c373fcc4ff38b7dbecd8139c467648ed967c23e63736aceccb9b960992a3334e3de322cd3b22cdb722cd7f22cdf0aacd08aacd84aacd4caacdc2aac12b9dc2f91c5ffaa2c56655dac4b3f2e566d0cad5a3d5b8dd55a9d75b56e9666e9d6ca5a5b1bd6d3f7ccd96ead3bd6522689b5b3f61677bfd6019f2393666a9dac7beb817d1ead27ebd93ab351da592fd6abf566bd5b1fd6274b98bf5884b0601e3d61b3e9c0faeea3cf1fd1d1bfa2634cb31a8bfe82f001fff74a89aca135b2c6d6c49a5a336b6e2d7acdb196cc74fa4a9ed18f85b5b34d48f2439643bf4c614e6ddb766cd77ab03ddbb7033bb42326cfc178b4633bb1533bb37336abda766197ea935dd997de92fecce74fc932307756cdc6646055aa67d77663b776675fed9badd9ba71303fec95bdb6376c249ef9676fed9924625414662bcc5e602bf766681bf6d6beb377f6de3eb0cfde3eda27fb9e8debde7eb01fed27fbd93eb319d7b35fec57656fbfb1d1b07efffcafc9f27cb16a66274cb78cc6f8b4df992c1ff6a7fd657fdb037bc8faf3c47a7864bbe6dc1edb137b6a2db924bb7e64fab161ff9cb1f6ce85fd9b91bdb0972c485698ddcc1dc3311d662c8eed384cd2bde33a9ee33b8113b218f5dd89545df17fcdecfe155954d7183ab113333bb1edda499cd4c9ec2f27778a5e0ea7640ff0ed3d6b55653d3b17361acf4cc706cc6216dc6ed8ff3b356b6be3b44ca6b9d3998173756e8e66f7938feeac9cb5b3b1b7ecf78eb365d21c8d9d73e7ec9cbd73708ecec9b9771e7ec9107ecb7a7eb6a03f234b2f09f3c683fe7ecea3f3e43c3b67e7c58cadb33db1ced6b33d6656cc3ece2b6b5dc5dab5c0a7f765ec63cfe9e374f8bc39efbd24f6d20e9d0f66fd47e7d3f9ea7fe954ce379366dffff5f6cec8e9ff5acca933b3eb9fe4f8576599ab9db3b05f9c25fba1e21a6ce2b08c23f34accd3bab6ebb8aebd702a73e17ab66b1f5d9ff9a8931b981fccdacfaca5f76ec86c2ae673e6d18ddcd84d98bde0e3746e6a7acc73b02b594fbcd93336be67377373b7704bb7722f6e6d176e63356e6b358ae67656f3afe8987a70afaaeddeecd6d55cdd5db96b3626cfeec6dd9a43f7ceddb97b3622dbde86dd837bb4576e6031ed331df7e4debb0feea3fbe43e1b817b765fdc472195fbeabeb9efec5707f7c3f9703fdd2ff7db1db84377c474f1c0fe7dec4edca93b73e7eec25daabd2f6091b8a7aa81f70fbdda9f91c533d8f46d79b6e778ae937b9e71b2179eef055ec8e4601fdbf0222ff612e6030eb6d1eb8c977a99977b85577a9577f16aaff15aaff3aedecdd33cdd5b796b36e7c7c6c9db785befce7a70471ebb0b1b5d9dfd3ff36fde8e59cec1db7b07efe89dbc7bb5f01e58467af31ebcc71f5af5bb1ff853b23c79cfded97bf15ebd37a730637362dbde3bd32f2e099368cbe6f229b39ae7de76bd0fefd3fbf2bebd8137f446ded89b78536fe6cdbd85b76441d7a3aff8866ffa966ffb8e71f45ddfb31e7c9ff9e8ad6df8811ff663e547ee8069e4831ffb899ffa198bd6be51bffd523c9189fe75599e2f7eee177ee957fec5af0d6603e6d46f7a49fc967d3aff6acead27ffd6cf77bee6ebfeca5ffb1b7febdff93b7fef1ffca37f62f966a2bef8f78aea3ff88ffe93ffec9ffd17ffd57ff3df8da3bdf03ffc4fff8bf9f485bd30c74ee57ffb037fe88f8cbd3ff627fed49ff9737fa1382c27fd6679f70f597ea97dfc99d8d25f066aa004060b112da65f6aff97c0f7fae5b7811d38fe3570cd0fe31478811f04411844411c24411a64411e14411954c14509839a7d1afb3d68838ee59af3e06a3f07b7400bf460c5fc48ef0d9560ddeb99ad30d906f6c27a0e36ecaedbe02ed8057ba50e0e4a191c8353708f0af54f35ab3f2d8b1d3c048fc153f01c9ccdd829ad73f012bcf6da15bc05ef81137c049fccf38c83afe03b1804c360148c8309fb330d66c19c49b47016c1325443253442d3188416fbc39c71e8865ee88741188651c86cc73a8709f3cb4698f29881c50f61d6fbfc300f8bb00cabf012d661e32fd421d3b41fb2387f94e5e77af6cf63d25f1db661175ec39b19875aa8b3bbafac636f27e13a5c33795e8c7b2f0d37e136bc0b77e13e3c84c7f014de870fe163f8143e8767f52d7c095fc337ab08dfc38ff033fc62d2982c22f6d97ff90e07e1301c8563e3184ed82cb40dd6e1943d63e6ee99fd7c9b53f6dfe7e1225c466aa428456444e68fcacdaf5a46b288ff862c28f1d4c8525fd5d7c88e1c7f19b9e673e41987c8376751c02375a61351c8e2f7cf88e524511c25511a65c62dca8347ab65f369cafe3c4645f01895aa1255d125aaa3266a5910d345d7e8166966678ccc75d4467ab48ad6d126da4677c629da452c82f0039ef778d68ecdb40bf6bc7d74888ed129ba77d2e8217aecefcdabed866af4d1eeaff6f2932c068fb043b77516ca2e7a8a9ea373f4629ea357f6a437e6750d16a79ca37773c2e6e8aad7eae823fa8cbea2ef68a0ce153f1a2aea8f2a2c7f9e1b8da27134096d2b8ca6d1cc8aa379b48896b11a2b56111b319bac629b85166eccbc3d9f73962c7f93b29843e33ef6e3200ea3fb388ae3f081f554cadbcafc5a1f25fe2c0b7ff68f7131d4f8f9e22cd4f73889d3388bf3b888cbb86277bcb0f87111d7d6dedd5b4f7c2639b959dcc46ddcc557ff515dfdb4f662cb3bbaca5875e25bacc5ba3f8b57f13adec4dbf82edec57ba5890fea323ec6a7f83e7e881fe327e3143fb3d866c9bc7380b86e689de373fc120ce2d76011bfc5effd88736b3055a38fdeff992c0ad34726cb6b9cb8adba8a3f4c23fe649db7641ec6b09ee3da665ed3fc0c33f6dcaff83b1ec4c378a456eaca7e51ee94713c862c3c1eecff9dfdb7493c55f57816cfe345bc4c54e3c17e4894c448ccc44aecc449dcc44bfc24484263efde9b3e8bd8d887e7a42c3b65f3d6d17c4da2244e92244db2a84872b1baf07765b1c886f8155b36bbb2fe65914fa2b8499194e69b71f26fd69e8dc9d9b998dff6c13ad953e39054c925a99326d6d5f7beea9db4ccca52f40d55c1d97d95bb385332bb4abae49adc12cd38252ceb4956c93ad924dbe42eba26bb641f1c9243724cd82c657a8ec272014364d94c9b4b2f4dee9387e4d158264f09b34ab146d2e722ff4c96e499f5e198e50e2bf6efe7e4257935dfad3e3f3f276f56ff8afa7df26ece8dfb709c7c249fc957f29d0c143d192a8b64c4abe3bdc7b4fbac8dc9c264b2df93713231de9269324be6c63159d8c76469c6a99a2aa9919aa995daa9e3dfa76eeaa5bef1603a2cbfe1b2f45910cb54b769601cd3308dd2384dd294cbc2d76dfa7cc4180aaff6932c96b0fe3453466e6b97cc8e9d344f8bb4343fd22a4c98f75a5afdfe8687f4621becee75daa46ddaa5d7d451f4a04b6fa996ea91c9fd3f978549c3644957e93adda4dbf42eddb15fedd3837d4c8fe9c9d8a7f7e943fa18fae953642b7a344c9fd373fa92bed2c8902c2ca7db4681719fbea5efe947fa997ef5feb197a56f7f9f5bfd2acb8f91e17a78607dbb5412ff2139a7dfce9069eb673ae86da5f7c54ee5fa696f8f553a4ac7e9249da6b3a4b50b65c3f42c5177fe23ef31361a7d0edad724d379ba4897999a29c63163f971b4efb3e3ccecb3e2649559999d39ea57ea0475e6665ee66781e9fa81a3a06ab0eb675096e1c5599845599c25ce23b3172e8b6af5b9d52fb2889a9add3f99d14efd4a064ccf952c553eb2cc74cc2fe61b077dcecbf477613d982316e37efaeb2ccf8aaccc2a61e7e45b98b34db24b56678d5dc763f53b6bb32ebb662c62f343d6df6ff6c2fd66de9c652c99661ce3a74ccf56d93adb306bd3b36d76e74efa5999c53363a603cf76bfcd8445369691edb23d93e5901db313d31d85db7491ddff268bf28b2ca67a973d3032b24743c99eb82ccc37f67d642ebcc4661146f69c9db397ec357bcbde852c1855577d4bdaec23fb8c9e93419a655fd97736c8d8e866a36cec8eb24936355da7cc66d9bcf7ebacbf17d93257734509552b377233b7723b77d8377d3d6dc29edad74398b7cedddccbfdec900779a828ff4496be024a7dabf8bd36f63edacc23c330ee982cbd97efed70c024619219f7799c27fe364ff32c3c30597eac4172bf95e779919779a556f925aff3266f8d63dee5d75eb7dc613f1ef9cdfdeeb3e25cb316f153aee7ab7cad9eed32dfe4dbfcced67396c1b09879c8729a4bafd9feb7719f29f93e3fe4c73cc88e4c9b1392c52afe812cbd0f559209d332db2ed5263f1926f32baed05ca6678eed5877ecbfbce6f7fe5dfe104cf347a3fd690d92d97afe943f671725cecff94bfe9abfe5ef7dd4937ff49909af719cddaf6cca73628dcd8871fe997fe5dff9404d9cc833f3613ecac7f1579ff1997dbc4c51b4cfee30c9a7f92cc9988e1d59a699f47e377c0bdffe200bb75792259fab7b854d65ea77be302c63cfd2fb1dd5bc481673943bf9b2500b8545f5b3e8814547b6dcabc0575793b1fa919f0ba33059b7d9ac557d2cbfe8f312ebaeb7e4c2e96b1785cb62ad53e1157e111461112923d52ee22229d22233f67d5ec365611ac6aecdd98cb92f8aa22caa3c2459faf6b398f5f597f9e5375958c6b34f6fcc62be8b0b7be4ce74a97227646177ae8ba6688b2e288a6b714bf25f7684303d53fc645268855eac8ab5710835e7b597a5d8b06cabaf6a7ef4d5be60cd243916dbe2aed815fbe2a0d8c5317b284ec57df1503c16cc3efa1a279764614e0b268f7128cec54bf15abcfd248b1aaa7f57164fcab22bde59fe742a3ed894b5efa33c5420875c9645f1597c15dfc5a01806398ba2c90bffd8555114a3625c4c8a692f4931ebd72c989ea8c5bc8f467b5b6677e03163b12cd5ecbb544287c540d7d250c2d22cadd22e9dd2354ebc22c2ae36c7f6a1f498cdc6a55f06e1ae64290dd731f7efc822d654c40cf3adb665c472b053191b2ecbef852cfb5e16f3cb3a9749999659996749745f163f564a7824669465599597b22e9b5e92b2cd34661b565f3b6371dc985bb4e10ffaaca7ecca6b79b3be4acd0a4a9d8d67c4a45995eb72536e992cbabdeda326368e5bebbecf64cabb7257ee7b591425cd7a6d28b552fb45961fd13ef773ea8dcd103b75c56439183e1bebc81c5b7d3d2cb0674e63cfcb63792aefcb87f2b17c6271ce86e527a398c594ca9d5d97cfe5b97c295fcbb7f29d79d12eef32adafee9bb3bebec13f337b5f7eb079bc2c3fcbaff2bb1c985d392c47e5b89c94d3c42d67e5bc5c944be3c45c7d156a7c4c0f665f1939564a655466d06746a7e0d4ef2ab2aadf62fedefb3059d8b7663f36c8d834bbaa2c26cbbd19b2deec97483a264b6b06c6a1b22bc79bc5e3a00996e5c4dc562e538ba86236cfa29545e5574115329fca66bb3ea736471513d73a313946fd9a4515dbdb2aa9d22aabf2aaa84a2bacaaea52d55553b5556745c1b1ba062b362e5ba7a355b57ebda3aff254b74aabf42467b21c83a36ad9f51f641151a5cf6571d488e9e246bd315559556b264bc4662c268b193269f64c96a37bf65a6fae2e2387e9eb5bb5a9b6d55db5abf6cab53a54c7ea54f575e17be6c717d681c5d5233e26a3fe2ebd3d570f4c96c7eaa97af646d5b97ab1aaead5dc556fd57bf5517d565ff128afabef5e966ac07ac2e5f5cf678bddb11a56a36a9ce4ce23c6c5339adf627e4bca6270efba60d1ee539ac5a36a524db98e912c51af654c965335f33a8f656bca3c34ccae9a87af9eaac6ac3f17d5f2a26637f7f5a25cb81fb615f38349d17f26b406c3ee7570377d7e75312fd6c5be38e1cbc5bd78179f8d897f092e6134b8449798c9d2b91fccbadefb159cde673059946a7449823e47f6d9c7fea32ca859283c96225912f549bdbfa4ec9e593fc6fdfa9c6df523d4af3d18a774e75d2fb9925e8ad0c8eefbbcfd525eaacbe5525f9a4b6b9c2edde56a6fcdd1e5165f98bd93244764f10773e445d68e5da55df4cbeab2b6c2cbe6b2bddc5d7655a7b697fde57039ba2fbd2c173633b1d8cde27fd5d684fde2fef27079e4b2a0adfd5add3f95256071f24d29c2faf27479eeb585d61bfb95a07ecd81e9d8a377f35545b3df7975c88ca6feec72bebc5c5ecdc4383afae58daf136d8235f75dbd7e8db92c7c3d96f5f196c5dd5333bebc5f3e2e9f97afcb777cbcf06a13d388e16578195dc66c869ddb6c66cd466c967db5ee7adbbf4c2ed3cb8ccba2f0bcc2fe5d16392f4096545373b5cdcf97f9657159f6eb90bdcdb2d8b85fd50accc08d8c83a7298f8a1fb4c620fca8d55a49b6b5519bc98ac9f9565bb56def1cc38bfaf99ecd8d336ef74cc7b8341e9b3146e6dcdef82cdeac9ddaadbddaaf83484b46e9ad0eeba88eeb84e5ca9fcce3796c6e9db008f4c9dd32590e755a67756e325990875bfd0aeaeff9cbcfb2287eaa2b6e5dd4a5f25557c68149c0bc0fb3dfa8978569716cc69eee2b6aa9cc422bfc8caa9a4590ec7f0d6b5beb7eb84347cdaf2c63af9cd73063f67faa22f6ebdeaff7d27875c746f9cbfc626d5cd6d7fa566bb55eafea35d36ca77c8af27a536fcdd8b9b23cdceb6318d6239bdec2eabb7a57efcb3d932515759e3fe695d8112074cc55efd44370523ae5b13e184cb3597e7f6fdbbc12cfda581f599b4ff57dfde0b6a1556d13b77eac9fea67e3549feb17a65b8bfab59f159cd728b02d1691ceeb37bfb1b7fe376fd994b220ca89acbdfb5abfd71ff56738a8bfeaef7a500fcba01e992ed3c27db17077aec3f29881cb324b63578feb493de5b2507ef20f7264f6a797a59ffb13f6ff0d9bfda7f5ac9ed70b9657b2fc8bc52e5b7b592f9d779bcdc98dda288de13f5a35f3ca1f8dd958c64363db47f6d9374e3f438693be6ed3fbb2c665ff34a2d0def09a9af1cb1ae0d074eb5be3357e1334a1f3d4444ddc244dcafae291e54977eeaec9ac2dfb158b429bbc299ab2a9b8bdd09ca8f42b763fcb42732397c5e4b364aa8cd2cc99c77a7369eaa6316377c3eefb7039352d0b8359d6e186c6aee99a6b738badd0b48a466b74fbc18c9b557aecc7c57c6fd64cdfc76c2c3efa5cbdd9345bebdcdcb9dbbe8283d53fac9c9b5ebfb3a4d935fbe6604d9a63736aee9b0726c363f3d43c3799bbeb6be64c2fe3e6dcbc34afcd9b948559c51f65a1d95ecaa2f1959bb5faa138cd7bf3c1a22ac7ff609e89d973bfa6686f9b4fe3e0dbcd57f31dbae167ad3483669828d60b7bde283359ae356bc66c961b46611f41369366dacc9ab971b296eeb6e1e3815566167d9b9ed3354b63efad5bb5555aa3355bcbe8ebd581396efb15c45d9f2b87ba71689dd66dbdd6ef63181e7719aadfaf09ff365752a5cfa4bdc2fdfa937a8bc76de03dc65d1b1afd4afdb658703fbbed6dba8d8c531bb7499b865ef5de666d9e9fdaa22ddbcad8370fed85595585fce4beaddba66ddbaebd5e5876dfded8bcf3ddd70ee4eabfefed5aaddf1de36baddeaeda755bb35f6dda6df0dede056f5ec89eb7734a63d7eedb437b6c4f52163f38fd41161bd97abff39945bc2c951e313ddbe5b9a2b7f7ed43fbc8b4f7686ffa9d05b5d53ef55adf326fdf9edb97f6d518861f4e5c44ed5bb269df59ccb3cf3b7bc9645ef5f949fbd17eb65fed773b6887eda865b3068b697aed123b19f67e906bf6b69db0acf8d44edb593b6751cb397875ed76d12e3bb59fdbeace38754a67746667c571922779af472c8e39fe4116e75759d84c99a94967770e93e6dab99d67192cd770d89cb063be56ef7c7b5b9f7d3753baa00bbba8da767197746997b1b0b8e8ca7e6dc8db75157bfea5abbbc6df756dd775d7eed6699ddeadfaac8e723b5ec95b326b687b8fe2fb4e65dce75db7ee36eeaedb76776c02d875fbe6397aef0eddb13b75f7dd43f7f8ab2cbfc563b40fdae2fbb87b59fabdb76ef7d43de7cfddb97be95e6bc738b9ae7de8ff1a4166c38eb3eddeba77964f9cba8feeb3fbeabe9d85fad80dba6137eac6d19d195b0b33f6b56ed24dbb5937ef16ddf2aa5e95ab71358d9dfbca7763f9bd1ce6d00ffa99fd6ad97bc7bada4cbe73b7bb322bb18ee1cadd5d5deffdea3109dfaffe35b886d7280fa302b66ffe1d1d13eb0b72bf196a7fdcef5de36b52b2d65d53ebe19ab119ef6c9dddcf7eb5f79ab3ff5a5ccb6bc5e29897ebe55a5bfeb5b9b6d7ee7acd27d7db55bb321d5533b30bdf8da69c5c57d7f57573dde6937efe655aa8f4750ce623a2be06c6f7638dd87c74ecfd38d515ade7de5aaa8171bcde5d77d7bdda3847b5edab2c5993353c07367f9c07f8afd7f89ca7ebe17a8cd953afa7eb3d3dddbf998b6641d1eef5e1fa787dba3e5fcfd797eb6bad3069deaeefd78febe7f5ebfa5d75d74139bc0eafa3eb987d26d7e975769d7b6bd60b8bcccccceb92dba2f5f327f2dd7d73c7fc1c27ebcc52c3a79b7263f955348c4c36f3b9aa6dbf33591cbebef31764b99937eb66df1cd6379ecb66877edf8bad140b2fb9b139d0b8f7b51b0b346f8152ddc25b748bd5db2db9a5b7ec96df8a68d025e15755df4a7377ab6e97f0e3c626c65b5bac6e9db1ef772df0fd16d6af1f5eafb0d86cc4246aee7236b3dcaeb7db4d4bc6d133cb2d44fefb87ddf3ffb52ce6e34dbfad6eeb86c5860d1b0d663515f3f8ecff6d8fc5eecc9fe593dbe6b6bdddd5a5fa62d7cae2b65386b7fdeda0d4ea58dd869f55773bde4eb7fbcbddede1f6787bba3ddfce51623f180fb71733643e7af24759983454afa4fbbfdede54f7f67efb48068a226ac97f7d7d3f2a6e9fb7afdbf76dc02b565f2cb35c58776c86d89a73162f6d6e43e3741bddc6b7c96d9abab759eadce6f1241ef77bf56f8bc80a5fa2eab6d4d4a8d394a85202f5ac199aa9599aadb1b16e5acdedade4e78fbbef3396c82759cc58f3345f0bb4508bf242d1d20ce3f287d3597fc25e1eb5584bb454cbfad981dd7b617e7a119385f624cdedad96f733a75668a5566917ad564325615ed0b65fe289b25322add15aadd3aedacdf84c1dd573979aa6e9da4a5b6b1b7ba16da99af0ebc8b03f2a8bb1ad7667dada9db653bba0b9bddbef2c7f37642dcfa1f8f22fc8926a7beda01db59376af3db008efce9cfa1f2c3bda71eb6451633568f92e43ed517bd29eb5b3f6a2bd46b935d2de8c85f61e4fb40f36269f2c216e94246ccb2767e999da97f6ad0d3436a6edeeefd98bf5dcee2c35f2b59136d6260a8bd955d72eed525db37111f562ef2fcbf2a84db59936d716da52578d7da8318f79673d9993b86e6fecb363518056b6bac26c79a71bbad92a9dab5bc64db77527327457c97596ee844e7fe622ce597e32d4033dd4233dd6133dedc7e0d74f98f5b2447e2f95bbd7333dcfebb2d20bf6fbfe0c84266b797c86ff2b3a16157aa957fa45aff5466ff5aedf11c3f2de39af8f322fa45ffb798faffbfaa6ebbe66817ed3355dd757fa5adfe85bfdcef850bff59dbe77c6d5413fe847fda4dfeb0ffaa3fe14bd07aece722db28dde4ef86e0bf3e78fe9e8e764adbfe8af4aa36ead86cdca34abf4f6eff075c43fbd8724c9f537fdbdb8ea1ffaa7fea57febcc07588affed6ed3ca56a3f7beea637afd3a561f4733895c33d687fa888dd0589fe8537da6cff585be5ca92b6565accc95e5eddd3c7ded778d38d5ca5e39b6e1eec90f0b0ff68b2cae7170dc95bbf2567e3c535f56415f310a4e2cdeea57df6a5a7bfb73b2048fab701505b355bc4a56e92a5be5ed78555807166b6efa5ccb3afe248bc9b28265dee5ceed8565b4b755b9aa5697555dcd568d3e5ab5b1c7f7c23129dcddaaeb76abab395e752c5bbbe3f66e626ef955166f7533e3b261f9d270a5b1f178e335567efeafaf2afd9571311f57fa6ab55a6bb362b8daacb6abbbcbc76ad75767d2a05f79b0b67d0ecf64796372ec983c0adfc570cff7819ef85efea3d8cf6bdcbbdf76e87ff8cd6abf3aac8ead1d7cb84edffa7e9e679aa6b63b6627bfcae2af4eab7b9643ad570fcdfbea919fce727f3a052c4f69fca971795a3dafceab176db67ad5ebd5dbea7df5b1fa8cbff26ef595f615a31fbbddf98749f7c177bc0f9d57f6795b7daf06d17e35147b2cfbbdbccd9339ee7739b58bd5a8d72e173b9358e3acdf65b1ceab717d67ec5693d574355bcd51c3b7708ec1fdf3314c92af16abe55a5d2b6b439badcdb5b5b6d7ceda5d7bc69e45cffb1f7bdefb489eaffb32097a7b62b3105fc7e3fba9f9beea7e36627e6318266b7f1dacc3c0091cbecb91452c6431bd17f85d967e7473dbd8d7efeb681dab77e20c2d9745f9b16be9cff8b1f03198af933c5d5bc1789daeb375be2ed6e5ba5a5fd6b5b5b437741601fbf7fbd5b30fbe57a25f6bb15a16fc34ceba757416dfb3e83e9ce9d77ecd807df6ebceefd6cc62bc50c8d2eeb411f366bfd90bd7d26374b7beadb53573e4b2fee5fed5793f628aba5eaf37ebedfa6ebd5befd787f5717d5adfaf1fd68feba790c5fdd69eef5ac1b8b04fbf9ef76a7e704b3e584bbedb9f5950bffba8f7e2eb7e97fcb1df83b63eaf5f02d736cc28effa73246c8e1feb193f73d2e7373edfafe4b23c69bb7e5dbf35cafa7dfdc1e617c8f2f7f78ffdf38ff3283f69566595d196e7f5e7fa6bfdbd1eac87eb11d335bea38c568b980e4db0afbf8fa6c6acc7cffc04c6b2dfadd7cbe90f7a7bea77569a43967505d5e0a69a713e6171d79d36d1f3f5b8f776eb49bfa3b61f93cb389f38de7aba9eade7eabdd8d32b674be7afc8f2d3d9621ecf798f6a11dcaf179774bdcc5f36ea46d9181bb37faead164ebf368979c230a77db5439cb4602336661ab91436d3dc39174ba1fd0a2caa7f6511e4ae0f0b36569fdfacc6cce59f8ce3c6c9271b77e36dfc4d607da94f56f35b9bfed2b8fc7eb6381a2a9ee2da55972acd26dc449b78936cd24db6c9f9aa0bcb6eac27ffdbf68bbc782effdf76ae6549552488eee733a6f615fdba7dbb6356a899203e5a6db51f3b4444f0c14b1489987f9faa8202a4bd37b457331113b9d010943a661645669d93b6d9e37b5a6207f5ce54d90a7b630ee6244ed8f3c2d4532060d9afca32ad349d280e4d481246103617866ae8b10a11c3b2b36c86248e1fe983506f36cb7bd7f59cde1344592e9dd23decc91c0e90c0115250a0014d680104cf80a691efb672cf7c667bc1191af13a6a6c8d2ed758790ea8a041fba8a546ca6681e23a2c67047dffd9b4a1130fb9e20cbad0833e2ce34747a706bc2c0e85fef98baee722bfd4f4404187dc51957668dcd0c2d0b660004318c12b8c61025378f3347fb13bb0acbe5df0f8ab3a31cdd0e01d3ee0136ee036e9c2ddb1ed7437f7e95459c13d7169c0bcfd003fe0117eb2bb700a4ff08c94def1b9eef5e9337dca1557dfc052a8ea8aefae6ed98c216b9d45ef4ffa485524aebeeaa181333471eeaa5edbb7f71bff47100423b4421517519a70a1686ff7106f632dbe471b97ebe0a027b3a4874ec8a276354cdffc603e255ca59dee228325a4b8c2354b719e8d29bbca113774bcb961e319c8f15c1f6327bd3884873ca043ee1bdcda7dce35430f7d0c30740718e10e636fed2f7ddd7f0cc2861b3aa1161991827b3cecfa8d66ec6112bce2115354f693204dfadb96d559cd6ccab25f967cd21655d61b3627a2d61336b0892d72a03dc20e53978ef868d8fa229f5faee75a7fe935c07eb745b764495b08ec7d0311d5f514356ca3bffd70224ff774bfb3f1822818bb5ad8461d3bd8c5de6e837df6fe0507fb088787258ef015c7d68bd0fa1a7cc79ef3f0a8623d21573237714a0f6bb636061dba66de58d0211dac1b76bfe293ef6039b59ad281736c393795d713791dceebf80ee712f96e3009ddd07544a5d179e13613e6e4967d435ca3ec245389a0cad56bfd58aad7bf7aee9fc122ff178e852391e3f3ba9c7d9399eff23a234758aeb7d96b869def6fe7fb0f468e60216ac18678a2378b9890bd31a42ee18c42f1d27b720dcf09969c1fb0909d7904e76ec356026184f0baafc89d66956e3da5fecbf6f6f369d67545d6b5c5d924df135a7ec542cb5e26e49a7cbfc201afa191da8093df3604f79408ae9ab0ad576031ca9ca3caca1635c83935653d22cfb448ce3bcf6adc752c32e62a9eb9443352aa19aaaae7e288acea1ab4729f2cb50e052bf5d4871cf952b02732ae47d9db635ea9689b453c57bc2062244752ad5f5e84c592fcc3e1ee4c949995795bc152fdbea830d827ffc84c20e9088f91d2fb395e4b665b520152c3422492ebf27dce3a1163b10a2cc60916c11710bad85b6ed69a7320cdc09db863ceee0a1533e20c1ccef6c814cd995eb334f9fc9ecf4b7ebda988b5c23b67b1108e04dff03d63da7fc32f8b9a5f4caeec2fc7c9c7e6f5bc5e154b795ce2e596e3679fca7dd222b624e3bc58134fe3a1e0bbcd199677fcb81c4b3d6a7ea7d6aeb0fb7e71ceb9a3f5738b7cbeda2ba7de3ba79caf57e52fff15fb1fcbbfd3fefcfbaf3ffe0193cc32fd</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/kioslave/media/mimetypes/floppy5_mounted.desktop b/kioslave/media/mimetypes/floppy5_mounted.desktop index bc782281a..b0284cadb 100644 --- a/kioslave/media/mimetypes/floppy5_mounted.desktop +++ b/kioslave/media/mimetypes/floppy5_mounted.desktop @@ -58,7 +58,7 @@ Comment[pt_BR]=Disquete 5¼" Montado Comment[ro]=Dischetă 5¼" montată Comment[ru]=Ð¡Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñкета 5¼" Comment[rw]=Disikete 5¼" Yashyizwemo -Comment[se]=ÄŒatnon 5¼-dibtqmaskearru +Comment[se]=ÄŒatnon 5¼-dibmaskearru Comment[sk]=Pripojená disketa 5¼" Comment[sl]=Priklopljena disketna enota 5¼" Comment[sr]=Монтиран 5¼" флопи diff --git a/kioslave/media/mimetypes/floppy5_unmounted.desktop b/kioslave/media/mimetypes/floppy5_unmounted.desktop index da021c3fc..53e53b46f 100644 --- a/kioslave/media/mimetypes/floppy5_unmounted.desktop +++ b/kioslave/media/mimetypes/floppy5_unmounted.desktop @@ -58,7 +58,7 @@ Comment[pt_BR]=Disquete 5¼" Desmontado Comment[ro]=Dischetă 5¼" nemontată Comment[ru]=ÐžÑ‚Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñкета 5¼" Comment[rw]=Disikete 5¼" Yakuwemo -Comment[se]=Gálgajuvvon 5¼-dibtqmaskearru +Comment[se]=Gálgajuvvon 5¼-dibmaskearru Comment[sk]=Nepripojená disketa 5¼" Comment[sl]=Odklopljena disketna enota 5¼" Comment[sr]=Демонтиран 5¼" флопи diff --git a/kioslave/media/mimetypes/floppy_mounted.desktop b/kioslave/media/mimetypes/floppy_mounted.desktop index edc6fbd4e..0a51605fd 100644 --- a/kioslave/media/mimetypes/floppy_mounted.desktop +++ b/kioslave/media/mimetypes/floppy_mounted.desktop @@ -58,7 +58,7 @@ Comment[pt_BR]=Disquete Montado Comment[ro]=Dischetă montată Comment[ru]=Ð¡Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñкета Comment[rw]=Disikete Yashyizwemo -Comment[se]=ÄŒatnon dibtqmaskearru +Comment[se]=ÄŒatnon dibmaskearru Comment[sk]=Pripojená disketa Comment[sl]=Priklopljena disketna enota Comment[sr]=Монтиран флопи diff --git a/kioslave/media/mimetypes/floppy_unmounted.desktop b/kioslave/media/mimetypes/floppy_unmounted.desktop index 774825f00..e17ab5557 100644 --- a/kioslave/media/mimetypes/floppy_unmounted.desktop +++ b/kioslave/media/mimetypes/floppy_unmounted.desktop @@ -58,7 +58,7 @@ Comment[pt_BR]=Disquete Desmontado Comment[ro]=Dischetă nemontată Comment[ru]=ÐžÑ‚Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ð´Ð¸Ñкета Comment[rw]=Disikete Yakuwemo -Comment[se]=Gálgajuvvon dibtqmaskearru +Comment[se]=Gálgajuvvon dibmaskearru Comment[sk]=Nepripojená disketa Comment[sl]=Odklopljena disketna enota Comment[sr]=Демонтиран флопи diff --git a/kioslave/media/mounthelper/decryptdialog.ui b/kioslave/media/mounthelper/decryptdialog.ui index e528ab833..15790c8ef 100644 --- a/kioslave/media/mounthelper/decryptdialog.ui +++ b/kioslave/media/mounthelper/decryptdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DecryptDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -55,13 +55,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32</width> <height>32</height> @@ -70,7 +70,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>41</height> @@ -109,7 +109,7 @@ <string><p><b>%1</b> is an encrypted storage device.</p> <p>Please enter the password to decrypt the storage device.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -117,7 +117,7 @@ </widget> <widget class="QLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -189,7 +189,7 @@ <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -197,5 +197,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kioslave/media/propsdlgplugin/propertiespage.cpp b/kioslave/media/propsdlgplugin/propertiespage.cpp index 70eab1b83..14ac2b33f 100644 --- a/kioslave/media/propsdlgplugin/propertiespage.cpp +++ b/kioslave/media/propsdlgplugin/propertiespage.cpp @@ -60,49 +60,49 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) options[key] = value; } - if (!options.tqcontains("ro")) + if (!options.contains("ro")) option_ro->hide(); else option_ro->setChecked(options["ro"] == "true"); connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("quiet")) + if (!options.contains("quiet")) option_quiet->hide(); else option_quiet->setChecked(options["quiet"] == "true"); connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("sync")) + if (!options.contains("sync")) option_sync->hide(); else option_sync->setChecked(options["sync"] == "true"); connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("atime")) + if (!options.contains("atime")) option_atime->hide(); else option_atime->setChecked(options["atime"] == "true"); connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("flush")) + if (!options.contains("flush")) option_flush->hide(); else option_flush->setChecked(options["flush"] == "true"); connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("utf8")) + if (!options.contains("utf8")) option_utf8->hide(); else option_utf8->setChecked(options["utf8"] == "true"); connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("uid")) + if (!options.contains("uid")) option_uid->hide(); else option_uid->setChecked(options["uid"] == "true"); connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("shortname")) + if (!options.contains("shortname")) { option_shortname->hide(); text_shortname->hide(); @@ -118,7 +118,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) ); } - if (!options.tqcontains("journaling")) + if (!options.contains("journaling")) { text_journaling->hide(); option_journaling->hide(); @@ -140,11 +140,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) option_automount->setChecked(options["automount"] == "true"); connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); - if (!options.tqcontains("journaling") && - !options.tqcontains("shortname") && - !options.tqcontains("uid") && - !options.tqcontains("utf8") && - !options.tqcontains("flush")) + if (!options.contains("journaling") && + !options.contains("shortname") && + !options.contains("uid") && + !options.contains("utf8") && + !options.contains("flush")) groupbox_specific->hide(); } else { @@ -163,31 +163,31 @@ bool PropertiesPage::save() { TQStringList result; - if (options.tqcontains("ro")) + if (options.contains("ro")) result << TQString("ro=%1").arg(option_ro->isChecked() ? "true" : "false"); - if (options.tqcontains("quiet")) + if (options.contains("quiet")) result << TQString("quiet=%1").arg(option_quiet->isChecked() ? "true" : "false"); - if (options.tqcontains("sync")) + if (options.contains("sync")) result << TQString("sync=%1").arg(option_sync->isChecked() ? "true" : "false"); - if (options.tqcontains("atime")) + if (options.contains("atime")) result << TQString("atime=%1").arg(option_atime->isChecked() ? "true" : "false"); - if (options.tqcontains("flush")) + if (options.contains("flush")) result << TQString("flush=%1").arg(option_flush->isChecked() ? "true" : "false"); - if (options.tqcontains("utf8")) + if (options.contains("utf8")) result << TQString("utf8=%1").arg(option_utf8->isChecked() ? "true" : "false"); - if (options.tqcontains("uid")) + if (options.contains("uid")) result << TQString("uid=%1").arg(option_uid->isChecked() ? "true" : "false"); - if (options.tqcontains("shortname")) + if (options.contains("shortname")) result << TQString("shortname=%1").arg(short_names[option_shortname->currentItem()]); - if (options.tqcontains("journaling")) + if (options.contains("journaling")) result << TQString("journaling=%1").arg(journales[option_journaling->currentItem()]); TQString mp = option_mountpoint->text(); diff --git a/kioslave/media/propsdlgplugin/propertiespagegui.ui b/kioslave/media/propsdlgplugin/propertiespagegui.ui index 7c91db351..c4de4c059 100644 --- a/kioslave/media/propsdlgplugin/propertiespagegui.ui +++ b/kioslave/media/propsdlgplugin/propertiespagegui.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PropertiesPageGUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -40,7 +40,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <vbox> <property name="name"> @@ -92,7 +92,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -150,7 +150,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <vbox> <property name="name"> @@ -191,7 +191,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -256,7 +256,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -352,7 +352,7 @@ Display the short name as is; store a long name when the short name is not all u <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -383,5 +383,5 @@ Display the short name as is; store a long name when the short name is not all u <functions> <function returnType="bool">hasChanged()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kioslave/nfs/kio_nfs.cpp b/kioslave/nfs/kio_nfs.cpp index 8df2c3609..debe19d3d 100644 --- a/kioslave/nfs/kio_nfs.cpp +++ b/kioslave/nfs/kio_nfs.cpp @@ -454,18 +454,18 @@ void NFSProtocol::openConnection() (xdrproc_t) xdr_exports, (char*)&exportlist,total_timeout); if (!checkForError(clnt_stat, 0, m_currentHost.latin1())) return; - fhstatus fhtqStatus; + fhstatus fhStatus; bool atLeastOnceSucceeded(FALSE); for(; exportlist!=0;exportlist = exportlist->ex_next) { kdDebug(7121) << "found export: " << exportlist->ex_dir << endl; - memset(&fhtqStatus, 0, sizeof(fhtqStatus)); + memset(&fhStatus, 0, sizeof(fhStatus)); clnt_stat = clnt_call(m_client, MOUNTPROC_MNT,(xdrproc_t) xdr_dirpath, (char*)(&(exportlist->ex_dir)), - (xdrproc_t) xdr_fhstatus,(char*) &fhtqStatus,total_timeout); - if (fhtqStatus.fhs_status==0) { + (xdrproc_t) xdr_fhstatus,(char*) &fhStatus,total_timeout); + if (fhStatus.fhs_status==0) { atLeastOnceSucceeded=TRUE; NFSFileHandle fh; - fh=fhtqStatus.fhstatus_u.fhs_fhandle; + fh=fhStatus.fhstatus_u.fhs_fhandle; TQString fname; if ( exportlist->ex_dir[0] == '/' ) fname = KIO::encodeFileName(exportlist->ex_dir + 1); @@ -473,7 +473,7 @@ void NFSProtocol::openConnection() fname = KIO::encodeFileName(exportlist->ex_dir); m_handleCache.insert(TQString("/")+fname,fh); m_exportedDirs.append(fname); - // kdDebug() <<"appending file -"<<fname<<"- with FH: -"<<fhtqStatus.fhstatus_u.fhs_fhandle<<"-"<<endl; + // kdDebug() <<"appending file -"<<fname<<"- with FH: -"<<fhStatus.fhstatus_u.fhs_fhandle<<"-"<<endl; } } if (!atLeastOnceSucceeded) @@ -807,7 +807,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& struct passwd *user = getpwuid( uid ); if ( user ) { - m_usercache.insert( uid, new TQString(TQString::tqfromLatin1(user->pw_name)) ); + m_usercache.insert( uid, new TQString(TQString::fromLatin1(user->pw_name)) ); atom.m_str = user->pw_name; } else @@ -825,7 +825,7 @@ void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& struct group *grp = getgrgid( gid ); if ( grp ) { - m_groupcache.insert( gid, new TQString(TQString::tqfromLatin1(grp->gr_name)) ); + m_groupcache.insert( gid, new TQString(TQString::fromLatin1(grp->gr_name)) ); atom.m_str = grp->gr_name; } else diff --git a/kioslave/nfs/mount.h b/kioslave/nfs/mount.h index 68924ed30..c3b8c217f 100644 --- a/kioslave/nfs/mount.h +++ b/kioslave/nfs/mount.h @@ -177,7 +177,7 @@ struct ppathcnf { short pc_pipe_buf; u_char pc_vdisable; char pc_xxx; - short pc_tqmask[2]; + short pc_mask[2]; }; typedef struct ppathcnf ppathcnf; #ifdef __cplusplus diff --git a/kioslave/nfs/mount.x b/kioslave/nfs/mount.x index fa51ab502..4aaf97de9 100644 --- a/kioslave/nfs/mount.x +++ b/kioslave/nfs/mount.x @@ -117,8 +117,8 @@ struct ppathcnf { short pc_path_max; /* max path name length (/x/y/x/.. ) */ short pc_pipe_buf; /* size of a pipe (bytes) */ u_char pc_vdisable; /* safe char to turn off c_cc[i] */ - char pc_xxx; /* tqalignment padding; cc_t == char */ - short pc_tqmask[2]; /* validity and boolean bits */ + char pc_xxx; /* alignment padding; cc_t == char */ + short pc_mask[2]; /* validity and boolean bits */ }; program MOUNTPROG { @@ -136,7 +136,7 @@ program MOUNTPROG { MOUNTPROC_NULL(void) = 0; /* - * If fhs_status is 0, then fhs_fhandle tqcontains the + * If fhs_status is 0, then fhs_fhandle contains the * file handle for the directory. This file handle may * be used in the NFS protocol. This procedure also adds * a new entry to the mount list for this client mounting @@ -148,7 +148,7 @@ program MOUNTPROG { /* * Returns the list of remotely mounted filesystems. The - * mountlist tqcontains one entry for each hostname and + * mountlist contains one entry for each hostname and * directory pair. */ mountlist @@ -197,7 +197,7 @@ program MOUNTPROG { MOUNTPROC_NULL(void) = 0; /* - * If fhs_status is 0, then fhs_fhandle tqcontains the + * If fhs_status is 0, then fhs_fhandle contains the * file handle for the directory. This file handle may * be used in the NFS protocol. This procedure also adds * a new entry to the mount list for this client mounting @@ -209,7 +209,7 @@ program MOUNTPROG { /* * Returns the list of remotely mounted filesystems. The - * mountlist tqcontains one entry for each hostname and + * mountlist contains one entry for each hostname and * directory pair. */ mountlist diff --git a/kioslave/nfs/mount_xdr.c b/kioslave/nfs/mount_xdr.c index fc393ec45..38a43ca28 100644 --- a/kioslave/nfs/mount_xdr.c +++ b/kioslave/nfs/mount_xdr.c @@ -234,14 +234,14 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp) } buf = XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_vector(xdrs, (char *)objp->pc_tqmask, 2, sizeof(short), (xdrproc_t)xdr_short)) { + if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { return (FALSE); } } else { { register short *genp; - for ( i = 0,genp=objp->pc_tqmask; + for ( i = 0,genp=objp->pc_mask; i < 2; i++){ IXDR_PUT_SHORT(buf,*genp++); } @@ -288,14 +288,14 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp) } buf = XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT); if (buf == NULL) { - if (!xdr_vector(xdrs, (char *)objp->pc_tqmask, 2, sizeof(short), (xdrproc_t)xdr_short)) { + if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { return (FALSE); } } else { { register short *genp; - for ( i = 0,genp=objp->pc_tqmask; + for ( i = 0,genp=objp->pc_mask; i < 2; i++){ *genp++ = IXDR_GET_SHORT(buf); } @@ -328,7 +328,7 @@ xdr_ppathcnf(XDR *xdrs, ppathcnf *objp) if (!xdr_char(xdrs, &objp->pc_xxx)) { return (FALSE); } - if (!xdr_vector(xdrs, (char *)objp->pc_tqmask, 2, sizeof(short), (xdrproc_t)xdr_short)) { + if (!xdr_vector(xdrs, (char *)objp->pc_mask, 2, sizeof(short), (xdrproc_t)xdr_short)) { return (FALSE); } return (TRUE); diff --git a/kioslave/nfs/nfs_prot.x b/kioslave/nfs/nfs_prot.x index 90dfd5dce..cd21123c7 100644 --- a/kioslave/nfs/nfs_prot.x +++ b/kioslave/nfs/nfs_prot.x @@ -207,7 +207,7 @@ struct readargs { }; /* - * tqStatus OK portion of remote read reply + * Status OK portion of remote read reply */ struct readokres { fattr attributes; /* attributes, need for pagin*/ diff --git a/kioslave/nntp/nntp.cpp b/kioslave/nntp/nntp.cpp index 2b689b0be..b109bb58a 100644 --- a/kioslave/nntp/nntp.cpp +++ b/kioslave/nntp/nntp.cpp @@ -589,7 +589,7 @@ bool NNTPProtocol::fetchGroupXOVER( unsigned long first, bool ¬Supported ) TQStringList::ConstIterator it2 = fields.constBegin(); ++it2; // first entry is the serial number for ( ; it != headers.constEnd() && it2 != fields.constEnd(); ++it, ++it2 ) { - if ( (*it).tqcontains( "Message-ID:", false ) ) { + if ( (*it).contains( "Message-ID:", false ) ) { msgId = (*it2); continue; } diff --git a/kioslave/pop3/pop3.cc b/kioslave/pop3/pop3.cc index 2b1b0f19a..0ab27f63b 100644 --- a/kioslave/pop3/pop3.cc +++ b/kioslave/pop3/pop3.cc @@ -242,8 +242,8 @@ POP3Protocol::Resp POP3Protocol::getResponse(char *r_buf, unsigned int r_len, QMIN(r_len, (buf[4] == ' ' ? recv_len - 5 : recv_len - 4))); } - TQString command = TQString::tqfromLatin1(cmd); - TQString serverMsg = TQString::tqfromLatin1(buf).mid(5).stripWhiteSpace(); + TQString command = TQString::fromLatin1(cmd); + TQString serverMsg = TQString::fromLatin1(buf).mid(5).stripWhiteSpace(); if (command.left(4) == "PASS") { command = i18n("PASS <your password>"); @@ -353,7 +353,7 @@ int POP3Protocol::loginAPOP( char *challenge, KIO::AuthInfo &ai ) { char buf[512]; - TQString apop_string = TQString::tqfromLatin1("APOP "); + TQString apop_string = TQString::fromLatin1("APOP "); if (m_sUser.isEmpty() || m_sPass.isEmpty()) { // Prompt for usernames if (!openPassDlg(ai)) { @@ -461,7 +461,7 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) { #ifdef HAVE_LIBSASL2 char buf[512]; - TQString sasl_buffer = TQString::tqfromLatin1("AUTH"); + TQString sasl_buffer = TQString::fromLatin1("AUTH"); int result; sasl_conn_t *conn = NULL; @@ -525,13 +525,13 @@ int POP3Protocol::loginSASL( KIO::AuthInfo &ai ) TQByteArray challenge, tmp; - TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mechusing ); + TQString firstCommand = "AUTH " + TQString::fromLatin1( mechusing ); challenge.setRawData( out, outlen ); KCodecs::base64Encode( challenge, tmp ); challenge.resetRawData( out, outlen ); if ( !tmp.isEmpty() ) { firstCommand += " "; - firstCommand += TQString::tqfromLatin1( tmp.data(), tmp.size() ); + firstCommand += TQString::fromLatin1( tmp.data(), tmp.size() ); } challenge.resize( 2049 ); @@ -624,7 +624,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai ) m_sOldUser = m_sUser; m_sOldPass = m_sPass; - TQString one_string = TQString::tqfromLatin1("USER "); + TQString one_string = TQString::fromLatin1("USER "); one_string.append( m_sUser ); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -638,7 +638,7 @@ bool POP3Protocol::loginPASS( KIO::AuthInfo &ai ) return false; } - one_string = TQString::tqfromLatin1("PASS "); + one_string = TQString::fromLatin1("PASS "); one_string.append(m_sPass); if ( command(one_string.local8Bit(), buf, sizeof(buf)) != Ok ) { @@ -821,7 +821,7 @@ void POP3Protocol::special(const TQByteArray & aData) if (qstrcmp(buf, ".\r\n") == 0) break; result += " " + TQString(buf).left(strlen(buf) - 2) - .tqreplace(" ", "-"); + .replace(" ", "-"); } } if (supports_apop) @@ -1176,7 +1176,7 @@ void POP3Protocol::listDir(const KURL &) uds_url.setUser(m_sUser); uds_url.setPass(m_sPass); uds_url.setHost(m_sServer); - uds_url.setPath(TQString::tqfromLatin1("/download/%1").arg(i + 1)); + uds_url.setPath(TQString::fromLatin1("/download/%1").arg(i + 1)); atom.m_str = uds_url.url(); atom.m_long = 0; entry.append(atom); diff --git a/kioslave/remote/kdedmodule/remotedirnotify.cpp b/kioslave/remote/kdedmodule/remotedirnotify.cpp index f87c6bb96..e6e2359a6 100644 --- a/kioslave/remote/kdedmodule/remotedirnotify.cpp +++ b/kioslave/remote/kdedmodule/remotedirnotify.cpp @@ -105,7 +105,7 @@ inline void evil_hack(const KURL::List &list) { KURL url = (*it).upURL(); - if (!notified.tqcontains(url)) + if (!notified.contains(url)) { notifier.FilesAdded(url); notified.append(url); diff --git a/kioslave/remote/remoteimpl.cpp b/kioslave/remote/remoteimpl.cpp index ed117d03f..47e41b821 100644 --- a/kioslave/remote/remoteimpl.cpp +++ b/kioslave/remote/remoteimpl.cpp @@ -74,7 +74,7 @@ void RemoteImpl::listRoot(TQValueList<KIO::UDSEntry> &list) const for(; name!=endf; ++name) { - if (!names_found.tqcontains(*name)) + if (!names_found.contains(*name)) { entry.clear(); createEntry(entry, *dirpath, *name); diff --git a/kioslave/sftp/kio_sftp.cpp b/kioslave/sftp/kio_sftp.cpp index ab9c78707..456d47084 100644 --- a/kioslave/sftp/kio_sftp.cpp +++ b/kioslave/sftp/kio_sftp.cpp @@ -291,7 +291,7 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool return; } - tqStatus info = sftpGet(src, offset, fd); + Status info = sftpGet(src, offset, fd); if ( info.code != 0 ) { // Should we keep the partially downloaded file ?? @@ -324,12 +324,12 @@ void sftpProtocol::sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool finished(); } -sftpProtocol::tqStatus sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t offset, int fd ) +sftpProtocol::Status sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t offset, int fd ) { int code; sftpFileAttr attr(remoteEncoding()); - tqStatus res; + Status res; res.code = 0; res.size = 0; @@ -337,7 +337,7 @@ sftpProtocol::tqStatus sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t o // stat the file first to get its size if( (code = sftpStat(src, attr)) != SSH2_FX_OK ) { - return doProcesstqStatus(code, src.prettyURL()); + return doProcessStatus(code, src.prettyURL()); } // We cannot get file if it is a directory @@ -348,7 +348,7 @@ sftpProtocol::tqStatus sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t o } KIO::filesize_t fileSize = attr.fileSize(); - TQ_UINT32 pflags = SSH2_FXF_READ; + Q_UINT32 pflags = SSH2_FXF_READ; attr.clear(); TQByteArray handle; @@ -368,7 +368,7 @@ sftpProtocol::tqStatus sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t o // How big should each data packet be? Definitely not bigger than 64kb or // you will overflow the 2 byte size variable in a sftp packet. - TQ_UINT32 len = 60*1024; + Q_UINT32 len = 60*1024; code = SSH2_FX_OK; kdDebug(KIO_SFTP_DB) << "sftpGet(): offset = " << offset << endl; @@ -385,7 +385,7 @@ sftpProtocol::tqStatus sftpProtocol::sftpGet( const KURL& src, KIO::filesize_t o if( mimeBuffer.size() > 1024 || offset == fileSize ) { // determine mimetype KMimeMagicResult* result = - KMimeMagic::self()->tqfindBufferFileType(mimeBuffer, src.fileName()); + KMimeMagic::self()->findBufferFileType(mimeBuffer, src.fileName()); kdDebug(KIO_SFTP_DB) << "sftpGet(): mimetype is " << result->mimeType() << endl; mimeType(result->mimeType()); @@ -449,13 +449,13 @@ void sftpProtocol::get(const KURL& url) { return; // Get resume offset - TQ_UINT64 offset = config()->readUnsignedLongNumEntry("resume"); + Q_UINT64 offset = config()->readUnsignedLongNumEntry("resume"); if( offset > 0 ) { canResume(); kdDebug(KIO_SFTP_DB) << "get(): canResume(), offset = " << offset << endl; } - tqStatus info = sftpGet(url, offset); + Status info = sftpGet(url, offset); if (info.code != 0) { @@ -772,16 +772,16 @@ void sftpProtocol::openConnection() { kdDebug(KIO_SFTP_DB) << "openConnection(): Sending SSH2_FXP_INIT packet." << endl; TQByteArray p; TQDataStream packet(p, IO_WriteOnly); - packet << (TQ_UINT32)5; // packet length - packet << (TQ_UINT8) SSH2_FXP_INIT; // packet type - packet << (TQ_UINT32)SSH2_FILEXFER_VERSION; // client version + packet << (Q_UINT32)5; // packet length + packet << (Q_UINT8) SSH2_FXP_INIT; // packet type + packet << (Q_UINT32)SSH2_FILEXFER_VERSION; // client version putPacket(p); getPacket(p); TQDataStream s(p, IO_ReadOnly); - TQ_UINT32 version; - TQ_UINT8 type; + Q_UINT32 version; + Q_UINT8 type; s >> type; kdDebug(KIO_SFTP_DB) << "openConnection(): Got type " << type << endl; @@ -895,7 +895,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool } } else if( code != SSH2_FX_NO_SUCH_FILE ) { - processtqStatus(code, origUrl.prettyURL()); + processStatus(code, origUrl.prettyURL()); return; } @@ -910,7 +910,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool KURL partUrl( origUrl ); partUrl.setFileName( partUrl.fileName() + ".part" ); - TQ_UINT64 offset = 0; + Q_UINT64 offset = 0; bool partExists = false; bool markPartial = config()->readBoolEntry("MarkPartial", true); @@ -966,7 +966,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool } } else { - processtqStatus(code, partUrl.prettyURL()); + processStatus(code, partUrl.prettyURL()); return; } } @@ -974,7 +974,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool // Determine the url we will actually write to... KURL writeUrl (markPartial ? partUrl:origUrl); - TQ_UINT32 pflags = 0; + Q_UINT32 pflags = 0; if( overwrite && !resume ) pflags = SSH2_FXF_WRITE | SSH2_FXF_CREAT | SSH2_FXF_TRUNC; else if( !overwrite && !resume ) @@ -1007,7 +1007,7 @@ void sftpProtocol::sftpPut( const KURL& dest, int permissions, bool resume, bool return; } else { - processtqStatus(code, writeUrl.prettyURL()); + processStatus(code, writeUrl.prettyURL()); return; } } @@ -1134,7 +1134,7 @@ void sftpProtocol::stat ( const KURL& url ){ int code; sftpFileAttr attr(remoteEncoding()); if( (code = sftpStat(url, attr)) != SSH2_FX_OK ) { - processtqStatus(code, url.prettyURL()); + processStatus(code, url.prettyURL()); return; } else { @@ -1157,7 +1157,7 @@ void sftpProtocol::mimetype ( const KURL& url ){ if( !mConnected ) return; - TQ_UINT32 pflags = SSH2_FXF_READ; + Q_UINT32 pflags = SSH2_FXF_READ; TQByteArray handle, mydata; sftpFileAttr attr(remoteEncoding()); int code; @@ -1166,8 +1166,8 @@ void sftpProtocol::mimetype ( const KURL& url ){ return; } - TQ_UINT32 len = 1024; // Get first 1k for determining mimetype - TQ_UINT64 offset = 0; + Q_UINT32 len = 1024; // Get first 1k for determining mimetype + Q_UINT64 offset = 0; code = SSH2_FX_OK; while( offset < len && code == SSH2_FX_OK ) { if( (code = sftpRead(handle, offset, len, mydata)) == SSH2_FX_OK ) { @@ -1210,7 +1210,7 @@ void sftpProtocol::listDir(const KURL& url) { if( (code = sftpOpenDirectory(url, handle)) != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "listDir(): open directory failed" << endl; - processtqStatus(code, url.prettyURL()); + processStatus(code, url.prettyURL()); return; } @@ -1219,13 +1219,13 @@ void sftpProtocol::listDir(const KURL& url) { while( code == SSH2_FX_OK ) { code = sftpReadDir(handle, url); if( code != SSH2_FX_OK && code != SSH2_FX_EOF ) - processtqStatus(code, url.prettyURL()); + processStatus(code, url.prettyURL()); kdDebug(KIO_SFTP_DB) << "listDir(): return code = " << code << endl; } if( (code = sftpClose(handle)) != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "listdir(): closing of directory failed" << endl; - processtqStatus(code, url.prettyURL()); + processStatus(code, url.prettyURL()); return; } @@ -1256,13 +1256,13 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ if (permissions != -1) attr.setPermissions(permissions); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); - s << (TQ_UINT8)SSH2_FXP_MKDIR; + s << Q_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); + s << (Q_UINT8)SSH2_FXP_MKDIR; s << id; s.writeBytes(path.data(), len); s << attr; @@ -1272,7 +1272,7 @@ void sftpProtocol::mkdir(const KURL&url, int permissions){ putPacket(p); getPacket(p); - TQ_UINT8 type; + Q_UINT8 type; TQDataStream r(p, IO_ReadOnly); r >> type >> id; @@ -1344,14 +1344,14 @@ void sftpProtocol::rename(const KURL& src, const KURL& dest, bool overwrite){ // If overwrite is specified, then simply remove the existing file/dir first... if( (code = sftpRemove( dest, !S_ISDIR(attr.permissions()) )) != SSH2_FX_OK ) { - processtqStatus(code); + processStatus(code); return; } } // Do the renaming... if( (code = sftpRename(src, dest)) != SSH2_FX_OK ) { - processtqStatus(code); + processStatus(code); return; } @@ -1404,7 +1404,7 @@ void sftpProtocol::symlink(const TQString& target, const KURL& dest, bool overwr // What error code do we return? Code for the original symlink command // or for the last command or for both? The second one is implemented here. if( failed ) - processtqStatus(code); + processStatus(code); finished(); } @@ -1429,7 +1429,7 @@ void sftpProtocol::chmod(const KURL& url, int permissions){ if( code == SSH2_FX_FAILURE ) error(ERR_CANNOT_CHMOD, TQString::null); else - processtqStatus(code, url.prettyURL()); + processStatus(code, url.prettyURL()); } finished(); } @@ -1445,7 +1445,7 @@ void sftpProtocol::del(const KURL &url, bool isfile){ int code; if( (code = sftpRemove(url, isfile)) != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "del(): sftpRemove failed with error code " << code << endl; - processtqStatus(code, url.prettyURL()); + processStatus(code, url.prettyURL()); } finished(); } @@ -1454,7 +1454,7 @@ void sftpProtocol::slave_status() { kdDebug(KIO_SFTP_DB) << "slave_status(): connected to " << mHost << "? " << mConnected << endl; - slavetqStatus ((mConnected ? mHost : TQString::null), mConnected); + slaveStatus ((mConnected ? mHost : TQString::null), mConnected); } bool sftpProtocol::getPacket(TQByteArray& msg) { @@ -1538,20 +1538,20 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << TQ_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (TQ_UINT8)SSH2_FXP_REALPATH; + s << Q_UINT32(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (Q_UINT8)SSH2_FXP_REALPATH; s << id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); - TQ_UINT8 type; + Q_UINT8 type; TQDataStream r(p, IO_ReadOnly); r >> type >> id; @@ -1561,7 +1561,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ } if( type == SSH2_FXP_STATUS ) { - TQ_UINT32 code; + Q_UINT32 code; r >> code; return code; } @@ -1571,7 +1571,7 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ return -1; } - TQ_UINT32 count; + Q_UINT32 count; r >> count; if( count != 1 ) { kdError(KIO_SFTP_DB) << "sftpRealPath(): Bad number of file attributes for realpath command" << endl; @@ -1589,9 +1589,9 @@ int sftpProtocol::sftpRealPath(const KURL& url, KURL& newUrl){ return SSH2_FX_OK; } -sftpProtocol::tqStatus sftpProtocol::doProcesstqStatus(TQ_UINT8 code, const TQString& message) +sftpProtocol::Status sftpProtocol::doProcessStatus(Q_UINT8 code, const TQString& message) { - tqStatus res; + Status res; res.code = 0; res.size = 0; res.text = message; @@ -1628,8 +1628,8 @@ sftpProtocol::tqStatus sftpProtocol::doProcesstqStatus(TQ_UINT8 code, const TQSt } /** Process SSH_FXP_STATUS packets. */ -void sftpProtocol::processtqStatus(TQ_UINT8 code, const TQString& message){ - tqStatus st = doProcesstqStatus( code, message ); +void sftpProtocol::processStatus(Q_UINT8 code, const TQString& message){ + Status st = doProcessStatus( code, message ); if( st.code != 0 ) error( st.code, st.text ); } @@ -1642,21 +1642,21 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (TQ_UINT8)SSH2_FXP_OPENDIR; - s << (TQ_UINT32)id; + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (Q_UINT8)SSH2_FXP_OPENDIR; + s << (Q_UINT32)id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1666,7 +1666,7 @@ int sftpProtocol::sftpOpenDirectory(const KURL& url, TQByteArray& handle){ } if( type == SSH2_FXP_STATUS ) { - TQ_UINT32 errCode; + Q_UINT32 errCode; r >> errCode; return errCode; } @@ -1691,21 +1691,21 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){ kdDebug(KIO_SFTP_DB) << "sftpClose()" << endl; - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); - s << (TQ_UINT8)SSH2_FXP_CLOSE; - s << (TQ_UINT32)id; + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); + s << (Q_UINT8)SSH2_FXP_CLOSE; + s << (Q_UINT32)id; s << handle; putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1718,7 +1718,7 @@ int sftpProtocol::sftpClose(const TQByteArray& handle){ return -1; } - TQ_UINT32 code; + Q_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "sftpClose: close failed with err code " << code << endl; @@ -1735,14 +1735,14 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); - s << (TQ_UINT8)SSH2_FXP_SETSTAT; - s << (TQ_UINT32)id; + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + attr.size()); + s << (Q_UINT8)SSH2_FXP_SETSTAT; + s << (Q_UINT32)id; s.writeBytes(path.data(), len); s << attr; @@ -1750,7 +1750,7 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1764,7 +1764,7 @@ int sftpProtocol::sftpSetStat(const KURL& url, const sftpFileAttr& attr){ return -1; } - TQ_UINT32 code; + Q_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "sftpSetStat(): set stat failed with err code " << code << endl; @@ -1781,21 +1781,21 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){ TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (TQ_UINT8)(isfile ? SSH2_FXP_REMOVE : SSH2_FXP_RMDIR); - s << (TQ_UINT32)id; + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (Q_UINT8)(isfile ? SSH2_FXP_REMOVE : SSH2_FXP_RMDIR); + s << (Q_UINT32)id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1808,7 +1808,7 @@ int sftpProtocol::sftpRemove(const KURL& url, bool isfile){ return -1; } - TQ_UINT32 code; + Q_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "del(): del failed with err code " << code << endl; @@ -1828,16 +1828,16 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){ uint slen = srcPath.length(); uint dlen = destPath.length(); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + slen + 4 /*str length*/ + dlen); - s << (TQ_UINT8)SSH2_FXP_RENAME; - s << (TQ_UINT32)id; + s << (Q_UINT8)SSH2_FXP_RENAME; + s << (Q_UINT32)id; s.writeBytes(srcPath.data(), slen); s.writeBytes(destPath.data(), dlen); @@ -1845,7 +1845,7 @@ int sftpProtocol::sftpRename(const KURL& src, const KURL& dest){ getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -1871,8 +1871,8 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ // url is needed so we can lookup the link destination kdDebug(KIO_SFTP_DB) << "sftpReadDir(): " << url << endl; - TQ_UINT32 id, expectedId, count; - TQ_UINT8 type; + Q_UINT32 id, expectedId, count; + Q_UINT8 type; sftpFileAttr attr (remoteEncoding()); attr.setDirAttrsFlag(true); @@ -1880,9 +1880,9 @@ int sftpProtocol::sftpReadDir(const TQByteArray& handle, const KURL& url){ TQByteArray p; TQDataStream s(p, IO_WriteOnly); id = expectedId = mMsgId++; - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); - s << (TQ_UINT8)SSH2_FXP_READDIR; - s << (TQ_UINT32)id; + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size()); + s << (Q_UINT8)SSH2_FXP_READDIR; + s << (Q_UINT32)id; s << handle; putPacket(p); @@ -1943,13 +1943,13 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Path: " << path << endl; //kdDebug(KIO_SFTP_DB) << "sftpReadLink(): Encoded Size: " << len << endl; - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (TQ_UINT8)SSH2_FXP_READLINK; + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (Q_UINT8)SSH2_FXP_READLINK; s << id; s.writeBytes(path.data(), len); @@ -1957,7 +1957,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ putPacket(p); getPacket(p); - TQ_UINT8 type; + Q_UINT8 type; TQDataStream r(p, IO_ReadOnly); r >> type >> id; @@ -1967,7 +1967,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ } if( type == SSH2_FXP_STATUS ) { - TQ_UINT32 code; + Q_UINT32 code; r >> code; kdDebug(KIO_SFTP_DB) << "sftpReadLink(): read link failed with code " << code << endl; return code; @@ -1978,7 +1978,7 @@ int sftpProtocol::sftpReadLink(const KURL& url, TQString& target){ return -1; } - TQ_UINT32 count; + Q_UINT32 count; r >> count; if( count != 1 ) { kdError(KIO_SFTP_DB) << "sftpReadLink(): Bad number of file attributes for realpath command" << endl; @@ -2005,16 +2005,16 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ kdDebug(KIO_SFTP_DB) << "sftpSymLink(" << target << " -> " << destPath << ")" << endl; - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + tlen + 4 /*str length*/ + dlen); - s << (TQ_UINT8)SSH2_FXP_SYMLINK; - s << (TQ_UINT32)id; + s << (Q_UINT8)SSH2_FXP_SYMLINK; + s << (Q_UINT32)id; s.writeBytes(target.data(), tlen); s.writeBytes(destPath.data(), dlen); @@ -2022,7 +2022,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2035,7 +2035,7 @@ int sftpProtocol::sftpSymLink(const TQString& _target, const KURL& dest){ return -1; } - TQ_UINT32 code; + Q_UINT32 code; r >> code; if( code != SSH2_FX_OK ) { kdError(KIO_SFTP_DB) << "sftpSymLink(): rename failed with err code " << code << endl; @@ -2052,21 +2052,21 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); - s << (TQ_UINT8)SSH2_FXP_LSTAT; - s << (TQ_UINT32)id; + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len); + s << (Q_UINT8)SSH2_FXP_LSTAT; + s << (Q_UINT32)id; s.writeBytes(path.data(), len); putPacket(p); getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2075,7 +2075,7 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { } if( type == SSH2_FXP_STATUS ) { - TQ_UINT32 errCode; + Q_UINT32 errCode; r >> errCode; kdError(KIO_SFTP_DB) << "sftpStat(): stat failed with code " << errCode << endl; return errCode; @@ -2133,23 +2133,23 @@ int sftpProtocol::sftpStat(const KURL& url, sftpFileAttr& attr) { } -int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, +int sftpProtocol::sftpOpen(const KURL& url, const Q_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle) { kdDebug(KIO_SFTP_DB) << "sftpOpen(" << url << ", handle" << endl; TQCString path = remoteEncoding()->encode(url.path()); uint len = path.length(); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + len + 4 /*pflags*/ + attr.size()); - s << (TQ_UINT8)SSH2_FXP_OPEN; - s << (TQ_UINT32)id; + s << (Q_UINT8)SSH2_FXP_OPEN; + s << (Q_UINT32)id; s.writeBytes(path.data(), len); s << pflags; s << attr; @@ -2158,7 +2158,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2167,7 +2167,7 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, } if( type == SSH2_FXP_STATUS ) { - TQ_UINT32 errCode; + Q_UINT32 errCode; r >> errCode; return errCode; } @@ -2188,19 +2188,19 @@ int sftpProtocol::sftpOpen(const KURL& url, const TQ_UINT32 pflags, } -int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data) +int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, TQByteArray& data) { // kdDebug(KIO_SFTP_DB) << "sftpRead( offset = " << offset << ", len = " << len << ")" << endl; TQByteArray p; TQDataStream s(p, IO_WriteOnly); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size() + 8 /*offset*/ + 4 /*length*/); - s << (TQ_UINT8)SSH2_FXP_READ; - s << (TQ_UINT32)id; + s << (Q_UINT8)SSH2_FXP_READ; + s << (Q_UINT32)id; s << handle; s << offset; // we don't have a convienient 64 bit int so set upper int to zero s << len; @@ -2209,7 +2209,7 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ getPacket(p); TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2218,7 +2218,7 @@ int sftpProtocol::sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ } if( type == SSH2_FXP_STATUS ) { - TQ_UINT32 errCode; + Q_UINT32 errCode; r >> errCode; kdError(KIO_SFTP_DB) << "sftpRead: read failed with code " << errCode << endl; return errCode; @@ -2241,14 +2241,14 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, c TQByteArray p; TQDataStream s(p, IO_WriteOnly); - TQ_UINT32 id, expectedId; + Q_UINT32 id, expectedId; id = expectedId = mMsgId++; - s << (TQ_UINT32)(1 /*type*/ + 4 /*id*/ + + s << (Q_UINT32)(1 /*type*/ + 4 /*id*/ + 4 /*str length*/ + handle.size() + 8 /*offset*/ + 4 /* data size */ + data.size()); - s << (TQ_UINT8)SSH2_FXP_WRITE; - s << (TQ_UINT32)id; + s << (Q_UINT8)SSH2_FXP_WRITE; + s << (Q_UINT32)id; s << handle; s << offset; // we don't have a convienient 64 bit int so set upper int to zero s << data; @@ -2264,7 +2264,7 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, c // kdDebug(KIO_SFTP_DB) << "sftpWrite(): received packet [" << p << "]" << endl; TQDataStream r(p, IO_ReadOnly); - TQ_UINT8 type; + Q_UINT8 type; r >> type >> id; if( id != expectedId ) { @@ -2278,7 +2278,7 @@ int sftpProtocol::sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, c return -1; } - TQ_UINT32 code; + Q_UINT32 code; r >> code; return code; } diff --git a/kioslave/sftp/kio_sftp.h b/kioslave/sftp/kio_sftp.h index f5b561325..22cd4764a 100644 --- a/kioslave/sftp/kio_sftp.h +++ b/kioslave/sftp/kio_sftp.h @@ -83,7 +83,7 @@ private: // Private variables /** Version of the sftp protocol we are using. */ int sftpVersion; - struct tqStatus + struct Status { int code; KIO::filesize_t size; @@ -109,9 +109,9 @@ private: // private methods /** Send an sftp packet to stdin of the ssh process. */ bool putPacket(TQByteArray& p); /** Process SSH_FXP_STATUS packets. */ - void processtqStatus(TQ_UINT8, const TQString& message = TQString::null); + void processStatus(Q_UINT8, const TQString& message = TQString::null); /** Process SSH_FXP_STATUS packes and return the result. */ - tqStatus doProcesstqStatus(TQ_UINT8, const TQString& message = TQString::null); + Status doProcessStatus(Q_UINT8, const TQString& message = TQString::null); /** Opens a directory handle for url.path. Returns true if succeeds. */ int sftpOpenDirectory(const KURL& url, TQByteArray& handle); /** Closes a directory or file handle. */ @@ -131,9 +131,9 @@ private: // private methods /** Stats a file. */ int sftpStat(const KURL& url, sftpFileAttr& attr); /** No descriptions */ - int sftpOpen(const KURL& url, const TQ_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle); + int sftpOpen(const KURL& url, const Q_UINT32 pflags, const sftpFileAttr& attr, TQByteArray& handle); /** No descriptions */ - int sftpRead(const TQByteArray& handle, KIO::filesize_t offset, TQ_UINT32 len, TQByteArray& data); + int sftpRead(const TQByteArray& handle, KIO::filesize_t offset, Q_UINT32 len, TQByteArray& data); /** No descriptions */ int sftpWrite(const TQByteArray& handle, KIO::filesize_t offset, const TQByteArray& data); @@ -143,7 +143,7 @@ private: // private methods void sftpCopyGet(const KURL& dest, const KURL& src, int mode, bool overwrite); /** */ - tqStatus sftpGet( const KURL& src, KIO::filesize_t offset = 0, int fd = -1); + Status sftpGet( const KURL& src, KIO::filesize_t offset = 0, int fd = -1); void sftpPut( const KURL& dest, int permissions, bool resume, bool overwrite, int fd = -1); }; #endif diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp index 20bdab679..9b2323bd6 100644 --- a/kioslave/sftp/ksshprocess.cpp +++ b/kioslave/sftp/ksshprocess.cpp @@ -30,7 +30,7 @@ * of ssh we are using. This command and its arguments are passed to * PTYProcess for execution. Once ssh is started we scan each line of input * from stdin, stderr, and the pty for recognizable strings. The recognizable - * strings are taken from several string tables. Each table tqcontains a string + * strings are taken from several string tables. Each table contains a string * for each specific version of ssh we support and a string for a generic * version of OpenSSH and commercial SSH incase we don't recognized the * specific ssh version strings (as when a new SSH version is released after @@ -206,7 +206,7 @@ void KSshProcess::removeSignalHandlers() { KSshProcess::KSshProcess() : mVersion(UNKNOWN_VER), mConnected(false), mRunning(false), mConnectState(0) { - mSshPath = KStandardDirs::findExe(TQString::tqfromLatin1("ssh")); + mSshPath = KStandardDirs::findExe(TQString::fromLatin1("ssh")); kdDebug(KSSHPROC) << "KSshProcess::KSshProcess(): ssh path [" << mSshPath << "]" << endl; @@ -292,7 +292,7 @@ TQString KSshProcess::versionStr() { return TQString::null; } - return TQString::tqfromLatin1(versionStrs[mVersion]); + return TQString::fromLatin1(versionStrs[mVersion]); } */ @@ -380,8 +380,8 @@ bool KSshProcess::setOptions(const SshOptList& opts) { // since KSshProcess depends on specific setting of these for // preforming authentication correctly. tmp = (*it).str.latin1(); - if( tmp.tqcontains("NumberOfPasswordPrompts") || - tmp.tqcontains("StrictHostKeyChecking") ) { + if( tmp.contains("NumberOfPasswordPrompts") || + tmp.contains("StrictHostKeyChecking") ) { mError = ERR_INVALID_OPT; return false; } @@ -762,7 +762,7 @@ bool KSshProcess::connect() { // STATE_WAIT_PROMPT: // Get a line of input from the ssh process. Check the contents // of the line to determine the next state. Ignore the line - // if we don't recognize its contents. If the line tqcontains + // if we don't recognize its contents. If the line contains // the continue prompt, we have an error since we should never // get that line in this state. Set ERR_INVALID_STATE error // and return false. @@ -776,7 +776,7 @@ bool KSshProcess::connect() { i18n("Error encountered while talking to ssh."); mConnectState = STATE_FATAL; } - else if( line.find(TQString::tqfromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { + else if( line.find(TQString::fromLatin1(passwordPrompt[mVersion]), 0, false) != -1 ) { mConnectState = STATE_TRY_PASSWD; } else if( line.find(passphrasePrompt[mVersion]) != -1 ) { diff --git a/kioslave/sftp/ksshprocess.h b/kioslave/sftp/ksshprocess.h index 5130628e4..7fe8dd814 100644 --- a/kioslave/sftp/ksshprocess.h +++ b/kioslave/sftp/ksshprocess.h @@ -116,9 +116,9 @@ public: */ class SshOpt { public: - TQ_UINT32 opt; + Q_UINT32 opt; TQString str; - TQ_INT32 num; + Q_INT32 num; bool boolean; }; diff --git a/kioslave/sftp/process.cpp b/kioslave/sftp/process.cpp index 6ef02108e..ca99b36bb 100644 --- a/kioslave/sftp/process.cpp +++ b/kioslave/sftp/process.cpp @@ -4,7 +4,7 @@ * This file is part of the KDE project, module kdesu. * Copyright (C) 1999,2000 Geert Jansen <jansen@kde.org> * - * This file tqcontains code from TEShell.C of the KDE konsole. + * This file contains code from TEShell.C of the KDE konsole. * Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de> * * This is free software; you can use this library under the GNU Library @@ -260,7 +260,7 @@ int MyPtyProcess::exec(TQCString command, QCStringList args) // From now on, terminal output goes through the tty. TQCString path; - if (command.tqcontains('/')) + if (command.contains('/')) path = command; else { diff --git a/kioslave/sftp/sftpfileattr.cpp b/kioslave/sftp/sftpfileattr.cpp index 7b98cb17f..42148ac28 100644 --- a/kioslave/sftp/sftpfileattr.cpp +++ b/kioslave/sftp/sftpfileattr.cpp @@ -44,7 +44,7 @@ sftpFileAttr::sftpFileAttr(KRemoteEncoding* encoding){ /** Constructor to initialize the file attributes on declaration. */ sftpFileAttr::sftpFileAttr(Q_ULLONG size, uid_t uid, gid_t gid, mode_t permissions, time_t atime, - time_t mtime, TQ_UINT32 extendedCount) { + time_t mtime, Q_UINT32 extendedCount) { clear(); mDirAttrs = false; mSize = size; @@ -124,22 +124,22 @@ UDSEntry sftpFileAttr::entry() { /** Use to output the file attributes to a sftp packet */ TQDataStream& operator<< (TQDataStream& s, const sftpFileAttr& fa) { - s << (TQ_UINT32)fa.mFlags; + s << (Q_UINT32)fa.mFlags; if( fa.mFlags & SSH2_FILEXFER_ATTR_SIZE ) { s << (Q_ULLONG)fa.mSize; } if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID ) - { s << (TQ_UINT32)fa.mUid << (TQ_UINT32)fa.mGid; } + { s << (Q_UINT32)fa.mUid << (Q_UINT32)fa.mGid; } if( fa.mFlags & SSH2_FILEXFER_ATTR_PERMISSIONS ) - { s << (TQ_UINT32)fa.mPermissions; } + { s << (Q_UINT32)fa.mPermissions; } if( fa.mFlags & SSH2_FILEXFER_ATTR_ACMODTIME ) - { s << (TQ_UINT32)fa.mAtime << (TQ_UINT32)fa.mMtime; } + { s << (Q_UINT32)fa.mAtime << (Q_UINT32)fa.mMtime; } if( fa.mFlags & SSH2_FILEXFER_ATTR_EXTENDED ) { - s << (TQ_UINT32)fa.mExtendedCount; + s << (Q_UINT32)fa.mExtendedCount; // XXX: Write extensions to data stream here // s.writeBytes(extendedtype).writeBytes(extendeddata); } @@ -175,7 +175,7 @@ TQDataStream& operator>> (TQDataStream& s, sftpFileAttr& fa) { fa.setFileSize(fileSize); } - TQ_UINT32 x; + Q_UINT32 x; if( fa.mFlags & SSH2_FILEXFER_ATTR_UIDGID ) { s >> x; fa.setUid(x); @@ -218,7 +218,7 @@ void sftpFileAttr::getUserGroupNames(){ kdDebug(7120) << "Decoded: " << longName << endl; - // Find the beginning of the third field which tqcontains the user name. + // Find the beginning of the third field which contains the user name. while( field != 2 ) { if( longName[i].isSpace() ) { field++; i++; @@ -233,7 +233,7 @@ void sftpFileAttr::getUserGroupNames(){ } // i is the first character of the space between fields 3 and 4 - // user tqcontains the owner's user name + // user contains the owner's user name while( i < l && longName[i].isSpace() ) { i++; } @@ -243,7 +243,7 @@ void sftpFileAttr::getUserGroupNames(){ group.append(longName[i]); i++; } - // group tqcontains the name of the group. + // group contains the name of the group. } mUserName = user; @@ -295,8 +295,8 @@ void sftpFileAttr::clear(){ } /** Return the size of the sftp attribute. */ -TQ_UINT32 sftpFileAttr::size() const{ - TQ_UINT32 size = 4; // for the attr flag +Q_UINT32 sftpFileAttr::size() const{ + Q_UINT32 size = 4; // for the attr flag if( mFlags & SSH2_FILEXFER_ATTR_SIZE ) size += 8; diff --git a/kioslave/sftp/sftpfileattr.h b/kioslave/sftp/sftpfileattr.h index 105b6d7c0..a2a9cf87e 100644 --- a/kioslave/sftp/sftpfileattr.h +++ b/kioslave/sftp/sftpfileattr.h @@ -42,7 +42,7 @@ private: // Private attributes TQString mFilename; /** Specifies which fields of the file attribute are available. */ - TQ_UINT32 mFlags; + Q_UINT32 mFlags; /** Size of the file in bytes. Should be 64 bit safe. */ Q_ULLONG mSize; @@ -64,7 +64,7 @@ private: // Private attributes /** Number of file attribute extensions. Not currently implemented */ - TQ_UINT32 mExtendedCount; + Q_UINT32 mExtendedCount; /** Longname of the file as found in a SSH_FXP_NAME sftp packet. These contents are parse to return the file's owner name and @@ -74,10 +74,10 @@ private: // Private attributes TQString mUserName; TQString mGroupName; - /** If file is a link, tqcontains the destination of the link */ + /** If file is a link, contains the destination of the link */ TQString mLinkDestination; - /** If resource is a link, tqcontains the type the link,e.g. file,dir... */ + /** If resource is a link, contains the type the link,e.g. file,dir... */ mode_t mLinkType; /** Whether >> operator should read filename and longname from the stream. */ @@ -95,10 +95,10 @@ public: /** Constructor to initialize the file attributes on declaration. */ sftpFileAttr(Q_ULLONG size_, uid_t uid_, gid_t gid_, mode_t permissions_, - time_t atime_, time_t mtime_, TQ_UINT32 extendedCount_ = 0); + time_t atime_, time_t mtime_, Q_UINT32 extendedCount_ = 0); /** Return the size of the sftp attribute not including filename or longname*/ - TQ_UINT32 size() const; + Q_UINT32 size() const; /** Clear all attributes and flags. */ void clear(); diff --git a/kioslave/smb/kio_smb_browse.cpp b/kioslave/smb/kio_smb_browse.cpp index dd60e7cbc..e9a216fd3 100644 --- a/kioslave/smb/kio_smb_browse.cpp +++ b/kioslave/smb/kio_smb_browse.cpp @@ -208,11 +208,11 @@ KURL SMBSlave::checkURL(const KURL& kurl) const // smb:/ normaly have no userinfo // we must redirect ourself to remove the username and password - if (surl.tqcontains('@') && !surl.tqcontains("smb://")) { + if (surl.contains('@') && !surl.contains("smb://")) { KURL url(kurl); url.setPath("/"+kurl.url().right( kurl.url().length()-kurl.url().find('@') -1)); TQString userinfo = kurl.url().mid(5, kurl.url().find('@')-5); - if(userinfo.tqcontains(':')) { + if(userinfo.contains(':')) { url.setUser(userinfo.left(userinfo.find(':'))); url.setPass(userinfo.right(userinfo.length()-userinfo.find(':')-1)); } else { @@ -409,7 +409,7 @@ void SMBSlave::listDir( const KURL& kurl ) udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::tqfromLatin1("application/x-smb-server"); + atom.m_str = TQString::fromLatin1("application/x-smb-server"); udsentry.append(atom); } @@ -429,7 +429,7 @@ void SMBSlave::listDir( const KURL& kurl ) udsentry.append(atom); atom.m_uds = KIO::UDS_MIME_TYPE; - atom.m_str = TQString::tqfromLatin1("application/x-smb-workgroup"); + atom.m_str = TQString::fromLatin1("application/x-smb-workgroup"); udsentry.append(atom); atom.m_uds = KIO::UDS_URL; diff --git a/kioslave/smb/kio_smb_file.cpp b/kioslave/smb/kio_smb_file.cpp index fd6331403..8c7867722 100644 --- a/kioslave/smb/kio_smb_file.cpp +++ b/kioslave/smb/kio_smb_file.cpp @@ -114,7 +114,7 @@ void SMBSlave::get( const KURL& kurl ) if ( !mime || mime->name() == KMimeType::defaultMimeType() || !accurate ) { - KMimeType::Ptr p_mimeType = KMimeType::tqfindByContent(filedata); + KMimeType::Ptr p_mimeType = KMimeType::findByContent(filedata); if ( p_mimeType && p_mimeType->name() != KMimeType::defaultMimeType() ) mime = p_mimeType; } diff --git a/kioslave/smb/kio_smb_mount.cpp b/kioslave/smb/kio_smb_mount.cpp index 04d4f56fd..f9c366235 100644 --- a/kioslave/smb/kio_smb_mount.cpp +++ b/kioslave/smb/kio_smb_mount.cpp @@ -59,7 +59,7 @@ void SMBSlave::special( const TQByteArray & data) kdDebug(KIO_SMB)<<"special() host -"<< host <<"- share -" << share <<"-"<<endl; } - remotePath.tqreplace('\\', '/'); // smbmounterplugin sends \\host/share + remotePath.replace('\\', '/'); // smbmounterplugin sends \\host/share kdDebug(KIO_SMB) << "mounting: " << remotePath.local8Bit() << " to " << mountPoint.local8Bit() << endl; diff --git a/kioslave/smtp/capabilities.cc b/kioslave/smtp/capabilities.cc index a99dbeb0b..5b2856837 100644 --- a/kioslave/smtp/capabilities.cc +++ b/kioslave/smtp/capabilities.cc @@ -56,16 +56,16 @@ namespace KioSMTP { return c; } - void Capabilities::add( const TQString & cap, bool tqreplace ) { + void Capabilities::add( const TQString & cap, bool replace ) { TQStringList tokens = TQStringList::split( ' ', cap.upper() ); if ( tokens.empty() ) return; TQString name = tokens.front(); tokens.pop_front(); - add( name, tokens, tqreplace ); + add( name, tokens, replace ); } - void Capabilities::add( const TQString & name, const TQStringList & args, bool tqreplace ) { - if ( tqreplace ) + void Capabilities::add( const TQString & name, const TQStringList & args, bool replace ) { + if ( replace ) mCapabilities[name] = args; else mCapabilities[name] += args; @@ -126,7 +126,7 @@ namespace KioSMTP { if ( it.key() == "AUTH" ) result += it.data(); else if ( it.key().startsWith( "AUTH=" ) ) { - result.push_back( it.key().mid( tqstrlen("AUTH=") ) ); + result.push_back( it.key().mid( qstrlen("AUTH=") ) ); result += it.data(); } } diff --git a/kioslave/smtp/capabilities.h b/kioslave/smtp/capabilities.h index c1976ced0..9f9464104 100644 --- a/kioslave/smtp/capabilities.h +++ b/kioslave/smtp/capabilities.h @@ -49,15 +49,15 @@ namespace KioSMTP { static Capabilities fromResponse( const Response & response ); - void add( const TQString & cap, bool tqreplace=false ); - void add( const TQString & name, const TQStringList & args, bool tqreplace=false ); + void add( const TQString & cap, bool replace=false ); + void add( const TQString & name, const TQStringList & args, bool replace=false ); void clear() { mCapabilities.clear(); } bool have( const TQString & cap ) const { return mCapabilities.find( cap.upper() ) != mCapabilities.end(); } bool have( const TQCString & cap ) const { return have( TQString( cap.data() ) ); } - bool have( const char * cap ) const { return have( TQString::tqfromLatin1( cap ) ); } + bool have( const char * cap ) const { return have( TQString::fromLatin1( cap ) ); } TQString asMetaDataString() const; diff --git a/kioslave/smtp/command.cc b/kioslave/smtp/command.cc index 41c9cf78a..2771baf82 100644 --- a/kioslave/smtp/command.cc +++ b/kioslave/smtp/command.cc @@ -321,14 +321,14 @@ static sasl_callback_t callbacks[] = { cmd = mUngetSASLResponse; mUngetSASLResponse = 0; } else if ( mFirstTime ) { - TQString firstCommand = "AUTH " + TQString::tqfromLatin1( mMechusing ); + TQString firstCommand = "AUTH " + TQString::fromLatin1( mMechusing ); tmp.setRawData( mOut, mOutlen ); KCodecs::base64Encode( tmp, challenge ); tmp.resetRawData( mOut, mOutlen ); if ( !challenge.isEmpty() ) { firstCommand += " "; - firstCommand += TQString::tqfromLatin1( challenge.data(), challenge.size() ); + firstCommand += TQString::fromLatin1( challenge.data(), challenge.size() ); } cmd = firstCommand.latin1(); diff --git a/kioslave/smtp/compliance.txt b/kioslave/smtp/compliance.txt index 36ce37542..b6b9874c8 100644 --- a/kioslave/smtp/compliance.txt +++ b/kioslave/smtp/compliance.txt @@ -3,29 +3,29 @@ The SMTP kioslave currently conforms to the following SMTP-related RFCs: Base Spec: 2821 Simple Mail Transfer Protocol. J. Klensin, Ed.. April 2001. (Format: TXT=192504 bytes) (Obsoletes RFC0821, RFC0974, RFC1869) - (tqStatus: PROPOSED STANDARD) + (Status: PROPOSED STANDARD) Encryption/Auth: 3207 SMTP Service Extension for Secure SMTP over Transport Layer Security. P. Hoffman. February 2002. (Format: TXT=18679 bytes) - (Obsoletes RFC2487) (tqStatus: PROPOSED STANDARD) + (Obsoletes RFC2487) (Status: PROPOSED STANDARD) 2554 SMTP Service Extension for Authentication. J. Myers. March 1999. - (Format: TXT=20534 bytes) (tqStatus: PROPOSED STANDARD) + (Format: TXT=20534 bytes) (Status: PROPOSED STANDARD) (with all SASL mechanisms supported by KDESasl) General: 1652 SMTP Service Extension for 8bit-MIMEtransport. J. Klensin, N. Freed, M. Rose, E. Stefferud, D. Crocker. July 1994. (Format: - TXT=11842 bytes) (Obsoletes RFC1426) (tqStatus: DRAFT STANDARD) + TXT=11842 bytes) (Obsoletes RFC1426) (Status: DRAFT STANDARD) 1870 SMTP Service Extension for Message Size Declaration. J. Klensin, N. Freed, K. Moore. November 1995. (Format: TXT=18226 bytes) - (Obsoletes RFC1653) (Also STD0010) (tqStatus: STANDARD) + (Obsoletes RFC1653) (Also STD0010) (Status: STANDARD) 2920 SMTP Service Extension for Command Pipelining. N. Freed. September 2000. (Format: TXT=17065 bytes) (Obsoletes RFC2197) (Also - STD0060) (tqStatus: STANDARD) + STD0060) (Status: STANDARD) Known shortcomings: - Doesn't enforce the CRLF lineending convention on user-supplied data. diff --git a/kioslave/smtp/interactivesmtpserver.h b/kioslave/smtp/interactivesmtpserver.h index 556b3cb3d..39a07f6a9 100644 --- a/kioslave/smtp/interactivesmtpserver.h +++ b/kioslave/smtp/interactivesmtpserver.h @@ -49,10 +49,10 @@ static TQString err2str( int err ) { static TQString escape( TQString s ) { return s - .tqreplace( '&', "&" ) - .tqreplace( '>', ">" ) - .tqreplace( '<', "<" ) - .tqreplace( '"', """ ) + .replace( '&', "&" ) + .replace( '>', ">" ) + .replace( '<', "<" ) + .replace( '"', """ ) ; } diff --git a/kioslave/smtp/request.cc b/kioslave/smtp/request.cc index b019b8285..ab02abc1c 100644 --- a/kioslave/smtp/request.cc +++ b/kioslave/smtp/request.cc @@ -93,7 +93,7 @@ namespace KioSMTP { static bool isUsAscii( const TQString & s ) { for ( uint i = 0 ; i < s.length() ; ++i ) - if ( s[i].tqunicode() > 127 ) return false; + if ( s[i].unicode() > 127 ) return false; return true; } diff --git a/kioslave/smtp/response.h b/kioslave/smtp/response.h index 2fd48ebf3..26c79b9c1 100644 --- a/kioslave/smtp/response.h +++ b/kioslave/smtp/response.h @@ -49,7 +49,7 @@ namespace KioSMTP { mWellFormed(true) {} void parseLine( const char * line ) { - parseLine( line, tqstrlen( line ) ); + parseLine( line, qstrlen( line ) ); } void parseLine( const char * line, int len ); diff --git a/kioslave/smtp/smtp.cc b/kioslave/smtp/smtp.cc index 883ee3ebb..e493f5132 100644 --- a/kioslave/smtp/smtp.cc +++ b/kioslave/smtp/smtp.cc @@ -200,7 +200,7 @@ void SMTPProtocol::put(const KURL & url, int /*permissions */ , KURL open_url = url; if ( !request.hasProfile() ) { //kdDebug(7112) << "kio_smtp: Profile is null" << endl; - bool hasProfile = mset.profiles().tqcontains( open_url.host() ); + bool hasProfile = mset.profiles().contains( open_url.host() ); if ( hasProfile ) { mset.setProfile(open_url.host()); open_url.setHost(mset.getSetting(KEMailSettings::OutServer)); diff --git a/kioslave/smtp/test_commands.cc b/kioslave/smtp/test_commands.cc index fd3adb949..680514b10 100644 --- a/kioslave/smtp/test_commands.cc +++ b/kioslave/smtp/test_commands.cc @@ -55,7 +55,7 @@ public: } bool usingSSL() const { return usesSSL; } bool usingTLS() const { return usesTLS; } - bool haveCapability( const char * cap ) const { return caps.tqcontains( cap ); } + bool haveCapability( const char * cap ) const { return caps.contains( cap ); } void error( int id, const TQString & msg ) { lastErrorCode = id; lastErrorMessage = msg; @@ -82,16 +82,16 @@ public: using namespace KioSMTP; static const char * foobarbaz = ".Foo bar baz"; -static const unsigned int foobarbaz_len = tqstrlen( foobarbaz ); +static const unsigned int foobarbaz_len = qstrlen( foobarbaz ); static const char * foobarbaz_dotstuffed = "..Foo bar baz"; -static const unsigned int foobarbaz_dotstuffed_len = tqstrlen( foobarbaz_dotstuffed ); +static const unsigned int foobarbaz_dotstuffed_len = qstrlen( foobarbaz_dotstuffed ); static const char * foobarbaz_lf = ".Foo bar baz\n"; -static const unsigned int foobarbaz_lf_len = tqstrlen( foobarbaz_lf ); +static const unsigned int foobarbaz_lf_len = qstrlen( foobarbaz_lf ); static const char * foobarbaz_crlf = "..Foo bar baz\r\n"; -static const unsigned int foobarbaz_crlf_len = tqstrlen( foobarbaz_crlf ); +static const unsigned int foobarbaz_crlf_len = qstrlen( foobarbaz_crlf ); static void checkSuccessfulTransferCommand( bool, bool, bool, bool, bool ); @@ -657,10 +657,10 @@ void checkSuccessfulTransferCommand( bool error, bool preload, bool ungetLast, mailEndsInNewline ? foobarbaz_lf : foobarbaz : mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed ; - const unsigned int s_pre_len = tqstrlen( s_pre ); + const unsigned int s_pre_len = qstrlen( s_pre ); const char * s_post = mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed ; - //const unsigned int s_post_len = tqstrlen( s_post ); + //const unsigned int s_post_len = qstrlen( s_post ); TransferCommand xfer( &smtp, preload ? s_post : 0 ); diff --git a/kioslave/system/kdedmodule/systemdirnotify.cpp b/kioslave/system/kdedmodule/systemdirnotify.cpp index 70d9057a6..162d96621 100644 --- a/kioslave/system/kdedmodule/systemdirnotify.cpp +++ b/kioslave/system/kdedmodule/systemdirnotify.cpp @@ -59,7 +59,7 @@ void SystemDirNotify::init() for(; name!=endf; ++name) { - if (!names_found.tqcontains(*name)) + if (!names_found.contains(*name)) { KDesktopFile desktop(*dirpath+*name, true); diff --git a/kioslave/system/systemimpl.cpp b/kioslave/system/systemimpl.cpp index 67732bc8c..63171009a 100644 --- a/kioslave/system/systemimpl.cpp +++ b/kioslave/system/systemimpl.cpp @@ -62,7 +62,7 @@ bool SystemImpl::listRoot(TQValueList<KIO::UDSEntry> &list) for(; filename!=endf; ++filename) { - if (!names_found.tqcontains(*filename)) + if (!names_found.contains(*filename)) { entry.clear(); createEntry(entry, *dirpath, *filename); @@ -285,7 +285,7 @@ void SystemImpl::createEntry(KIO::UDSEntry &entry, const KIO::UDSEntryList &) ) ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( slotResult(KIO::Job *) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); if (m_lastListingEmpty) icon = empty_icon; } @@ -299,13 +299,13 @@ void SystemImpl::slotEntries(KIO::Job *job, const KIO::UDSEntryList &list) { job->kill(true); m_lastListingEmpty = false; - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } } void SystemImpl::slotResult(KIO::Job *) { - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc index 6d773bc43..8afc1d0e8 100644 --- a/kioslave/tar/tar.cc +++ b/kioslave/tar/tar.cc @@ -125,7 +125,7 @@ bool ArchiveProtocol::checkNewFile( const KURL & url, TQString & path, KIO::Erro path.truncate( len - 1 ); } else - path = TQString::tqfromLatin1("/"); + path = TQString::fromLatin1("/"); kdDebug(7109) << "Found. archiveFile=" << archiveFile << " path=" << path << endl; break; } @@ -248,9 +248,9 @@ void ArchiveProtocol::listDir( const KURL & url ) if ( path.isEmpty() ) { - KURL redir( url.protocol() + TQString::tqfromLatin1( ":/") ); + KURL redir( url.protocol() + TQString::fromLatin1( ":/") ); kdDebug( 7109 ) << "url.path()==" << url.path() << endl; - redir.setPath( url.path() + TQString::tqfromLatin1("/") ); + redir.setPath( url.path() + TQString::fromLatin1("/") ); kdDebug( 7109 ) << "ArchiveProtocol::listDir: redirection " << redir.url() << endl; redirection( redir ); finished(); @@ -360,7 +360,7 @@ void ArchiveProtocol::stat( const KURL & url ) const KArchiveEntry* archiveEntry; if ( path.isEmpty() ) { - path = TQString::tqfromLatin1( "/" ); + path = TQString::fromLatin1( "/" ); archiveEntry = root; } else { path = TQString::fromLocal8Bit(remoteEncoding()->encode(path)); @@ -506,7 +506,7 @@ void ArchiveProtocol::get( const KURL & url ) bufferSize = kMin( maxSize, fileSize ); buffer.resize( bufferSize, TQGArray::SpeedOptim ); } - const TQ_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong. + const Q_LONG read = io->readBlock( buffer.data(), buffer.size() ); // Avoid to use bufferSize here, in case something went wrong. if ( read != bufferSize ) { kdWarning(7109) << "Read " << read << " bytes but expected " << bufferSize << endl; @@ -517,7 +517,7 @@ void ArchiveProtocol::get( const KURL & url ) { // We use the magic one the first data read // (As magic detection is about fixed positions, we can be sure that it is enough data.) - KMimeMagicResult * result = KMimeMagic::self()->tqfindBufferFileType( buffer, path ); + KMimeMagicResult * result = KMimeMagic::self()->findBufferFileType( buffer, path ); kdDebug(7109) << "Emitting mimetype " << result->mimeType() << endl; mimeType( result->mimeType() ); firstRead = false; @@ -620,4 +620,4 @@ debug("void TARProtocol::filterData"); } */ -// kate: space-indent on; indent-width 4; tqreplace-tabs on; +// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/kioslave/thumbnail/cursorcreator.cpp b/kioslave/thumbnail/cursorcreator.cpp index a8f6a2eb9..d77629acf 100644 --- a/kioslave/thumbnail/cursorcreator.cpp +++ b/kioslave/thumbnail/cursorcreator.cpp @@ -48,14 +48,14 @@ bool CursorCreator::create( const TQString &path, int width, int height, TQImage img.setAlphaBuffer( true ); // Convert the image to non-premultiplied alpha - TQ_UINT32 *pixels = reinterpret_cast<TQ_UINT32 *>( img.bits() ); + Q_UINT32 *pixels = reinterpret_cast<Q_UINT32 *>( img.bits() ); for ( int i = 0; i < (img.width() * img.height()); i++ ) { - float alpha = tqAlpha( pixels[i] ) / 255.0; + float alpha = qAlpha( pixels[i] ) / 255.0; if ( alpha > 0.0 && alpha < 1.0 ) - pixels[i] = tqRgba( int( tqRed(pixels[i]) / alpha ), - int( tqGreen(pixels[i]) / alpha ), - int( tqBlue(pixels[i]) / alpha ), - tqAlpha(pixels[i]) ); + pixels[i] = qRgba( int( qRed(pixels[i]) / alpha ), + int( qGreen(pixels[i]) / alpha ), + int( qBlue(pixels[i]) / alpha ), + qAlpha(pixels[i]) ); } // Create a deep copy of the image so the image data is preserved diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp index d0edbd38e..633ad5095 100644 --- a/kioslave/thumbnail/exrcreator.cpp +++ b/kioslave/thumbnail/exrcreator.cpp @@ -50,7 +50,7 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img) for ( unsigned int y=0; y < preview.height(); y++ ) { for ( unsigned int x=0; x < preview.width(); x++ ) { const Imf::PreviewRgba &q = preview.pixels()[x+(y*preview.width())]; - qpreview.setPixel( x, y, tqRgba(q.r, q.g, q.b, q.a) ); + qpreview.setPixel( x, y, qRgba(q.r, q.g, q.b, q.a) ); } } img = qpreview; diff --git a/kioslave/thumbnail/htmlcreator.cpp b/kioslave/thumbnail/htmlcreator.cpp index 43aec5f39..c9ddf0204 100644 --- a/kioslave/thumbnail/htmlcreator.cpp +++ b/kioslave/thumbnail/htmlcreator.cpp @@ -63,7 +63,7 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i int t = startTimer(5000); - tqApp->enter_loop(); + qApp->enter_loop(); killTimer(t); @@ -101,12 +101,12 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i void HTMLCreator::timerEvent(TQTimerEvent *) { - tqApp->exit_loop(); + qApp->exit_loop(); } void HTMLCreator::slotCompleted() { - tqApp->exit_loop(); + qApp->exit_loop(); } ThumbCreator::Flags HTMLCreator::flags() const diff --git a/kioslave/thumbnail/textcreator.cpp b/kioslave/thumbnail/textcreator.cpp index a2c713c87..31f4c4254 100644 --- a/kioslave/thumbnail/textcreator.cpp +++ b/kioslave/thumbnail/textcreator.cpp @@ -52,7 +52,7 @@ TextCreator::~TextCreator() bool TextCreator::create(const TQString &path, int width, int height, TQImage &img) { // Filter out unwanted mimetypes - KMimeType::Ptr mimeType = KMimeType::tqfindByPath( path ); + KMimeType::Ptr mimeType = KMimeType::findByPath( path ); if ( mimeType->is( "text/rtf" ) ) return false; diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index 29a1ae565..272e34eed 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -322,10 +322,10 @@ void ThumbnailProtocol::get(const KURL &url) p.drawLine( 0, 0, 0, y2 ); p.end(); - const TQBitmap *tqmask = pix.tqmask(); - if ( tqmask ) // need to update it so we can see the frame + const TQBitmap *mask = pix.mask(); + if ( mask ) // need to update it so we can see the frame { - TQBitmap bitmap( *tqmask ); + TQBitmap bitmap( *mask ); TQPainter painter; painter.begin( &bitmap ); painter.drawLine( x2, 0, x2, y2 ); diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index 3cd52e02c..1210bb59a 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -78,10 +78,10 @@ TrashProtocol::TrashProtocol( const TQCString& protocol, const TQCString &pool, { struct passwd *user = getpwuid( getuid() ); if ( user ) - m_userName = TQString::tqfromLatin1(user->pw_name); + m_userName = TQString::fromLatin1(user->pw_name); struct group *grp = getgrgid( getgid() ); if ( grp ) - m_groupName = TQString::tqfromLatin1(grp->gr_name); + m_groupName = TQString::fromLatin1(grp->gr_name); } TrashProtocol::~TrashProtocol() @@ -427,7 +427,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString if ( !url.isEmpty() ) addAtom( entry, KIO::UDS_URL, 0, url ); - KMimeType::Ptr mt = KMimeType::tqfindByPath( physicalPath, buff.st_mode ); + KMimeType::Ptr mt = KMimeType::findByPath( physicalPath, buff.st_mode ); addAtom( entry, KIO::UDS_MIME_TYPE, 0, mt->name() ); addAtom( entry, KIO::UDS_ACCESS, access ); addAtom( entry, KIO::UDS_SIZE, buff.st_size ); @@ -540,7 +540,7 @@ void TrashProtocol::get( const KURL& url ) this, TQT_SLOT( slotMimetype( KIO::Job*, const TQString& ) ) ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } void TrashProtocol::slotData( KIO::Job*, const TQByteArray&arr ) @@ -559,7 +559,7 @@ void TrashProtocol::jobFinished( KIO::Job* job ) error( job->error(), job->errorText() ); else finished(); - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } #if 0 diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp index 146748d73..fb6927d3e 100644 --- a/kioslave/trash/testtrash.cpp +++ b/kioslave/trash/testtrash.cpp @@ -383,7 +383,7 @@ static void checkInfoFile( const TQString& infoPath, const TQString& origFilePat assert( origPath == KURL::encode_string( origFilePath, KGlobal::locale()->fileEncodingMib() ) ); const TQString date = infoFile.readEntry( "DeletionDate" ); assert( !date.isEmpty() ); - assert( date.tqcontains( "T" ) ); + assert( date.contains( "T" ) ); } static void createTestFile( const TQString& path ) @@ -479,8 +479,8 @@ void TestTrash::trashUmlautFileFromHome() void TestTrash::testTrashNotEmpty() { KSimpleConfig cfg( "trashrc", true ); - assert( cfg.hasGroup( "tqStatus" ) ); - cfg.setGroup( "tqStatus" ); + assert( cfg.hasGroup( "Status" ) ); + cfg.setGroup( "Status" ); assert( cfg.readBoolEntry( "Empty", true ) == false ); } @@ -1104,7 +1104,7 @@ void TestTrash::listRootDir() assert( m_entryCount > 1 ); kdDebug() << k_funcinfo << m_listResult << endl; - assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once + assert( m_listResult.contains( "." ) == 1 ); // found it, and only once } void TestTrash::listRecursiveRootDir() @@ -1121,7 +1121,7 @@ void TestTrash::listRecursiveRootDir() assert( m_entryCount > 1 ); kdDebug() << k_funcinfo << m_listResult << endl; - assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once + assert( m_listResult.contains( "." ) == 1 ); // found it, and only once } void TestTrash::listSubDir() @@ -1138,8 +1138,8 @@ void TestTrash::listSubDir() assert( m_entryCount == 2 ); kdDebug() << k_funcinfo << m_listResult << endl; - assert( m_listResult.tqcontains( "." ) == 1 ); // found it, and only once - assert( m_listResult.tqcontains( "testfile" ) == 1 ); // found it, and only once + assert( m_listResult.contains( "." ) == 1 ); // found it, and only once + assert( m_listResult.contains( "testfile" ) == 1 ); // found it, and only once } void TestTrash::slotEntries( KIO::Job*, const KIO::UDSEntryList& lst ) @@ -1182,8 +1182,8 @@ void TestTrash::emptyTrash() assert( ok ); KSimpleConfig cfg( "trashrc", true ); - assert( cfg.hasGroup( "tqStatus" ) ); - cfg.setGroup( "tqStatus" ); + assert( cfg.hasGroup( "Status" ) ); + cfg.setGroup( "Status" ); assert( cfg.readBoolEntry( "Empty", false ) == true ); assert( !TQFile::exists( m_trashDir + "/files/fileFromHome" ) ); diff --git a/kioslave/trash/trashimpl.cpp b/kioslave/trash/trashimpl.cpp index 8139956fe..f43e7929f 100644 --- a/kioslave/trash/trashimpl.cpp +++ b/kioslave/trash/trashimpl.cpp @@ -52,7 +52,7 @@ TrashImpl::TrashImpl() : TQObject(), m_lastErrorCode( 0 ), - m_inittqStatus( InitToBeDone ), + m_initStatus( InitToBeDone ), m_lastId( 0 ), m_homeDevice( 0 ), m_trashDirectoriesScanned( false ), @@ -123,14 +123,14 @@ int TrashImpl::testDir( const TQString &_name ) const bool TrashImpl::init() { - if ( m_inittqStatus == InitOK ) + if ( m_initStatus == InitOK ) return true; - if ( m_inittqStatus == InitError ) + if ( m_initStatus == InitError ) return false; // Check the trash directory and its info and files subdirs // see also kdesktop/init.cc for first time initialization - m_inittqStatus = InitError; + m_initStatus = InitError; // $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default. const TQString xdgDataDir = KGlobal::dirs()->localxdgdatadir(); if ( !KStandardDirs::makeDir( xdgDataDir, 0700 ) ) { @@ -153,7 +153,7 @@ bool TrashImpl::init() return false; } m_trashDirectories.insert( 0, trashDir ); - m_inittqStatus = InitOK; + m_initStatus = InitOK; kdDebug() << k_funcinfo << "initialization OK, home trash dir: " << trashDir << endl; return true; } @@ -262,7 +262,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1(); info += "\n"; info += "DeletionDate="; - info += TQDateTime::tqcurrentDateTime().toString( Qt::ISODate ).latin1(); + info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1(); info += "\n"; size_t sz = info.size() - 1; // avoid trailing 0 from QCString @@ -372,7 +372,7 @@ bool TrashImpl::move( const TQString& src, const TQString& dest ) #endif connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; } @@ -381,7 +381,7 @@ void TrashImpl::jobFinished(KIO::Job* job) { kdDebug() << k_funcinfo << " error=" << job->error() << endl; error( job->error(), job->errorText() ); - tqApp->eventLoop()->exitLoop(); + qApp->eventLoop()->exitLoop(); } bool TrashImpl::copyToTrash( const TQString& origPath, int trashId, const TQString& fileId ) @@ -419,7 +419,7 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest ) #endif connect( job, TQT_SIGNAL( result( KIO::Job* ) ), this, TQT_SLOT( jobFinished( KIO::Job* ) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; } @@ -429,7 +429,7 @@ bool TrashImpl::directRename( const TQString& src, const TQString& dest ) kdDebug() << k_funcinfo << src << " -> " << dest << endl; if ( ::rename( TQFile::encodeName( src ), TQFile::encodeName( dest ) ) != 0 ) { if (errno == EXDEV) { - error( KIO::ERR_UNSUPPORTED_ACTION, TQString::tqfromLatin1("rename") ); + error( KIO::ERR_UNSUPPORTED_ACTION, TQString::fromLatin1("rename") ); } else { if (( errno == EACCES ) || (errno == EPERM)) { error( KIO::ERR_ACCESS_DENIED, dest ); @@ -508,14 +508,14 @@ bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, boo KIO::ChmodJob* chmodJob = KIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ ); connect( chmodJob, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); } kdDebug() << k_funcinfo << "deleting " << url << endl; KIO::DeleteJob *job = KIO::del( url, false, false ); connect( job, TQT_SIGNAL( result(KIO::Job *) ), this, TQT_SLOT( jobFinished(KIO::Job *) ) ); - tqApp->eventLoop()->enterLoop(); + qApp->eventLoop()->enterLoop(); bool ok = m_lastErrorCode == 0; if ( !setLastErrorCode ) { m_lastErrorCode = oldErrorCode; @@ -682,7 +682,7 @@ bool TrashImpl::isEmpty() const void TrashImpl::fileAdded() { - m_config.setGroup( "tqStatus" ); + m_config.setGroup( "Status" ); if ( m_config.readBoolEntry( "Empty", true ) == true ) { m_config.writeEntry( "Empty", false ); m_config.sync(); @@ -695,7 +695,7 @@ void TrashImpl::fileAdded() void TrashImpl::fileRemoved() { if ( isEmpty() ) { - m_config.setGroup( "tqStatus" ); + m_config.setGroup( "Status" ); m_config.writeEntry( "Empty", true ); m_config.sync(); } @@ -713,7 +713,7 @@ int TrashImpl::findTrashDirectory( const TQString& origPath ) && buff.st_dev == m_homeDevice ) return 0; - TQString mountPoint = KIO::tqfindPathMountPoint( origPath ); + TQString mountPoint = KIO::findPathMountPoint( origPath ); const TQString trashDir = trashForMountPoint( mountPoint, true ); kdDebug() << "mountPoint=" << mountPoint << " trashDir=" << trashDir << endl; if ( trashDir.isEmpty() ) @@ -898,7 +898,7 @@ TQString TrashImpl::trashDirectoryPath( int trashId ) const // and reusing a directory listing from the earlier instance.) if ( !m_trashDirectoriesScanned ) scanTrashDirectories(); - Q_ASSERT( m_trashDirectories.tqcontains( trashId ) ); + Q_ASSERT( m_trashDirectories.contains( trashId ) ); return m_trashDirectories[trashId]; } @@ -907,7 +907,7 @@ TQString TrashImpl::topDirectoryPath( int trashId ) const if ( !m_trashDirectoriesScanned ) scanTrashDirectories(); assert( trashId != 0 ); - Q_ASSERT( m_topDirectories.tqcontains( trashId ) ); + Q_ASSERT( m_topDirectories.contains( trashId ) ); return m_topDirectories[trashId]; } diff --git a/kioslave/trash/trashimpl.h b/kioslave/trash/trashimpl.h index 1a00e14bd..027864456 100644 --- a/kioslave/trash/trashimpl.h +++ b/kioslave/trash/trashimpl.h @@ -157,7 +157,7 @@ private: int m_lastErrorCode; TQString m_lastErrorMessage; - enum { InitToBeDone, InitOK, InitError } m_inittqStatus; + enum { InitToBeDone, InitOK, InitError } m_initStatus; // A "trash directory" is a physical directory on disk, // e.g. $HOME/.local/share/Trash/$uid or /mnt/foo/.Trash/$uid diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 24b5b6a34..97eee6eec 100644 --- a/klipper/applet.cpp +++ b/klipper/applet.cpp @@ -91,7 +91,7 @@ void KlipperApplet::preferences() void KlipperApplet::help() { - kapp->invokeHelp(TQString::null, TQString::tqfromLatin1("klipper")); + kapp->invokeHelp(TQString::null, TQString::fromLatin1("klipper")); } void KlipperApplet::about() diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 500b22088..3f325d40e 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -66,7 +66,7 @@ void ConfigDialog::show() { if ( !isVisible() ) { KWinModule module(0, KWinModule::INFO_DESKTOP); - TQSize s1 = tqsizeHint(); + TQSize s1 = sizeHint(); TQSize s2 = module.workArea().size(); int w = s1.width(); int h = s1.height(); @@ -298,14 +298,14 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, delActionButton = new TQPushButton( i18n("&Delete Action"), box ); connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() )); - TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be tqreplaced with the clipboard contents."), box); - label->tqsetAlignment( WordBreak | AlignLeft | AlignVCenter ); + TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box); + label->setAlignment( WordBreak | AlignLeft | AlignVCenter ); box->setStretchFactor( label, 5 ); box = new TQHBox( this ); TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box ); - advanced->setFixedSize( advanced->tqsizeHint() ); + advanced->setFixedSize( advanced->sizeHint() ); connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() )); (void) new TQWidget( box ); // spacer @@ -410,8 +410,8 @@ void ActionWidget::slotAdvanced() AdvancedWidget *widget = new AdvancedWidget( box ); widget->setWMClasses( m_wmClasses ); - dlg.resize( dlg.tqsizeHint().width(), - dlg.tqsizeHint().height() +40); // or we get an ugly scrollbar :( + dlg.resize( dlg.sizeHint().width(), + dlg.sizeHint().height() +40); // or we get an ugly scrollbar :( if ( dlg.exec() == TQDialog::Accepted ) { m_wmClasses = widget->wmClasses(); diff --git a/klipper/configdialog.h b/klipper/configdialog.h index 9012719d0..b7aa26659 100644 --- a/klipper/configdialog.h +++ b/klipper/configdialog.h @@ -237,11 +237,11 @@ public: ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name ) : KListView( parent, name ), _configWidget( configWidget ), _regExpEditor(0L) {} - // TQListView has a weird idea of a tqsizeHint... - virtual TQSize tqsizeHint () const { - int w = tqminimumSizeHint().width(); + // TQListView has a weird idea of a sizeHint... + virtual TQSize sizeHint () const { + int w = minimumSizeHint().width(); int h = header()->height(); - h += viewport()->tqsizeHint().height(); + h += viewport()->sizeHint().height(); h += horizontalScrollBar()->height(); TQListViewItem *item = firstChild(); diff --git a/klipper/historyitem.cpp b/klipper/historyitem.cpp index b217bdb31..481339b30 100644 --- a/klipper/historyitem.cpp +++ b/klipper/historyitem.cpp @@ -52,7 +52,7 @@ HistoryItem* HistoryItem::create( const TQMimeSource& aSource ) TQMap<TQString,TQString> metaData; if( KURLDrag::decode( &aSource, urls, metaData )) { // this is from KonqDrag (libkonq) - TQByteArray a = aSource.tqencodedData( "application/x-kde-cutselection" ); + TQByteArray a = aSource.encodedData( "application/x-kde-cutselection" ); bool cut = !a.isEmpty() && (a.at(0) == '1'); // true if 1 return new HistoryURLItem( urls, metaData, cut ); } diff --git a/klipper/historyurlitem.cpp b/klipper/historyurlitem.cpp index 18fd72536..863a93fb8 100644 --- a/klipper/historyurlitem.cpp +++ b/klipper/historyurlitem.cpp @@ -56,7 +56,7 @@ bool HistoryURLItem::operator==( const HistoryItem& rhs) const if ( const HistoryURLItem* casted_rhs = dynamic_cast<const HistoryURLItem*>( &rhs ) ) { return casted_rhs->urls == urls && casted_rhs->metaData.count() == metaData.count() - && tqEqual( casted_rhs->metaData.begin(), casted_rhs->metaData.end(), metaData.begin()) + && qEqual( casted_rhs->metaData.begin(), casted_rhs->metaData.end(), metaData.begin()) && casted_rhs->cut == cut; } return false; diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index f5a96cd87..954768fc5 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -106,7 +106,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name n_history_items( 0 ) { KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry ); - TQRect g = i.tqgeometry(); + TQRect g = i.geometry(); TQRect screen = KGlobalSettings::desktopGeometry(g.center()); int menu_height = ( screen.height() ) * 3/4; int menu_width = ( screen.width() ) * 1/3; diff --git a/klipper/klipperrc.desktop b/klipper/klipperrc.desktop index 57aa4043c..5ad72c141 100644 --- a/klipper/klipperrc.desktop +++ b/klipper/klipperrc.desktop @@ -243,7 +243,7 @@ Description[bn]=কনকরার দিয়ে খোলো (&ক) Description[br]=Digeriñ gant &Konqueror Description[bs]=Otvori u &Konqueroru Description[ca]=Obre amb el &Konqueror -Description[cs]=OtevÅ™Ãt potqmocà &Konqueroru +Description[cs]=OtevÅ™Ãt pomocà &Konqueroru Description[csb]=Ã’temknij w &Konquerorze Description[cy]=Agor gyda &Konqueror Description[da]=Ã…bn med &Konqueror @@ -292,7 +292,7 @@ Description[ro]=Deschide cu &Konqueror Description[ru]=Открыть в &Konqueror Description[rw]=Gufungura ukoresheje Konqueror Description[se]=Raba &Konquerorain -Description[sk]=OtvoriÅ¥ potqmocou &Konqueror +Description[sk]=OtvoriÅ¥ pomocou &Konqueror Description[sl]=Odpri s &Konquerorjem Description[sr]=Отвори помоћу &Konqueror-а Description[sr@Latn]=Otvori pomoću &Konqueror-a @@ -328,7 +328,7 @@ Description[bn]=মোজিলা দিয়ে খোলো (&ম) Description[br]=Digeriñ gant &Mozilla Description[bs]=Otvori u &Mozilla Description[ca]=Obre amb el &Mozilla -Description[cs]=OtevÅ™Ãt potqmocà &Mozilla +Description[cs]=OtevÅ™Ãt pomocà &Mozilla Description[csb]=Ã’temknij w &Mozillë Description[cy]=Agor gyda &Mozilla Description[da]=Ã…bn med &Mozilla @@ -377,7 +377,7 @@ Description[ro]=Deschide cu &Mozilla Description[ru]=Открыть в &Mozilla Description[rw]=Gufungura ukoresheje Mozilla Description[se]=Raba &Mozillain -Description[sk]=OtvoriÅ¥ potqmocou &Mozilla +Description[sk]=OtvoriÅ¥ pomocou &Mozilla Description[sl]=Odpri z &Mozillo Description[sr]=Отвори помоћу &Mozilla-е Description[sr@Latn]=Otvori pomoću &Mozilla-e @@ -492,7 +492,7 @@ Description[bn]=ফায়ার&ফকà§à¦¸ দিয়ে খোলো Description[br]=Digeriñ gant &Firefox Description[bs]=Otvori u &Firefoxu Description[ca]=Obre amb el &Firefox -Description[cs]=OtevÅ™Ãt potqmocà &Firefox +Description[cs]=OtevÅ™Ãt pomocà &Firefox Description[csb]=Ã’temknij w &Firefokse Description[da]=Ã…bn med &Firefox Description[de]=Mit &Firefox öffnen @@ -531,7 +531,7 @@ Description[pt_BR]=Abrir com o &Firefox Description[ro]=Deschide cu &Firefox Description[ru]=Открыть в &Firefox Description[se]=Raba &Firefox:ain -Description[sk]=OtvoriÅ¥ potqmocou &Firefox +Description[sk]=OtvoriÅ¥ pomocou &Firefox Description[sl]=Odpri s &Firefox Description[sr]=Отвори помоћу &Firefox-а Description[sr@Latn]=Otvori pomoću &Firefox-a @@ -1655,7 +1655,7 @@ Description[bn]=কনকরার দিয়ে খোলো (&ক) Description[br]=Digeriñ gant &Konqueror Description[bs]=Otvori u &Konqueroru Description[ca]=Obre amb el &Konqueror -Description[cs]=OtevÅ™Ãt potqmocà &Konqueroru +Description[cs]=OtevÅ™Ãt pomocà &Konqueroru Description[csb]=Ã’temknij w &Konquerorze Description[cy]=Agor gyda &Konqueror Description[da]=Ã…bn med &Konqueror @@ -1704,7 +1704,7 @@ Description[ro]=Deschide cu &Konqueror Description[ru]=Открыть в &Konqueror Description[rw]=Gufungura ukoresheje Konqueror Description[se]=Raba &Konquerorain -Description[sk]=OtvoriÅ¥ potqmocou &Konqueror +Description[sk]=OtvoriÅ¥ pomocou &Konqueror Description[sl]=Odpri s &Konquerorjem Description[sr]=Отвори помоћу &Konqueror-а Description[sr@Latn]=Otvori pomoću &Konqueror-a @@ -1739,7 +1739,7 @@ Description[bn]=নেটসà§à¦•à§‡à¦ª দিয়ে খোলো (&ন) Description[br]=Digeriñ gant &Netscape Description[bs]=Otvori u &Netscape Description[ca]=Obre amb el &Netscape -Description[cs]=OtevÅ™Ãt potqmocà &Netscape +Description[cs]=OtevÅ™Ãt pomocà &Netscape Description[csb]=Ã’temknij w &Netscape Description[cy]=Agor gyda &Netscape Description[da]=Ã…bn med &Netscape @@ -1788,7 +1788,7 @@ Description[ro]=Deschide cu &Netscape Description[ru]=Открыть в &Netscape Description[rw]=Gufungura ukoresheje Netscape Description[se]=Raba &Netscapeain -Description[sk]=OtvoriÅ¥ potqmocou &Netscape +Description[sk]=OtvoriÅ¥ pomocou &Netscape Description[sl]=Odpri z &Netscape Description[sr]=Отвори помоћу &Netscape-а Description[sr@Latn]=Otvori pomoću &Netscape-a @@ -1823,7 +1823,7 @@ Description[bn]=মোজিলা দিয়ে খোলো (&ম) Description[br]=Digeriñ gant &Mozilla Description[bs]=Otvori u &Mozilla Description[ca]=Obre amb el &Mozilla -Description[cs]=OtevÅ™Ãt potqmocà &Mozilla +Description[cs]=OtevÅ™Ãt pomocà &Mozilla Description[csb]=Ã’temknij w &Mozillë Description[cy]=Agor gyda &Mozilla Description[da]=Ã…bn med &Mozilla @@ -1872,7 +1872,7 @@ Description[ro]=Deschide cu &Mozilla Description[ru]=Открыть в &Mozilla Description[rw]=Gufungura ukoresheje Mozilla Description[se]=Raba &Mozillain -Description[sk]=OtvoriÅ¥ potqmocou &Mozilla +Description[sk]=OtvoriÅ¥ pomocou &Mozilla Description[sl]=Odpri z &Mozillo Description[sr]=Отвори помоћу &Mozilla-е Description[sr@Latn]=Otvori pomoću &Mozilla-e diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index 6c70a279a..196a4259c 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -94,7 +94,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, // Squeeze text strings so that do not take up the entire screen (or more) TQString text( KStringHandler::cPixelSqueeze(item->text().simplifyWhiteSpace(), proxy_for_menu->fontMetrics(), - m_menu_width).tqreplace( "&", "&&" ) ); + m_menu_width).replace( "&", "&&" ) ); id = proxy_for_menu->insertItem( text, -1, index ); } else { const TQSize max_size( m_menu_width,m_menu_height/4 ); @@ -133,7 +133,7 @@ int PopupProxy::insertFromSpill( int index ) { // discarding any that doesn't match the current filter. // stop when the total number of items equal m_itemsPerMenu; int count = 0; - int remainingHeight = m_menu_height - proxy_for_menu->tqsizeHint().height(); + int remainingHeight = m_menu_height - proxy_for_menu->sizeHint().height(); // Force at least one item to be inserted. remainingHeight = QMAX( remainingHeight, 0 ); for ( const HistoryItem* item = spillPointer.current(); diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 15267d3d8..8b2bcb0eb 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -327,7 +327,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu ) { Q_ASSERT( menu != 0L ); - TQSize size = menu->tqsizeHint(); // tqgeometry is not valid until it's shown + TQSize size = menu->sizeHint(); // geometry is not valid until it's shown if (bPopupAtMouse) { TQPoint g = TQCursor::pos(); if ( size.height() < g.y() ) @@ -336,7 +336,7 @@ void KlipperWidget::showPopupMenu( TQPopupMenu *menu ) menu->popup(TQPoint(g.x(), g.y())); } else { KWin::WindowInfo i = KWin::windowInfo( winId(), NET::WMGeometry ); - TQRect g = i.tqgeometry(); + TQRect g = i.geometry(); TQRect screen = KGlobalSettings::desktopGeometry(g.center()); if ( g.x()-screen.x() > screen.width()/2 && @@ -380,7 +380,7 @@ bool KlipperWidget::loadHistory() { TQDataStream* history_stream = &file_stream; TQByteArray data; if( !oldfile ) { - TQ_UINT32 crc; + Q_UINT32 crc; file_stream >> crc >> data; if( crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ) != crc ) { kdWarning() << failed_load_warning << ": " << history_file.errorString() << endl; @@ -444,7 +444,7 @@ void KlipperWidget::saveHistory() { for ( const HistoryItem* item = history()->first(); item; item = history()->next() ) { history_stream << item; } - TQ_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ); + Q_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ); *history_file.dataStream() << crc << data; } @@ -1013,13 +1013,13 @@ TQString KlipperWidget::getClipboardHistoryItem(int i) // bool KlipperWidget::ignoreClipboardChanges() const { - TQWidget *tqfocusWidget = tqApp->tqfocusWidget(); - if ( tqfocusWidget ) + TQWidget *focusWidget = qApp->focusWidget(); + if ( focusWidget ) { - if ( tqfocusWidget->inherits( "QSpinBox" ) || - (tqfocusWidget->tqparentWidget() && - tqfocusWidget->inherits("QLineEdit") && - tqfocusWidget->tqparentWidget()->inherits("QSpinWidget")) ) + if ( focusWidget->inherits( "QSpinBox" ) || + (focusWidget->parentWidget() && + focusWidget->inherits("QLineEdit") && + focusWidget->parentWidget()->inherits("QSpinWidget")) ) { return true; } diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index d13c651d7..c814508c1 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -379,7 +379,7 @@ void URLGrabber::slotKillPopupMenu() { if ( myMenu && myMenu->isVisible() ) { - if ( myMenu->tqgeometry().tqcontains( TQCursor::pos() ) && + if ( myMenu->geometry().contains( TQCursor::pos() ) && myPopupKillTimeout > 0 ) { myPopupKillTimer->start( 1000 * myPopupKillTimeout, true ); diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index a5cd9ac64..1ab175c17 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -53,7 +53,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) _menuFolderInfo = 0; _menuEntryInfo = 0; - TQGridLayout *tqlayout = new TQGridLayout(this, 6, 2, + TQGridLayout *layout = new TQGridLayout(this, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); @@ -75,7 +75,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) _execEdit = new KURLRequester(general_group); _execEdit->lineEdit()->setAcceptDrops(false); TQWhatsThis::add(_execEdit,i18n( - "Following the command, you can have several place holders which will be tqreplaced " + "Following the command, you can have several place holders which will be replaced " "with the actual values when the actual program is run:\n" "%f - a single file name\n" "%F - a list of files; use for applications that can open several local files at once\n" @@ -129,8 +129,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged())); grid->addMultiCellWidget(_iconButton, 0, 1, 2, 2); - // add the general group to the main tqlayout - tqlayout->addMultiCellWidget(general_group, 0, 0, 0, 1); + // add the general group to the main layout + layout->addMultiCellWidget(general_group, 0, 0, 0, 1); // path group _path_group = new TQGroupBox(this); @@ -151,7 +151,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) connect(_pathEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); vbox->addWidget(hbox); - tqlayout->addMultiCellWidget(_path_group, 1, 1, 0, 1); + layout->addMultiCellWidget(_path_group, 1, 1, 0, 1); // terminal group _term_group = new TQGroupBox(this); @@ -172,7 +172,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) connect(_termOptEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); vbox->addWidget(hbox); - tqlayout->addMultiCellWidget(_term_group, 2, 2, 0, 1); + layout->addMultiCellWidget(_term_group, 2, 2, 0, 1); _termOptEdit->setEnabled(false); @@ -195,18 +195,18 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) connect(_uidEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); vbox->addWidget(hbox); - tqlayout->addMultiCellWidget(_uid_group, 3, 3, 0, 1); + layout->addMultiCellWidget(_uid_group, 3, 3, 0, 1); _uidEdit->setEnabled(false); - tqlayout->setRowStretch(0, 2); + layout->setRowStretch(0, 2); // key binding group general_group_keybind = new TQGroupBox(this); - tqlayout->addMultiCellWidget( general_group_keybind, 4, 4, 0, 1 ); + layout->addMultiCellWidget( general_group_keybind, 4, 4, 0, 1 ); // dummy widget in order to make it look a bit better - tqlayout->addWidget( new TQWidget(this), 5, 0 ); - tqlayout->setRowStretch( 5, 4 ); + layout->addWidget( new TQWidget(this), 5, 0 ); + layout->setRowStretch( 5, 4 ); TQGridLayout *grid_keybind = new TQGridLayout(general_group_keybind, 3, 1, KDialog::marginHint(), KDialog::spacingHint()); @@ -468,8 +468,8 @@ void BasicTab::slotCapturedShortcut(const KShortcut& cut) if (signalsBlocked()) return; - if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, tqtopLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( cut, true, tqtopLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( cut, true, topLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( cut, true, topLevelWidget())) return; if ( KHotKeys::present() ) diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp index 90cf7b7c7..d1582c23b 100644 --- a/kmenuedit/menufile.cpp +++ b/kmenuedit/menufile.cpp @@ -297,7 +297,7 @@ void MenuFile::addEntry(const TQString &menuName, const TQString &menuId) includeNode.appendChild(fileNode); } -void MenuFile::setLayout(const TQString &menuName, const TQStringList &tqlayout) +void MenuFile::setLayout(const TQString &menuName, const TQStringList &layout) { m_bDirty = true; @@ -305,47 +305,47 @@ void MenuFile::setLayout(const TQString &menuName, const TQStringList &tqlayout) purgeLayout(elem); - TQDomElement tqlayoutNode = m_doc.createElement(MF_LAYOUT); - elem.appendChild(tqlayoutNode); + TQDomElement layoutNode = m_doc.createElement(MF_LAYOUT); + elem.appendChild(layoutNode); - for(TQStringList::ConstIterator it = tqlayout.begin(); - it != tqlayout.end(); ++it) + for(TQStringList::ConstIterator it = layout.begin(); + it != layout.end(); ++it) { TQString li = *it; if (li == ":S") { - tqlayoutNode.appendChild(m_doc.createElement(MF_SEPARATOR)); + layoutNode.appendChild(m_doc.createElement(MF_SEPARATOR)); } else if (li == ":M") { TQDomElement mergeNode = m_doc.createElement(MF_MERGE); mergeNode.setAttribute("type", "menus"); - tqlayoutNode.appendChild(mergeNode); + layoutNode.appendChild(mergeNode); } else if (li == ":F") { TQDomElement mergeNode = m_doc.createElement(MF_MERGE); mergeNode.setAttribute("type", "files"); - tqlayoutNode.appendChild(mergeNode); + layoutNode.appendChild(mergeNode); } else if (li == ":A") { TQDomElement mergeNode = m_doc.createElement(MF_MERGE); mergeNode.setAttribute("type", "all"); - tqlayoutNode.appendChild(mergeNode); + layoutNode.appendChild(mergeNode); } else if (li.endsWith("/")) { li.truncate(li.length()-1); TQDomElement menuNode = m_doc.createElement(MF_MENUNAME); menuNode.appendChild(m_doc.createTextNode(li)); - tqlayoutNode.appendChild(menuNode); + layoutNode.appendChild(menuNode); } else { TQDomElement fileNode = m_doc.createElement(MF_FILENAME); fileNode.appendChild(m_doc.createTextNode(li)); - tqlayoutNode.appendChild(fileNode); + layoutNode.appendChild(fileNode); } } } @@ -468,7 +468,7 @@ TQString MenuFile::uniqueMenuName(const TQString &menuName, const TQString &newM for(int n = 1; ++n; ) { - if (findMenu(elem, result, false).isNull() && !excludeList.tqcontains(result)) + if (findMenu(elem, result, false).isNull() && !excludeList.contains(result)) return result; result.truncate(trunc); diff --git a/kmenuedit/menufile.h b/kmenuedit/menufile.h index 60c1b454b..c216d486c 100644 --- a/kmenuedit/menufile.h +++ b/kmenuedit/menufile.h @@ -72,7 +72,7 @@ public: bool performAllActions(); /** - * Returns whether the stack tqcontains any actions + * Returns whether the stack contains any actions */ bool dirty(); @@ -83,7 +83,7 @@ public: void moveMenu(const TQString &oldMenu, const TQString &newMenu); void removeMenu(const TQString &menuName); - void setLayout(const TQString &menuName, const TQStringList &tqlayout); + void setLayout(const TQString &menuName, const TQStringList &layout); /** * Returns a unique menu-name for a new menu under @p menuName diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp index 95cd64182..affb0bcba 100644 --- a/kmenuedit/menuinfo.cpp +++ b/kmenuedit/menuinfo.cpp @@ -489,14 +489,14 @@ bool MenuEntryInfo::isShortcutAvailable(const KShortcut &_shortcut) { s_allShortcuts = new TQStringList(KHotKeys::allShortCuts()); } - available = !s_allShortcuts->tqcontains(shortcutKey); + available = !s_allShortcuts->contains(shortcutKey); if (available && s_newShortcuts) { - available = !s_newShortcuts->tqcontains(shortcutKey); + available = !s_newShortcuts->contains(shortcutKey); } if (!available && s_freeShortcuts) { - available = s_freeShortcuts->tqcontains(shortcutKey); + available = s_freeShortcuts->contains(shortcutKey); } return available; } diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 5fcbcb80d..693ba568c 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -62,11 +62,11 @@ #define COPY_SEPARATOR 'S' TreeItem::TreeItem(TQListViewItem *parent, TQListViewItem *after, const TQString& menuId, bool __init) - :TQListViewItem(parent, after), _hidden(false), _init(__init), _tqlayoutDirty(false), _menuId(menuId), + :TQListViewItem(parent, after), _hidden(false), _init(__init), _layoutDirty(false), _menuId(menuId), m_folderInfo(0), m_entryInfo(0) {} TreeItem::TreeItem(TQListView *parent, TQListViewItem *after, const TQString& menuId, bool __init) - : TQListViewItem(parent, after), _hidden(false), _init(__init), _tqlayoutDirty(false), _menuId(menuId), + : TQListViewItem(parent, after), _hidden(false), _init(__init), _layoutDirty(false), _menuId(menuId), m_folderInfo(0), m_entryInfo(0) {} void TreeItem::setName(const TQString &name) @@ -149,7 +149,7 @@ static TQPixmap appIcon(const TQString &iconName) TreeView::TreeView( bool controlCenter, KActionCollection *ac, TQWidget *parent, const char *name ) : KListView(parent, name), m_ac(ac), m_rmb(0), m_clipboard(0), m_clipboardFolderInfo(0), m_clipboardEntryInfo(0), - m_controlCenter(controlCenter), m_tqlayoutDirty(false) + m_controlCenter(controlCenter), m_layoutDirty(false) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); @@ -273,7 +273,7 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr folderInfo->comment = folder->comment(); // Item names may contain ampersands. To avoid them being converted - // to accelerators, tqreplace them with two ampersands. + // to accelerators, replace them with two ampersands. folderInfo->hidden = folder->noDisplay(); folderInfo->directoryFile = folder->directoryEntryPath(); folderInfo->icon = folder->icon(); @@ -611,7 +611,7 @@ TQStringList TreeView::fileList(const TQString& rPath) TQStringList files = dir.entryList(); for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) { // does not work?! - //if (filelist.tqcontains(*it)) continue; + //if (filelist.contains(*it)) continue; if (relativePath.isEmpty()) { filelist.remove(*it); // hack @@ -649,7 +649,7 @@ TQStringList TreeView::dirList(const TQString& rPath) for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) { if ((*it) == "." || (*it) == "..") continue; // does not work?! - // if (dirlist.tqcontains(*it)) continue; + // if (dirlist.contains(*it)) continue; if (relativePath.isEmpty()) { dirlist.remove(*it); //hack @@ -715,7 +715,7 @@ static TQString createDirectoryFile(const TQString &file, TQStringList *excludeL else result = base + TQString("-%1.directory").arg(i); - if (!excludeList->tqcontains(result)) + if (!excludeList->contains(result)) { if (locate("xdgdata-dirs", result).isEmpty()) break; @@ -997,7 +997,7 @@ void TreeView::newsubmenu() if (!ok) return; TQString file = caption; - file.tqreplace('/', '-'); + file.replace('/', '-'); file = createDirectoryFile(file, &m_newDirectoryList); // Create @@ -1069,7 +1069,7 @@ void TreeView::newitem() TQString menuId; TQString file = caption; - file.tqreplace('/', '-'); + file.replace('/', '-'); file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create @@ -1470,7 +1470,7 @@ static TQStringList extractLayout(TreeItem *item) { bool firstFolder = true; bool firstEntry = true; - TQStringList tqlayout; + TQStringList layout; for(;item; item = static_cast<TreeItem*>(item->nextSibling())) { if (item->isDirectory()) @@ -1478,41 +1478,41 @@ static TQStringList extractLayout(TreeItem *item) if (firstFolder) { firstFolder = false; - tqlayout << ":M"; // Add new folders here... + layout << ":M"; // Add new folders here... } - tqlayout << (item->folderInfo()->id); + layout << (item->folderInfo()->id); } else if (item->isEntry()) { if (firstEntry) { firstEntry = false; - tqlayout << ":F"; // Add new entries here... + layout << ":F"; // Add new entries here... } - tqlayout << (item->entryInfo()->menuId()); + layout << (item->entryInfo()->menuId()); } else { - tqlayout << ":S"; + layout << ":S"; } } - return tqlayout; + return layout; } -TQStringList TreeItem::tqlayout() +TQStringList TreeItem::layout() { - TQStringList tqlayout = extractLayout(static_cast<TreeItem*>(firstChild())); - _tqlayoutDirty = false; - return tqlayout; + TQStringList layout = extractLayout(static_cast<TreeItem*>(firstChild())); + _layoutDirty = false; + return layout; } void TreeView::saveLayout() { - if (m_tqlayoutDirty) + if (m_layoutDirty) { - TQStringList tqlayout = extractLayout(static_cast<TreeItem*>(firstChild())); - m_menuFile->setLayout(m_rootFolder->fullId, tqlayout); - m_tqlayoutDirty = false; + TQStringList layout = extractLayout(static_cast<TreeItem*>(firstChild())); + m_menuFile->setLayout(m_rootFolder->fullId, layout); + m_layoutDirty = false; } TQPtrList<TQListViewItem> lst; @@ -1521,7 +1521,7 @@ void TreeView::saveLayout() TreeItem *item = static_cast<TreeItem*>(it.current()); if ( item->isLayoutDirty() ) { - m_menuFile->setLayout(item->folderInfo()->fullId, item->tqlayout()); + m_menuFile->setLayout(item->folderInfo()->fullId, item->layout()); } ++it; } @@ -1554,7 +1554,7 @@ void TreeView::setLayoutDirty(TreeItem *parentItem) if (parentItem) parentItem->setLayoutDirty(); else - m_tqlayoutDirty = true; + m_layoutDirty = true; } bool TreeView::isLayoutDirty() @@ -1571,7 +1571,7 @@ bool TreeView::isLayoutDirty() bool TreeView::dirty() { - return m_tqlayoutDirty || m_rootFolder->hasDirt() || m_menuFile->dirty() || isLayoutDirty(); + return m_layoutDirty || m_rootFolder->hasDirt() || m_menuFile->dirty() || isLayoutDirty(); } void TreeView::findServiceShortcut(const KShortcut&cut, KService::Ptr &service) diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h index b64d7da57..ebb5c6d14 100644 --- a/kmenuedit/treeview.h +++ b/kmenuedit/treeview.h @@ -62,9 +62,9 @@ public: bool isHidden() const { return _hidden; } void setHidden(bool b); - bool isLayoutDirty() { return _tqlayoutDirty; } - void setLayoutDirty() { _tqlayoutDirty = true; } - TQStringList tqlayout(); + bool isLayoutDirty() { return _layoutDirty; } + void setLayoutDirty() { _layoutDirty = true; } + TQStringList layout(); virtual void setOpen(bool o); void load(); @@ -77,7 +77,7 @@ private: bool _hidden : 1; bool _init : 1; - bool _tqlayoutDirty : 1; + bool _layoutDirty : 1; TQString _menuId; TQString _name; TQString _directoryPath; @@ -172,7 +172,7 @@ private: TQStringList m_newDirectoryList; bool m_detailedMenuEntries; bool m_detailedEntriesNamesFirst; - bool m_tqlayoutDirty; + bool m_layoutDirty; }; diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index 13b7d0f9c..b93a7e62f 100644 --- a/knetattach/knetattach.ui +++ b/knetattach/knetattach.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KNetAttach</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -96,7 +96,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>16</height> @@ -145,7 +145,7 @@ <property name="text"> <string>Select the type of network folder you wish to connect to and press the Next button.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -159,7 +159,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -186,7 +186,7 @@ <property name="text"> <string>Enter a name for this <i>%1</i> as well as the server address, port and folder path to use and press the Next button.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -327,7 +327,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>560</width> <height>16</height> @@ -367,19 +367,19 @@ <sender>_user</sender> <signal>textChanged(const QString&)</signal> <receiver>KNetAttach</receiver> - <slot>updateParametersPagetqStatus()</slot> + <slot>updateParametersPageStatus()</slot> </connection> <connection> <sender>_host</sender> <signal>textChanged(const QString&)</signal> <receiver>KNetAttach</receiver> - <slot>updateParametersPagetqStatus()</slot> + <slot>updateParametersPageStatus()</slot> </connection> <connection> <sender>_path</sender> <signal>textChanged(const QString&)</signal> <receiver>KNetAttach</receiver> - <slot>updateParametersPagetqStatus()</slot> + <slot>updateParametersPageStatus()</slot> </connection> <connection> <sender>_useEncryption</sender> @@ -427,7 +427,7 @@ <slot access="private">init()</slot> <slot>setInformationText( const QString & type )</slot> <slot access="private">showPage( QWidget * page )</slot> - <slot access="private">updateParametersPagetqStatus()</slot> + <slot access="private">updateParametersPageStatus()</slot> <slot access="private">finished()</slot> <slot access="private">updatePort( bool encryption )</slot> <slot access="private">updateFinishButtonText( bool save )</slot> @@ -436,5 +436,5 @@ <function access="private" returnType="bool">doConnectionTest( const KURL & url )</function> <function access="private" returnType="bool">updateForProtocol( const QString & protocol )</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h index 4de321bd3..f60dab03e 100644 --- a/knetattach/knetattach.ui.h +++ b/knetattach/knetattach.ui.h @@ -16,7 +16,7 @@ void KNetAttach::init() disconnect(finishButton(), TQT_SIGNAL(clicked()), (TQDialog*)this, TQT_SLOT(accept())); connect(finishButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(finished())); finishButton()->setText(i18n("Save && C&onnect")); - //setResizeMode(Fixed); FIXME: make the wizard fixed-tqgeometry + //setResizeMode(Fixed); FIXME: make the wizard fixed-geometry setFinishEnabled(_folderParameters, false); KConfig recent("krecentconnections", true, false); recent.setGroup("General"); @@ -109,14 +109,14 @@ void KNetAttach::showPage( TQWidget *page ) _connectionName->setText(_recentConnectionName->currentText()); _createIcon->setChecked(false); } - updateParametersPagetqStatus(); + updateParametersPageStatus(); } TQWizard::showPage(page); } -void KNetAttach::updateParametersPagetqStatus() +void KNetAttach::updateParametersPageStatus() { setFinishEnabled(_folderParameters, !_host->text().stripWhiteSpace().isEmpty() && @@ -190,7 +190,7 @@ void KNetAttach::finished() recent.setGroup("General"); TQStringList idx = recent.readListEntry("Index"); recent.deleteGroup(name); // erase anything stale - if (idx.tqcontains(name)) { + if (idx.contains(name)) { idx.remove(name); idx.prepend(name); recent.writeEntry("Index", idx); diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog index 42e14ecbc..438da0d69 100644 --- a/konqueror/ChangeLog +++ b/konqueror/ChangeLog @@ -22,7 +22,7 @@ * konq_actions.h (class KonqGoURLAction): new class, derived from KAction, used for the 'go url' action. when plugging the action into a toolbar make sure to align the button right. - Otherwise the toolbar tqlayout completely fucks up and QToolBar + Otherwise the toolbar layout completely fucks up and QToolBar starts flickering like mad, when the window width is getting small than the lenght of the url in the combobox. @@ -57,8 +57,8 @@ * konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and KGlobal::config()->sync() after toggling the visiblity of the menubar, just like it is done for toolbars. - (slotPartActivated): connect and disconnect to/from the actiontqStatusText - and cleartqStatusText signals of the part's actioncollection + (slotPartActivated): connect and disconnect to/from the actionStatusText + and clearStatusText signals of the part's actioncollection 2001-03-02 Simon Hausmann <simon@kde.org> diff --git a/konqueror/DESIGN b/konqueror/DESIGN index 067e0e757..fb2628aaa 100644 --- a/konqueror/DESIGN +++ b/konqueror/DESIGN @@ -14,9 +14,9 @@ icon views, tree views, html views...) The main(), including all the startup mechanism is in konq_main.* -The main window tqcontains several "views", in order to show several URLs +The main window contains several "views", in order to show several URLs at once, possibly using several modes. Each view is a KonqView. -The KonqView tqcontains the child part, which can be : +The KonqView contains the child part, which can be : - an icon view (KonqIconView) - a list view / tree view (KonqListView/KonqTreeView) - an HTML view (KHTMLPart) @@ -76,7 +76,7 @@ How history is implemented From the konqueror side: -* KonqView has a list of history items. Each item tqcontains a URL, +* KonqView has a list of history items. Each item contains a URL, and a QByteArray for the view to store its stuff in the format that suits it best. It calls saveState() at various points of time (right after starting loading the URL, when the loading is completed, and right before loading another URL). Reason: diff --git a/konqueror/IDEAS b/konqueror/IDEAS index 017c181e9..426b4d006 100644 --- a/konqueror/IDEAS +++ b/konqueror/IDEAS @@ -162,7 +162,7 @@ plus it's own toolbar. This integration is in fact not sooo seamless because: whenever the use activates your khelpcenter part a complete GUI "switch" will take place, meaning all the *bars from -konqueror will be tqreplaced by the *bars from the child view +konqueror will be replaced by the *bars from the child view Therefor another approach is developed: The *bars of konqueror will contain entries for all child-views which are diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index a22788858..ce7850967 100644 --- a/konqueror/KonquerorIface.cc +++ b/konqueror/KonquerorIface.cc @@ -252,18 +252,18 @@ bool KonquerorIface::processCanBeReused( int screen ) TQStringList allowed_parts = KonqSettings::safeParts(); bool all_parts_allowed = false; - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "SAFE" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" )) { allowed_parts.clear(); // is duplicated in client/kfmclient.cc - allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) - << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) - << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) - << TQString::tqfromLatin1( "konq_infolistview.desktop" ) - << TQString::tqfromLatin1( "konq_treeview.desktop" ) - << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); } - else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) + else if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) { allowed_parts.clear(); all_parts_allowed = true; @@ -281,7 +281,7 @@ bool KonquerorIface::processCanBeReused( int screen ) ++it2 ) { kdDebug(1202) << "processCanBeReused: part=" << (*it2)->service()->desktopEntryPath() << ", URL=" << (*it2)->url().prettyURL() << endl; - if( !allowed_parts.tqcontains( (*it2)->service()->desktopEntryPath())) + if( !allowed_parts.contains( (*it2)->service()->desktopEntryPath())) return false; } } diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index e7b0553b1..c9c83fd4f 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -50,15 +50,15 @@ KonqAboutPageFactory::~KonqAboutPageFactory() s_plugins_html = 0; } -KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *KonqAboutPageFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *, const TQStringList & ) { - //KonqFrame *frame = dynamic_cast<KonqFrame *>( tqparentWidget ); + //KonqFrame *frame = dynamic_cast<KonqFrame *>( parentWidget ); //if ( !frame ) return 0; return new KonqAboutPage( //frame->childView()->mainWindow(), - tqparentWidget, widgetName, parent, name ); + parentWidget, widgetName, parent, name ); } TQString KonqAboutPageFactory::loadFile( const TQString& file ) @@ -77,12 +77,12 @@ TQString KonqAboutPageFactory::loadFile( const TQString& file ) res = t.read(); // otherwise all embedded objects are referenced as about:/... - TQString basehref = TQString::tqfromLatin1("<BASE HREF=\"file:") + + TQString basehref = TQString::fromLatin1("<BASE HREF=\"file:") + file.left( file.findRev( '/' )) + - TQString::tqfromLatin1("/\">\n"); + TQString::fromLatin1("/\">\n"); TQRegExp reg("<head>"); reg.setCaseSensitive(FALSE); - res.tqreplace(reg, "<head>\n\t" + basehref); + res.replace(reg, "<head>\n\t" + basehref); return res; } @@ -295,7 +295,7 @@ TQString KonqAboutPageFactory::specs() .arg( i18n("Secure Sockets Layer") ) .arg( i18n("(TLS/SSL v2/3) for secure communications up to 168bit") ) .arg( i18n("OpenSSL") ) - .arg( i18n("Bidirectional 16bit tqunicode support") ) + .arg( i18n("Bidirectional 16bit unicode support") ) .arg( i18n("built-in") ) .arg( i18n("AutoCompletion for forms") ) .arg( i18n("built-in") ) @@ -427,9 +427,9 @@ TQString KonqAboutPageFactory::plugins() KonqAboutPage::KonqAboutPage( //KonqMainWindow * - TQWidget *tqparentWidget, const char *widgetName, + TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ) - : KHTMLPart( tqparentWidget, widgetName, parent, name, BrowserViewGUI ) + : KHTMLPart( parentWidget, widgetName, parent, name, BrowserViewGUI ) { //m_mainWindow = mainWindow; TQTextCodec* codec = KGlobal::locale()->codecForEncoding(); @@ -507,32 +507,32 @@ void KonqAboutPage::urlSelected( const TQString &url, int button, int state, con return; } - if ( url == TQString::tqfromLatin1("launch.html") ) + if ( url == TQString::fromLatin1("launch.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::launch(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("intro.html") ) + else if ( url == TQString::fromLatin1("intro.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::intro(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("specs.html") ) + else if ( url == TQString::fromLatin1("specs.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::specs(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("tips.html") ) + else if ( url == TQString::fromLatin1("tips.html") ) { emit browserExtension()->openURLNotify(); serve( KonqAboutPageFactory::tips(), "konqueror" ); return; } - else if ( url == TQString::tqfromLatin1("config:/disable_overview") ) + else if ( url == TQString::fromLatin1("config:/disable_overview") ) { if ( KMessageBox::questionYesNo( widget(), i18n("Do you want to disable showing " diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index 3d53cf02c..c72a85250 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -13,7 +13,7 @@ public: KonqAboutPageFactory( TQObject *parent = 0, const char *name = 0 ); virtual ~KonqAboutPageFactory(); - virtual KParts::Part *createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); @@ -37,7 +37,7 @@ class KonqAboutPage : public KHTMLPart Q_OBJECT public: KonqAboutPage( /*KonqMainWindow *mainWindow,*/ - TQWidget *tqparentWidget, const char *widgetName, + TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ); ~KonqAboutPage(); diff --git a/konqueror/about/launch.html b/konqueror/about/launch.html index ed78e44fa..9acc5d6a9 100644 --- a/konqueror/about/launch.html +++ b/konqueror/about/launch.html @@ -60,7 +60,7 @@ <div id="boxCenter"> <table border="0" align="center"> -<!--search bar argument tqreplacement is performed between the "search bar splitter" lines--> +<!--search bar argument replacement is performed between the "search bar splitter" lines--> <!--search bar splitter--> <tr> diff --git a/konqueror/about/specs.html b/konqueror/about/specs.html index 4989754cf..b04212067 100644 --- a/konqueror/about/specs.html +++ b/konqueror/about/specs.html @@ -121,7 +121,7 @@ <td valign="top"><a href="http://www.openssl.org">%1<!--OpenSSL--></a></td> </tr> <tr bgcolor="#fff4c9"> - <td valign="top">%1<!--Bidirectional 16bit tqunicode support--></td> + <td valign="top">%1<!--Bidirectional 16bit unicode support--></td> <td valign="top"> </td> <td valign="top">%1<!--built-in--></td> </tr> diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 2e95106ec..60a384102 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -178,33 +178,33 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) */ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& profile ) { - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); TQStringList allowed_parts; // is duplicated in ../KonquerorIface.cc - allowed_parts << TQString::tqfromLatin1( "konq_iconview.desktop" ) - << TQString::tqfromLatin1( "konq_multicolumnview.desktop" ) - << TQString::tqfromLatin1( "konq_sidebartng.desktop" ) - << TQString::tqfromLatin1( "konq_infolistview.desktop" ) - << TQString::tqfromLatin1( "konq_treeview.desktop" ) - << TQString::tqfromLatin1( "konq_detailedlistview.desktop" ); + allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" ) + << TQString::fromLatin1( "konq_multicolumnview.desktop" ) + << TQString::fromLatin1( "konq_sidebartng.desktop" ) + << TQString::fromLatin1( "konq_infolistview.desktop" ) + << TQString::fromLatin1( "konq_treeview.desktop" ) + << TQString::fromLatin1( "konq_detailedlistview.desktop" ); if( cfg.hasKey( "SafeParts" ) - && cfg.readEntry( "SafeParts" ) != TQString::tqfromLatin1( "SAFE" )) + && cfg.readEntry( "SafeParts" ) != TQString::fromLatin1( "SAFE" )) allowed_parts = cfg.readListEntry( "SafeParts" ); - if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::tqfromLatin1( "ALL" )) + if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "ALL" )) return false; // all parts allowed if( url.isEmpty()) { if( profile.isEmpty()) return true; - TQString profilepath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profile ); + TQString profilepath = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profile ); if( profilepath.isEmpty()) return true; KConfig cfg( profilepath, true ); cfg.setDollarExpansion( true ); cfg.setGroup( "Profile" ); - TQMap< TQString, TQString > entries = cfg.entryMap( TQString::tqfromLatin1( "Profile" )); - TQRegExp urlregexp( TQString::tqfromLatin1( "^View[0-9]*_URL$" )); + TQMap< TQString, TQString > entries = cfg.entryMap( TQString::fromLatin1( "Profile" )); + TQRegExp urlregexp( TQString::fromLatin1( "^View[0-9]*_URL$" )); TQStringList urls; for( TQMap< TQString, TQString >::ConstIterator it = entries.begin(); it != entries.end(); @@ -218,16 +218,16 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString& if( urls.count() != 1 ) return true; url = urls.first(); - mimetype = TQString::tqfromLatin1( "" ); + mimetype = TQString::fromLatin1( "" ); } if( mimetype.isEmpty()) mimetype = KMimeType::findByURL( KURL( url ) )->name(); - KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::tqfromLatin1( "KParts/ReadOnlyPart" ), + KTrader::OfferList offers = KTrader::self()->query( mimetype, TQString::fromLatin1( "KParts/ReadOnlyPart" ), TQString::null, TQString::null ); KService::Ptr serv; if( offers.count() > 0 ) serv = offers.first(); - return serv == NULL || !allowed_parts.tqcontains( serv->desktopEntryName() + TQString::tqfromLatin1(".desktop") ); + return serv == NULL || !allowed_parts.contains( serv->desktopEntryName() + TQString::fromLatin1(".desktop") ); } static int currentScreen() @@ -248,7 +248,7 @@ static int currentScreen() // when reusing a preloaded konqy, make sure your always use a DCOP call which opens a profile ! static TQCString getPreloadedKonqy() { - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "Reusing" ); if( cfg.readNumEntry( "MaxPreloadCount", 1 ) == 0 ) return ""; @@ -271,7 +271,7 @@ static TQCString konqyToReuse( const TQString& url, const TQString& mimetype, co TQByteArray data; TQDataStream str( data, IO_WriteOnly ); str << currentScreen(); - if( !KApplication::dcopClient()->tqfindObject( "konqueror*", "KonquerorIface", + if( !KApplication::dcopClient()->findObject( "konqueror*", "KonquerorIface", "processCanBeReused( int )", data, ret, appObj, false, 3000 ) ) return ""; return ret; @@ -301,8 +301,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co // check if user wants to use external browser // ###### this option seems to have no GUI and to be redundant with BrowserApplication now. // ###### KDE4: remove - KConfig config( TQString::tqfromLatin1("kfmclientrc")); - config.setGroup( TQString::tqfromLatin1("Settings")); + KConfig config( TQString::fromLatin1("kfmclientrc")); + config.setGroup( TQString::fromLatin1("Settings")); TQString strBrowser = config.readPathEntry("ExternalBrowser"); if (!strBrowser.isEmpty()) { @@ -314,7 +314,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co return true; } - if (url.protocol().startsWith(TQString::tqfromLatin1("http"))) + if (url.protocol().startsWith(TQString::fromLatin1("http"))) { config.setGroup("General"); if (!config.readEntry("BrowserApplication").isEmpty()) @@ -330,14 +330,14 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co } } - KConfig cfg( TQString::tqfromLatin1( "konquerorrc" ), true ); + KConfig cfg( TQString::fromLatin1( "konquerorrc" ), true ); cfg.setGroup( "FMSettings" ); if ( newTab || cfg.readBoolEntry( "KonquerorTabforExternalURL", false ) ) { TQCString foundApp, foundObj; TQByteArray data; TQDataStream str( data, IO_WriteOnly ); - if( KApplication::dcopClient()->tqfindObject( "konqueror*", "konqueror-mainwindow*", + if( KApplication::dcopClient()->findObject( "konqueror*", "konqueror-mainwindow*", "windowCanBeUsedForTab()", data, foundApp, foundObj, false, 3000 ) ) { DCOPRef ref( foundApp, foundObj ); @@ -361,7 +361,7 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co { TQString error; /* Well, we can't pass a mimetype through startServiceByDesktopPath ! - if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), url.url(), &error ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; @@ -391,17 +391,17 @@ bool clientApp::openProfile( const TQString & profileName, const TQString & url, if( appId.isEmpty()) { TQString error; - if ( KApplication::startServiceByDesktopPath( TQString::tqfromLatin1("konqueror.desktop"), - TQString::tqfromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) + if ( KApplication::startServiceByDesktopPath( TQString::fromLatin1("konqueror.desktop"), + TQString::fromLatin1("--silent"), &error, &appId, NULL, startup_id_str ) > 0 ) { kdError() << "Couldn't start konqueror from konqueror.desktop: " << error << endl; return false; } // startServiceByDesktopPath waits for the app to register with DCOP - // so when we arrive here, konq is up and running already, and appId tqcontains the identification + // so when we arrive here, konq is up and running already, and appId contains the identification } - TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); if ( profile.isEmpty() ) { fprintf( stderr, "%s", i18n("Profile %1 not found\n").arg(profileName).local8Bit().data() ); @@ -479,7 +479,7 @@ bool clientApp::doIt() } if ( argc == 3 ) { - return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::tqfromLatin1(args->arg(2)) ); + return createNewWindow( args->url(1), command == "newTab", tempFile, TQString::fromLatin1(args->arg(2)) ); } } else if ( command == "openProfile" ) @@ -529,7 +529,7 @@ bool clientApp::doIt() { KURL::List urls; urls.append( args->url(1) ); - const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::tqfromLatin1( "Application" ), TQString::null, TQString::null ); + const KTrader::OfferList offers = KTrader::self()->query( TQString::fromLocal8Bit( args->arg( 2 ) ), TQString::fromLatin1( "Application" ), TQString::null, TQString::null ); if (offers.isEmpty()) return 1; KService::Ptr serv = offers.first(); return KRun::run( *serv, urls ); diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index e075838f5..cf567c33f 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -72,13 +72,13 @@ public: s_defaultViewProps = 0; } - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) { if( args.count() < 1 ) kdWarning() << "KonqKfmIconView: Missing Parameter" << endl; - KonqKfmIconView *obj = new KonqKfmIconView( tqparentWidget, parent, name,args.first() ); + KonqKfmIconView *obj = new KonqKfmIconView( parentWidget, parent, name,args.first() ); return obj; } @@ -164,7 +164,7 @@ void IconViewBrowserExtension::setNameFilter( const TQString &nameFilter ) m_iconView->m_nameFilter = nameFilter; } -KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ) +KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ) : KonqDirPart( parent, name ) , m_bNeedSetCurrentItem( false ) , m_pEnsureVisible( 0 ) @@ -179,7 +179,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, co // Create a properties instance for this view m_pProps = new KonqPropsView( KonqIconViewFactory::instance(), KonqIconViewFactory::defaultViewProps() ); - m_pIconView = new KonqIconViewWidget( tqparentWidget, "qiconview" ); + m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" ); m_pIconView->initConfig( true ); connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()), @@ -206,7 +206,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, co setXMLFile( "konq_iconview.rc" ); - // Don't tqrepaint on configuration changes during construction + // Don't repaint on configuration changes during construction m_bInit = true; m_paDotFiles = new KToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), @@ -313,8 +313,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, co this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); - m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given tqmask" ) ); - m_paUnselect->setToolTip( i18n( "Allows unselecting of file or folder items based on a given tqmask" ) ); + m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) ); + m_paUnselect->setToolTip( i18n( "Allows unselecting of file or folder items based on a given mask" ) ); m_paSelectAll->setToolTip( i18n( "Selects all items" ) ); m_paUnselectAll->setToolTip( i18n( "Unselects all selected items" ) ); m_paInvertSelection->setToolTip( i18n( "Inverts the current selection of items" ) ); @@ -359,7 +359,7 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, co // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); - m_dirLister->setMainWindow(m_pIconView->tqtopLevelWidget()); + m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), this, TQT_SLOT( slotStarted() ) ); @@ -686,7 +686,7 @@ void KonqKfmIconView::newIconSize( int size ) // Stop a preview job that might be running m_pIconView->stopImagePreview(); - // Set icons size, arrage items in grid and tqrepaint the whole view + // Set icons size, arrage items in grid and repaint the whole view m_pIconView->setIcons( size ); // If previews are enabled start a new job @@ -873,7 +873,7 @@ void KonqKfmIconView::slotCanceled( const KURL& url ) if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { m_pIconView->viewport()->setUpdatesEnabled( true ); - m_pIconView->viewport()->tqrepaint(); + m_pIconView->viewport()->repaint(); } if ( m_pEnsureVisible ){ m_pIconView->ensureItemVisible( m_pEnsureVisible ); @@ -889,11 +889,11 @@ void KonqKfmIconView::slotCompleted() m_pTimeoutRefreshTimer->stop(); // If updates to the viewport are still blocked (so slotNewItems() has - // not been called), a viewport tqrepaint is forced. + // not been called), a viewport repaint is forced. if ( !m_pIconView->viewport()->isUpdatesEnabled() ) { m_pIconView->viewport()->setUpdatesEnabled( true ); - m_pIconView->viewport()->tqrepaint(); + m_pIconView->viewport()->repaint(); } // Root item ? Store root item in konqiconviewwidget (whether 0L or not) @@ -1136,7 +1136,7 @@ void KonqKfmIconView::slotRefreshItems( const KFileItemList& entries ) } else { - // In case we tqreplace a big icon with a small one, need to tqrepaint. + // In case we replace a big icon with a small one, need to repaint. if ( bNeedRepaint ) m_pIconView->updateContents(); } @@ -1248,7 +1248,7 @@ void KonqKfmIconView::slotRefreshViewport() TQWidget * vp = m_pIconView->viewport(); bool prevState = vp->isUpdatesEnabled(); vp->setUpdatesEnabled( true ); - vp->tqrepaint(); + vp->repaint(); vp->setUpdatesEnabled( prevState ); } diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index b1ac6df9d..517734182 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -51,7 +51,7 @@ public: enum SortCriterion { NameCaseSensitive, NameCaseInsensitive, Size, Type, Date }; - KonqKfmIconView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ); + KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqKfmIconView(); virtual const KFileItem * currentItem(); diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index cdd790f0b..2aafe885c 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -157,11 +157,11 @@ void KEBApp::createActions() { i18n("&Open in Konqueror"), "fileopen", 0, actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new KAction( - i18n("Check &tqStatus"), "bookmark", 0, + i18n("Check &Status"), "bookmark", 0, actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new KAction( - i18n("Check tqStatus: &All"), 0, + i18n("Check Status: &All"), 0, actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new KAction( i18n("Update All &Favicons"), 0, @@ -237,7 +237,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) { // TODO - add a factory and make all this use the base class if (type == OperaExport) { if (path.isNull()) - path = KOperaBookmarkImporterImpl().tqfindDefaultLocation(true); + path = KOperaBookmarkImporterImpl().findDefaultLocation(true); KOperaBookmarkExporterImpl exporter(mgr(), path); exporter.write(mgr()->root()); return; @@ -253,7 +253,7 @@ void CurrentMgr::doExport(ExportType type, const TQString & _path) { } else if (type == IEExport) { if (path.isNull()) - path = KIEBookmarkImporterImpl().tqfindDefaultLocation(true); + path = KIEBookmarkImporterImpl().findDefaultLocation(true); KIEBookmarkExporterImpl exporter(mgr(), path); exporter.write(mgr()->root()); return; diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index b4d6d6f37..edc4a66bb 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -106,11 +106,11 @@ void BookmarkInfoWidget::showBookmark(const KBookmark &bk) { NodeEditCommand::getNodeText(bk, TQStringList() << "desc")); // readonly fields - updatetqStatus(); + updateStatus(); } -void BookmarkInfoWidget::updatetqStatus() +void BookmarkInfoWidget::updateStatus() { TQString visitDate = CurrentMgr::makeTimeStr( NodeEditCommand::getNodeText(m_bk, TQStringList() << "info" << "metadata" diff --git a/konqueror/keditbookmarks/bookmarkinfo.h b/konqueror/keditbookmarks/bookmarkinfo.h index bc3ee9f37..8565616ed 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.h +++ b/konqueror/keditbookmarks/bookmarkinfo.h @@ -47,7 +47,7 @@ public: KBookmark bookmark() { return m_bk; } bool connected() { return m_connected; }; void setConnected(bool b) { m_connected = b; }; - void updatetqStatus(); + void updateStatus(); public slots: void slotTextChangedURL(const TQString &); diff --git a/konqueror/keditbookmarks/commands.cpp b/konqueror/keditbookmarks/commands.cpp index c7c5f83a6..2ad58a682 100644 --- a/konqueror/keditbookmarks/commands.cpp +++ b/konqueror/keditbookmarks/commands.cpp @@ -218,7 +218,7 @@ void CreateCommand::unexecute() { KBookmark bk = CurrentMgr::bookmarkAt(m_to); Q_ASSERT(!bk.isNull() && !bk.parentGroup().isNull()); - ListView::self()->tqinvalidate(bk.address()); + ListView::self()->invalidate(bk.address()); bk.parentGroup().deleteBookmark(bk); } @@ -643,13 +643,13 @@ KEBMacroCommand* CmdGen::insertMimeSource( bool modified = false; const char *format = 0; for (int i = 0; format = data->format(i), format; i++) { - // qt docs don't say if tqencodedData(blah) where + // qt docs don't say if encodedData(blah) where // blah is not a stored mimetype should return null // or not. so, we search. sucky... if (strcmp(format, "GALEON_BOOKMARK") == 0) { modified = true; TQStoredDrag *mydrag = new TQStoredDrag("application/x-xbel"); - mydrag->setEncodedData(data->tqencodedData("GALEON_BOOKMARK")); + mydrag->setEncodedData(data->encodedData("GALEON_BOOKMARK")); data = mydrag; break; } else if( strcmp(format, "application/x-xbel" )==0) { diff --git a/konqueror/keditbookmarks/commands.h b/konqueror/keditbookmarks/commands.h index f7fd468af..3df5d3acf 100644 --- a/konqueror/keditbookmarks/commands.h +++ b/konqueror/keditbookmarks/commands.h @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 3; tqreplace-tabs on; +// kate: space-indent on; indent-width 3; replace-tabs on; /* This file is part of the KDE project Copyright (C) 2000 David Faure <faure@kde.org> Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index c30930801..a31af0c80 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -59,8 +59,8 @@ void KBookmarkEditorIface::slotDcopUpdatedAccessMetadata(TQString filename, TQSt kdDebug() << "slotDcopUpdatedAccessMetadata(" << url << ")" << endl; // no undo CurrentMgr::self()->mgr()->updateAccessMetadata(url, false); - ListView::self()->updatetqStatus(url); - KEBApp::self()->updatetqStatus(url); + ListView::self()->updateStatus(url); + KEBApp::self()->updateStatus(url); // notice - no save here! see! :) } } diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index 6b44fb0a1..b9b9b4ea9 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -66,13 +66,13 @@ FavIconsItr::FavIconsItr(TQValueList<KBookmark> bks) FavIconsItr::~FavIconsItr() { if (curItem()) - curItem()->restoretqStatus(); + curItem()->restoreStatus(); delete m_updater; } void FavIconsItr::slotDone(bool succeeded) { // kdDebug() << "FavIconsItr::slotDone()" << endl; - curItem()->setTmptqStatus(succeeded ? i18n("OK") : i18n("No favicon found")); + curItem()->setTmpStatus(succeeded ? i18n("OK") : i18n("No favicon found")); holder()->addAffectedBookmark(KBookmark::parentAddress(curBk().address())); delayedEmitNextOne(); } @@ -83,7 +83,7 @@ bool FavIconsItr::isApplicable(const KBookmark &bk) const { void FavIconsItr::doAction() { // kdDebug() << "FavIconsItr::doAction()" << endl; - curItem()->setTmptqStatus(i18n("Updating favicon...")); + curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); connect(m_updater, TQT_SIGNAL( done(bool) ), @@ -92,7 +92,7 @@ void FavIconsItr::doAction() { if (curBk().url().protocol().startsWith("http")) { m_updater->downloadIcon(curBk()); } else { - curItem()->setTmptqStatus(i18n("Local file")); + curItem()->setTmpStatus(i18n("Local file")); delayedEmitNextOne(); } } diff --git a/konqueror/keditbookmarks/importers.cpp b/konqueror/keditbookmarks/importers.cpp index 188398481..4df0d237d 100644 --- a/konqueror/keditbookmarks/importers.cpp +++ b/konqueror/keditbookmarks/importers.cpp @@ -73,7 +73,7 @@ ImportCommand* ImportCommand::performImport(const TQCString &type, TQWidget *top int answer = KMessageBox::questionYesNoCancel( - top, i18n("Import as a new subfolder or tqreplace all the current bookmarks?"), + top, i18n("Import as a new subfolder or replace all the current bookmarks?"), i18n("%1 Import").arg(importer->visibleName()), i18n("As New Folder"), i18n("Replace")); @@ -149,27 +149,27 @@ TQString ImportCommand::affectedBookmarks() const TQString MozImportCommand::requestFilename() const { static KMozillaBookmarkImporterImpl importer; - return importer.tqfindDefaultLocation(); + return importer.findDefaultLocation(); } TQString NSImportCommand::requestFilename() const { static KNSBookmarkImporterImpl importer; - return importer.tqfindDefaultLocation(); + return importer.findDefaultLocation(); } TQString OperaImportCommand::requestFilename() const { static KOperaBookmarkImporterImpl importer; - return importer.tqfindDefaultLocation(); + return importer.findDefaultLocation(); } TQString CrashesImportCommand::requestFilename() const { static KCrashBookmarkImporterImpl importer; - return importer.tqfindDefaultLocation(); + return importer.findDefaultLocation(); } TQString IEImportCommand::requestFilename() const { static KIEBookmarkImporterImpl importer; - return importer.tqfindDefaultLocation(); + return importer.findDefaultLocation(); } // following two are really just xbel diff --git a/konqueror/keditbookmarks/keditbookmarks.kcfg b/konqueror/keditbookmarks/keditbookmarks.kcfg index 60c5f5933..16da3d8b9 100644 --- a/konqueror/keditbookmarks/keditbookmarks.kcfg +++ b/konqueror/keditbookmarks/keditbookmarks.kcfg @@ -39,4 +39,4 @@ </entry> </group> -</kcfg> +</kcfg>
\ No newline at end of file diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 554f06b99..1fa31e967 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -158,12 +158,12 @@ TQValueList<KBookmark> ListView::itemsToBookmarks(const TQValueVector<KEBListVie return bookmarks; } -void ListView::tqinvalidate(const TQString & address) +void ListView::invalidate(const TQString & address) { - tqinvalidate(getItemAtAddress(address)); + invalidate(getItemAtAddress(address)); } -void ListView::tqinvalidate(TQListViewItem * item) +void ListView::invalidate(TQListViewItem * item) { if(item->isSelected()) { @@ -181,7 +181,7 @@ void ListView::tqinvalidate(TQListViewItem * item) TQListViewItem * child = item->firstChild(); while(child) { - //tqinvalidate(child); + //invalidate(child); child = child->nextSibling(); } } @@ -277,7 +277,7 @@ void ListView::deselectAllChildren(KEBListViewItem *item) else deselectAllChildren(child); } - child->tqrepaint(); + child->repaint(); child = static_cast<KEBListViewItem *>(child->nextSibling()); } } @@ -436,7 +436,7 @@ void ListView::handleDropped(KEBListView *, TQDropEvent *e, TQListViewItem *newP CmdHistory::self()->didCommand(mcmd); } -void ListView::updatetqStatus(TQString url) { +void ListView::updateStatus(TQString url) { m_listView->updateByURL(url); } @@ -483,7 +483,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI KEBListViewItem *tree = new KEBListViewItem(lv, group); fillWithGroup(lv, group, tree); tree->TQListViewItem::setOpen(true); - if (s_selected_addresses.tqcontains(tree->bookmark().address())) + if (s_selected_addresses.contains(tree->bookmark().address())) lv->setSelected(tree, true); if(!s_current_address.isNull() && s_current_address == tree->bookmark().address()) lv->setCurrentItem(tree); @@ -515,7 +515,7 @@ void ListView::fillWithGroup(KEBListView *lv, KBookmarkGroup group, KEBListViewI : new KEBListViewItem(lv, bk)); lastItem = item; } - if (s_selected_addresses.tqcontains(bk.address())) + if (s_selected_addresses.contains(bk.address())) lv->setSelected(item, true); if(!s_current_address.isNull() && s_current_address == bk.address()) lv->setCurrentItem(item); @@ -670,7 +670,7 @@ void KEBListView::loadColumnSetting() header()->resizeSection(KEBListView::NameColumn, KEBSettings::name()); header()->resizeSection(KEBListView::UrlColumn, KEBSettings::uRL()); header()->resizeSection(KEBListView::CommentColumn, KEBSettings::comment()); - header()->resizeSection(KEBListView::tqStatusColumn, KEBSettings::status()); + header()->resizeSection(KEBListView::StatusColumn, KEBSettings::status()); #ifdef DEBUG_ADDRESSES header()->resizeSection(KEBListView::AddressColumn, KEBSettings::address()); #endif @@ -683,7 +683,7 @@ void KEBListView::saveColumnSetting () KEBSettings::setName( header()->sectionSize(KEBListView::NameColumn)); KEBSettings::setURL( header()->sectionSize(KEBListView::UrlColumn)); KEBSettings::setComment( header()->sectionSize(KEBListView::CommentColumn)); - KEBSettings::setStatus( header()->sectionSize(KEBListView::tqStatusColumn)); + KEBSettings::setStatus( header()->sectionSize(KEBListView::StatusColumn)); #ifdef DEBUG_ADDRESSES KEBSettings::setAddress( header()->sectionSize(KEBListView::AddressColumn)); #endif @@ -702,7 +702,7 @@ void KEBListView::init() { addColumn(i18n("Bookmark"), 0); // KEBListView::NameColumn addColumn(i18n("URL"), 0); addColumn(i18n("Comment"), 0); - addColumn(i18n("tqStatus"), 0); + addColumn(i18n("Status"), 0); #ifdef DEBUG_ADDRESSES addColumn(i18n("Address"), 0); #endif @@ -829,7 +829,7 @@ void KEBListViewItem::setSelected(bool s) { ListView::self()->selected(this, false); TQListViewItem::setSelected( false ); - ListView::deselectAllChildren( this ); //tqrepaints + ListView::deselectAllChildren( this ); //repaints } else if(parentSelected(this)) return; @@ -939,7 +939,7 @@ void KEBListViewItem::paintCell(TQPainter *p, const TQColorGroup &ocg, int col, cg.setColor(TQColorGroup::Base, col); } - if (col == KEBListView::tqStatusColumn) { + if (col == KEBListView::StatusColumn) { switch (m_paintStyle) { case KEBListViewItem::GreyStyle: { diff --git a/konqueror/keditbookmarks/listview.h b/konqueror/keditbookmarks/listview.h index 3e6110535..0ca0edf38 100644 --- a/konqueror/keditbookmarks/listview.h +++ b/konqueror/keditbookmarks/listview.h @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 3; tqreplace-tabs on; +// kate: space-indent on; indent-width 3; replace-tabs on; /* This file is part of the KDE project Copyright (C) 2002-2003 Alexander Kellett <lypanov@kde.org> @@ -52,11 +52,11 @@ public: void modUpdate(); - void setOldtqStatus(const TQString &); - void setTmptqStatus(const TQString &); - void restoretqStatus(); + void setOldStatus(const TQString &); + void setTmpStatus(const TQString &); + void restoreStatus(); - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); void setSelected ( bool s ); virtual void setOpen(bool); @@ -75,7 +75,7 @@ private: KBookmark m_bookmark; PaintStyle m_paintStyle; bool m_emptyFolderPadder; - TQString m_oldtqStatus; + TQString m_oldStatus; void greyStyle(TQColorGroup &); void boldStyle(TQPainter *); }; @@ -88,7 +88,7 @@ public: NameColumn = 0, UrlColumn = 1, CommentColumn = 2, - tqStatusColumn = 3, + StatusColumn = 3, AddressColumn = 4 }; KEBListView(TQWidget *parent, bool folderList) @@ -140,8 +140,8 @@ public: // selected item stuff void selected(KEBListViewItem * item, bool s); - void tqinvalidate(const TQString & address); - void tqinvalidate(TQListViewItem * item); + void invalidate(const TQString & address); + void invalidate(TQListViewItem * item); void fixUpCurrent(const TQString & address); KEBListViewItem * firstSelected() const; @@ -172,7 +172,7 @@ public: void rename(int); void clearSelection(); - void updatetqStatus(TQString url); + void updateStatus(TQString url); static ListView* self() { return s_self; } static void createListViews(TQSplitter *parent); diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index e0a2ae01a..3416e7e0d 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -67,7 +67,7 @@ static void continueInWindow(TQString _wname) { for (QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it) { TQCString &clientId = *it; - if (tqstrncmp(clientId, wname, wname.length()) != 0) + if (qstrncmp(clientId, wname, wname.length()) != 0) continue; DCOPRef client(clientId.data(), wname + "-mainwindow#1"); @@ -139,8 +139,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) { bool gotArg = (args->count() == 1); TQString filename = gotArg - ? TQString::tqfromLatin1(args->arg(0)) - : locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + ? TQString::fromLatin1(args->arg(0)) + : locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); if (!isGui) { CurrentMgr::self()->createManager(filename); diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index f6d396805..0d7d0ddf8 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -73,7 +73,7 @@ TestLinkItr::TestLinkItr(TQValueList<KBookmark> bks) TestLinkItr::~TestLinkItr() { if (m_job) { // kdDebug() << "JOB kill\n"; - curItem()->restoretqStatus(); + curItem()->restoreStatus(); m_job->disconnect(); m_job->kill(false); } @@ -95,9 +95,9 @@ void TestLinkItr::doAction() { connect(m_job, TQT_SIGNAL( data( KIO::Job *, const TQByteArray &)), this, TQT_SLOT( slotJobData(KIO::Job *, const TQByteArray &))); - curItem()->setTmptqStatus(i18n("Checking...")); + curItem()->setTmpStatus(i18n("Checking...")); TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); - curItem()->setOldtqStatus(oldModDate); + curItem()->setOldStatus(oldModDate); TestLinkItrHolder::self()->setMod(curBk().url().url(), i18n("Checking...")); } @@ -144,7 +144,7 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { // can we assume that errorString will contain no entities? TQString jerr = job->errorString(); if (!jerr.isEmpty()) { - jerr.tqreplace("\n", " "); + jerr.replace("\n", " "); curItem()->nsPut(jerr); chkErr = false; } @@ -166,13 +166,13 @@ void TestLinkItr::slotJobResult(KIO::Job *job) { /* -------------------------- */ const TQString TestLinkItrHolder::getMod(const TQString &url) const { - return m_modify.tqcontains(url) + return m_modify.contains(url) ? m_modify[url] : TQString::null; } const TQString TestLinkItrHolder::getOldVisit(const TQString &url) const { - return self()->m_oldModify.tqcontains(url) + return self()->m_oldModify.contains(url) ? self()->m_oldModify[url] : TQString::null; } @@ -347,7 +347,7 @@ void KEBListViewItem::nsPut(const TQString &newModDate) { TQString blah = updateNsInfoMod(info, newModDate); m_bookmark.internalElement().setAttribute(NetscapeInfoAttribute, blah); TestLinkItrHolder::self()->setMod(m_bookmark.url().url(), newModDate); - setText(KEBListView::tqStatusColumn, newModDate); + setText(KEBListView::StatusColumn, newModDate); } // KEBListViewItem !!!!!!!!!!! @@ -365,29 +365,29 @@ void KEBListViewItem::modUpdate() { TQString statusLine; statusLine = TestLinkItrHolder::calcPaintStyle(m_bookmark.url().url(), m_paintStyle, iVisit, oldModify); if (statusLine != "Error") - setText(KEBListView::tqStatusColumn, statusLine); + setText(KEBListView::StatusColumn, statusLine); } /* -------------------------- */ // KEBListViewItem !!!!!!!!!!! -void KEBListViewItem::setOldtqStatus(const TQString &oldtqStatus) { - // kdDebug() << "KEBListViewItem::setOldtqStatus" << endl; - m_oldtqStatus = oldtqStatus; +void KEBListViewItem::setOldStatus(const TQString &oldStatus) { + // kdDebug() << "KEBListViewItem::setOldStatus" << endl; + m_oldStatus = oldStatus; } // KEBListViewItem !!!!!!!!!!! -void KEBListViewItem::setTmptqStatus(const TQString &status) { - // kdDebug() << "KEBListViewItem::setTmptqStatus" << endl; +void KEBListViewItem::setTmpStatus(const TQString &status) { + // kdDebug() << "KEBListViewItem::setTmpStatus" << endl; m_paintStyle = KEBListViewItem::BoldStyle; - setText(KEBListView::tqStatusColumn, status); + setText(KEBListView::StatusColumn, status); } // KEBListViewItem !!!!!!!!!!! -void KEBListViewItem::restoretqStatus() { - if (!m_oldtqStatus.isNull()) { - // kdDebug() << "KEBListViewItem::restoretqStatus" << endl; - TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldtqStatus); +void KEBListViewItem::restoreStatus() { + if (!m_oldStatus.isNull()) { + // kdDebug() << "KEBListViewItem::restoreStatus" << endl; + TestLinkItrHolder::self()->resetToValue(m_bookmark.url().url(), m_oldStatus); modUpdate(); } } diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index 3af294f26..4a505d495 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -82,7 +82,7 @@ void CmdHistory::slotCommandExecuted(KCommand *k) { CurrentMgr::self()->notifyManagers(bk.toGroup()); // sets currentItem to something sensible - // if the currentItem was tqinvalidated by executing + // if the currentItem was invalidated by executing // CreateCommand or DeleteManyCommand // otherwise does nothing // sensible is either a already selected item or cmd->currentAddress() @@ -122,7 +122,7 @@ void CmdHistory::clearHistory() { CurrentMgr *CurrentMgr::s_mgr = 0; KBookmark CurrentMgr::bookmarkAt(const TQString &a) { - return self()->mgr()->tqfindByAddress(a); + return self()->mgr()->findByAddress(a); } bool CurrentMgr::managerSave() { return mgr()->save(); } @@ -184,7 +184,7 @@ TQString CurrentMgr::makeTimeStr(int b) { TQDateTime dt; dt.setTime_t(b); - return (dt.daysTo(TQDateTime::tqcurrentDateTime()) > 31) + return (dt.daysTo(TQDateTime::currentDateTime()) > 31) ? KGlobal::locale()->formatDate(dt.date(), false) : KGlobal::locale()->formatDateTime(dt, false); } @@ -233,11 +233,11 @@ KEBApp::KEBApp( vsplitter->setOrientation(TQSplitter::Vertical); vsplitter->setSizes(TQValueList<int>() << h << 380 - << m_bkinfo->tqsizeHint().height() ); + << m_bkinfo->sizeHint().height() ); setCentralWidget(vsplitter); - resize(ListView::self()->widget()->tqsizeHint().width(), - vsplitter->tqsizeHint().height()); + resize(ListView::self()->widget()->sizeHint().width(), + vsplitter->sizeHint().height()); createActions(); if (m_browser) @@ -276,10 +276,10 @@ void KEBApp::construct() { setAutoSaveSettings(); } -void KEBApp::updatetqStatus(TQString url) +void KEBApp::updateStatus(TQString url) { if(m_bkinfo->bookmark().url() == url) - m_bkinfo->updatetqStatus(); + m_bkinfo->updateStatus(); } KEBApp::~KEBApp() { diff --git a/konqueror/keditbookmarks/toplevel.h b/konqueror/keditbookmarks/toplevel.h index 22ed74ec5..7b1ec5f81 100644 --- a/konqueror/keditbookmarks/toplevel.h +++ b/konqueror/keditbookmarks/toplevel.h @@ -116,7 +116,7 @@ public: KEBApp(const TQString & bookmarksFile, bool readonly, const TQString &address, bool browser, const TQString &caption); virtual ~KEBApp(); - void updatetqStatus(TQString url); + void updateStatus(TQString url); void setActionsEnabled(SelcAbilities); void setCancelFavIconUpdatesEnabled(bool); diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index 3314d15ec..7cb8a6148 100644 --- a/konqueror/konq_actions.cc +++ b/konqueror/konq_actions.cc @@ -63,7 +63,7 @@ void KonqBidiHistoryAction::fillHistoryPopup( const TQPtrList<HistoryEntry> &his { TQString text = it.current()->title; text = KStringHandler::cEmSqueeze(text, popup->fontMetrics(), 30); //CT: squeeze - text.tqreplace( "&", "&&" ); + text.replace( "&", "&&" ); if ( checkCurrentItem && it.current() == current ) { int id = popup->insertItem( text ); // no pixmap if checked @@ -103,7 +103,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) connect( m_goMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); //kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl; - // Store how many items the menu already tqcontains. + // Store how many items the menu already contains. // This means, the KonqBidiHistoryAction has to be plugged LAST in a menu ! m_firstIndex = m_goMenu->count(); return m_goMenu->count(); // hmmm, what should this be ? diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 0cbab502f..0a73e6c83 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -99,7 +99,7 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) m_pageSecurity( KonqMainWindow::NotCrypted ) { setInsertionPolicy( NoInsertion ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); Q_ASSERT( s_config ); @@ -307,7 +307,7 @@ void KonqCombo::updatePixmaps() updateItem( prov->pixmapFor( text( i ) ), text( i ), i, titleOfURL( text( i ) ) ); } setUpdatesEnabled( true ); - tqrepaint(); + repaint(); restoreState(); } @@ -540,7 +540,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) if ( e->button() == LeftButton && pixmap( currentItem()) ) { // check if the pixmap was clicked int x = e->pos().x(); - int x0 = TQStyle::tqvisualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x(); if ( x > x0 + 2 && x < lineEdit()->x() ) { m_dragStart = e->pos(); @@ -551,7 +551,7 @@ void KonqCombo::mousePressEvent( TQMouseEvent *e ) if ( e->button() == LeftButton && m_pageSecurity!=KonqMainWindow::NotCrypted ) { // check if the lock icon was clicked int x = e->pos().x(); - int x0 = TQStyle::tqvisualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); + int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow ), this ).x(); if ( x < x0 ) emit showPageSecurity(); @@ -605,7 +605,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) TQLineEdit *edit = lineEdit(); TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + re = TQStyle::visualRect(re, this); if ( m_pageSecurity!=KonqMainWindow::NotCrypted ) { TQColor color(245, 246, 190); @@ -620,9 +620,9 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) p.drawPixmap( re.x() + 2, re.y() + ( re.height() - pix.height() ) / 2, pix ); } - TQRect r = edit->tqgeometry(); + TQRect r = edit->geometry(); r.setRight( re.right() - pix.width() - 4 ); - if ( r != edit->tqgeometry() ) + if ( r != edit->geometry() ) edit->setGeometry( r ); if ( useColor) @@ -635,9 +635,9 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) p.setClipping( FALSE ); } else { - TQRect r = edit->tqgeometry(); + TQRect r = edit->geometry(); r.setRight( re.right() ); - if ( r != edit->tqgeometry() ) + if ( r != edit->geometry() ) edit->setGeometry( r ); edit->setPaletteBackgroundColor( TQApplication::palette( edit ).color( TQPalette::Active, TQColorGroup::Base ) ); } @@ -646,7 +646,7 @@ void KonqCombo::paintEvent( TQPaintEvent *pe ) void KonqCombo::setPageSecurity( int pageSecurity ) { m_pageSecurity = pageSecurity; - tqrepaint(); + repaint(); } bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) @@ -723,8 +723,8 @@ void KonqComboListBoxPixmap::paint( TQPainter *painter ) pmWidth = pm->width() + 5; } - int entryWidth = listBox()->width() - listBox()->style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) - - 2 * listBox()->style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ); + int entryWidth = listBox()->width() - listBox()->style().pixelMetric( TQStyle::PM_ScrollBarExtent ) - + 2 * listBox()->style().pixelMetric( TQStyle::PM_DefaultFrameWidth ); int titleWidth = ( entryWidth / 3 ) - 1; int urlWidth = entryWidth - titleWidth - pmWidth - 2; @@ -850,7 +850,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items ) insertStringList( items ); else { //Keep track of whether we need to change anything, - //so we can avoid a tqrepaint for identical updates, + //so we can avoid a repaint for identical updates, //to reduce flicker bool dirty = false; @@ -884,7 +884,7 @@ void KonqComboCompletionBox::setItems( const TQStringList& items ) triggerUpdate( false ); } - if ( isVisible() && size().height() != tqsizeHint().height() ) + if ( isVisible() && size().height() != sizeHint().height() ) sizeAndPosition(); blockSignals( block ); diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index 42b117af6..d6d9f71a0 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -65,7 +65,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai if ( activePart ) { KInstance* instance = activePart->instance(); d->pluginSelector->addPlugins(instance->instanceName(), i18n("Tools"), "Tools", instance->config()); - d->pluginSelector->addPlugins(instance->instanceName(), i18n("tqStatusbar"), "tqStatusbar", instance->config()); + d->pluginSelector->addPlugins(instance->instanceName(), i18n("Statusbar"), "Statusbar", instance->config()); } } diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index 8417bf580..8dfee7f85 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -42,10 +42,10 @@ KonqViewFactory::KonqViewFactory( KLibFactory *factory, const TQStringList &args : m_factory( factory ), m_args( args ), m_createBrowser( createBrowser ) { if ( m_createBrowser ) - m_args << TQString::tqfromLatin1( "Browser/View" ); + m_args << TQString::fromLatin1( "Browser/View" ); } -KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *tqparentWidget, const char *widgetName, +KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name ) { if ( !m_factory ) @@ -56,18 +56,18 @@ KParts::ReadOnlyPart *KonqViewFactory::create( TQWidget *tqparentWidget, const c if ( m_factory->inherits( "KParts::Factory" ) ) { if ( m_createBrowser ) - obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "Browser/View", m_args ); + obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "Browser/View", m_args ); if ( !obj ) - obj = static_cast<KParts::Factory *>(m_factory)->createPart( tqparentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args ); + obj = static_cast<KParts::Factory *>(m_factory)->createPart( parentWidget, widgetName, parent, name, "KParts::ReadOnlyPart", m_args ); } else { if ( m_createBrowser ) - obj = m_factory->create( tqparentWidget, name, "Browser/View", m_args ); + obj = m_factory->create( parentWidget, name, "Browser/View", m_args ); if ( !obj ) - obj = m_factory->create( tqparentWidget, name, "KParts::ReadOnlyPart", m_args ); + obj = m_factory->create( parentWidget, name, "KParts::ReadOnlyPart", m_args ); } if ( !obj->inherits( "KParts::ReadOnlyPart" ) ) @@ -189,7 +189,7 @@ KonqViewFactory KonqFactory::createView( const TQString &serviceType, args = TQStringList::split( " ", argStr ); } - return KonqViewFactory( factory, args, service->serviceTypes().tqcontains( "Browser/View" ) ); + return KonqViewFactory( factory, args, service->serviceTypes().contains( "Browser/View" ) ); } void KonqFactory::getOffers( const TQString & serviceType, diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index 1f7834d64..ac24061e6 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -52,7 +52,7 @@ public: return *this; } - KParts::ReadOnlyPart *create( TQWidget *tqparentWidget, const char *widgetName, + KParts::ReadOnlyPart *create( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name ); bool isNull() const { return m_factory ? false : true; } diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 265aa0d15..ef474a4cb 100644 --- a/konqueror/konq_frame.cc +++ b/konqueror/konq_frame.cc @@ -68,20 +68,20 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) setSizeGripEnabled( false ); m_led = new TQLabel( this ); - m_led->tqsetAlignment( Qt::AlignCenter ); - m_led->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_led->setAlignment( Qt::AlignCenter ); + m_led->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); addWidget( m_led, 0, false ); // led (active view indicator) m_led->hide(); - m_ptqStatusLabel = new KSqueezedTextLabel( this ); - m_ptqStatusLabel->setMinimumSize( 0, 0 ); - m_ptqStatusLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); - m_ptqStatusLabel->installEventFilter(this); - addWidget( m_ptqStatusLabel, 1 /*stretch*/, false ); // status label + m_pStatusLabel = new KSqueezedTextLabel( this ); + m_pStatusLabel->setMinimumSize( 0, 0 ); + m_pStatusLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed )); + m_pStatusLabel->installEventFilter(this); + addWidget( m_pStatusLabel, 1 /*stretch*/, false ); // status label m_pLinkedViewCheckBox = new KonqCheckBox( this, "m_pLinkedViewCheckBox" ); m_pLinkedViewCheckBox->setFocusPolicy(NoFocus); - m_pLinkedViewCheckBox->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); + m_pLinkedViewCheckBox->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); TQWhatsThis::add( m_pLinkedViewCheckBox, i18n("Checking this box on at least two views sets those views as 'linked'. " "Then, when you change directories in one view, the other views " @@ -99,7 +99,7 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) addWidget( m_progressBar, 0, true /*permanent->right align*/ ); // // FIXME: This was added by OpenSUSE; someone needs to figure out what it does and how to fix it! -// StatusBarNetworktqStatusIndicator * indicator = new StatusBarNetworktqStatusIndicator( this, "networkstatusindicator" ); +// StatusBarNetworkStatusIndicator * indicator = new StatusBarNetworkStatusIndicator( this, "networkstatusindicator" ); // addWidget( indicator, 0, false ); // indicator->init(); @@ -118,7 +118,7 @@ void KonqFrameStatusBar::fontChange(const TQFont & /* oldFont */) m_led->setFixedHeight( h + 2 ); m_progressBar->setFixedHeight( h + 2 ); // This one is important. Otherwise richtext messages make it grow in height. - m_ptqStatusLabel->setFixedHeight( h + 2 ); + m_pStatusLabel->setFixedHeight( h + 2 ); } @@ -173,7 +173,7 @@ void KonqFrameStatusBar::splitFrameMenu() bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) { - if (o == m_ptqStatusLabel && e->type()==TQEvent::MouseButtonPress) + if (o == m_pStatusLabel && e->type()==TQEvent::MouseButtonPress) { emit clicked(); update(); @@ -184,7 +184,7 @@ bool KonqFrameStatusBar::eventFilter(TQObject* o, TQEvent *e) else if ( o == this && e->type() == TQEvent::ApplicationPaletteChange ) { unsetPalette(); - updateActivetqStatus(); + updateActiveStatus(); return true; } @@ -197,21 +197,21 @@ void KonqFrameStatusBar::message( const TQString &msg ) // it really looks ugly (the label border goes away, the active-view indicator // is hidden...) TQString saveMsg = m_savedMessage; - slotDisplaytqStatusText( msg ); + slotDisplayStatusText( msg ); m_savedMessage = saveMsg; } -void KonqFrameStatusBar::slotDisplaytqStatusText(const TQString& text) +void KonqFrameStatusBar::slotDisplayStatusText(const TQString& text) { - //kdDebug(1202)<<"KonqFrameHeader::slotDisplaytqStatusText("<<text<<")"<<endl; - //m_ptqStatusLabel->resize(fontMetrics().width(text),fontMetrics().height()+2); - m_ptqStatusLabel->setText(text); + //kdDebug(1202)<<"KonqFrameHeader::slotDisplayStatusText("<<text<<")"<<endl; + //m_pStatusLabel->resize(fontMetrics().width(text),fontMetrics().height()+2); + m_pStatusLabel->setText(text); m_savedMessage = text; } void KonqFrameStatusBar::slotClear() { - slotDisplaytqStatusText( m_savedMessage ); + slotDisplayStatusText( m_savedMessage ); } void KonqFrameStatusBar::slotLoadingProgress( int percent ) @@ -236,20 +236,20 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) else sizeStr = i18n( "Stalled" ); - slotDisplaytqStatusText( sizeStr ); // let's share the same label... + slotDisplayStatusText( sizeStr ); // let's share the same label... } void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne) { if (newOne!=0) - connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplaytqStatusText(const TQString&))); - slotDisplaytqStatusText( TQString::null ); + connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&))); + slotDisplayStatusText( TQString::null ); } void KonqFrameStatusBar::showActiveViewIndicator( bool b ) { m_led->setShown( b ); - updateActivetqStatus(); + updateActiveStatus(); } void KonqFrameStatusBar::showLinkedViewIndicator( bool b ) @@ -264,7 +264,7 @@ void KonqFrameStatusBar::setLinkedView( bool b ) m_pLinkedViewCheckBox->blockSignals( false ); } -void KonqFrameStatusBar::updateActivetqStatus() +void KonqFrameStatusBar::updateActiveStatus() { if ( !m_led->isShown() ) { @@ -301,7 +301,7 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); - m_pStatusBar->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; @@ -327,16 +327,16 @@ void KonqFrame::listViews( ChildViewList *viewList ) void KonqFrame::saveConfig( KConfig* config, const TQString &prefix, bool saveURLs, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { if (saveURLs) - config->writePathEntry( TQString::tqfromLatin1( "URL" ).prepend( prefix ), + config->writePathEntry( TQString::fromLatin1( "URL" ).prepend( prefix ), childView()->url().url() ); - config->writeEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); - config->writeEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); - config->writeEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); - config->writeEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); - config->writeEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); - config->writeEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); - //config->writeEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); - if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + config->writeEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), childView()->serviceType() ); + config->writeEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ), childView()->service()->desktopEntryName() ); + config->writeEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), childView()->isPassiveMode() ); + config->writeEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), childView()->isLinkedView() ); + config->writeEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), childView()->isToggleView() ); + config->writeEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), childView()->isLockedLocation() ); + //config->writeEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); KonqConfigEvent ev( config, prefix+"_", true/*save*/); TQApplication::sendEvent( childView()->part(), &ev ); @@ -460,7 +460,7 @@ void KonqFrame::slotLinkedViewClicked( bool mode ) void KonqFrame::paintEvent( TQPaintEvent* ) { - m_pStatusBar->tqrepaint(); + m_pStatusBar->repaint(); } void KonqFrame::slotRemoveView() @@ -517,40 +517,40 @@ void KonqFrameContainer::saveConfig( KConfig* config, const TQString &prefix, bo int idSecond = id + (int)pow( 2.0, depth ); //write children sizes - config->writeEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); + config->writeEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix ), sizes() ); //write children TQStringList strlst; if( firstChild() ) - strlst.append( TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); + strlst.append( TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1) ); if( secondChild() ) - strlst.append( TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); + strlst.append( TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ) ); - config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); //write orientation TQString o; if( orientation() == Qt::Horizontal ) - o = TQString::tqfromLatin1("Horizontal"); + o = TQString::fromLatin1("Horizontal"); else if( orientation() == Qt::Vertical ) - o = TQString::tqfromLatin1("Vertical"); - config->writeEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ), o ); + o = TQString::fromLatin1("Vertical"); + config->writeEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ), o ); //write docContainer - if (this == docContainer) config->writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + if (this == docContainer) config->writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); - if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); - else config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); + if (m_pSecondChild == m_pActiveChild) config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 1 ); + else config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), 0 ); //write child configs if( firstChild() ) { - TQString newPrefix = TQString::tqfromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); + TQString newPrefix = TQString::fromLatin1( firstChild()->frameType() ) + TQString::number(idSecond - 1); newPrefix.append( '_' ); firstChild()->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + 1 ); } if( secondChild() ) { - TQString newPrefix = TQString::tqfromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); + TQString newPrefix = TQString::fromLatin1( secondChild()->frameType() ) + TQString::number( idSecond ); newPrefix.append( '_' ); secondChild()->saveConfig( config, newPrefix, saveURLs, docContainer, idSecond, depth + 1 ); } @@ -661,7 +661,7 @@ void KonqFrameContainer::removeChildFrame( KonqFrameBase * frame ) void KonqFrameContainer::childEvent( TQChildEvent *c ) { - // Child events cause tqlayout changes. These are unnecassery if we are going + // Child events cause layout changes. These are unnecassery if we are going // to be deleted anyway. if (!m_bAboutToBeDeleted) TQSplitter::childEvent(c); diff --git a/konqueror/konq_frame.h b/konqueror/konq_frame.h index b07859ecf..c695515e8 100644 --- a/konqueror/konq_frame.h +++ b/konqueror/konq_frame.h @@ -59,7 +59,7 @@ namespace KParts /** * A CheckBox with a special paintEvent(). It looks like the - * unchecked radiobutton in b2k style if unchecked and tqcontains a little + * unchecked radiobutton in b2k style if unchecked and contains a little * anchor if checked. */ class KonqCheckBox : public QCheckBox @@ -101,13 +101,13 @@ class KonqFrameStatusBar : public KStatusBar /** * Updates the active-view indicator and the statusbar color. */ - void updateActivetqStatus(); + void updateActiveStatus(); public slots: void slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *oldOne,KParts::ReadOnlyPart *newOne); void slotLoadingProgress( int percent ); void slotSpeedProgress( int bytesPerSecond ); - void slotDisplaytqStatusText(const TQString& text); + void slotDisplayStatusText(const TQString& text); void slotClear(); void message ( const TQString & message ); @@ -141,7 +141,7 @@ class KonqFrameStatusBar : public KStatusBar KonqFrame* m_pParentKonqFrame; TQCheckBox *m_pLinkedViewCheckBox; KProgress *m_progressBar; - KSqueezedTextLabel *m_ptqStatusLabel; + KSqueezedTextLabel *m_pStatusLabel; TQLabel* m_led; TQString m_savedMessage; }; @@ -190,10 +190,10 @@ protected: * them on click at the statusbar. * * KonqFrame makes the difference between built-in views and remote ones. - * We create a tqlayout in it (with the KonqFrameStatusBar as top item in the tqlayout) - * For builtin views we have the view as direct child widget of the tqlayout + * We create a layout in it (with the KonqFrameStatusBar as top item in the layout) + * For builtin views we have the view as direct child widget of the layout * For remote views we have an OPFrame, having the view attached, as child - * widget of the tqlayout + * widget of the layout */ class KonqFrame : public TQWidget, public KonqFrameBase @@ -218,12 +218,12 @@ public: virtual bool eventFilter(TQObject*obj,TQEvent *ev); /** - * Inserts the part's widget and the statusbar into the tqlayout + * Inserts the part's widget and the statusbar into the layout */ void attachInternal(); /** - * Inserts a widget at the top of the part's widget, in the tqlayout + * Inserts a widget at the top of the part's widget, in the layout * (used for the find functionality) */ void insertTopWidget( TQWidget * widget ); @@ -257,7 +257,7 @@ public: virtual TQWidget* widget() { return this; } virtual TQCString frameType() { return TQCString("View"); } - TQVBoxLayout *tqlayout()const { return m_pLayout; } + TQVBoxLayout *layout()const { return m_pLayout; } KonqFrameStatusBar *statusbar() const { return m_pStatusBar; } diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cc index 196a046ca..316c88254 100644 --- a/konqueror/konq_guiclients.cc +++ b/konqueror/konq_guiclients.cc @@ -230,7 +230,7 @@ TQPtrList<KAction> ToggleViewGUIClient::actions() const void ToggleViewGUIClient::slotToggleView( bool toggle ) { - TQString serviceName = TQString::tqfromLatin1( sender()->name() ); + TQString serviceName = TQString::fromLatin1( sender()->name() ); bool horizontal = m_mapOrientation[ serviceName ]; @@ -240,7 +240,7 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) { KonqView *childView = viewManager->splitWindow( horizontal ? Qt::Vertical : Qt::Horizontal, - TQString::tqfromLatin1( "Browser/View" ), + TQString::fromLatin1( "Browser/View" ), serviceName, !horizontal /* vertical = make it first */); @@ -299,13 +299,13 @@ void ToggleViewGUIClient::slotToggleView( bool toggle ) void ToggleViewGUIClient::saveConfig( bool add, const TQString &serviceName ) { // This is used on konqueror's startup....... so it's never used, since - // the K menu only tqcontains calls to kfmclient...... + // the K menu only contains calls to kfmclient...... // Well, it could be useful again in the future. // Currently, the profiles save this info. TQStringList toggableViewsShown = KonqSettings::toggableViewsShown(); if (add) { - if ( !toggableViewsShown.tqcontains( serviceName ) ) + if ( !toggableViewsShown.contains( serviceName ) ) toggableViewsShown.append(serviceName); } else diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index 17888e8c8..3f3e47bc3 100644 --- a/konqueror/konq_main.cc +++ b/konqueror/konq_main.cc @@ -76,7 +76,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) while ( KonqMainWindow::canBeRestored( n ) ) { TQString className = KMainWindow::classNameOfToplevel( n ); - if( className == TQString::tqfromLatin1( "KonqMainWindow" )) + if( className == TQString::fromLatin1( "KonqMainWindow" )) (new KonqMainWindow( KURL(), false ) )->restore( n ); else kdWarning() << "Unknown class " << className << " in session saved data!" << endl; @@ -104,7 +104,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) TQString profile = TQString::fromLocal8Bit(args->getOption("profile")); TQString profilePath = profile; if (profile[0] != '/') - profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); + profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); TQString url; TQStringList filesToSelect; if (args->count() == 1) @@ -150,7 +150,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) { // By default try to open in webbrowser mode. People can use "konqueror ." to get a filemanager. TQString profile = "webbrowsing"; - TQString profilePath = locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ); + TQString profilePath = locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ); if ( !profilePath.isEmpty() ) { KonqMisc::createBrowserWindowFromProfile( profilePath, profile ); } else { diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 49a3e925f..ada6c2ef3 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -235,7 +235,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) - plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); else { delete m_toggleViewGUIClient; @@ -342,8 +342,8 @@ KonqMainWindow::~KonqMainWindow() TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { - static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); TQWidget *res = KParts::MainWindow::createContainer( parent, index, element, id ); @@ -393,8 +393,8 @@ void KonqMainWindow::initBookmarkBar() void KonqMainWindow::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) { - static TQString nameBookmarkBar = TQString::tqfromLatin1( "bookmarkToolBar" ); - static TQString tagToolBar = TQString::tqfromLatin1( "ToolBar" ); + static TQString nameBookmarkBar = TQString::fromLatin1( "bookmarkToolBar" ); + static TQString tagToolBar = TQString::fromLatin1( "ToolBar" ); if ( element.tagName() == tagToolBar && element.attribute( "name" ) == nameBookmarkBar ) { @@ -511,7 +511,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, } pclose(fs); } - aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, result ); + aValue.replace( nDollarPos, nEndPos-nDollarPos, result ); } else if( (aValue)[nDollarPos+1] != '$' ) { uint nEndPos = nDollarPos+1; // the next character is no $ @@ -537,7 +537,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, // !!! Sergey A. Sukiyazov <corwin@micom.don.ru> !!! // A environment variables may contain values in 8bit // locale cpecified encoding or in UTF8 encoding. - aValue.tqreplace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); + aValue.replace( nDollarPos, nEndPos-nDollarPos, KStringHandler::from8Bit( pEnv ) ); } else aValue.remove( nDollarPos, nEndPos-nDollarPos ); } else { @@ -966,10 +966,10 @@ void KonqMainWindow::slotOpenURLRequest( const KURL &url, const KParts::URLArgs if ( !frameName.isEmpty() ) { - static TQString _top = TQString::tqfromLatin1( "_top" ); - static TQString _self = TQString::tqfromLatin1( "_self" ); - static TQString _parent = TQString::tqfromLatin1( "_parent" ); - static TQString _blank = TQString::tqfromLatin1( "_blank" ); + static TQString _top = TQString::fromLatin1( "_top" ); + static TQString _self = TQString::fromLatin1( "_self" ); + static TQString _parent = TQString::fromLatin1( "_parent" ); + static TQString _blank = TQString::fromLatin1( "_blank" ); if ( frameName.lower() == _blank ) { @@ -1234,7 +1234,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs mainWindow->viewManager()->setActivePart( part, true ); } - TQString profileName = TQString::tqfromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); + TQString profileName = TQString::fromLatin1( url.isLocalFile() ? "konqueror/profiles/filemanagement" : "konqueror/profiles/webbrowsing" ); KSimpleConfig cfg( locate( "data", profileName ), true ); cfg.setGroup( "Profile" ); @@ -1284,7 +1284,7 @@ void KonqMainWindow::slotCreateNewWindow( const KURL &url, const KParts::URLArgs if ( !windowArgs.resizable ) // ### this doesn't seem to work :-( - mainWindow->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); + mainWindow->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); // Trying to show the window initially behind the current window is a bit tricky, // as this involves the window manager, which may see things differently. @@ -1337,12 +1337,12 @@ void KonqMainWindow::slotNewWindow() if ( profile.isEmpty() ) { if ( m_currentView && m_currentView->url().protocol().startsWith( "http" ) ) - profile = TQString::tqfromLatin1("webbrowsing"); + profile = TQString::fromLatin1("webbrowsing"); else - profile = TQString::tqfromLatin1("filemanagement"); + profile = TQString::fromLatin1("filemanagement"); } KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::tqfromLatin1("konqueror/profiles/")+profile ), + locate( "data", TQString::fromLatin1("konqueror/profiles/")+profile ), profile ); } @@ -1529,7 +1529,7 @@ void KonqMainWindow::slotToolFind() else url.setPath( TQDir::homeDirPath() ); KonqMainWindow * mw = KonqMisc::createBrowserWindowFromProfile( - locate( "data", TQString::tqfromLatin1("konqueror/profiles/filemanagement") ), + locate( "data", TQString::fromLatin1("konqueror/profiles/filemanagement") ), "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) @@ -1653,7 +1653,7 @@ void KonqMainWindow::slotViewModeToggle( bool toggle ) // current viewmode TQPtrListIterator<KAction> it( m_toolBarViewModeActions ); for (; it.current(); ++it ) - if ( TQString::tqfromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) + if ( TQString::fromLatin1( it.current()->name() ) == oldService->desktopEntryName() ) { assert( it.current()->inherits( "KonqViewModeAction" ) ); @@ -1816,11 +1816,11 @@ void KonqMainWindow::slotReload( KonqView* reloadView ) if ( !reloadView || reloadView->url().isEmpty() ) return; - if ( reloadView->part() && (reloadView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if ( reloadView->part() && (reloadView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = reloadView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, - i18n("This page tqcontains changes that have not been submitted.\nReloading the page will discard these changes."), + i18n("This page contains changes that have not been submitted.\nReloading the page will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"reload"), "discardchangesreload") != KMessageBox::Continue ) return; } @@ -2033,7 +2033,7 @@ void KonqMainWindow::slotConfigureToolbars() void KonqMainWindow::slotNewToolbarConfig() // This is called when OK or Apply is clicked { if ( m_toggleViewGUIClient ) - plugActionList( TQString::tqfromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); + plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); if ( m_currentView && m_currentView->appServiceOffers().count() > 0 ) plugActionList( "openwith", m_openWithActions ); @@ -2049,7 +2049,7 @@ void KonqMainWindow::slotUndoAvailable( bool avail ) if ( avail && m_currentView && m_currentView->part() ) { // Avoid qWarning from TQObject::property if it doesn't exist - if ( m_currentView->part()->tqmetaObject()->findProperty( "supportsUndo" ) != -1 ) + if ( m_currentView->part()->metaObject()->findProperty( "supportsUndo" ) != -1 ) { TQVariant prop = m_currentView->part()->property( "supportsUndo" ); if ( prop.isValid() && prop.toBool() ) @@ -2069,7 +2069,7 @@ void KonqMainWindow::slotPartChanged( KonqView *childView, KParts::ReadOnlyPart // Remove the old part, and add the new part to the manager // Note: this makes the new part active... so it calls slotPartActivated - m_pViewManager->tqreplacePart( oldPart, newPart, false ); + m_pViewManager->replacePart( oldPart, newPart, false ); // Set active immediately m_pViewManager->setActivePart( newPart, true ); @@ -2309,10 +2309,10 @@ void KonqMainWindow::slotPartActivated( KParts::Part *part ) m_pMenuNew->setEnabled( m_currentView->supportsServiceType( "inode/directory" ) ); - m_currentView->frame()->statusbar()->updateActivetqStatus(); + m_currentView->frame()->statusbar()->updateActiveStatus(); if ( oldView && oldView->frame() ) - oldView->frame()->statusbar()->updateActivetqStatus(); + oldView->frame()->statusbar()->updateActiveStatus(); //kdDebug(1202) << "KonqMainWindow::slotPartActivated: setting location bar url to " // << m_currentView->locationBarURL() << " m_currentView=" << m_currentView << endl; @@ -2439,7 +2439,7 @@ KonqView * KonqMainWindow::childView( KParts::ReadOnlyPart *callingPart, const T KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() ); if ( ext ) { - ext = ext->tqfindFrameParent(callingPart, name); + ext = ext->findFrameParent(callingPart, name); kdDebug() << "BrowserHostExtension found part " << ext << endl; if (!ext) continue; // Don't use this window @@ -2666,11 +2666,11 @@ void KonqMainWindow::slotDuplicateTabPopup() void KonqMainWindow::slotBreakOffTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, - i18n("This tab tqcontains changes that have not been submitted.\nDetaching the tab will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nDetaching the tab will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_breakoff"), "discardchangesdetach") != KMessageBox::Continue ) return; } @@ -2683,12 +2683,12 @@ void KonqMainWindow::slotBreakOffTabPopup() { KonqView* originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, - i18n("This tab tqcontains changes that have not been submitted.\nDetaching the tab will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nDetaching the tab will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_breakoff"), "discardchangesdetach") != KMessageBox::Continue ) { m_pViewManager->showTab( originalView ); @@ -2788,11 +2788,11 @@ void KonqMainWindow::openMultiURL( KURL::List url ) void KonqMainWindow::slotRemoveView() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, - i18n("This view tqcontains changes that have not been submitted.\nClosing the view will discard these changes."), + i18n("This view contains changes that have not been submitted.\nClosing the view will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"view_remove"), "discardchangesclose") != KMessageBox::Continue ) return; } @@ -2804,11 +2804,11 @@ void KonqMainWindow::slotRemoveView() void KonqMainWindow::slotRemoveTab() { if (m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) { + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, - i18n("This tab tqcontains changes that have not been submitted.\nClosing the tab will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nClosing the tab will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_remove"), "discardchangesclose") != KMessageBox::Continue ) return; } @@ -2820,12 +2820,12 @@ void KonqMainWindow::slotRemoveTabPopup() { KonqView *originalView = m_currentView; KonqView *view = m_pWorkingTab->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, - i18n("This tab tqcontains changes that have not been submitted.\nClosing the tab will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nClosing the tab will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_remove"), "discardchangesclose") != KMessageBox::Continue ) { m_pViewManager->showTab( originalView ); @@ -2857,12 +2857,12 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if ( view != originalView && view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if ( view != originalView && view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, - i18n("This tab tqcontains changes that have not been submitted.\nClosing other tabs will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nClosing other tabs will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"tab_remove"), "discardchangescloseother") != KMessageBox::Continue ) { m_pViewManager->showTab( originalView ); @@ -2890,12 +2890,12 @@ void KonqMainWindow::slotReloadAllTabs() MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, - i18n("This tab tqcontains changes that have not been submitted.\nReloading all tabs will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nReloading all tabs will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"reload"), "discardchangesreload") != KMessageBox::Continue ) { m_pViewManager->showTab( originalView ); @@ -3455,7 +3455,7 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) ext = m_currentView->browserExtension(); TQStrList slotNames; if (ext) - slotNames = ext->tqmetaObject()->slotNames(); + slotNames = ext->metaObject()->slotNames(); //for ( char * s = slotNames.first() ; s ; s = slotNames.next() ) //{ @@ -3481,13 +3481,13 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( false ); - if (slotNames.tqcontains("cut()")) + if (slotNames.contains("cut()")) disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); - if (slotNames.tqcontains("copy()")) + if (slotNames.contains("copy()")) disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); - if (slotNames.tqcontains("paste()")) + if (slotNames.contains("paste()")) disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); - if (slotNames.tqcontains("del()")) + if (slotNames.contains("del()")) disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); disconnect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); @@ -3522,13 +3522,13 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) if ( duplicate->shortcut() == TQKeySequence(CTRL+Key_D) ) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); - if (slotNames.tqcontains("cut()")) + if (slotNames.contains("cut()")) connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); - if (slotNames.tqcontains("copy()")) + if (slotNames.contains("copy()")) connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); - if (slotNames.tqcontains("paste()")) + if (slotNames.contains("paste()")) connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); - if (slotNames.tqcontains("del()")) + if (slotNames.contains("del()")) connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); connect( m_paTrash, TQT_SIGNAL( activated( KAction::ActivationReason, Qt::ButtonState ) ), this, TQT_SLOT( slotTrashActivated( KAction::ActivationReason, Qt::ButtonState ) ) ); @@ -4168,9 +4168,9 @@ void KonqMainWindow::updateToolBarActions( bool pendingAction /*=false*/) if ( m_currentView && m_currentView->url().isLocalFile() && !m_currentView->isLockedViewMode() ) { - if ( m_currentView->serviceTypes().tqcontains( "inode/directory" ) ) + if ( m_currentView->serviceTypes().contains( "inode/directory" ) ) m_ptaUseHTML->setEnabled( true ); - else if ( m_currentView->serviceTypes().tqcontains( "text/html" ) ) { + else if ( m_currentView->serviceTypes().contains( "text/html" ) ) { // Currently viewing an index.html file via this feature (i.e. url points to a dir) TQString locPath = KURL( m_currentView->locationBarURL() ).path(); m_ptaUseHTML->setEnabled( TQFileInfo( locPath ).isDir() ); @@ -4328,7 +4328,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->tqmetaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { @@ -4337,7 +4337,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) if ( act ) { // Does the extension have a slot with the name of this action ? - if ( slotNames.tqcontains( it.key()+"()" ) ) + if ( slotNames.contains( it.key()+"()" ) ) { if ( it.key() != "trash" ) connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ ); @@ -4362,13 +4362,13 @@ void KonqMainWindow::disconnectExtension( KParts::BrowserExtension *ext ) KParts::BrowserExtension::ActionSlotMap::ConstIterator it = actionSlotMap->begin(); KParts::BrowserExtension::ActionSlotMap::ConstIterator itEnd = actionSlotMap->end(); - TQStrList slotNames = ext->tqmetaObject()->slotNames(); + TQStrList slotNames = ext->metaObject()->slotNames(); for ( ; it != itEnd ; ++it ) { KAction * act = actionCollection()->action( it.key() ); //kdDebug(1202) << it.key() << endl; - if ( act && slotNames.tqcontains( it.key()+"()" ) ) + if ( act && slotNames.contains( it.key()+"()" ) ) { //kdDebug(1202) << "disconnectExtension: " << act << " " << act->name() << endl; act->disconnect( ext ); @@ -4444,7 +4444,7 @@ void KonqMainWindow::enableAllActions( bool enable ) { KAction *act = *it; if ( !TQString(act->name()).startsWith("options_configure") /* do not touch the configureblah actions */ - && ( !enable || !actionSlotMap->tqcontains( act->name() ) ) ) /* don't enable BE actions */ + && ( !enable || !actionSlotMap->contains( act->name() ) ) ) /* don't enable BE actions */ act->setEnabled( enable ); } // This method is called with enable=false on startup, and @@ -4678,7 +4678,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa // This action collection is used to pass actions to KonqPopupMenu. // It has to be a KActionCollection instead of a KActionPtrList because we need - // the actiontqStatusText signal... + // the actionStatusText signal... KActionCollection popupMenuCollection( (TQWidget*)0 ); popupMenuCollection.insert( m_paBack ); popupMenuCollection.insert( m_paForward ); @@ -4840,7 +4840,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa delete pPopupMenu; - // We're sort of misusing KActionCollection here, but we need it for the actiontqStatusText signal... + // We're sort of misusing KActionCollection here, but we need it for the actionStatusText signal... // Anyway. If the action belonged to the view, and the view got deleted, we don't want ~KActionCollection // to iterate over those deleted actions KActionPtrList lst = popupMenuCollection.actions(); @@ -4889,7 +4889,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa m_currentView = m_oldView; } // Special case: RMB + renaming in sidebar; setFocus would abort editing. - TQWidget* fw = tqfocusWidget(); + TQWidget* fw = focusWidget(); if ( !fw || !::qt_cast<TQLineEdit*>( fw ) ) m_oldView->part()->widget()->setFocus(); } @@ -4901,7 +4901,7 @@ void KonqMainWindow::slotItemsRemoved( const KFileItemList &items ) TQPtrListIterator<KFileItem> it( items ); for ( ; it.current(); ++it ) { - if ( popupItems.tqcontains( it.current() ) ) + if ( popupItems.contains( it.current() ) ) { emit popupItemsDisturbed(); return; @@ -4984,7 +4984,7 @@ void KonqMainWindow::setInitialFrameName( const TQString &name ) m_initialFrameName = name; } -void KonqMainWindow::slotActiontqStatusText( const TQString &text ) +void KonqMainWindow::slotActionStatusText( const TQString &text ) { if ( !m_currentView ) return; @@ -4997,7 +4997,7 @@ void KonqMainWindow::slotActiontqStatusText( const TQString &text ) statusBar->message( text ); } -void KonqMainWindow::slotCleartqStatusText() +void KonqMainWindow::slotClearStatusText() { if ( !m_currentView ) return; @@ -5068,7 +5068,7 @@ void KonqMainWindow::updateViewModeActions() // make sure to also clear our [libiconview,liblistview]->service-for-viewmode // map if ( m_viewModeToolBarServices.count() > 0 && - !m_viewModeToolBarServices.begin().data()->serviceTypes().tqcontains( m_currentView->serviceType() ) ) + !m_viewModeToolBarServices.begin().data()->serviceTypes().contains( m_currentView->serviceType() ) ) { // Save the current map to the config file, for later reuse saveToolBarServicesMap(); @@ -5112,7 +5112,7 @@ void KonqMainWindow::updateViewModeActions() itname = (*it)->name(); TQString icon = (*it)->icon(); - if ( icon != TQString::tqfromLatin1( "unknown" ) ) + if ( icon != TQString::fromLatin1( "unknown" ) ) // we *have* to specify a parent qobject, otherwise the exclusive group stuff doesn't work!(Simon) action = new KRadioAction( itname, icon, 0, this, (*it)->desktopEntryName().ascii() ); else @@ -5193,7 +5193,7 @@ void KonqMainWindow::updateViewModeActions() // Set the contents of the button from the current service, either if it's the current view // or if it's our preferred service for this button (library) if ( bIsCurrentView - || ( preferredServiceMap.tqcontains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) ) + || ( preferredServiceMap.contains( library ) && (*it)->desktopEntryName() == preferredServiceMap[ library ] ) ) { //kdDebug(1202) << " Changing action for " << library << " into service " << (*it)->name() << endl; @@ -5283,7 +5283,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) if ( tabContainer->count() > 1 ) { KConfig *config = KGlobal::config(); - KConfigGroupSaver cs( config, TQString::tqfromLatin1("Notification Messages") ); + KConfigGroupSaver cs( config, TQString::fromLatin1("Notification Messages") ); if ( !config->hasKey( "MultipleTabConfirm" ) ) { @@ -5321,12 +5321,12 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) MapViews::ConstIterator end = m_mapViews.end(); for (; it != end; ++it ) { KonqView *view = it.data(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1) ) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { m_pViewManager->showTab( view ); if ( KMessageBox::warningContinueCancel( this, - i18n("This tab tqcontains changes that have not been submitted.\nClosing the window will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nClosing the window will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"exit"), "discardchangesclose") != KMessageBox::Continue ) { e->ignore(); @@ -5339,12 +5339,12 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) // m_pViewManager->showTab( originalView ); } else if ( m_currentView && m_currentView->part() && - (m_currentView->part()->tqmetaObject()->findProperty("modified") != -1) ) + (m_currentView->part()->metaObject()->findProperty("modified") != -1) ) { TQVariant prop = m_currentView->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( this, - i18n("This page tqcontains changes that have not been submitted.\nClosing the window will discard these changes."), + i18n("This page contains changes that have not been submitted.\nClosing the window will discard these changes."), i18n("Discard Changes?"), KGuiItem(i18n("&Discard Changes"),"exit"), "discardchangesclose") != KMessageBox::Continue ) { e->ignore(); @@ -5356,7 +5356,7 @@ void KonqMainWindow::closeEvent( TQCloseEvent *e ) saveWindowSize(); hide(); - tqApp->flushX(); + qApp->flushX(); } // We're going to close - tell the parts MapViews::ConstIterator it = m_mapViews.begin(); @@ -5500,18 +5500,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) void KonqMainWindow::connectActionCollection( KActionCollection *coll ) { - connect( coll, TQT_SIGNAL( actiontqStatusText( const TQString & ) ), - this, TQT_SLOT( slotActiontqStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( cleartqStatusText() ), - this, TQT_SLOT( slotCleartqStatusText() ) ); + connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), + this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQT_SIGNAL( clearStatusText() ), + this, TQT_SLOT( slotClearStatusText() ) ); } void KonqMainWindow::disconnectActionCollection( KActionCollection *coll ) { - disconnect( coll, TQT_SIGNAL( actiontqStatusText( const TQString & ) ), - this, TQT_SLOT( slotActiontqStatusText( const TQString & ) ) ); - disconnect( coll, TQT_SIGNAL( cleartqStatusText() ), - this, TQT_SLOT( slotCleartqStatusText() ) ); + disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), + this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); + disconnect( coll, TQT_SIGNAL( clearStatusText() ), + this, TQT_SLOT( slotClearStatusText() ) ); } // @@ -5684,7 +5684,7 @@ TQStringList KonqMainWindow::historyPopupCompletionItems( const TQString& s) hp_removeDuplicates( matches ); TQStringList items = matches.list(); if( items.count() == 0 - && !s.tqcontains( ':' ) && s[ 0 ] != '/' ) + && !s.contains( ':' ) && s[ 0 ] != '/' ) { TQString pre = hp_tryPrepend( s ); if( !pre.isNull()) diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index a36ed5739..9ee5b7e19 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -505,8 +505,8 @@ protected slots: void slotOpenURL( const KURL& ); - void slotActiontqStatusText( const TQString &text ); - void slotCleartqStatusText(); + void slotActionStatusText( const TQString &text ); + void slotClearStatusText(); void slotFindOpen( KonqDirPart * dirPart ); void slotFindClosed( KonqDirPart * dirPart ); diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 49d934082..66aeaba41 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -106,7 +106,7 @@ KonqMainWindow * KonqMisc::createNewWindow( const KURL &url, const KParts::URLAr KMimeType::findByURL(url)->name() == "text/html") ? "webbrowsing" : "filemanagement"; - TQString profile = locate( "data", TQString::tqfromLatin1("konqueror/profiles/") + profileName ); + TQString profile = locate( "data", TQString::fromLatin1("konqueror/profiles/") + profileName ); return createBrowserWindowFromProfile(profile, profileName, url, args, forbidUseHTML, filesToSelect, tempFile, openURL ); @@ -225,7 +225,7 @@ KonqDraggableLabel::KonqDraggableLabel( KonqMainWindow* mw, const TQString& text , m_mw(mw) { setBackgroundMode( Qt::PaletteButton ); - tqsetAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | + setAlignment( (TQApplication::reverseLayout() ? Qt::AlignRight : Qt::AlignLeft) | Qt::AlignVCenter | Qt::ShowPrefix ); setAcceptDrops(true); adjustSize(); diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cc index eca415ba5..2a3547068 100644 --- a/konqueror/konq_profiledlg.cc +++ b/konqueror/konq_profiledlg.cc @@ -104,7 +104,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); - m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); + m_pListView->setMinimumSize( m_pListView->sizeHint() ); m_cbSaveURLs = new TQCheckBox( i18n("Save &URLs in profile"), box ); m_cbSaveURLs->setChecked( KonqSettings::saveURLInProfile() ); @@ -121,7 +121,7 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); - resize( tqsizeHint() ); + resize( sizeHint() ); } KonqProfileDlg::~KonqProfileDlg() diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cc index 2311e7637..3cc5cc60d 100644 --- a/konqueror/konq_tabs.cc +++ b/konqueror/konq_tabs.cc @@ -62,7 +62,7 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon { KAcceleratorManager::setNoAccel(this); - TQWhatsThis::add( tabBar(), i18n( "This bar tqcontains the list of currently open tabs. Click on a tab to make it " + TQWhatsThis::add( tabBar(), i18n( "This bar contains the list of currently open tabs. Click on a tab to make it " "active. The option to show a close button instead of the website icon in the left " "corner of the tab is configurable. You can also use keyboard shortcuts to " "navigate through tabs. The text on the tab is the title of the website " @@ -196,16 +196,16 @@ void KonqFrameTabs::saveConfig( KConfig* config, const TQString &prefix, bool sa TQString newPrefix; for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) { - newPrefix = TQString::tqfromLatin1( it->frameType() ) + "T" + TQString::number(i); + newPrefix = TQString::fromLatin1( it->frameType() ) + "T" + TQString::number(i); strlst.append( newPrefix ); newPrefix.append( '_' ); it->saveConfig( config, newPrefix, saveURLs, docContainer, id, depth + i ); i++; } - config->writeEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), strlst ); + config->writeEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), strlst ); - config->writeEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend( prefix ), + config->writeEntry( TQString::fromLatin1( "activeChildIndex" ).prepend( prefix ), currentPageIndex() ); } diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 315b071b8..b27779a4e 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -528,8 +528,8 @@ void KonqView::slotStarted( KIO::Job * job ) // Manage passwords properly... if (m_pMainWindow) { - kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->tqtopLevelWidget()->winId() << endl; - job->setWindow (m_pMainWindow->tqtopLevelWidget ()); + kdDebug(7035) << "slotStarted: Window ID = " << m_pMainWindow->topLevelWidget()->winId() << endl; + job->setWindow (m_pMainWindow->topLevelWidget ()); } connect( job, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( KIO::Job *, unsigned long ) ) ); @@ -1056,7 +1056,7 @@ KParts::BrowserHostExtension* KonqView::hostExtension( KParts::ReadOnlyPart *par if ( !ext ) return 0; - if ( ext->frameNames().tqcontains( name ) ) + if ( ext->frameNames().contains( name ) ) return ext; const TQPtrList<KParts::ReadOnlyPart> children = ext->frames(); @@ -1077,7 +1077,7 @@ bool KonqView::callExtensionMethod( const char *methodName ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; QUObject o[ 1 ]; @@ -1092,7 +1092,7 @@ bool KonqView::callExtensionBoolMethod( const char *methodName, bool value ) if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; QUObject o[ 2 ]; @@ -1109,7 +1109,7 @@ bool KonqView::callExtensionStringMethod( const char *methodName, TQString value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; QUObject o[ 2 ]; @@ -1126,7 +1126,7 @@ bool KonqView::callExtensionURLMethod( const char *methodName, const KURL& value if ( !obj ) // not all views have a browser extension ! return false; - int id = obj->tqmetaObject()->findSlot( methodName ); + int id = obj->metaObject()->findSlot( methodName ); if ( id == -1 ) return false; QUObject o[ 2 ]; @@ -1268,7 +1268,7 @@ bool KonqView::eventFilter( TQObject *obj, TQEvent *e ) TQObjectList *children = m_pPart->widget()->queryList( "TQWidget" ); if ( ok && - !lstDragURLs.first().url().tqcontains( "javascript:", false ) && // ### this looks like a hack to me + !lstDragURLs.first().url().contains( "javascript:", false ) && // ### this looks like a hack to me ev->source() != m_pPart->widget() && children && children->findRef( ev->source() ) == -1 ) diff --git a/konqueror/konq_view.h b/konqueror/konq_view.h index 9c4e9c5a1..28f2568d9 100644 --- a/konqueror/konq_view.h +++ b/konqueror/konq_view.h @@ -58,7 +58,7 @@ struct HistoryEntry }; /* This class represents a child of the main view. The main view maintains - * the list of children. A KonqView tqcontains a Browser::View and + * the list of children. A KonqView contains a Browser::View and * handles it. It's more or less the backend structure for the views. * The widget handling stuff is done by the KonqFrame. */ diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index cc0a30576..c4f03da75 100644 --- a/konqueror/konq_viewmgr.cc +++ b/konqueror/konq_viewmgr.cc @@ -423,7 +423,7 @@ void KonqViewManager::duplicateTab( KonqFrameBase* tab, bool openAfterCurrentPag KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); @@ -493,10 +493,10 @@ void KonqViewManager::breakOffTab( KonqFrameBase* tab ) KConfig config( tempFile.name() ); config.setGroup( "View Profile" ); - TQString prefix = TQString::tqfromLatin1( currentFrame->frameType() ) + TQString::number(0); + TQString prefix = TQString::fromLatin1( currentFrame->frameType() ) + TQString::number(0); config.writeEntry( "RootItem", prefix ); prefix.append( '_' ); - config.writeEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), true ); + config.writeEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), true ); currentFrame->saveConfig( &config, prefix, true, 0L, 0, 1); KonqMainWindow *mainWindow = new KonqMainWindow( KURL(), false ); @@ -1077,7 +1077,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, void KonqViewManager::saveViewProfile( const TQString & fileName, const TQString & profileName, bool saveURLs, bool saveWindowSize ) { - TQString path = locateLocal( "data", TQString::tqfromLatin1( "konqueror/profiles/" ) + + TQString path = locateLocal( "data", TQString::fromLatin1( "konqueror/profiles/" ) + fileName, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1096,7 +1096,7 @@ void KonqViewManager::saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWi { //kdDebug(1202) << "KonqViewManager::saveViewProfile" << endl; if( m_pMainWindow->childFrame() != 0L ) { - TQString prefix = TQString::tqfromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString prefix = TQString::fromLatin1( m_pMainWindow->childFrame()->frameType() ) + TQString::number(0); cfg.writeEntry( "RootItem", prefix ); prefix.append( '_' ); @@ -1156,12 +1156,12 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, for ( it.toFirst(); it != 0L; ++it ) { KonqView *view = it.current()->activeChildView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) { showTab( view ); if ( KMessageBox::warningContinueCancel( 0, - i18n("This tab tqcontains changes that have not been submitted.\nLoading a profile will discard these changes."), + i18n("This tab contains changes that have not been submitted.\nLoading a profile will discard these changes."), i18n("Discard Changes?"), i18n("&Discard Changes"), "discardchangesloadprofile") != KMessageBox::Continue ) { showTab( originalView ); @@ -1175,11 +1175,11 @@ void KonqViewManager::loadViewProfile( KConfig &cfg, const TQString & filename, else { KonqView *view = m_pMainWindow->currentView(); - if (view && view->part() && (view->part()->tqmetaObject()->findProperty("modified") != -1)) { + if (view && view->part() && (view->part()->metaObject()->findProperty("modified") != -1)) { TQVariant prop = view->part()->property("modified"); if (prop.isValid() && prop.toBool()) if ( KMessageBox::warningContinueCancel( 0, - i18n("This page tqcontains changes that have not been submitted.\nLoading a profile will discard these changes."), + i18n("This page contains changes that have not been submitted.\nLoading a profile will discard these changes."), i18n("Discard Changes?"), i18n("&Discard Changes"), "discardchangesloadprofile") != KMessageBox::Continue ) return; } @@ -1387,7 +1387,7 @@ void KonqViewManager::slotActivePartChanged ( KParts::Part *newPart ) } if (view->frame()->parentContainer() == 0L) return; if (!m_bLoadingProfile) { - view->frame()->statusbar()->updateActivetqStatus(); + view->frame()->statusbar()->updateActiveStatus(); view->frame()->parentContainer()->setActiveChild( view->frame() ); } //kdDebug(1202) << "KonqViewManager::slotActivePartChanged done" << endl; @@ -1413,7 +1413,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) TQRect geom = KGlobalSettings::desktopGeometry(widget); - if ( widthStr.tqcontains( '%' ) == 1 ) + if ( widthStr.contains( '%' ) == 1 ) { widthStr.truncate( widthStr.length() - 1 ); int relativeWidth = widthStr.toInt( &ok ); @@ -1428,7 +1428,7 @@ TQSize KonqViewManager::readConfigSize( KConfig &cfg, TQWidget *widget ) width = -1; } - if ( heightStr.tqcontains( '%' ) == 1 ) + if ( heightStr.contains( '%' ) == 1 ) { heightStr.truncate( heightStr.length() - 1 ); int relativeHeight = heightStr.toInt( &ok ); @@ -1465,8 +1465,8 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, serviceType = "text/html"; serviceName = "html"; } else { - serviceType = cfg.readEntry( TQString::tqfromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); - serviceName = cfg.readEntry( TQString::tqfromLatin1( "ServiceName" ).prepend( prefix ) ); + serviceType = cfg.readEntry( TQString::fromLatin1( "ServiceType" ).prepend( prefix ), "inode/directory"); + serviceName = cfg.readEntry( TQString::fromLatin1( "ServiceName" ).prepend( prefix ) ); } //kdDebug(1202) << "KonqViewManager::loadItem: ServiceType " << serviceType << " " << serviceName << endl; @@ -1480,17 +1480,17 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, return; //ugh.. } - bool passiveMode = cfg.readBoolEntry( TQString::tqfromLatin1( "PassiveMode" ).prepend( prefix ), false ); + bool passiveMode = cfg.readBoolEntry( TQString::fromLatin1( "PassiveMode" ).prepend( prefix ), false ); //kdDebug(1202) << "KonqViewManager::loadItem: Creating View Stuff" << endl; KonqView *childView = setupView( parent, viewFactory, service, partServiceOffers, appServiceOffers, serviceType, passiveMode, openAfterCurrentPage ); - if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::tqfromLatin1( "LinkedView" ).prepend( prefix ), false ) ); - childView->setToggleView( cfg.readBoolEntry( TQString::tqfromLatin1( "ToggleView" ).prepend( prefix ), false ) ); - if( !cfg.readBoolEntry( TQString::tqfromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) + if (!childView->isFollowActive()) childView->setLinkedView( cfg.readBoolEntry( TQString::fromLatin1( "LinkedView" ).prepend( prefix ), false ) ); + childView->setToggleView( cfg.readBoolEntry( TQString::fromLatin1( "ToggleView" ).prepend( prefix ), false ) ); + if( !cfg.readBoolEntry( TQString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), true ) ) childView->frame()->statusbar()->hide(); - if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = childView->frame(); if (!m_pDocContainer) @@ -1536,7 +1536,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, childView->frame()->show(); - TQString key = TQString::tqfromLatin1( "URL" ).prepend( prefix ); + TQString key = TQString::fromLatin1( "URL" ).prepend( prefix ); if ( openURL ) { KURL url; @@ -1546,11 +1546,11 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, { TQString u = cfg.readPathEntry( key ); if ( u.isEmpty() ) - u = TQString::tqfromLatin1("about:blank"); + u = TQString::fromLatin1("about:blank"); url = u; } else if(key == "empty_URL") - url = TQString::tqfromLatin1("about:blank"); + url = TQString::fromLatin1("about:blank"); else url = defaultURL; @@ -1567,13 +1567,13 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, //else kdDebug(1202) << "KonqViewManager::loadItem: url is empty" << endl; } // Do this after opening the URL, so that it's actually possible to open it :) - childView->setLockedLocation( cfg.readBoolEntry( TQString::tqfromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); + childView->setLockedLocation( cfg.readBoolEntry( TQString::fromLatin1( "LockedLocation" ).prepend( prefix ), false ) ); } else if( name.startsWith("Container") ) { //kdDebug(1202) << "KonqViewManager::loadItem Item is Container" << endl; //load container config - TQString ostr = cfg.readEntry( TQString::tqfromLatin1( "Orientation" ).prepend( prefix ) ); + TQString ostr = cfg.readEntry( TQString::fromLatin1( "Orientation" ).prepend( prefix ) ); //kdDebug(1202) << "Orientation: " << ostr << endl; Qt::Orientation o; if( ostr == "Vertical" ) @@ -1586,12 +1586,12 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, } TQValueList<int> sizes = - cfg.readIntListEntry( TQString::tqfromLatin1( "SplitterSizes" ).prepend( prefix )); + cfg.readIntListEntry( TQString::fromLatin1( "SplitterSizes" ).prepend( prefix )); - int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), -1 ); TQStrList childList; - if( cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) + if( cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ), childList ) < 2 ) { kdWarning() << "Profile Loading Error: Less than two children in " << name << endl; // fallback to defaults @@ -1608,7 +1608,7 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, parent->insertChildFrame( newContainer, tabindex ); - if (cfg.readBoolEntry( TQString::tqfromLatin1( "docContainer" ).prepend( prefix ), false )) + if (cfg.readBoolEntry( TQString::fromLatin1( "docContainer" ).prepend( prefix ), false )) m_pDocContainer = newContainer; loadItem( cfg, newContainer, childList.at(0), defaultURL, openURL ); @@ -1634,9 +1634,9 @@ void KonqViewManager::loadItem( KConfig &cfg, KonqFrameContainerBase *parent, parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; - int index = cfg.readNumEntry( TQString::tqfromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); + int index = cfg.readNumEntry( TQString::fromLatin1( "activeChildIndex" ).prepend(prefix), 0 ); - TQStringList childList = cfg.readListEntry( TQString::tqfromLatin1( "Children" ).prepend( prefix ) ); + TQStringList childList = cfg.readListEntry( TQString::fromLatin1( "Children" ).prepend( prefix ) ); for ( TQStringList::Iterator it = childList.begin(); it != childList.end(); ++it ) { loadItem( cfg, newContainer, *it, defaultURL, openURL ); @@ -1803,7 +1803,7 @@ void KonqViewManager::printSizeInfo( KonqFrameBase* frame, const char* msg ) { TQRect r; - r = frame->widget()->tqgeometry(); + r = frame->widget()->geometry(); qDebug("Child size %s : x: %d, y: %d, w: %d, h: %d", msg, r.x(),r.y(),r.width(),r.height() ); if ( parent->frameType() == "Container" ) diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index a09773533..0e1a7f3dc 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -172,7 +172,7 @@ public: void updatePixmaps(); /** - * Saves the current view tqlayout to a config file. + * Saves the current view layout to a config file. * Remove config file before saving, especially if saveURLs is false. * @param cfg the config file * @param saveURLs whether to save the URLs in the profile @@ -181,7 +181,7 @@ public: void saveViewProfile( KConfig & cfg, bool saveURLs, bool saveWindowSize ); /** - * Saves the current view tqlayout to a config file. + * Saves the current view layout to a config file. * Remove config file before saving, especially if saveURLs is false. * @param fileName the name of the config file * @param profileName the name of the profile @@ -192,7 +192,7 @@ public: bool saveURLs, bool saveWindowSize ); /** - * Loads a view tqlayout from a config file. Removes all views before loading. + * Loads a view layout from a config file. Removes all views before loading. * @param cfg the config file * @param filename if set, remember the file name of the profile (for save settings) * It has to be under the profiles dir. Otherwise, set to TQString::null @@ -207,7 +207,7 @@ public: bool resetWindow = false, bool openURL = true ); /** - * Loads a view tqlayout from a config file. Removes all views before loading. + * Loads a view layout from a config file. Removes all views before loading. * @param path the full path to the config file * @param filename if set, remember the file name of the profile (for save settings) * It has to be under the profiles dir. Otherwise, set to TQString::null diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg index 8f1a56e84..a412347d1 100644 --- a/konqueror/konqueror.kcfg +++ b/konqueror/konqueror.kcfg @@ -479,7 +479,7 @@ PATH_JAVA <label></label> <whatsthis></whatsthis> </entry> - <entry key="WindowtqStatusPolicy" type="UInt"> <!--KHTML--> + <entry key="WindowStatusPolicy" type="UInt"> <!--KHTML--> <label></label> <whatsthis></whatsthis> </entry> diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cc index ad8c46ddd..7b06a4996 100644 --- a/konqueror/listview/konq_infolistviewitem.cc +++ b/konqueror/listview/konq_infolistviewitem.cc @@ -206,7 +206,7 @@ void KonqInfoListViewItem::setDisabled( bool disabled ) setPixmap( 0, m_fileitem->pixmap( iconSize, state() ) ); } -void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); @@ -242,7 +242,7 @@ void KonqInfoListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqInfoListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) diff --git a/konqueror/listview/konq_infolistviewitem.h b/konqueror/listview/konq_infolistviewitem.h index 2ba7b8067..e81928118 100644 --- a/konqueror/listview/konq_infolistviewitem.h +++ b/konqueror/listview/konq_infolistviewitem.h @@ -56,7 +56,7 @@ class KonqInfoListViewItem : public KonqBaseListViewItem virtual ~KonqInfoListViewItem() { } virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cc index 753699bcc..783c6eef3 100644 --- a/konqueror/listview/konq_infolistviewwidget.cc +++ b/konqueror/listview/konq_infolistviewwidget.cc @@ -32,8 +32,8 @@ #include <tqstringlist.h> KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, - TQWidget* tqparentWidget) - : KonqBaseListViewWidget(parent, tqparentWidget) + TQWidget* parentWidget) + : KonqBaseListViewWidget(parent, parentWidget) { m_metaInfoJob = 0; diff --git a/konqueror/listview/konq_infolistviewwidget.h b/konqueror/listview/konq_infolistviewwidget.h index 46bda8b22..5ae497ac2 100644 --- a/konqueror/listview/konq_infolistviewwidget.h +++ b/konqueror/listview/konq_infolistviewwidget.h @@ -37,7 +37,7 @@ class KonqInfoListViewWidget : public KonqBaseListViewWidget // friend class KonqTextViewItem; Q_OBJECT public: - KonqInfoListViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); + KonqInfoListViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqInfoListViewWidget(); const TQStringList columnKeys() {return m_columnKeys;} diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index 461e97b29..f256e8e3b 100644 --- a/konqueror/listview/konq_listview.cc +++ b/konqueror/listview/konq_listview.cc @@ -63,12 +63,12 @@ KonqListViewFactory::~KonqListViewFactory() s_defaultViewProps = 0; } -KParts::Part* KonqListViewFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) +KParts::Part* KonqListViewFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ) { if( args.count() < 1 ) kdWarning() << "KonqListView: Missing Parameter" << endl; - KParts::Part *obj = new KonqListView( tqparentWidget, parent, name, args.first() ); + KParts::Part *obj = new KonqListView( parentWidget, parent, name, args.first() ); return obj; } @@ -216,7 +216,7 @@ void ListViewBrowserExtension::editMimeType() KonqOperations::editMimeType( items.first()->mimetype() ); } -KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ) +KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ) : KonqDirPart( parent, name ) ,m_headerTimer(0) { @@ -234,25 +234,25 @@ KonqListView::KonqListView( TQWidget *tqparentWidget, TQObject *parent, const ch { kdDebug(1202) << "Creating KonqTextViewWidget" << endl; xmlFile = "konq_textview.rc"; - m_pListView=new KonqTextViewWidget(this, tqparentWidget); + m_pListView=new KonqTextViewWidget(this, parentWidget); } else if (mode=="MixedTree") { kdDebug(1202) << "Creating KonqTreeViewWidget" << endl; xmlFile = "konq_treeview.rc"; - m_pListView=new KonqTreeViewWidget(this,tqparentWidget); + m_pListView=new KonqTreeViewWidget(this,parentWidget); } else if (mode=="InfoListView") { kdDebug(1202) << "Creating KonqInfoListViewWidget" << endl; xmlFile = "konq_infolistview.rc"; - m_pListView=new KonqInfoListViewWidget(this,tqparentWidget); + m_pListView=new KonqInfoListViewWidget(this,parentWidget); } else { kdDebug(1202) << "Creating KonqDetailedListViewWidget" << endl; xmlFile = "konq_detailedlistview.rc"; - m_pListView = new KonqBaseListViewWidget( this, tqparentWidget); + m_pListView = new KonqBaseListViewWidget( this, parentWidget); } setWidget( m_pListView ); setDirLister( m_pListView->m_dirLister ); diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 0fc8f0340..8665160d3 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -44,7 +44,7 @@ public: KonqListViewFactory(); virtual ~KonqListViewFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); static KInstance *instance(); static KonqPropsView *defaultViewProps(); @@ -65,7 +65,7 @@ class KonqListView : public KonqDirPart Q_OBJECT Q_PROPERTY( bool supportsUndo READ supportsUndo ) public: - KonqListView( TQWidget *tqparentWidget, TQObject *parent, const char *name, const TQString& mode ); + KonqListView( TQWidget *parentWidget, TQObject *parent, const char *name, const TQString& mode ); virtual ~KonqListView(); virtual const KFileItem * currentItem(); diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cc index 2485a4ae4..3c70f1fb0 100644 --- a/konqueror/listview/konq_listviewitems.cc +++ b/konqueror/listview/konq_listviewitems.cc @@ -173,7 +173,7 @@ void KonqListViewItem::setActive( bool active ) if ( m_bActive == active ) return; - //#### Optimize away tqrepaint if possible, like the iconview does? + //#### Optimize away repaint if possible, like the iconview does? KonqBaseListViewItem::setActive( active ); int iconSize = m_pListViewWidget->iconSize(); iconSize = iconSize ? iconSize : KGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small @@ -203,7 +203,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) int newWidth = pm.isNull() ? 0 : pm.width(); int newHeight = pm.isNull() ? 0 : pm.height(); - // If the height or width have changed then we're going to have to tqrepaint + // If the height or width have changed then we're going to have to repaint // this whole thing. Fortunately since most of the calls are coming from // setActive() this is the uncommon case. @@ -211,12 +211,12 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) { setup(); widthChanged( column ); - tqinvalidateHeight(); + invalidateHeight(); return; } // If we're just replacing the icon with another one its size -- i.e. a - // "highlighted" icon, don't bother tqrepainting the whole widget. + // "highlighted" icon, don't bother repainting the whole widget. TQListView *lv = m_pListViewWidget; @@ -225,7 +225,7 @@ void KonqListViewItem::setPixmap( int column, const TQPixmap& pm ) int y = lv->itemPos( this ); int w = newWidth; int h = height(); - lv->tqrepaintContents( x, y, w, h ); + lv->repaintContents( x, y, w, h ); } const TQPixmap* KonqListViewItem::pixmap( int column ) const @@ -294,7 +294,7 @@ int KonqBaseListViewItem::compare( TQListViewItem* item, int col, bool ascending } } -void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); @@ -330,7 +330,7 @@ void KonqListViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, _width = newWidth; } - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } void KonqListViewItem::paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & _r ) @@ -421,7 +421,7 @@ KonqBaseListViewItem::~KonqBaseListViewItem() TQRect KonqBaseListViewItem::rect() const { - TQRect r = m_pListViewWidget->tqitemRect(this); + TQRect r = m_pListViewWidget->itemRect(this); return TQRect( m_pListViewWidget->viewportToContents( r.topLeft() ), TQSize( r.width(), r.height() ) ); } diff --git a/konqueror/listview/konq_listviewitems.h b/konqueror/listview/konq_listviewitems.h index 8e78b10f0..b54f1c2db 100644 --- a/konqueror/listview/konq_listviewitems.h +++ b/konqueror/listview/konq_listviewitems.h @@ -107,7 +107,7 @@ class KonqListViewItem : public KonqBaseListViewItem virtual ~KonqListViewItem(); virtual void paintCell( TQPainter *_painter, const TQColorGroup & cg, - int column, int width, int tqalignment ); + int column, int width, int alignment ); virtual void paintFocus( TQPainter * _painter, const TQColorGroup & cg, const TQRect & r ); virtual void updateContents(); virtual void setDisabled( bool disabled ); diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 115e762ee..8f166af0a 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -84,8 +84,8 @@ void ColumnInfo::setData(const TQString& n, const TQString& desktopName, int kio } -KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget) - : KListView(tqparentWidget) +KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget) + : KListView(parentWidget) ,sortedByColumn(0) ,m_pBrowserView(parent) ,m_dirLister(new KDirLister( true /*m_showIcons==false*/)) @@ -107,7 +107,7 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * { kdDebug(1202) << "+KonqBaseListViewWidget" << endl; - m_dirLister->setMainWindow(tqtopLevelWidget()); + m_dirLister->setMainWindow(topLevelWidget()); m_bTopLevelComplete = true; @@ -410,7 +410,7 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - tqrepaintContents( r, FALSE ); + repaintContents( r, FALSE ); } delete m_selected; @@ -448,7 +448,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) TQRect r( m_rubber->normalize() ); delete m_rubber; m_rubber = 0; - tqrepaintContents( r, FALSE ); + repaintContents( r, FALSE ); } if ( m_scrollTimer ) @@ -489,7 +489,7 @@ void KonqBaseListViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) emit m_pBrowserView->setStatusBarText( item->item()->getStatusBarInfo() ); m_pBrowserView->emitMouseOver( item->item() ); - vp.setY( tqitemRect( item ).y() ); + vp.setY( itemRect( item ).y() ); TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_fileTip->setItem( item->item(), rect, item->pixmap( 0 ) ); m_fileTip->setPreview( KGlobalSettings::showFilePreview( item->item()->url() ) ); @@ -553,7 +553,7 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p ) pt = contentsToViewport( pt ); style().drawPrimitive( TQStyle::PE_RubberBand, p, TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ), - tqcolorGroup(), TQStyle::Style_Default, tqcolorGroup().base() ); + colorGroup(), TQStyle::Style_Default, colorGroup().base() ); } @@ -591,9 +591,9 @@ void KonqBaseListViewWidget::slotAutoScroll() { TQRect rect; if ( allColumnsShowFocus() ) - rect = tqitemRect( cur ); + rect = itemRect( cur ); else { - rect = tqitemRect( cur ); + rect = itemRect( cur ); rect.setWidth( executeArea( cur ) ); } @@ -623,7 +623,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } } else @@ -631,10 +631,10 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } - if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) ) + if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) { setSelected( cur, false ); } @@ -659,7 +659,7 @@ void KonqBaseListViewWidget::slotAutoScroll() { setSelected( cur, true ); changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } } else @@ -667,10 +667,10 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( cur->isSelected() ) { changed = TRUE; - rr = rr.unite( tqitemRect( cur ) ); + rr = rr.unite( itemRect( cur ) ); } - if ( !m_selected || !m_selected->tqcontains( (KonqBaseListViewItem*)cur ) ) + if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) ) { setSelected( cur, false ); } @@ -718,7 +718,7 @@ void KonqBaseListViewWidget::slotAutoScroll() if ( !TQRect( scroll_margin, scroll_margin, viewport()->width() - 2*scroll_margin, - viewport()->height() - 2*scroll_margin ).tqcontains( pos ) ) + viewport()->height() - 2*scroll_margin ).contains( pos ) ) { if ( !m_scrollTimer ) { @@ -762,7 +762,7 @@ void KonqBaseListViewWidget::viewportDragMoveEvent( TQDragMoveEvent *_ev ) // Unselect previous drag-over-item if ( m_dragOverItem && m_dragOverItem != item ) - if ( !m_selected || !m_selected->tqcontains( m_dragOverItem ) ) + if ( !m_selected || !m_selected->contains( m_dragOverItem ) ) setSelected( m_dragOverItem, false ); if ( !item ) @@ -985,7 +985,7 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item ) if (_item->pixmap(0) != 0) { // Rect of the QListViewItem's pixmap area. - TQRect rect = _item->listView()->tqitemRect(_item); + TQRect rect = _item->listView()->itemRect(_item); // calculate nesting depth int nestingDepth = 0; @@ -1111,7 +1111,7 @@ bool KonqBaseListViewWidget::openURL( const KURL &url ) args.yOffset = contentsY(); m_pBrowserView->extension()->setURLArgs( args ); - if ( currentItem() && tqitemRect( currentItem() ).isValid() ) + if ( currentItem() && itemRect( currentItem() ).isValid() ) m_itemToGoTo = currentItem()->text(0); m_pBrowserView->m_filesToSelect.clear(); diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index 7d57c202f..d6123c11f 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -81,7 +81,7 @@ class KonqBaseListViewWidget : public KListView Q_OBJECT public: - KonqBaseListViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); + KonqBaseListViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqBaseListViewWidget(); unsigned int NumberOfAtoms; @@ -176,7 +176,7 @@ protected slots: virtual void slotRedirection( const KURL & ); void slotPopupMenu( TQListViewItem *, const TQPoint&, int ); - // forces a tqrepaint on column size changes / branch expansion + // forces a repaint on column size changes / branch expansion // when there is a background pixmap void slotUpdateBackground(); diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cc index 0d40ecfce..8e03e171e 100644 --- a/konqueror/listview/konq_textviewitem.cc +++ b/konqueror/listview/konq_textviewitem.cc @@ -200,7 +200,7 @@ void KonqTextViewItem::updateContents() }; } -void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { TQColorGroup cg( _cg ); cg.setColor(TQColorGroup::Text, static_cast<KonqTextViewWidget *>(listView())->colors[type]); @@ -208,7 +208,7 @@ void KonqTextViewItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, // cg.setColor(TQColorGroup::HighlightedText, static_cast<KonqTextViewWidget *>(listView())->highlight[type]); // cg.setColor(TQColorGroup::Highlight, Qt::darkGray); - KListViewItem::paintCell( _painter, cg, _column, _width, _tqalignment ); + KListViewItem::paintCell( _painter, cg, _column, _width, _alignment ); } /*void KonqTextViewItem::paintFocus( TQPainter *_p, const TQColorGroup &_cg, const TQRect &_r ) diff --git a/konqueror/listview/konq_textviewitem.h b/konqueror/listview/konq_textviewitem.h index 02a534688..f091781e2 100644 --- a/konqueror/listview/konq_textviewitem.h +++ b/konqueror/listview/konq_textviewitem.h @@ -57,7 +57,7 @@ class KonqTextViewItem : public KonqBaseListViewItem // virtual TQString key( int _column, bool asc) const; /** Call this before destroying the text view (decreases reference count * on the view)*/ - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); // virtual void paintFocus( TQPainter *_painter, const TQColorGroup & _cg, const TQRect & r ); virtual void updateContents(); diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cc index ded829d67..32de25351 100644 --- a/konqueror/listview/konq_textviewwidget.cc +++ b/konqueror/listview/konq_textviewwidget.cc @@ -29,8 +29,8 @@ #include <assert.h> -KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget ) -:KonqBaseListViewWidget(parent,tqparentWidget) +KonqTextViewWidget::KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ) +:KonqBaseListViewWidget(parent,parentWidget) { kdDebug(1202) << "+KonqTextViewWidget" << endl; m_filenameColumn=1; diff --git a/konqueror/listview/konq_textviewwidget.h b/konqueror/listview/konq_textviewwidget.h index 5596e4d23..06a5cbbb5 100644 --- a/konqueror/listview/konq_textviewwidget.h +++ b/konqueror/listview/konq_textviewwidget.h @@ -34,7 +34,7 @@ class KonqTextViewWidget : public KonqBaseListViewWidget friend class KonqTextViewItem; Q_OBJECT public: - KonqTextViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); + KonqTextViewWidget( KonqListView *parent, TQWidget *parentWidget ); ~KonqTextViewWidget(); virtual bool isExecuteArea( const TQPoint& point ); diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cc index 07adda9e5..4d04f2fa4 100644 --- a/konqueror/listview/konq_treeviewwidget.cc +++ b/konqueror/listview/konq_treeviewwidget.cc @@ -27,8 +27,8 @@ template class TQDict<KonqListViewDir>; -KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget) - : KonqBaseListViewWidget( parent, tqparentWidget ) +KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget) + : KonqBaseListViewWidget( parent, parentWidget ) { kdDebug(1202) << "+KonqTreeViewWidget" << endl; @@ -163,7 +163,7 @@ void KonqTreeViewWidget::slotClear( const KURL & _url ) } // Remark: This code works only if we have exactly one tree which is the - // case for Konqy's treeview. It will break if m_dictSubDirs tqcontains two + // case for Konqy's treeview. It will break if m_dictSubDirs contains two // subdirectories where only one of them will have its items deleted by // the following code. diff --git a/konqueror/listview/konq_treeviewwidget.h b/konqueror/listview/konq_treeviewwidget.h index 8ced17e6b..3f08cc3d5 100644 --- a/konqueror/listview/konq_treeviewwidget.h +++ b/konqueror/listview/konq_treeviewwidget.h @@ -34,7 +34,7 @@ class KonqTreeViewWidget : public KonqBaseListViewWidget Q_OBJECT public: - KonqTreeViewWidget( KonqListView *parent, TQWidget *tqparentWidget ); + KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWidget ); virtual ~KonqTreeViewWidget(); virtual bool openURL( const KURL &url ); diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index 020d7dc6b..23c1704d9 100644 --- a/konqueror/preloader/preloader.cc +++ b/konqueror/preloader/preloader.cc @@ -109,8 +109,8 @@ void KonqyPreloader::updateCount() { if( !check_always_preloaded_timer.isActive()) { - if( kapp->kdeinitExec( TQString::tqfromLatin1( "konqueror" ), - TQStringList() << TQString::tqfromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) + if( kapp->kdeinitExec( TQString::fromLatin1( "konqueror" ), + TQStringList() << TQString::fromLatin1( "--preload" ), NULL, NULL, "0" ) == 0 ) { kdDebug( 1202 ) << "Preloading Konqueror instance" << endl; check_always_preloaded_timer.start( 5000, true ); diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 026ed08bc..7d84071fc 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -41,7 +41,7 @@ #include "kremoteencodingplugin.h" -#define DATA_KEY TQString::tqfromLatin1("Charset") +#define DATA_KEY TQString::fromLatin1("Charset") KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, const char *name, diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index e41d1c99a..eefa57337 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -43,10 +43,10 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& closeButton= new KPushButton(KStdGuiItem::close(), buttonsBox); closeButton->setDefault(true); - label->resize(label->tqsizeHint()); - m_shell->resize(m_shell->tqsizeHint()); - closeButton->setFixedSize(closeButton->tqsizeHint()); - cancelButton->setFixedSize(cancelButton->tqsizeHint()); + label->resize(label->sizeHint()); + m_shell->resize(m_shell->sizeHint()); + closeButton->setFixedSize(closeButton->sizeHint()); + cancelButton->setFixedSize(cancelButton->sizeHint()); box->addWidget(label,0); box->addWidget(m_shell,1); diff --git a/konqueror/sidebar/Makefile.am b/konqueror/sidebar/Makefile.am index 4e71f9db0..702320841 100644 --- a/konqueror/sidebar/Makefile.am +++ b/konqueror/sidebar/Makefile.am @@ -13,7 +13,7 @@ noinst_HEADERS = konqsidebar.h sidebar_widget.h konqsidebariface_p.h include_HEADERS = konqsidebarplugin.h -# let autotqmoc handle all of the meta source files (tqmoc) +# let automoc handle all of the meta source files (moc) METASOURCES = AUTO lib_LTLIBRARIES = libkonqsidebarplugin.la diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 3e7013114..bdc99a4ca 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -22,7 +22,7 @@ #include <tqapplication.h> #include <kaccelmanager.h> -KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName, +KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, bool universalMode ) : KParts::ReadOnlyPart(parent, name),KonqSidebarIface() { @@ -30,7 +30,7 @@ KonqSidebar::KonqSidebar( TQWidget *tqparentWidget, const char *widgetName, setInstance( KonqSidebarFactory::instance() ); m_extension = 0; // this should be your custom internal widget - m_widget = new Sidebar_Widget( tqparentWidget, this, widgetName ,universalMode, tqparentWidget->tqtopLevelWidget()->property("currentProfile").toString() ); + m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); connect(m_widget,TQT_SIGNAL(started(KIO::Job *)), this, TQT_SIGNAL(started(KIO::Job*))); @@ -97,12 +97,12 @@ KonqSidebarFactory::~KonqSidebarFactory() s_about = 0L; } -KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName, +KParts::Part* KonqSidebarFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char * /*classname*/, const TQStringList &args ) { // Create an instance of our Part - KonqSidebar* obj = new KonqSidebar( tqparentWidget, widgetName, parent, name, args.tqcontains("universal") ); + KonqSidebar* obj = new KonqSidebar( parentWidget, widgetName, parent, name, args.contains("universal") ); // See if we are to be read-write or not // if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 2724b2d39..ec63e6d00 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -77,7 +77,7 @@ public: /** * Default constructor */ - KonqSidebar(TQWidget *tqparentWidget, const char *widgetName, + KonqSidebar(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name,bool universalMode); /** @@ -113,7 +113,7 @@ class KonqSidebarFactory : public KParts::Factory public: KonqSidebarFactory(); virtual ~KonqSidebarFactory(); - virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index 8844d302b..d3ecf7ce4 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -66,7 +66,7 @@ class KDE_EXPORT KonqSidebarPlugin : public QObject void openPreviewOnMouseOver(const KFileItem& item); // not used yet, perhaps KDE 3.1 /* - if your plugin supports a setup dialog, instead (tqreplaces the url menu entry in the popup) (not supported yet) + if your plugin supports a setup dialog, instead (replaces the url menu entry in the popup) (not supported yet) void setup(TQWidget *parent); */ diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 44429de7b..b4940e8e5 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -234,7 +234,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_somethingVisible = false; m_initial = true; m_noUpdate = false; - m_tqlayout = 0; + m_layout = 0; m_currentButton = 0; m_activeModule = 0; m_userMovedSplitter = false; @@ -251,7 +251,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_buttons.setAutoDelete(true); m_hasStoredUrl = false; m_latestViewed = -1; - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); TQSplitter *splitterWidget = splitter(); if (splitterWidget) { @@ -261,7 +261,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons } m_area = new KDockArea(this); - m_area->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_area->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_mainDockWidget = m_area->createDockWidget("free", 0); m_mainDockWidget->setWidget(new TQWidget(m_mainDockWidget)); m_area->setMainDockWidget(m_mainDockWidget); @@ -387,21 +387,21 @@ void Sidebar_Widget::saveConfig() void Sidebar_Widget::doLayout() { - if (m_tqlayout) - delete m_tqlayout; + if (m_layout) + delete m_layout; - m_tqlayout = new TQHBoxLayout(this); + m_layout = new TQHBoxLayout(this); if (m_showTabsLeft) { - m_tqlayout->add(m_buttonBar); - m_tqlayout->add(m_area); + m_layout->add(m_buttonBar); + m_layout->add(m_area); m_buttonBar->setPosition(KMultiTabBar::Left); } else { - m_tqlayout->add(m_area); - m_tqlayout->add(m_buttonBar); + m_layout->add(m_area); + m_layout->add(m_buttonBar); m_buttonBar->setPosition(KMultiTabBar::Right); } - m_tqlayout->activate(); + m_layout->activate(); if (m_hideTabs) m_buttonBar->hide(); else m_buttonBar->show(); } @@ -460,10 +460,10 @@ void Sidebar_Widget::initialCopy() TQStringList::ConstIterator eEnd = globalDirEntries.end(); for (; eIt != eEnd; ++eIt ) { - //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir tqcontains " << *eIt << endl; + //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; if ( *eIt != "." && *eIt != ".." && - !entries.tqcontains( *eIt ) && - !dirEntries.tqcontains( *eIt ) ) + !entries.contains( *eIt ) && + !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); @@ -674,7 +674,7 @@ void Sidebar_Widget::stdAction(const char *handlestd) kdDebug() << "Try calling >active< module's (" << mod->module->className() << ") slot " << handlestd << endl; - int id = mod->module->tqmetaObject()->findSlot( handlestd ); + int id = mod->module->metaObject()->findSlot( handlestd ); if ( id == -1 ) return; kdDebug() << "Action slot was found, it will be called now" << endl; @@ -742,7 +742,7 @@ void Sidebar_Widget::createButtons() for (uint i = 0; i < m_buttons.count(); i++) { ButtonInfo *button = m_buttons.at(i); - if (m_openViews.tqcontains(button->file)) + if (m_openViews.contains(button->file)) { m_buttonBar->setTab(i,true); m_noUpdate = true; @@ -1042,28 +1042,28 @@ void Sidebar_Widget::showHidePage(int page) void Sidebar_Widget::collapseExpandSidebar() { - if (!tqparentWidget()) + if (!parentWidget()) return; // Can happen during destruction if (m_visibleViews.count()==0) { m_somethingVisible = false; - tqparentWidget()->setMaximumWidth(tqminimumSizeHint().width()); + parentWidget()->setMaximumWidth(minimumSizeHint().width()); updateGeometry(); emit panelHasBeenExpanded(false); } else { m_somethingVisible = true; - tqparentWidget()->setMaximumWidth(32767); + parentWidget()->setMaximumWidth(32767); updateGeometry(); emit panelHasBeenExpanded(true); } } -TQSize Sidebar_Widget::tqsizeHint() const +TQSize Sidebar_Widget::sizeHint() const { if (m_somethingVisible) return TQSize(m_savedWidth,200); - return tqminimumSizeHint(); + return minimumSizeHint(); } void Sidebar_Widget::dockWidgetHasUndocked(KDockWidget* wid) @@ -1194,50 +1194,50 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { - if (mod->tqmetaObject()->findSignal("started(KIO::Job*)") != -1) { + if (mod->metaObject()->findSignal("started(KIO::Job*)") != -1) { connect(mod,TQT_SIGNAL(started(KIO::Job *)),this, TQT_SIGNAL(started(KIO::Job*))); } - if (mod->tqmetaObject()->findSignal("completed()") != -1) { + if (mod->metaObject()->findSignal("completed()") != -1) { connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); } - if (mod->tqmetaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } - if (mod->tqmetaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } - if (mod->tqmetaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { + if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } - if (mod->tqmetaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } - if (mod->tqmetaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { + if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } - if (mod->tqmetaObject()->findSignal("enableAction(const char*,bool)") != -1) { + if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), this,TQT_SLOT(enableAction(const char *, bool))); } - if (mod->tqmetaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { + if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index 183a88bfa..c99ae3883 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -107,7 +107,7 @@ public: void stdAction(const char *handlestd); //virtual KParts::ReadOnlyPart *getPart(); KParts::BrowserExtension *getExtension(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; public slots: void addWebSideBar(const KURL& url, const TQString& name); @@ -185,7 +185,7 @@ private: KMultiTabBar *m_buttonBar; TQPtrVector<ButtonInfo> m_buttons; - TQHBoxLayout *m_tqlayout; + TQHBoxLayout *m_layout; KPopupMenu *m_buttonPopup; TQPopupMenu *m_menu; TQGuardedPtr<ButtonInfo> m_activeModule; diff --git a/konqueror/sidebar/test/Makefile.am b/konqueror/sidebar/test/Makefile.am index 962b43ff5..ebaeff299 100644 --- a/konqueror/sidebar/test/Makefile.am +++ b/konqueror/sidebar/test/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(srcdir)/.. $(all_includes) # these are the headers for your project noinst_HEADERS = konqsidebartest.h -# let autotqmoc handle all of the meta source files (tqmoc) +# let automoc handle all of the meta source files (moc) METASOURCES = AUTO kde_module_LTLIBRARIES = konq_sidebartest.la diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 2c7ae8a47..d00605c82 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -387,7 +387,7 @@ void KonqSidebarBookmarkModule::slotOpenTab() else return; - DCOPRef ref(kapp->dcopClient()->appId(), tree()->tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), tree()->topLevelWidget()->name()); if (bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); @@ -443,7 +443,7 @@ void KonqSidebarBookmarkModule::slotBookmarksChanged( const TQString & groupAddr m_ignoreOpenChange = true; // update the right part of the tree - KBookmarkGroup group = KonqBookmarkManager::self()->tqfindByAddress( groupAddress ).toGroup(); + KBookmarkGroup group = KonqBookmarkManager::self()->findByAddress( groupAddress ).toGroup(); KonqSidebarBookmarkItem * item = findByAddress( groupAddress ); Q_ASSERT(!group.isNull()); Q_ASSERT(item); @@ -484,7 +484,7 @@ void KonqSidebarBookmarkModule::fillGroup( KonqSidebarTreeItem * parentItem, KBo fillGroup( item, grp ); TQString address(grp.address()); - if (m_folderOpenState.tqcontains(address)) + if (m_folderOpenState.contains(address)) item->setOpen(m_folderOpenState[address]); else item->setOpen(false); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp index 58c1c86cf..811867b14 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.cpp @@ -108,7 +108,7 @@ bool KonqSidebarDirTreeItem::hasStandardIcon() return m_fileItem->iconName() == "folder"; } -void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ) +void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ) { if (m_fileItem->isLink()) { @@ -116,7 +116,7 @@ void KonqSidebarDirTreeItem::paintCell( TQPainter *_painter, const TQColorGroup f.setItalic( TRUE ); _painter->setFont( f ); } - TQListViewItem::paintCell( _painter, _cg, _column, _width, _tqalignment ); + TQListViewItem::paintCell( _painter, _cg, _column, _width, _alignment ); } KURL KonqSidebarDirTreeItem::externalURL() const @@ -134,7 +134,7 @@ TQString KonqSidebarDirTreeItem::externalMimeType() const bool KonqSidebarDirTreeItem::acceptsDrops( const TQStrList & formats ) { - if ( formats.tqcontains("text/uri-list") ) + if ( formats.contains("text/uri-list") ) return m_fileItem->acceptsDrops(); return false; } @@ -163,7 +163,7 @@ void KonqSidebarDirTreeItem::itemSelected() bInTrash = true; TQMimeSource *data = TQApplication::clipboard()->data(); - bool paste = ( data->tqencodedData( data->format() ).size() != 0 ); + bool paste = ( data->encodedData( data->format() ).size() != 0 ); tree()->enableActions( true, true, paste, true && !bInTrash, true, true ); } diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h index 3a599c7e9..050f19424 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_item.h +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_item.h @@ -36,7 +36,7 @@ public: virtual void setOpen( bool open ); - virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _tqalignment ); + virtual void paintCell( TQPainter *_painter, const TQColorGroup & _cg, int _column, int _width, int _alignment ); virtual bool acceptsDrops( const TQStrList & formats ); virtual void drop( TQDropEvent * ev ); diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index 401c4985a..ac26b1285 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -357,7 +357,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) if (openItem) { // We have this directory listed already, just copy the entries as we - // can't use the dirlister, it would tqinvalidate the old entries + // can't use the dirlister, it would invalidate the old entries int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); KonqSidebarTreeItem * parentItem = item; KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild()); @@ -549,7 +549,7 @@ void KonqSidebarDirTreeModule::slotRedirection( const KURL & oldUrl, const KURL do { - if (item->alias.tqcontains(newUrlStr)) continue; + if (item->alias.contains(newUrlStr)) continue; kdDebug()<<"Redirectiong element"<<endl; // We need to update the URL in m_dictSubDirs m_dictSubDirs.insert( newUrlStr, item ); @@ -574,7 +574,7 @@ void KonqSidebarDirTreeModule::slotListingStopped( const KURL & url ) if ( item->childCount() == 0 ) { item->setExpandable( false ); - item->tqrepaint(); + item->repaint(); } m_pTree->stopAnimation( item ); diff --git a/konqueror/sidebar/trees/history_module/history_dlg.ui b/konqueror/sidebar/trees/history_module/history_dlg.ui index efffe5982..32fd31296 100644 --- a/konqueror/sidebar/trees/history_module/history_dlg.ui +++ b/konqueror/sidebar/trees/history_module/history_dlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KonqHistoryDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>16</height> @@ -193,7 +193,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>418</width> <height>0</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>30</height> @@ -224,8 +224,8 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="0"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="0"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp index 844f963a4..981be03bb 100644 --- a/konqueror/sidebar/trees/history_module/history_item.cpp +++ b/konqueror/sidebar/trees/history_module/history_item.cpp @@ -126,10 +126,10 @@ TQString KonqSidebarHistoryItem::toolTipText() const } void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, - int column, int width, int tqalignment ) + int column, int width, int alignment ) { TQDateTime dt; - TQDateTime current = TQDateTime::tqcurrentDateTime(); + TQDateTime current = TQDateTime::currentDateTime(); if ( s_settings->m_metricYoungerThan == KonqSidebarHistorySettings::DAYS ) dt = current.addDays( - s_settings->m_valueYoungerThan ); @@ -149,7 +149,7 @@ void KonqSidebarHistoryItem::paintCell( TQPainter *p, const TQColorGroup & cg, p->setFont( s_settings->m_fontOlderThan ); } - KonqSidebarTreeItem::paintCell( p, cg, column, width, tqalignment ); + KonqSidebarTreeItem::paintCell( p, cg, column, width, alignment ); } /////////////////////////////////////////////////////////////////// diff --git a/konqueror/sidebar/trees/history_module/history_item.h b/konqueror/sidebar/trees/history_module/history_item.h index 0ddc7ae4e..1c6c7c4c4 100644 --- a/konqueror/sidebar/trees/history_module/history_item.h +++ b/konqueror/sidebar/trees/history_module/history_item.h @@ -60,7 +60,7 @@ public: static void setSettings( KonqSidebarHistorySettings *s ) { s_settings = s; } virtual void paintCell( TQPainter *, const TQColorGroup & cg, int column, - int width, int tqalignment ); + int width, int alignment ); private: const KonqHistoryEntry *m_entry; diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index a29a2fe0c..a3806be94 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -54,7 +54,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KConfig *kc = KGlobal::config(); KConfigGroupSaver cs( kc, "HistorySettings" ); @@ -132,7 +132,7 @@ void KonqSidebarHistoryModule::slotCreateItems() KonqHistoryEntry *entry; KonqHistoryList entries( KonqHistoryManager::kself()->entries() ); KonqHistoryIterator it( entries ); - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); // the group item and the item of the serverroot '/' get a fav-icon // if available. All others get the protocol icon. @@ -171,7 +171,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry ) if ( !m_initialized ) return; - m_currentTime = TQDateTime::tqcurrentDateTime(); + m_currentTime = TQDateTime::currentDateTime(); KonqSidebarHistoryGroupItem *group = getGroupItem( entry->url ); KonqSidebarHistoryItem *item = group->findChild( entry ); if ( !item ) @@ -185,7 +185,7 @@ void KonqSidebarHistoryModule::slotEntryAdded( const KonqHistoryEntry *entry ) t->lockScrolling( true ); group->sort(); m_topLevelItem->sort(); - tqApp->processOneEvent(); + qApp->processOneEvent(); t->lockScrolling( false ); } diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index 20ca214d4..6871415a0 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/konqueror/sidebar/trees/history_module/history_settings.cpp @@ -56,8 +56,8 @@ void KonqSidebarHistorySettings::readSettings(bool global) m_valueYoungerThan = config->readNumEntry("Value youngerThan", 1 ); m_valueOlderThan = config->readNumEntry("Value olderThan", 2 ); - TQString minutes = TQString::tqfromLatin1("minutes"); - TQString days = TQString::tqfromLatin1("days"); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); TQString metric = config->readEntry("Metric youngerThan", days ); m_metricYoungerThan = (metric == days) ? DAYS : MINUTES; metric = config->readEntry("Metric olderThan", days ); @@ -83,8 +83,8 @@ void KonqSidebarHistorySettings::applySettings() config->writeEntry("Value youngerThan", m_valueYoungerThan ); config->writeEntry("Value olderThan", m_valueOlderThan ); - TQString minutes = TQString::tqfromLatin1("minutes"); - TQString days = TQString::tqfromLatin1("days"); + TQString minutes = TQString::fromLatin1("minutes"); + TQString days = TQString::fromLatin1("days"); config->writeEntry("Metric youngerThan", m_metricYoungerThan == DAYS ? days : minutes ); config->writeEntry("Metric olderThan", m_metricOlderThan == DAYS ? diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 532e3a164..ccedf65d9 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -144,8 +144,8 @@ void HistorySidebarConfig::load() void HistorySidebarConfig::save() { - TQ_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0; - TQ_UINT32 count = dialog->spinEntries->value(); + Q_UINT32 age = dialog->cbExpire->isChecked() ? dialog->spinExpire->value() : 0; + Q_UINT32 count = dialog->spinEntries->value(); KConfig config("konquerorrc"); config.setGroup("HistorySettings"); @@ -156,13 +156,13 @@ void HistorySidebarConfig::save() TQDataStream streamAge( dataAge, IO_WriteOnly ); streamAge << age << "foo"; kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxAge(TQ_UINT32, TQCString)", dataAge ); + "notifyMaxAge(Q_UINT32, TQCString)", dataAge ); TQByteArray dataCount; TQDataStream streamCount( dataCount, IO_WriteOnly ); streamCount << count << "foo"; kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxCount(TQ_UINT32, TQCString)", dataCount ); + "notifyMaxCount(Q_UINT32, TQCString)", dataCount ); m_settings->m_valueYoungerThan = dialog->spinNewer->value(); m_settings->m_valueOlderThan = dialog->spinOlder->value(); diff --git a/konqueror/sidebar/trees/init/home.desktop b/konqueror/sidebar/trees/init/home.desktop index d91617b92..d18f98466 100644 --- a/konqueror/sidebar/trees/init/home.desktop +++ b/konqueror/sidebar/trees/init/home.desktop @@ -76,7 +76,7 @@ Name[vi]=ThÆ° mục Nhà Name[wa]=Ridant mÃ¥jhon Name[zh_CN]=主文件夹 Name[zh_TW]=家目錄 -Comment=This folder tqcontains your personal files +Comment=This folder contains your personal files Comment[af]=Hierdie kabinet bevat jou persoonlike lêers Comment[ar]=هذا المجلّد ÙŠØتوي على ملÙاتك الخاصة Comment[az]=Bütün ÅŸÉ™xsi fayllarınız bu qovluqda yer alır diff --git a/konqueror/sidebar/trees/init/system.desktop b/konqueror/sidebar/trees/init/system.desktop index 9a43fe03a..490b4ef7f 100644 --- a/konqueror/sidebar/trees/init/system.desktop +++ b/konqueror/sidebar/trees/init/system.desktop @@ -111,11 +111,11 @@ Comment[kk]=Бұл қапшық компьютердегі ортақ орынд Comment[km]=ážážâ€‹áž“áŸáŸ‡â€‹áž¢áž“ុញ្ញាážâ€‹áž²áŸ’យអ្នក​ចូលដំណើរការ​កន្លែង​ទូទៅ​លើកុំព្យូទáŸážšâ€‹ážšáž”ស់​អ្នក Comment[lt]=Å io aplanko padedami pasieksite dažniausiai lankomas kompiuterio vietas Comment[mk]=Оваа папка ви овозможува приÑтап до вообичаените меÑта на вашиот компјутер -Comment[nb]=Denne mappa gir deg tilgang til vanlige steder pÃ¥ din datatqmaskin +Comment[nb]=Denne mappa gir deg tilgang til vanlige steder pÃ¥ din datamaskin Comment[nds]=Mit dissen Orner kannst Du op en Reeg faken bruukte Öörd togriepen Comment[ne]=यो फोलà¥à¤¡à¤°à¤²à¥‡ तपाईà¤à¤²à¤¾à¤ˆ कमà¥à¤ªà¥à¤¯à¥à¤Ÿà¤°à¤•à¥‹ साà¤à¤¾ सà¥à¤¥à¤¾à¤¨à¤¹à¤°à¥‚मा पहà¥à¤à¤š अनà¥à¤®à¤¤à¤¿ दिनà¥à¤› Comment[nl]=Deze map geeft toegang tot algemene plekken van uw desktop -Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader pÃ¥ datatqmaskina +Comment[nn]=Denne mappa gir deg tilgang til nokre vanlege stader pÃ¥ datamaskina Comment[pa]=ਇਹ ਫੋਲਡਰ ਤà©à¨¹à¨¾à¨¨à©‚à©° ਤà©à¨¹à¨¾à¨¡à©‡ ਕੰਪਿਊਟਰ 'ਚ ਆਮ ਥਾਵਾਂ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ Comment[pl]=Ten folder umożliwia dostÄ™p do najczęściej używanych miejsc w Twoim komputerze Comment[pt]=Esta pasta permite aceder a alguns locais comuns no seu computador diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 0ce8f9d52..c1c98e07a 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -55,7 +55,7 @@ static const int autoOpenTimeout = 750; getModule KonqSidebarTree::getPluginFactory(TQString name) { - if (!pluginFactories.tqcontains(name)) + if (!pluginFactories.contains(name)) { KLibLoader *loader = KLibLoader::self(); TQString libName = pluginInfo[name]; @@ -114,8 +114,8 @@ public: }; -KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path ) - : KListView( tqparentWidget ), +KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ) + : KListView( parentWidget ), m_currentTopLevelItem( 0 ), m_toolTip( this ), m_scrollingLocked( false ), @@ -272,7 +272,7 @@ void KonqSidebarTree::contentsDragMoveEvent( TQDragMoveEvent *e ) TQListViewItem *item = itemAt( contentsToViewport( e->pos() ) ); // Accept drops on the background, if URLs - if ( !item && m_lstDropFormats.tqcontains("text/uri-list") ) + if ( !item && m_lstDropFormats.contains("text/uri-list") ) { m_dropItem = 0; e->acceptAction(); @@ -417,7 +417,7 @@ bool KonqSidebarTree::acceptDrag(TQDropEvent* e) const { // for KListViewMode... for( int i = 0; e->format( i ); i++ ) - if ( d->m_dropFormats.tqcontains(e->format( i ) ) ) + if ( d->m_dropFormats.contains(e->format( i ) ) ) return true; return false; } @@ -516,7 +516,7 @@ void KonqSidebarTree::slotAutoOpenFolder() return; m_dropItem->setOpen( true ); - m_dropItem->tqrepaint(); + m_dropItem->repaint(); } void KonqSidebarTree::rescanConfiguration() @@ -606,7 +606,7 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path // Version 5 includes the audiocd browser // Version 6 includes the printmanager and lan browser const int currentVersion = 6; - TQString key = TQString::tqfromLatin1("X-KDE-DirTreeVersionNumber"); + TQString key = TQString::fromLatin1("X-KDE-DirTreeVersionNumber"); KSimpleConfig versionCfg( path + "/.directory" ); int versionNumber = versionCfg.readNumEntry( key, 1 ); kdDebug(1201) << "KonqSidebarTree::scanDir found version " << versionNumber << endl; @@ -650,9 +650,9 @@ void KonqSidebarTree::scanDir( KonqSidebarTreeItem *parent, const TQString &path TQStringList::ConstIterator eEnd = globalDirEntries.end(); for (; eIt != eEnd; ++eIt ) { - //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir tqcontains " << *eIt << endl; + //kdDebug(1201) << "KonqSidebarTree::scanDir dirtree_dir contains " << *eIt << endl; if ( *eIt != "." && *eIt != ".." - && !entries.tqcontains( *eIt ) && !dirEntries.tqcontains( *eIt ) ) + && !entries.contains( *eIt ) && !dirEntries.contains( *eIt ) ) { // we don't have that one yet -> copy it. TQString cp("cp -R -- "); cp += KProcess::quote(dirtree_dir + *eIt); @@ -813,7 +813,7 @@ void KonqSidebarTree::slotAnimation() for (; it != end; ++it ) { uint & iconNumber = it.data().iconNumber; - TQString icon = TQString::tqfromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); + TQString icon = TQString::fromLatin1( it.data().iconBaseName ).append( TQString::number( iconNumber ) ); it.key()->setPixmap( 0, SmallIcon( icon)); iconNumber++; @@ -882,7 +882,7 @@ void KonqSidebarTree::enableActions( bool copy, bool cut, bool paste, bool KonqSidebarTree::tabSupport() { // see if the newTab() dcop function is available (i.e. the sidebar is embedded into konqueror) - DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); DCOPReply reply = ref.call("functions()"); if (reply.isValid()) { QCStringList funcs; @@ -1023,7 +1023,7 @@ void KonqSidebarTree::slotOpenNewWindow() void KonqSidebarTree::slotOpenTab() { if (!m_currentTopLevelItem) return; - DCOPRef ref(kapp->dcopClient()->appId(), tqtopLevelWidget()->name()); + DCOPRef ref(kapp->dcopClient()->appId(), topLevelWidget()->name()); ref.call( "newTab(TQString)", m_currentTopLevelItem->externalURL().url() ); } @@ -1045,7 +1045,7 @@ void KonqSidebarTreeToolTip::maybeTip( const TQPoint &point ) if ( item ) { TQString text = static_cast<KonqSidebarTreeItem*>( item )->toolTipText(); if ( !text.isEmpty() ) - tip ( m_view->tqitemRect( item ), text ); + tip ( m_view->itemRect( item ), text ); } } diff --git a/konqueror/sidebar/trees/konq_sidebartree.h b/konqueror/sidebar/trees/konq_sidebartree.h index 8cfb2106c..269803a84 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.h +++ b/konqueror/sidebar/trees/konq_sidebartree.h @@ -77,7 +77,7 @@ class KonqSidebarTree : public KListView, public KDirNotify { Q_OBJECT public: - KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *tqparentWidget, int virt, const TQString& path ); + KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidget, int virt, const TQString& path ); virtual ~KonqSidebarTree(); void followURL( const KURL &url ); diff --git a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp index d526a826f..4ce6fe445 100644 --- a/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp +++ b/konqueror/sidebar/trees/konq_sidebartreetoplevelitem.cpp @@ -57,7 +57,7 @@ void KonqSidebarTreeTopLevelItem::itemSelected() bool KonqSidebarTreeTopLevelItem::acceptsDrops( const TQStrList & formats ) { - return formats.tqcontains("text/uri-list") && + return formats.contains("text/uri-list") && ( m_bTopLevelGroup || !externalURL().isEmpty() ); } diff --git a/konsole/COPYING b/konsole/COPYING index 0058a832a..5185fd3f3 100644 --- a/konsole/COPYING +++ b/konsole/COPYING @@ -65,7 +65,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -102,7 +102,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/konsole/ChangeLog b/konsole/ChangeLog index ab3539748..55aacd580 100644 --- a/konsole/ChangeLog +++ b/konsole/ChangeLog @@ -79,10 +79,10 @@ Lots happened here... - added privacy code 1049. - reverted to TERM=xterm. 11 Jan 2000 -- upgraded xterm title hack to tqunicode. -- upgraded copy/paste to handle tqunicode. +- upgraded xterm title hack to unicode. +- upgraded copy/paste to handle unicode. 7 Jan 2000 -- added tqunicode support. (see README.tqunicode) +- added unicode support. (see README.unicode) - added arbitrary long history buffers. - code adjustments to the provide linux console font. - added font directory to simply installation. @@ -125,10 +125,10 @@ Lots happened here... - added some docs - set version to 0.9.10 06 Feb 1999 -- adjusting tqgeometry save/restore +- adjusting geometry save/restore 03 Feb 1999 - fixed -caption -- some adjustments in tqgeometry management +- some adjustments in geometry management 01 Feb 1999 Matt Gerassimoff <mg@s303.msoe.edu> - scroll line wise through the history buffer using Shift-Up/Down 31 Jan 1998 @@ -195,7 +195,7 @@ Lots happened here... - marking within mouse aware application now needs an extra shift - added command configuration files /opt/kde/share/apps/konsole/*.kdelnk 24 Oct 1998 - - adjusted tqgeometry management. Window is not resized anylonger when + - adjusted geometry management. Window is not resized anylonger when changeing font size, scrollbar, frame, menubar. - made font & schema attributes per-session. 23 Oct 1998 diff --git a/konsole/README.fonts b/konsole/README.fonts index 0466a6cb6..55d410980 100644 --- a/konsole/README.fonts +++ b/konsole/README.fonts @@ -72,8 +72,8 @@ Fonts need to suit the needs of X11, QT and konsole. The following graphical glyphs are defined in VT100 fonts, too, but are not used in any program i know about. Codes for them have been assigned - in the private tqunicode page. See the linux kernel - documentation file [tqunicode.txt] about this assignment. + in the private unicode page. See the linux kernel + documentation file [unicode.txt] about this assignment. - 0x10 U+f800 : DEC VT GRAPHICS HORIZONTAL LINE SCAN 1 - 0x11 U+f801 : DEC VT GRAPHICS HORIZONTAL LINE SCAN 3 @@ -111,7 +111,7 @@ Fonts need to suit the needs of X11, QT and konsole. Use the "DEFAULT_CHAR" property with bdf fonts to do so. Other font representations provide - likely means. The tqunicode assignment is U+fffd. + likely means. The unicode assignment is U+fffd. If such a character isn't defined, X11 might choose to void the character completely, causing diff --git a/konsole/README.unicode b/konsole/README.unicode index b366a6bad..bf8134674 100644 --- a/konsole/README.unicode +++ b/konsole/README.unicode @@ -1,6 +1,6 @@ -[README.tqunicode] +[README.unicode] -Konsole supports tqunicode, which means one can display up +Konsole supports unicode, which means one can display up to 64K different glyphs at the same time on one screen. The enhancement is pretty complete and the main current @@ -9,7 +9,7 @@ within localed environments. At least the european locales should be enabled to use their local scripts when running konsole. -To fully install it, please get a complete set of tqunicode +To fully install it, please get a complete set of unicode enhanced fixed fonts from <http://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html>. @@ -29,36 +29,36 @@ Also, a new linux console font has been converted for X11. This font has iso10646-1 encoding and the usual vga glyphs. -* A more precise anatomy of tqunicode support within konsole +* A more precise anatomy of unicode support within konsole -The internal character representation is uniquely 16 bit tqunicode. +The internal character representation is uniquely 16 bit unicode. All in- and output connections of konsole (beside the mouse) are filtered through three different codecs (corresponding to 2 different codes): - 1) Font Code - The renderer converts from tqunicode to the code of + 1) Font Code - The renderer converts from unicode to the code of the font to the degree that code is supported within Qt. - Non-iso10646 (tqunicode) codes are considered to be VT100 - enhanced, meaning that 0x00 .. 0x1f tqcontains the VT100 + Non-iso10646 (unicode) codes are considered to be VT100 + enhanced, meaning that 0x00 .. 0x1f contains the VT100 graphical characters. 2) Client Code - This is used for bytes from and to the pty. Often, the clients code is identical with the locale setting. -Thus, tqunicode support mainly turns out to be a potter's wheel of +Thus, unicode support mainly turns out to be a potter's wheel of code conversions. Beside these conversions, up to 2^16 diffent glyphs can be displayed now. Though it is not possible to type each of these codes, one can use utf-8 encoding on the clients side. -Please note that tqunicode support is still under development in +Please note that unicode support is still under development in the freeware community and is not supported by terminal aware applications, since ncurses does currently not provide wide character operations. -Because utf-8 tqcontains ascii-7 properly, one can work with utf-8 +Because utf-8 contains ascii-7 properly, one can work with utf-8 enabled as long as no international characters are used. Try to cat 9x15.repertoire-utf8 from the test when having utf-8 encoding enabled. @@ -66,7 +66,7 @@ enabled. Utf-8 code is enabled and disabled by sending <ESC>%G or <ESC>%@. The utf8.sh utility in the test directory does this. -Though utf8 properly tqcontains ascii-7 note that the length of a +Though utf8 properly contains ascii-7 note that the length of a utf8 encoded string differs from the length of the string itself. This confuses many length aware programs as soon as proper (non- ascii-7 characters) are used, this may result in deviating cursor diff --git a/konsole/doc/Konsole2.Requirements b/konsole/doc/Konsole2.Requirements index 45633403b..19cbd72fc 100644 --- a/konsole/doc/Konsole2.Requirements +++ b/konsole/doc/Konsole2.Requirements @@ -29,7 +29,7 @@ This file is to collect requirements and ideas for this. Current history algorithm does not allow to limit the histories size. Also, it descreases the speed. -- improve tqunicode support +- improve unicode support this is both an ncurses and terminfo issue. We may need to provide some help for these packages. diff --git a/konsole/doc/More/Ansi_esc.txt b/konsole/doc/More/Ansi_esc.txt index 795b3d091..ede1a7c24 100644 --- a/konsole/doc/More/Ansi_esc.txt +++ b/konsole/doc/More/Ansi_esc.txt @@ -1,6 +1,6 @@ ANSI ESCAPE SEQUENCES =============================================================================== -Wherever you see '#', that should be tqreplaced by the appropriate number. +Wherever you see '#', that should be replaced by the appropriate number. ESC code sequence Function ------------------- --------------------------- diff --git a/konsole/doc/More/Eterm.ref b/konsole/doc/More/Eterm.ref index de808b84b..849be1f3b 100644 --- a/konsole/doc/More/Eterm.ref +++ b/konsole/doc/More/Eterm.ref @@ -151,8 +151,8 @@ ESC [ Pm m Character Attributes (SGR) Ps = 37 / 47 -> fg / bg White Ps = 39 / 49 -> fg / bg Default -ESC [ Ps n Device tqStatus Report (DSR) - Ps = 5 -> tqStatus Report ESC [ 0 n (``OK'') +ESC [ Ps n Device Status Report (DSR) + Ps = 5 -> Status Report ESC [ 0 n (``OK'') Ps = 6 -> Report Cursor Position (CPR) [row;column] as ESC [ r ; c R Ps = 7 -> Request Display Name @@ -295,7 +295,7 @@ or "\E]20;;200;?\a" sets the scaling of the current pixmap to 200% and displays - the image tqgeometry in the title. + the image geometry in the title. -------------------------------------------------------------------------- Eterm menuBar diff --git a/konsole/doc/More/ansix364.txt b/konsole/doc/More/ansix364.txt index 37844fee0..da74ad156 100644 --- a/konsole/doc/More/ansix364.txt +++ b/konsole/doc/More/ansix364.txt @@ -48,7 +48,7 @@ DCH Delete Character Esc [ Pn P 1 eF DCS Device Control String Esc P Delim DL Delete Line Esc [ Pn M 1 eF DMI Disable Manual Input Esc \ Fs -DSR Device tqStatus Report Esc [ Ps n 0 +DSR Device Status Report Esc [ Ps n 0 EA Erase in Area Esc [ Ps O 0 eF ECH Erase Character Esc [ Pn X 1 eF ED Erase in Display Esc [ Ps J 0 eF @@ -196,7 +196,7 @@ ANSI X3.64 Mode-Changing Parameters for use with the 3/1 1 GATM guarded-area transfer mode 3/2 2 KAM keyboard action mode 3/3 3 CRM control representation mode -3/4 4 IRM insertion/tqreplacement mode +3/4 4 IRM insertion/replacement mode 3/5 5 SRTM status-reporting transfer mode 3/6 6 ERM erasure mode 3/7 7 VEM vertical editing mode @@ -277,7 +277,7 @@ by transmitting the sequence where Ps is a character that describes installed options. -The VT100's cursor location can be read with the DSR (Device tqStatus +The VT100's cursor location can be read with the DSR (Device Status Report) control Esc [ 6 n diff --git a/konsole/doc/More/dec_vt100_codes.txt b/konsole/doc/More/dec_vt100_codes.txt index 7a2a59aac..e9d4b9f82 100644 --- a/konsole/doc/More/dec_vt100_codes.txt +++ b/konsole/doc/More/dec_vt100_codes.txt @@ -107,7 +107,7 @@ ANSI Compatible Mode Response is ESC [ Pl; Pc R * Pl = line number; Pc = column number - tqStatus Report + Status Report Invoked by ESC [ 5 n Response is ESC [ 0 n (terminal ok) ESC [ 3 n (terminal not ok) diff --git a/konsole/doc/More/rxvt-ref.html b/konsole/doc/More/rxvt-ref.html index 847e41964..a27f5b4bc 100644 --- a/konsole/doc/More/rxvt-ref.html +++ b/konsole/doc/More/rxvt-ref.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> <!-- don't use Netscape to edit this file, since it has some stange ideas of -formatting that makes later global/change/tqreplace difficult, +formatting that makes later global/change/replace difficult, but it is okay for making the text version of this document --> <HTML> @@ -484,8 +484,8 @@ Reset Mode (RM)</DD> <DL> <DT><B><TT>ESC [ Ps n</TT></B></DT> -<DD>Device tqStatus Report (DSR)<BR> -<B><TT>Ps = 5</TT></B> : tqStatus Report <B><TT>ESC [ 0 n</TT></B> (``OK'')<BR> +<DD>Device Status Report (DSR)<BR> +<B><TT>Ps = 5</TT></B> : Status Report <B><TT>ESC [ 0 n</TT></B> (``OK'')<BR> <B><TT>Ps = 6</TT></B> : Report Cursor Position (CPR) [row;column] as <B><TT>ESC [ r ; c R</TT></B><BR> <B><TT>Ps = 7</TT></B> : Request Display Name<BR> @@ -1095,7 +1095,7 @@ For example: <DT><B>\E]20;mona;100\a</B></DT> <DD>load <B>mona.xpm</B> with a scaling of 100%</DD> <DT><B>\E]20;;200;?\a</B></DT> -<DD>rescale the current pixmap to 200% and display the image tqgeometry +<DD>rescale the current pixmap to 200% and display the image geometry in the title</DD> </DL> <P> diff --git a/konsole/doc/More/swedish_vt102_codes.txt b/konsole/doc/More/swedish_vt102_codes.txt index b19c74b14..7fca08c71 100644 --- a/konsole/doc/More/swedish_vt102_codes.txt +++ b/konsole/doc/More/swedish_vt102_codes.txt @@ -284,12 +284,12 @@ Reports Where <c> is '0'=Response Ready, no malfunctions detected '3'=Malfunction, error in self-test. - '5'=tqStatus report request + '5'=Status report request '6'=Request cursor position. '?10'=Response to printer status request, All ok. '?11'=Response to printer status request, Printer is not ready. '?13'=Response to printer status request, No printer. - '?15'=tqStatus report request from printer + '?15'=Status report request from printer Cursor position raport (Response to request cursor position) Esc [ <n1> ; <n2> R diff --git a/konsole/doc/More/villanova-vt100-esc-codes.txt b/konsole/doc/More/villanova-vt100-esc-codes.txt index 053c0f3c8..8142978ed 100644 --- a/konsole/doc/More/villanova-vt100-esc-codes.txt +++ b/konsole/doc/More/villanova-vt100-esc-codes.txt @@ -13,7 +13,7 @@ In-Reply-To: <9010240014.AA10730@ucbvax.Berkeley.EDU> 23 Oct 90 16:00 EDT Campus Computing - Terminal Emulation Includes VT100 and VT52 Terminal and Control Codes - This file tqcontains control and terminal codes for the VT100 terminals, + This file contains control and terminal codes for the VT100 terminals, ANSI terminals, and VT52 terminals. Many of the codes were derived from PC/ Intercomm, from Mark of the Unicorn Software. I have researched some of them and added some of my own. @@ -377,7 +377,7 @@ VT100 CURRENT STATES: be the same. 9600 baud is sent for 7200 baud. - Esc [ Ps n DSR: Device tqStatus Report + Esc [ Ps n DSR: Device Status Report * Parameter values other than 5, 6, are ignored. If the parameter value is 5, the sequence diff --git a/konsole/doc/More/vt100_codes_news.txt b/konsole/doc/More/vt100_codes_news.txt index 5cb09baea..d136e2224 100644 --- a/konsole/doc/More/vt100_codes_news.txt +++ b/konsole/doc/More/vt100_codes_news.txt @@ -57,7 +57,7 @@ Cursor Key VT52 mode key mode reset key mode set If the Special Graphics set is selected, the graphics for ASCII codes -0137 through 0176 will be tqreplaced according to the following table (see the +0137 through 0176 will be replaced according to the following table (see the SCS control sequence). @@ -384,7 +384,7 @@ DECALN Screen Alignment Display (DEC private) <ESC># 8 This command causes the VT100 to fill it's screen with uppercase Es for - screen focus and tqalignment. + screen focus and alignment. DECANM ANSI/VT52 Mode (DEC Private) @@ -447,7 +447,7 @@ DECDWL Double Width Line (DEC Private) <ESC>#6 - This causes the line that tqcontains the cursor to become double-width + This causes the line that contains the cursor to become double-width single height. If the line was single width, all characters ro the right of the center of the screen will be lost. The cursor remains over the same character position, unless it would be to the right of @@ -630,7 +630,7 @@ DECSWL Single-width Line (DEC Private) <ESC>#5 - This causes the line which tqcontains the cursor to become single-width, + This causes the line which contains the cursor to become single-width, single-height. The cursor remains on the same character position. This is the default condition for all new lines on the screen. @@ -651,7 +651,7 @@ DECTST Invoke Confidence Test Repeat Testing until failure 8 -DSR Device tqStatus Report Host to VT100 & VT100 to Host +DSR Device Status Report Host to VT100 & VT100 to Host <ESC>[ {Ps} n @@ -662,7 +662,7 @@ DSR Device tqStatus Report Host to VT100 & VT100 to Host --------------------------------------------------------------- 0 Response from VT100 - Ready, no faults detected 3 Response from VT100 - Malfunction Detected - 5 Command from host - Report tqStatus (using a DSR control + 5 Command from host - Report Status (using a DSR control sequence) 6 Command from host - Report Active Position (using a CPR sequence) @@ -787,12 +787,12 @@ MODES The Following is a list of VT100 modes which may be changed with Set FETM Format Effector Transfer Reset GATM Guarded Area Transfer NA HEM Horizontal Editing NA - IRM Insertion-tqreplacement Reset + IRM Insertion-replacement Reset KAM Keyboard Action Reset MATM Multiple area transfer NA PUM Positioning Unit Reset SATM Selected Area Transfer NA - SRTM tqStatus Reporting Transfer Reset + SRTM Status Reporting Transfer Reset TSM Tabulation Stop Reset TTM Transfer Termination NA VEM Vertical Editing NA @@ -852,7 +852,7 @@ SCS Select Character Set The United Kingdom and ASCII sets conform to the "ISO international register of character sets to be used with escape sequences". The other sets are private character sets. Special graphics means that the - graphic characters fpr the codes 0137 to 0176 are tqreplaced with other + graphic characters fpr the codes 0137 to 0176 are replaced with other characters. The specified character set will be used until another SCS is recieved. diff --git a/konsole/doc/More/vt100_reference_card.txt b/konsole/doc/More/vt100_reference_card.txt index 5ab2aac0c..e80ea1325 100644 --- a/konsole/doc/More/vt100_reference_card.txt +++ b/konsole/doc/More/vt100_reference_card.txt @@ -108,7 +108,7 @@ ANSI Compatible Mode Response is ESC [ Pl; Pc R * Pl = line number; Pc = column number - tqStatus Report + Status Report Invoked by ESC [ 5 n Response is ESC [ 0 n (terminal ok) ESC [ 3 n (terminal not ok) @@ -189,7 +189,7 @@ Lines: 25 In article <chan.728236678@hertz> chan@ece.scarolina.edu (Simon Chan) writes: >Taken from VT100 Programming Reference Card (DIGITAL) -Note that EK-VT100-RC-001 tqcontains several errors and omissions. +Note that EK-VT100-RC-001 contains several errors and omissions. The errors appear to all be fixed in the posted version. Here are some additions: diff --git a/konsole/doc/More/vt100_setup.txt b/konsole/doc/More/vt100_setup.txt index c0e2af70e..1bdf44cdd 100644 --- a/konsole/doc/More/vt100_setup.txt +++ b/konsole/doc/More/vt100_setup.txt @@ -106,7 +106,7 @@ nils@f109f.mil.se (Nils Hammar) writes: < graphics to the caller too. What a surprise to get a hig resolution < picture on the screen when you are calling an ordinary BBS! -The ANSI Device tqStatus Report (DSR) is +The ANSI Device Status Report (DSR) is ESC [ <n> n diff --git a/konsole/doc/More/xterm.codes b/konsole/doc/More/xterm.codes index e2ae680bc..b14ead600 100644 --- a/konsole/doc/More/xterm.codes +++ b/konsole/doc/More/xterm.codes @@ -125,7 +125,7 @@ x 7 (A) White x 9 (A) Default x ESC [ 6 n Send Device Report -x Ps = 5 Send tqStatus report (ESC [ 0 n) +x Ps = 5 Send Status report (ESC [ 0 n) x 6 Send Cursor Position Report (ESC [ Row ; Col R) x ESC [ Pn ; Pn r (dft:all) Set Scrolling region diff --git a/konsole/doc/VT100/Table.Codes b/konsole/doc/VT100/Table.Codes index 376d8bb6d..6ece0f4bf 100644 --- a/konsole/doc/VT100/Table.Codes +++ b/konsole/doc/VT100/Table.Codes @@ -18,7 +18,7 @@ # make a script that extracts it again. From db.trans, we then generate parts # of the decoder (the semantic assignment). # -# db2.pl tqcontains as script able to slit TEScreen.C into the emulation +# db2.pl contains as script able to slit TEScreen.C into the emulation # (in)dependent parts due to [db.trans]. # # A like thing has to be done for TEmuVt102.C/h and for TEScreen.h. @@ -54,7 +54,7 @@ Introduction.html The serial cable is folded into the operating system as a sort of loop back device, and a program, the terminal emulation, uses modern means of graphical user interfaces to behave like an earlier terminal. - To complete the picture, the host in the diagram is tqreplaced by the + To complete the picture, the host in the diagram is replaced by the application that runs in the emulation (typically a shell or an old editor). So, terminal emulations are in fact interfaces to character oriented applications. @@ -308,7 +308,7 @@ Sequences.html <p> The second one is used to specify character set mappings (see <a href=#SCS>SCS</a>). A CSI instruction to do this is specified in ECMA, - and this should be used as a tqreplacement. + and this should be used as a replacement. . <h4>XTERM hacks</h4> @@ -1070,7 +1070,7 @@ DECALN.sect Command DECALN.code HSH|8| DECALN.text Causes the VT100 to fill it's screen with - uppercase Es for screen focus and tqalignment. + uppercase Es for screen focus and alignment. DECALN.table.XPS Subcode|Emulation|Scope|Operation|Args|Meaning N/A|VT100|scr|helpAlign||see above @@ -1176,7 +1176,7 @@ DECDWL.emus VT100 DECDWL.sect Command.NoImp DECDWL.code HSH|6| DECDWL.text - This causes the line that tqcontains the cursor to become double-width + This causes the line that contains the cursor to become double-width single height. If the line was single width, all characters ro the right of the center of the screen will be lost. The cursor remains over the same character position, unless it would be to the right of @@ -1399,7 +1399,7 @@ DECSWL.emus VT100 DECSWL.sect Command.NoImp DECSWL.code HSH|5| DECSWL.text - This causes the line which tqcontains the cursor to become single-width, + This causes the line which contains the cursor to become single-width, single-height. The cursor remains on the same character position. This is the default condition for all new lines on the screen. DECSWL.table.XPS @@ -1424,7 +1424,7 @@ DECTST.table.Weight 3|EIA Modem Control Test (Loopback connector req.) 4|Repeat Testing until failure -DSRREQ.head Device tqStatus Report +DSRREQ.head Device Status Report DSRREQ.emus ECMA VT100 DSRREQ.sect Command.Request DSRREQ.code CSI|n|{Ps} @@ -1432,21 +1432,21 @@ DSRREQ.text Requests status of the VT100 according to the following parameters. DSRREQ.table.XPS Subcode|Emulation|Scope|Operation|Args|Meaning - 5|VT100|emu|reporttqStatus||Report tqStatus (using a \ref:DSRREP control sequence) + 5|VT100|emu|reportStatus||Report Status (using a \ref:DSRREP control sequence) 6|VT100|emu|reportCursorPosition||Report Active Position (using a \ref:CPR sequence) -DSRREP.head Device tqStatus Report Reply +DSRREP.head Device Status Report Reply DSRREP.emus ECMA VT100 DSRREP.sect Reply -DSRREP.code CSI|n|{tqStatus} +DSRREP.code CSI|n|{Status} DSRREP.text Reports the general status of the VT100 according to the following parameters. . DSRREP with a parameter of 0 or 3 is always sent as a response to a requesting \ref:DSRREQ with a parameter of 5. -DSRREP.table.tqStatus - tqStatus|Meaning:3 +DSRREP.table.Status + Status|Meaning:3 0|Ready, no faults detected 3|Malfunction detected @@ -1608,7 +1608,7 @@ SCS.text The United Kingdom and ASCII sets conform to the "ISO international register of character sets to be used with escape sequences". The other sets are private character sets. Special graphics means that the - graphic characters fpr the codes 0137 to 0176 are tqreplaced with other + graphic characters fpr the codes 0137 to 0176 are replaced with other characters. The specified character set will be used until another SCS is received. SCS.table.XPS diff --git a/konsole/doc/VT100/db.trans b/konsole/doc/VT100/db.trans index 406d9f1ed..7fe21ef27 100644 --- a/konsole/doc/VT100/db.trans +++ b/konsole/doc/VT100/db.trans @@ -109,7 +109,7 @@ TY_CSI_PS|SGR|'m'|104|scr|setBackColor|12 TY_CSI_PS|SGR|'m'|105|scr|setBackColor|13 TY_CSI_PS|SGR|'m'|106|scr|setBackColor|14 TY_CSI_PS|SGR|'m'|107|scr|setBackColor|15 -TY_CSI_PS|DSR|'n'|5|emu|reporttqStatus| +TY_CSI_PS|DSR|'n'|5|emu|reportStatus| TY_CSI_PS|DSR|'n'|6|emu|reportCursorPosition| TY_CSI_PS|DECLL|'q'|0||| TY_CSI_PS|DECLL|'q'|1||| diff --git a/konsole/doc/VT100/genDocument b/konsole/doc/VT100/genDocument index 927f48f83..4ecee0996 100755 --- a/konsole/doc/VT100/genDocument +++ b/konsole/doc/VT100/genDocument @@ -183,12 +183,12 @@ as noted. <tr><td>FETM </td><td>Format Effector Transfer </td><td>Reset</td></tr> <tr><td>GATM </td><td>Guarded Area Transfer </td><td>NA </td></tr> <tr><td>HEM </td><td>Horizontal Editing </td><td>NA </td></tr> -<tr><td>IRM </td><td>Insertion-tqreplacement </td><td>Reset</td></tr> +<tr><td>IRM </td><td>Insertion-replacement </td><td>Reset</td></tr> <tr><td>KAM </td><td>Keyboard Action </td><td>Reset</td></tr> <tr><td>MATM </td><td>Multiple area transfer </td><td>NA </td></tr> <tr><td>PUM </td><td>Positioning Unit </td><td>Reset</td></tr> <tr><td>SATM </td><td>Selected Area Transfer </td><td>NA </td></tr> -<tr><td>SRTM </td><td>tqStatus Reporting Transfer</td><td>Reset</td></tr> +<tr><td>SRTM </td><td>Status Reporting Transfer</td><td>Reset</td></tr> <tr><td>TSM </td><td>Tabulation Stop </td><td>Reset</td></tr> <tr><td>TTM </td><td>Transfer Termination </td><td>NA </td></tr> <tr><td>VEM </td><td>Vertical Editing </td><td>NA </td></tr> @@ -223,7 +223,7 @@ cat >> $RES << etx <h2>Special Graphics Characters</h2> If the Special Graphics set is selected, the graphics for ASCII codes -0137 through 0176 will be tqreplaced according to the following table (see the +0137 through 0176 will be replaced according to the following table (see the <a href=#SCS>SCS</a> control sequence). etx diff --git a/konsole/doc/VT100/genTC.pl b/konsole/doc/VT100/genTC.pl index bc06a3cb1..a3a7c5669 100755 --- a/konsole/doc/VT100/genTC.pl +++ b/konsole/doc/VT100/genTC.pl @@ -147,7 +147,7 @@ sub txt2Html return $_; } -sub tqlayout +sub layout { my ($Name, $Head, $Code, $Doku, $Dflt, $Attr) = @_; if ($html) { @@ -234,7 +234,7 @@ print "</table>\n"; print "</h2>\n"; } -sub tqlayout2 +sub layout2 { my ($Name, $Head, $Code) = @_; my @Part = split('\|',$Code); my $Type = $#Part > -1 ? $Part[0] : ""; @@ -261,7 +261,7 @@ sub tqlayout2 print "<td $color1>$Head\n"; } -sub tqlayoutTable +sub layoutTable { my ($Head, $t, $Include) = @_; my $p; @@ -276,7 +276,7 @@ foreach $p (sort keys %$t) my $attr = exists $t->{"$name.sect"}?$t->{"$name.sect"}:""; if ($attr =~ /$Include/) { - tqlayout2( $name, $head, exists $t->{"$name.code"}?$t->{"$name.code"}:""); + layout2( $name, $head, exists $t->{"$name.code"}?$t->{"$name.code"}:""); } } } @@ -311,7 +311,7 @@ sub sortTest print "<tr><td colspan=5><h3>$Fld[0] codes</h3>\n"; } $curr = $Fld[0]; - tqlayout2($name,$t->{"$name.head"},$p); + layout2($name,$t->{"$name.head"},$p); } print "</table>\n"; } @@ -346,29 +346,29 @@ sortTest($t); secthead("Host to Terminal (Instructions by Group)"); htmlsect("Operations"); print "<table>\n"; -tqlayoutTable("Commands (Character Display Operation)",$t,"Command\.Display"); -tqlayoutTable("Commands (Rendition related status)",$t,"Command\.RenderMode"); -tqlayoutTable("Commands (Cursor)",$t,"Command\.Cursor"); -tqlayoutTable("Commands (Cursor related status)",$t,"Command\.CursMode"); -tqlayoutTable("Commands (Edit)",$t,"Command\.Erase|Command\.Insert|Command.\Delete"); -tqlayoutTable("Commands (Miscellaneous)",$t,"Command[^.]|Command\$"); -tqlayoutTable("Commands (General mode setting)",$t,"Command\.SetMode"); -tqlayoutTable("Commands (Miscellaneous status)",$t,"Command\.Mode"); -tqlayoutTable("Commands (VT52)",$t,"Command\.VT52"); -tqlayoutTable("Commands (Not implemented)",$t,"Command\.NoImp"); -tqlayoutTable("Commands (Ignored)",$t,"Command\.Ignored"); -tqlayoutTable("Commands (Requests)",$t,"Command\.Request"); +layoutTable("Commands (Character Display Operation)",$t,"Command\.Display"); +layoutTable("Commands (Rendition related status)",$t,"Command\.RenderMode"); +layoutTable("Commands (Cursor)",$t,"Command\.Cursor"); +layoutTable("Commands (Cursor related status)",$t,"Command\.CursMode"); +layoutTable("Commands (Edit)",$t,"Command\.Erase|Command\.Insert|Command.\Delete"); +layoutTable("Commands (Miscellaneous)",$t,"Command[^.]|Command\$"); +layoutTable("Commands (General mode setting)",$t,"Command\.SetMode"); +layoutTable("Commands (Miscellaneous status)",$t,"Command\.Mode"); +layoutTable("Commands (VT52)",$t,"Command\.VT52"); +layoutTable("Commands (Not implemented)",$t,"Command\.NoImp"); +layoutTable("Commands (Ignored)",$t,"Command\.Ignored"); +layoutTable("Commands (Requests)",$t,"Command\.Request"); print "</table>\n"; # ------------------------------- secthead("Terminal to Host"); print "<table>\n"; -tqlayoutTable("Replies",$t,"Reply"); -tqlayoutTable("Events",$t,"Event"); +layoutTable("Replies",$t,"Reply"); +layoutTable("Events",$t,"Event"); # ------------------------------- print "</table>\n"; secthead("Modes"); print "<table>\n"; -tqlayoutTable("Modes",$t,"Mode"); +layoutTable("Modes",$t,"Mode"); #print "<h3>Other Codes</h3>\n"; print "</table>\n"; # ------------------------------- @@ -385,7 +385,7 @@ foreach $p (sort keys %$t) # print "</table>\n" if ($table); my $name = $Fld[0]; my $head = $t->{$p}; - tqlayout( $name, $head, + layout( $name, $head, exists $t->{"$name.code"}?$t->{"$name.code"}:"", exists $t->{"$name.text"}?$t->{"$name.text"}:"", exists $t->{"$name.dflt"}?$t->{"$name.dflt"}:"", diff --git a/konsole/doc/VT100/techref.html b/konsole/doc/VT100/techref.html index d16d4804b..6e36f39e5 100644 --- a/konsole/doc/VT100/techref.html +++ b/konsole/doc/VT100/techref.html @@ -90,7 +90,7 @@ Work is currently in progress to fix this issue. The serial cable is folded into the operating system as a sort of loop back device, and a program, the terminal emulation, uses modern means of graphical user interfaces to behave like an earlier terminal. - To complete the picture, the host in the diagram is tqreplaced by the + To complete the picture, the host in the diagram is replaced by the application that runs in the emulation (typically a shell or an old editor). So, terminal emulations are in fact interfaces to character oriented applications. @@ -349,7 +349,7 @@ Work is currently in progress to fix this issue. <p> The second one is used to specify character set mappings (see <a href=#SCS>SCS</a>). A CSI instruction to do this is specified in ECMA, - and this should be used as a tqreplacement. + and this should be used as a replacement. <p> <h4>XTERM hacks</h4> <h2> @@ -498,13 +498,13 @@ Work is currently in progress to fix this issue. <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n <td bgcolor="#D0D0D0">{Ps} -<td bgcolor="#D0D0D0">Device tqStatus Report +<td bgcolor="#D0D0D0">Device Status Report <tr> <td bgcolor="#D0D0D0"><a href=#DSRREP>DSRREP</a> <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n -<td bgcolor="#D0D0D0">{tqStatus} -<td bgcolor="#D0D0D0">Device tqStatus Report Reply +<td bgcolor="#D0D0D0">{Status} +<td bgcolor="#D0D0D0">Device Status Report Reply <tr> <td bgcolor="#D0D0D0"><a href=#DECLL>DECLL</a> <td bgcolor="#D0D0D0">CSI @@ -1559,7 +1559,7 @@ Work is currently in progress to fix this issue. <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n <td bgcolor="#D0D0D0">{Ps} -<td bgcolor="#D0D0D0">Device tqStatus Report +<td bgcolor="#D0D0D0">Device Status Report <tr> <td bgcolor="#D0D0D0"><a href=#ENQ>ENQ</a> <td bgcolor="#D0D0D0">CTL @@ -1598,8 +1598,8 @@ Work is currently in progress to fix this issue. <td bgcolor="#D0D0D0"><a href=#DSRREP>DSRREP</a> <td bgcolor="#D0D0D0">CSI <td bgcolor="#D0D0D0">n -<td bgcolor="#D0D0D0">{tqStatus} -<td bgcolor="#D0D0D0">Device tqStatus Report Reply +<td bgcolor="#D0D0D0">{Status} +<td bgcolor="#D0D0D0">Device Status Report Reply <tr><td colspan=5><h3>Events</h3> <tr> <td bgcolor="#D0D0D0"><a href=#CUB>CUB</a> @@ -2234,7 +2234,7 @@ Work is currently in progress to fix this issue. <tr><td><p></td> <tr><td></td> <td colspan=6> Causes the VT100 to fill it's screen with - uppercase Es for screen focus and tqalignment. + uppercase Es for screen focus and alignment. <tr><td><p></td></tr> <tr> <td></td> @@ -2403,7 +2403,7 @@ Work is currently in progress to fix this issue. <td colspan=5 ><code> <b>ESC</b> <b>#</b> <b>6</b></code> <tr><td><p></td> <tr><td></td> - <td colspan=6> This causes the line that tqcontains the cursor to become double-width + <td colspan=6> This causes the line that contains the cursor to become double-width single height. If the line was single width, all characters ro the right of the center of the screen will be lost. The cursor remains over the same character position, unless it would be to the right of @@ -2883,7 +2883,7 @@ Work is currently in progress to fix this issue. <td colspan=5 ><code> <b>ESC</b> <b>#</b> <b>5</b></code> <tr><td><p></td> <tr><td></td> - <td colspan=6> This causes the line which tqcontains the cursor to become single-width, + <td colspan=6> This causes the line which contains the cursor to become single-width, single-height. The cursor remains on the same character position. This is the default condition for all new lines on the screen. <tr><td><p></td></tr> @@ -2974,11 +2974,11 @@ Work is currently in progress to fix this issue. <td colspan=1 bgcolor="#5188B2"> N/A</td><td colspan=1 bgcolor="#5188B2">VT100</td><td colspan=1 bgcolor="#5188B2">emu</td><td colspan=1 bgcolor="#5188B2">Ignored</td><td colspan=1 bgcolor="#5188B2"></td><td colspan=1 bgcolor="#5188B2">see above</td></tr> <tr><td><p></td></tr> <tr><td bgcolor="#D0D0D0"><a name=DSRREP>DSRREP</a> - <td colspan=5 bgcolor="#D0D0D0"><b>Device tqStatus Report Reply</b> + <td colspan=5 bgcolor="#D0D0D0"><b>Device Status Report Reply</b> <td bgcolor="#D0D0D0">ECMA VT100 <tr><td><p></td> <tr><td> - <td colspan=5 ><code> <b>ESC</b> <b>[</b> <em>tqStatus</em> <b>n</b></code> + <td colspan=5 ><code> <b>ESC</b> <b>[</b> <em>Status</em> <b>n</b></code> <tr><td><p></td> <tr><td></td> <td colspan=6> Reports the general status of the VT100 according to the @@ -2989,7 +2989,7 @@ Work is currently in progress to fix this issue. <tr><td><p></td></tr> <tr> <td></td> -<td colspan=1 bgcolor="#D0D0D0"> tqStatus</td><td colspan=3 bgcolor="#D0D0D0">Meaning</td></tr> +<td colspan=1 bgcolor="#D0D0D0"> Status</td><td colspan=3 bgcolor="#D0D0D0">Meaning</td></tr> <tr> <td></td> <td colspan=1 bgcolor="#5188B2"> 0</td><td colspan=3 bgcolor="#5188B2">Ready, no faults detected</td></tr> @@ -2998,7 +2998,7 @@ Work is currently in progress to fix this issue. <td colspan=1 bgcolor="#5BA5B2"> 3</td><td colspan=3 bgcolor="#5BA5B2">Malfunction detected</td></tr> <tr><td><p></td></tr> <tr><td bgcolor="#D0D0D0"><a name=DSRREQ>DSRREQ</a> - <td colspan=5 bgcolor="#D0D0D0"><b>Device tqStatus Report</b> + <td colspan=5 bgcolor="#D0D0D0"><b>Device Status Report</b> <td bgcolor="#D0D0D0">ECMA VT100 <tr><td><p></td> <tr><td> @@ -3012,7 +3012,7 @@ Work is currently in progress to fix this issue. <td colspan=1 bgcolor="#D0D0D0"> Subcode</td><td colspan=1 bgcolor="#D0D0D0">Emulation</td><td colspan=1 bgcolor="#D0D0D0">Scope</td><td colspan=1 bgcolor="#D0D0D0">Operation</td><td colspan=1 bgcolor="#D0D0D0">Args</td><td colspan=1 bgcolor="#D0D0D0">Meaning</td></tr> <tr> <td></td> -<td colspan=1 bgcolor="#5188B2"> 5</td><td colspan=1 bgcolor="#5188B2">VT100</td><td colspan=1 bgcolor="#5188B2">emu</td><td colspan=1 bgcolor="#5188B2">reporttqStatus</td><td colspan=1 bgcolor="#5188B2"></td><td colspan=1 bgcolor="#5188B2">Report tqStatus (using a <a href=#DSRREP>DSRREP</a> control sequence)</td></tr> +<td colspan=1 bgcolor="#5188B2"> 5</td><td colspan=1 bgcolor="#5188B2">VT100</td><td colspan=1 bgcolor="#5188B2">emu</td><td colspan=1 bgcolor="#5188B2">reportStatus</td><td colspan=1 bgcolor="#5188B2"></td><td colspan=1 bgcolor="#5188B2">Report Status (using a <a href=#DSRREP>DSRREP</a> control sequence)</td></tr> <tr> <td></td> <td colspan=1 bgcolor="#5BA5B2"> 6</td><td colspan=1 bgcolor="#5BA5B2">VT100</td><td colspan=1 bgcolor="#5BA5B2">emu</td><td colspan=1 bgcolor="#5BA5B2">reportCursorPosition</td><td colspan=1 bgcolor="#5BA5B2"></td><td colspan=1 bgcolor="#5BA5B2">Report Active Position (using a <a href=#CPR>CPR</a> sequence)</td></tr> @@ -3740,7 +3740,7 @@ Work is currently in progress to fix this issue. The United Kingdom and ASCII sets conform to the "ISO international register of character sets to be used with escape sequences". The other sets are private character sets. Special graphics means that the - graphic characters fpr the codes 0137 to 0176 are tqreplaced with other + graphic characters fpr the codes 0137 to 0176 are replaced with other characters. The specified character set will be used until another SCS is received. <tr><td><p></td></tr> @@ -4513,12 +4513,12 @@ as noted. <tr><td>FETM </td><td>Format Effector Transfer </td><td>Reset</td></tr> <tr><td>GATM </td><td>Guarded Area Transfer </td><td>NA </td></tr> <tr><td>HEM </td><td>Horizontal Editing </td><td>NA </td></tr> -<tr><td>IRM </td><td>Insertion-tqreplacement </td><td>Reset</td></tr> +<tr><td>IRM </td><td>Insertion-replacement </td><td>Reset</td></tr> <tr><td>KAM </td><td>Keyboard Action </td><td>Reset</td></tr> <tr><td>MATM </td><td>Multiple area transfer </td><td>NA </td></tr> <tr><td>PUM </td><td>Positioning Unit </td><td>Reset</td></tr> <tr><td>SATM </td><td>Selected Area Transfer </td><td>NA </td></tr> -<tr><td>SRTM </td><td>tqStatus Reporting Transfer</td><td>Reset</td></tr> +<tr><td>SRTM </td><td>Status Reporting Transfer</td><td>Reset</td></tr> <tr><td>TSM </td><td>Tabulation Stop </td><td>Reset</td></tr> <tr><td>TTM </td><td>Transfer Termination </td><td>NA </td></tr> <tr><td>VEM </td><td>Vertical Editing </td><td>NA </td></tr> @@ -4542,7 +4542,7 @@ The notation <ESC> denotes a single ASCII Escape character, 1Bx. <h2>Special Graphics Characters</h2> If the Special Graphics set is selected, the graphics for ASCII codes -0137 through 0176 will be tqreplaced according to the following table (see the +0137 through 0176 will be replaced according to the following table (see the <a href=#SCS>SCS</a> control sequence). <center> <table cellspacing=30> diff --git a/konsole/eventsrc b/konsole/eventsrc index cc2d02316..12ceefc8b 100644 --- a/konsole/eventsrc +++ b/konsole/eventsrc @@ -607,7 +607,7 @@ Name[cs]=Relace ukonÄena s nenulovým stavem Name[csb]=Seséja òstaÅ‚a zakùńczonô z nienulowim stónã Name[cy]=Gorffenodd y sesiwn efo cyflwr di-sero Name[da]=Session afsluttet med ikke-nul status -Name[de]=Sitzung beendet mit tqStatus ungleich Null +Name[de]=Sitzung beendet mit Status ungleich Null Name[el]=Η συνεδÏία τελείωσε με μη μηδενική κατάσταση Name[eo]=Seanco finiÄis kun eraro Name[es]=Sesión terminada con estado no cero @@ -636,7 +636,7 @@ Name[mn]=ТÑг Ð±ÑƒÑ Ñ‚Ó©Ð»Ð²Ó©Ó©Ñ€ Ñуулт дууÑлаа Name[ms]=Sesi selesai dengan status bukan sifar Name[mt]=Sessjoni temmet bi status mhux zero Name[nb]=Økta ble avsluttet med en status ulik null -Name[nds]=Törn wöör mit Nich-Null-tqStatus beendt +Name[nds]=Törn wöör mit Nich-Null-Status beendt Name[ne]=शूनà¥à¤¯ नà¤à¤à¤•à¥‹ सà¥à¤¥à¤¿à¤¤à¤¿à¤¸à¤à¤— सतà¥à¤° अनà¥à¤¤à¥à¤¯ à¤à¤¯à¥‹ Name[nl]=Sessie is voltooid met een non-zero status Name[nn]=Økt avslutta med status ulik null @@ -675,7 +675,7 @@ Comment[cs]=Relace byla ukonÄena s nenulovým stavem Comment[csb]=Seséja zakùńczëła sã nienulowim stónã Comment[cy]=Terfynnodd sesiwn efo cyflwr di-sero Comment[da]=En session er afsluttet med ikke-nul status -Comment[de]=Sitzung beendet mit tqStatus ungleich Null +Comment[de]=Sitzung beendet mit Status ungleich Null Comment[el]=Μια συνεδÏία τελείωσε με μη μηδενική κατάσταση Comment[eo]=Seanco finiÄis kun eraro Comment[es]=Ha terminado una sesión con estado no cero @@ -704,7 +704,7 @@ Comment[mn]=Name=ТÑг Ð±ÑƒÑ Ñ‚Ó©Ð»Ð²Ó©Ó©Ñ€ ÑÑƒÑƒÐ»Ñ‚Ð°Ð°Ñ Ð³Ð°Ñ€Ð»Ð°Ð° Comment[ms]=Satu sesi keluar dengan status bukan sifar Comment[mt]=Sessjoni temmet bi status mhux zero Comment[nb]=En økt ble avsluttet med en status som ikke var null -Comment[nds]=En Törn is mit Nich-Null-tqStatus to't Enn kamen +Comment[nds]=En Törn is mit Nich-Null-Status to't Enn kamen Comment[ne]=शूनà¥à¤¯ नà¤à¤à¤•à¥‹ सà¥à¤¥à¤¿à¤¤à¤¿à¤¸à¤à¤— यो सतà¥à¤° अनà¥à¤¤à¥à¤¯ à¤à¤¯à¥‹ Comment[nl]=Een sessie is beëindigd met een non-zero status Comment[nn]=Ei økt avslutta med status som ikkje var null diff --git a/konsole/konsole/TEHistory.cpp b/konsole/konsole/TEHistory.cpp index 172887c9c..cbe8b199d 100644 --- a/konsole/konsole/TEHistory.cpp +++ b/konsole/konsole/TEHistory.cpp @@ -62,7 +62,7 @@ FIXME: There is noticeable decrease in speed, also. Perhaps, scheme with wrap around would be it's complexity. */ -//FIXME: tempory tqreplacement for tmpfile +//FIXME: tempory replacement for tmpfile // this is here one for debugging purpose. //#define tmpfile xTmpFile @@ -135,7 +135,7 @@ bool HistoryScroll::hasScroll() /* The history scroll makes a Row(Row(Cell)) from - two history buffers. The index buffer tqcontains + two history buffers. The index buffer contains start of line positions which refere to the cells buffer. @@ -457,7 +457,7 @@ void HistoryScrollBlockArray::addCells(ca a[], int count) size_t *pLen = new size_t; *pLen = count; - m_lineLengths.tqreplace(m_blockArray.getCurrent(), pLen); + m_lineLengths.replace(m_blockArray.getCurrent(), pLen); } void HistoryScrollBlockArray::addLine(bool) diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 76aeaaa7d..86e916e57 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -44,7 +44,7 @@ \par FIXME - [NOTE: much of the technical stuff below will be tqreplaced by forkpty.] + [NOTE: much of the technical stuff below will be replaced by forkpty.] publish the SIGCHLD signal if not related to an instance. diff --git a/konsole/konsole/TEScreen.cpp b/konsole/konsole/TEScreen.cpp index 1428ac90b..54b479844 100644 --- a/konsole/konsole/TEScreen.cpp +++ b/konsole/konsole/TEScreen.cpp @@ -783,7 +783,7 @@ void TEScreen::compose(TQString compose) TQChar c(image[lastPos].c); compose.prepend(c); compose.compose(); - image[lastPos].c = compose[0].tqunicode(); + image[lastPos].c = compose[0].unicode(); } // Region commands ------------------------------------------------------------- @@ -1023,7 +1023,7 @@ void TEScreen::clearEntireScreen() } /*! fill screen with 'E' - This is to aid screen tqalignment + This is to aid screen alignment */ void TEScreen::helpAlign() @@ -1281,7 +1281,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (hX < eol && hX <= sel_Right % columns) { - TQ_UINT16 c = hist->getCell(hY, hX++).c; + Q_UINT16 c = hist->getCell(hY, hX++).c; if (c) m[d++] = c; s++; @@ -1293,7 +1293,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) } else { // or from screen image. if (testIsSelected((s - hist_BR) % columns, (s - hist_BR) / columns)) { - TQ_UINT16 c = image[s++ - hist_BR].c; + Q_UINT16 c = image[s++ - hist_BR].c; if (c) { m[d++] = c; newlineneeded = true; @@ -1334,7 +1334,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (hX < eol) { - TQ_UINT16 c = hist->getCell(hY, hX++).c; + Q_UINT16 c = hist->getCell(hY, hX++).c; if (c) m[d++] = c; s++; @@ -1401,7 +1401,7 @@ void TEScreen::getSelText(bool preserve_line_breaks, TQTextStream *stream) while (s <= eol) { - TQ_UINT16 c = image[s++ - hist_BR].c; + Q_UINT16 c = image[s++ - hist_BR].c; if (c) m[d++] = c; } diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 91087d9c0..cb16ff497 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -116,7 +116,7 @@ bool TEWidget::s_standalone = false; static const ColorEntry base_color_table[TABLE_COLORS] = // The following are almost IBM standard color codes, with some slight // gamma correction for the dim colors to compensate for bright X screens. -// It tqcontains the 8 ansiterm/xterm colors in 2 intensities. +// It contains the 8 ansiterm/xterm colors in 2 intensities. { // Fixme: could add faint colors here, also. // normal @@ -144,7 +144,7 @@ static const ColorEntry base_color_table[TABLE_COLORS] = void TEWidget::setDefaultBackColor(const TQColor& color) { defaultBgColor = color; - if (tqAlpha(blend_color) != 0xff && !backgroundPixmap()) + if (qAlpha(blend_color) != 0xff && !backgroundPixmap()) setBackgroundColor(getDefaultBackColor()); } @@ -165,14 +165,14 @@ void TEWidget::setColorTable(const ColorEntry table[]) for (int i = 0; i < TABLE_COLORS; i++) color_table[i] = table[i]; const TQPixmap* pm = backgroundPixmap(); if (!pm) - if (!argb_visual || (tqAlpha(blend_color) == 0xff)) + if (!argb_visual || (qAlpha(blend_color) == 0xff)) setBackgroundColor(getDefaultBackColor()); else { - float alpha = tqAlpha(blend_color) / 255.; - int pixel = tqAlpha(blend_color) << 24 | - int(tqRed(blend_color) * alpha) << 16 | - int(tqGreen(blend_color) * alpha) << 8 | - int(tqBlue(blend_color) * alpha); + float alpha = qAlpha(blend_color) / 255.; + int pixel = qAlpha(blend_color) << 24 | + int(qRed(blend_color) * alpha) << 16 | + int(qGreen(blend_color) * alpha) << 8 | + int(qBlue(blend_color) * alpha); setBackgroundColor(TQColor(blend_color, pixel)); } update(); @@ -191,14 +191,14 @@ void TEWidget::setColorTable(const ColorEntry table[]) xterm fonts have these at 0x00..0x1f. QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals - come in here as proper tqunicode characters. + come in here as proper unicode characters. We treat non-iso10646 fonts as VT100 extended and do the requiered mapping - from tqunicode to 0x00..0x1f. The remaining translation is then left to the + from unicode to 0x00..0x1f. The remaining translation is then left to the QCodec. */ -static inline bool isLineChar(TQ_UINT16 c) { return ((c & 0xFF80) == 0x2500);} +static inline bool isLineChar(Q_UINT16 c) { return ((c & 0xFF80) == 0x2500);} // assert for i in [0..31] : vt100extended(vt100_graphics[i]) == i. @@ -213,7 +213,7 @@ unsigned short vt100_graphics[32] = /* static TQChar vt100extended(TQChar c) { - switch (c.tqunicode()) + switch (c.unicode()) { case 0x25c6 : return 1; case 0x2592 : return 2; @@ -265,7 +265,7 @@ void TEWidget::fontChange(const TQFont &) // "Base character width on widest ASCII character. This prevents too wide // characters in the presence of double wide (e.g. Japanese) characters." // Get the width from representative normal width characters - font_w = tqRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR)); + font_w = qRound((double)fm.width(REPCHAR)/(double)strlen(REPCHAR)); fixed_font = true; int fw = fm.width(REPCHAR[0]); @@ -382,7 +382,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) ,m_cursorCol(0) ,m_isIMEdit(false) ,m_isIMSel(false) -,blend_color(tqRgba(0,0,0,0xff)) +,blend_color(qRgba(0,0,0,0xff)) { // The offsets are not yet calculated. // Do not calculate these too often to be more smoothly when resizing @@ -405,7 +405,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) setMouseMarks(true); setColorTable(base_color_table); // init color table - tqApp->installEventFilter( this ); //FIXME: see below + qApp->installEventFilter( this ); //FIXME: see below KCursor::setAutoHideCursor( this, true ); // Init DnD //////////////////////////////////////////////////////////////// @@ -428,7 +428,7 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) // Here's a start (David) TEWidget::~TEWidget() { - tqApp->removeEventFilter( this ); + qApp->removeEventFilter( this ); if (image) free(image); } @@ -439,7 +439,7 @@ TEWidget::~TEWidget() /* ------------------------------------------------------------------------- */ /** - A table for emulating the simple (single width) tqunicode drawing chars. + A table for emulating the simple (single width) unicode drawing chars. It represents the 250x - 257x glyphs. If it's zero, we can't use it. if it's not, it's encoded as follows: imagine a 5x5 grid where the points are numbered 0 to 24 left to top, top to bottom. Each point is represented by the corresponding bit. @@ -496,7 +496,7 @@ static void drawLineChar(TQPainter& paint, int x, int y, int w, int h, uchar cod int ex = x + w - 1; int ey = y + h - 1; - TQ_UINT32 toDraw = LineChars[code]; + Q_UINT32 toDraw = LineChars[code]; //Top lines: if (toDraw & TopL) @@ -576,7 +576,7 @@ void TEWidget::drawTextFixed(TQPainter &paint, int x, int y, } //Check for line-drawing char - if (isLineChar(drawstr[0].tqunicode())) + if (isLineChar(drawstr[0].unicode())) { uchar code = drawstr[0].cell(); if (LineChars[code]) @@ -624,17 +624,17 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, attr->b == cacol(CO_DFT, colorsSwapped ? DEFAULT_FORE_COLOR : DEFAULT_BACK_COLOR) ) // draw background colors with 75% opacity - if ( argb_visual && tqAlpha(blend_color) < 0xff ) { + if ( argb_visual && qAlpha(blend_color) < 0xff ) { QRgb col = bColor.rgb(); - TQ_UINT8 salpha = 192; - TQ_UINT8 dalpha = 255 - salpha; + Q_UINT8 salpha = 192; + Q_UINT8 dalpha = 255 - salpha; int a, r, g, b; - a = QMIN( (tqAlpha (col) * salpha) / 255 + (tqAlpha (blend_color) * dalpha) / 255, 255 ); - r = QMIN( (tqRed (col) * salpha) / 255 + (tqRed (blend_color) * dalpha) / 255, 255 ); - g = QMIN( (tqGreen (col) * salpha) / 255 + (tqGreen (blend_color) * dalpha) / 255, 255 ); - b = QMIN( (tqBlue (col) * salpha) / 255 + (tqBlue (blend_color) * dalpha) / 255, 255 ); + a = QMIN( (qAlpha (col) * salpha) / 255 + (qAlpha (blend_color) * dalpha) / 255, 255 ); + r = QMIN( (qRed (col) * salpha) / 255 + (qRed (blend_color) * dalpha) / 255, 255 ); + g = QMIN( (qGreen (col) * salpha) / 255 + (qGreen (blend_color) * dalpha) / 255, 255 ); + b = QMIN( (qBlue (col) * salpha) / 255 + (qBlue (blend_color) * dalpha) / 255, 255 ); col = a << 24 | r << 16 | g << 8 | b; int pixel = a << 24 | (r * a / 255) << 16 | (g * a / 255) << 8 | (b * a / 255); @@ -695,8 +695,8 @@ void TEWidget::drawAttrStr(TQPainter &paint, TQRect rect, { // ### Disabled for now, since it causes problems with characters // that use the full width and/or height of the character cells. - //bool shadow = ( !isPrinting && tqAlpha(blend_color) < 0xff - // && tqGray( fColor.rgb() ) > 64 ); + //bool shadow = ( !isPrinting && qAlpha(blend_color) < 0xff + // && qGray( fColor.rgb() ) > 64 ); bool shadow = false; paint.setPen(fColor); int x = rect.x(); @@ -830,7 +830,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) const ca* lcl = &image[y*this->columns]; const ca* const ext = &newimg[y*columns]; - // The dirty tqmask indicates which characters need tqrepainting. We also + // The dirty mask indicates which characters need repainting. We also // mark surrounding neighbours dirty, in case the character exceeds // its cell boundaries memset(dirtyMask, 0, cols+2); @@ -856,7 +856,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) // where characters exceed their cell width. if (dirtyMask[x]) { - TQ_UINT16 c = ext[x+0].c; + Q_UINT16 c = ext[x+0].c; if ( !c ) continue; int p = 0; @@ -947,7 +947,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeLabel = new TQLabel(i18n("Size: XXX x XXX"), mResizeWidget); l->addWidget(mResizeLabel, 1, AlignCenter); mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); - mResizeWidget->setMinimumHeight(mResizeLabel->tqsizeHint().height()+20); + mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); mResizeTimer = new TQTimer(this); connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); } @@ -1097,7 +1097,7 @@ void TEWidget::paintContents(TQPainter &paint, const TQRect &rect, bool pm) TQChar *disstrU = new QChar[columns]; for (int y = luy; y <= rly; y++) { - TQ_UINT16 c = image[loc(lux,y)].c; + Q_UINT16 c = image[loc(lux,y)].c; int x = lux; if(!c && x) x--; // Search for start of multi-col char @@ -1152,14 +1152,14 @@ void TEWidget::blinkEvent() { blinking = !blinking; isBlinkEvent = true; - tqrepaint(false); + repaint(false); isBlinkEvent = false; } void TEWidget::blinkCursorEvent() { cursorBlinking = !cursorBlinking; - tqrepaint(cursorRect, true); + repaint(cursorRect, true); } /* ------------------------------------------------------------------------- */ @@ -1178,9 +1178,9 @@ void TEWidget::propagateSize() if (isFixedSize) { setSize(columns, lines); - TQFrame::setFixedSize(tqsizeHint()); - tqparentWidget()->adjustSize(); - tqparentWidget()->setFixedSize(tqparentWidget()->tqsizeHint()); + TQFrame::setFixedSize(sizeHint()); + parentWidget()->adjustSize(); + parentWidget()->setFixedSize(parentWidget()->sizeHint()); return; } if (image) @@ -1288,7 +1288,7 @@ void TEWidget::mousePressEvent(TQMouseEvent* ev) return; } - if ( !contentsRect().tqcontains(ev->pos()) ) return; + if ( !contentsRect().contains(ev->pos()) ) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1371,7 +1371,7 @@ void TEWidget::mouseMoveEvent(TQMouseEvent* ev) return; } else if (dragInfo.state == diDragging) { // this isn't technically needed because mouseMoveEvent is suppressed during - // Qt drag operations, tqreplaced by dragMoveEvent + // Qt drag operations, replaced by dragMoveEvent return; } @@ -1390,7 +1390,7 @@ void TEWidget::setSelectionEnd() void TEWidget::extendSelection( TQPoint pos ) { - //if ( !contentsRect().tqcontains(ev->pos()) ) return; + //if ( !contentsRect().contains(ev->pos()) ) return; TQPoint tL = contentsRect().topLeft(); int tLx = tL.x(); int tLy = tL.y(); @@ -1735,14 +1735,14 @@ void TEWidget::mouseTripleClickEvent(TQMouseEvent* ev) void TEWidget::focusInEvent( TQFocusEvent * ) { - tqrepaint(cursorRect, true); // *do* erase area, to get rid of the + repaint(cursorRect, true); // *do* erase area, to get rid of the // hollow cursor rectangle. } void TEWidget::focusOutEvent( TQFocusEvent * ) { - tqrepaint(cursorRect, true); // don't erase area + repaint(cursorRect, true); // don't erase area } bool TEWidget::focusNextPrevChild( bool next ) @@ -1759,7 +1759,7 @@ int TEWidget::charClass(UINT16 ch) const TQChar qch=TQChar(ch); if ( qch.isSpace() ) return ' '; - if ( qch.isLetterOrNumber() || word_characters.tqcontains(qch, false) ) + if ( qch.isLetterOrNumber() || word_characters.contains(qch, false) ) return 'a'; // Everything else is weird @@ -1802,7 +1802,7 @@ void TEWidget::emitSelection(bool useXselection,bool appendReturn) text.append("\r"); if ( ! text.isEmpty() ) { - text.tqreplace("\n", "\r"); + text.replace("\n", "\r"); TQKeyEvent e(TQEvent::KeyPress, 0,-1,0, text); emit keyPressedSignal(&e); // expose as a big fat keypress event emit clearSelectionSignal(); @@ -1853,7 +1853,7 @@ void TEWidget::onClearSelection() //FIXME: an `eventFilter' has been installed instead of a `keyPressEvent' // due to a bug in `QT' or the ignorance of the author to prevent -// tqrepaint events being emitted to the screen whenever one leaves +// repaint events being emitted to the screen whenever one leaves // or reenters the screen to/from another application. // // Troll says one needs to change focusInEvent() and focusOutEvent(), @@ -1873,7 +1873,7 @@ void TEWidget::doScroll(int lines) bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) { if ( (e->type() == TQEvent::Accel || - e->type() == TQEvent::AccelAvailable ) && tqApp->tqfocusWidget() == this ) + e->type() == TQEvent::AccelAvailable ) && qApp->focusWidget() == this ) { static_cast<TQKeyEvent *>( e )->ignore(); return false; @@ -1971,13 +1971,13 @@ void TEWidget::imEndEvent( TQIMEvent *e ) int tLx = tL.x(); int tLy = tL.y(); - TQRect tqrepaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine, + TQRect repaintRect = TQRect( bX+tLx, bY+tLy+font_h*m_imStartLine, contentsRect().width(), contentsRect().height() ); m_imStart = 0; m_imPreeditLength = 0; m_isIMEdit = m_isIMSel = false; - tqrepaint( tqrepaintRect, true ); + repaint( repaintRect, true ); } // Override any Ctrl+<key> accelerator when pressed with the keyboard @@ -2097,7 +2097,7 @@ void TEWidget::clearImage() void TEWidget::calcGeometry() { - scrollbar->resize(TQApplication::style().tqpixelMetric(TQStyle::PM_ScrollBarExtent), + scrollbar->resize(TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent), contentsRect().height()); switch(scrollLoc) { @@ -2170,7 +2170,7 @@ void TEWidget::setFixedSize(int cols, int lins) TQFrame::setFixedSize(m_size); } -TQSize TEWidget::tqsizeHint() const +TQSize TEWidget::sizeHint() const { return m_size; } @@ -2235,7 +2235,7 @@ void TEWidget::dropEvent(TQDropEvent* event) TQString tmp; if (url.isLocalFile()) { tmp = url.path(); // local URL : remove protocol. This helps "ln" & "cd" and doesn't harm the others - } else if ( url.protocol() == TQString::tqfromLatin1( "mailto" ) ) { + } else if ( url.protocol() == TQString::fromLatin1( "mailto" ) ) { justPaste = true; break; } else { diff --git a/konsole/konsole/TEWidget.h b/konsole/konsole/TEWidget.h index ae7e0a8ec..2c11eac2e 100644 --- a/konsole/konsole/TEWidget.h +++ b/konsole/konsole/TEWidget.h @@ -96,7 +96,7 @@ public: void updateImageSize(); void setSize(int cols, int lins); void setFixedSize(int cols, int lins); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void setWordCharacters(TQString wc); TQString wordCharacters() { return word_characters; } diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index a60246106..0bdb0f42c 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -307,7 +307,7 @@ void TEmuVt102::initTokenizer() #define ESC 27 #define CNTL(c) ((c)-'@') -// process an incoming tqunicode character +// process an incoming unicode character void TEmuVt102::onRcvChar(int cc) { int i; @@ -606,7 +606,7 @@ switch( N ) case TY_CSI_PS('m', 106) : scr->setBackColor (CO_SYS, 14); break; case TY_CSI_PS('m', 107) : scr->setBackColor (CO_SYS, 15); break; - case TY_CSI_PS('n', 5) : reporttqStatus ( ); break; + case TY_CSI_PS('n', 5) : reportStatus ( ); break; case TY_CSI_PS('n', 6) : reportCursorPosition ( ); break; case TY_CSI_PS('q', 0) : /* IGNORED: LEDs off */ break; //VT100 case TY_CSI_PS('q', 1) : /* IGNORED: LED1 on */ break; //VT100 @@ -847,7 +847,7 @@ void TEmuVt102::reportTerminalParms(int p) /*! */ -void TEmuVt102::reporttqStatus() +void TEmuVt102::reportStatus() { sendString("\033[0n"); //VT100. Device status report. 0 = Ready. } @@ -1007,7 +1007,7 @@ void TEmuVt102::onKeyPress( TQKeyEvent* ev ) // Character Set Conversion ------------------------------------------------ -- /* - The processing tqcontains a VT100 specific code translation layer. + The processing contains a VT100 specific code translation layer. It's still in use and mainly responsible for the line drawing graphics. These and some other glyphs are assigned to codes (0x5f-0xfe) @@ -1328,7 +1328,7 @@ static int xkb_init() #if 0 // This method doesn't work in all cases. The atom "ScrollLock" doesn't seem // to exist on all XFree versions (at least it's not here with my 3.3.6) - DF -static unsigned int xkb_tqmask_modifier( XkbDescPtr xkb, const char *name ) +static unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name ) { int i; if( !xkb || !xkb->names ) @@ -1344,30 +1344,30 @@ static unsigned int xkb_tqmask_modifier( XkbDescPtr xkb, const char *name ) { if (atom == xkb->names->vmods[i] ) { - unsigned int tqmask; - XkbVirtualModsToReal( xkb, 1 << i, &tqmask ); - return tqmask; + unsigned int mask; + XkbVirtualModsToReal( xkb, 1 << i, &mask ); + return mask; } } return 0; } -static unsigned int xkb_scrolllock_tqmask() +static unsigned int xkb_scrolllock_mask() { XkbDescPtr xkb; if(( xkb = XkbGetKeyboard( qt_xdisplay(), XkbAllComponentsMask, XkbUseCoreKbd )) != NULL ) { - unsigned int tqmask = xkb_tqmask_modifier( xkb, "ScrollLock" ); + unsigned int mask = xkb_mask_modifier( xkb, "ScrollLock" ); XkbFreeKeyboard( xkb, 0, True ); - return tqmask; + return mask; } return 0; } #else -static unsigned int xkb_scrolllock_tqmask() +static unsigned int xkb_scrolllock_mask() { - int scrolllock_tqmask = 0; + int scrolllock_mask = 0; XModifierKeymap* map = XGetModifierMapping( qt_xdisplay() ); KeyCode scrolllock_keycode = XKeysymToKeycode( qt_xdisplay(), XK_Scroll_Lock ); if( scrolllock_keycode == NoSymbol ) { @@ -1379,42 +1379,42 @@ static unsigned int xkb_scrolllock_tqmask() ++i ) { if( map->modifiermap[ map->max_keypermod * i ] == scrolllock_keycode ) - scrolllock_tqmask += 1 << i; + scrolllock_mask += 1 << i; } XFreeModifiermap(map); - return scrolllock_tqmask; + return scrolllock_mask; } #endif -static unsigned int scrolllock_tqmask = 0; +static unsigned int scrolllock_mask = 0; static int xkb_set_on() { - if (!scrolllock_tqmask) + if (!scrolllock_mask) { if( !xkb_init()) return 0; - scrolllock_tqmask = xkb_scrolllock_tqmask(); - if( scrolllock_tqmask == 0 ) + scrolllock_mask = xkb_scrolllock_mask(); + if( scrolllock_mask == 0 ) return 0; } - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_tqmask, scrolllock_tqmask); + XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, scrolllock_mask); return 1; } static int xkb_set_off() { - if (!scrolllock_tqmask) + if (!scrolllock_mask) { if( !xkb_init()) return 0; - scrolllock_tqmask = xkb_scrolllock_tqmask(); - if( scrolllock_tqmask == 0 ) + scrolllock_mask = xkb_scrolllock_mask(); + if( scrolllock_mask == 0 ) return 0; } - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_tqmask, 0); + XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, scrolllock_mask, 0); return 1; } diff --git a/konsole/konsole/TEmuVt102.h b/konsole/konsole/TEmuVt102.h index fde0f9557..05f30ac04 100644 --- a/konsole/konsole/TEmuVt102.h +++ b/konsole/konsole/TEmuVt102.h @@ -117,7 +117,7 @@ private: void reportTerminalType(); void reportSecondaryAttributes(); - void reporttqStatus(); + void reportStatus(); void reportAnswerBack(); void reportCursorPosition(); void reportTerminalParms(int p); diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index f8e3e501d..39aeab542 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -251,7 +251,7 @@ int TEmulation::keymapNo() */ void TEmulation::onRcvChar(int c) -// process application tqunicode input to terminal +// process application unicode input to terminal // this is a trivial scanner { c &= 0xff; @@ -284,7 +284,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) scr->setHistCursor(scr->getHistLines()); if (!ev->text().isEmpty()) { // A block of text - // Note that the text is proper tqunicode. + // Note that the text is proper unicode. // We should do a conversion here, but since this // routine will never be used, we simply emit plain ascii. emit sndBlock(ev->text().ascii(),ev->text().length()); @@ -299,7 +299,7 @@ void TEmulation::onKeyPress( TQKeyEvent* ev ) // Unblocking, Byte to Unicode translation --------------------------------- -- /* - We are doing code conversion from locale to tqunicode first. + We are doing code conversion from locale to unicode first. */ void TEmulation::onRcvBlock(const char *s, int len) @@ -345,7 +345,7 @@ void TEmulation::onRcvBlock(const char *s, int len) if (r[j].category() == TQChar::Mark_NonSpacing) scr->compose(r.mid(j,1)); else - onRcvChar(r[j].tqunicode()); + onRcvChar(r[j].unicode()); } i = l; } diff --git a/konsole/konsole/fontembedder.cpp b/konsole/konsole/fontembedder.cpp index d0c17e084..dfbd88ce4 100644 --- a/konsole/konsole/fontembedder.cpp +++ b/konsole/konsole/fontembedder.cpp @@ -26,7 +26,7 @@ using namespace std; -static TQ_UINT32 charVal(TQChar val) +static Q_UINT32 charVal(TQChar val) { if (val == ' ') return 0; @@ -34,13 +34,13 @@ static TQ_UINT32 charVal(TQChar val) return 1; } -static TQ_UINT32 readGlyphLine(TQTextStream& input) +static Q_UINT32 readGlyphLine(TQTextStream& input) { TQString line = input.readLine(); while (line.length() < 5) line += ' '; - TQ_UINT32 val = charVal(line[0]) | + Q_UINT32 val = charVal(line[0]) | (charVal(line[1]) << 1) | (charVal(line[2]) << 2) | (charVal(line[3]) << 3) | @@ -48,7 +48,7 @@ static TQ_UINT32 readGlyphLine(TQTextStream& input) return val; } -static TQ_UINT32 readGlyph(TQTextStream& input) +static Q_UINT32 readGlyph(TQTextStream& input) { return readGlyphLine(input) | (readGlyphLine(input) << 5) | @@ -72,7 +72,7 @@ int main(int argc, char **argv) TQTextStream input(&inFile); - TQ_UINT32 glyphStates[128]; + Q_UINT32 glyphStates[128]; for (int i = 0; i < 128; ++i) glyphStates[i] = 0; //nothing.. @@ -98,7 +98,7 @@ int main(int argc, char **argv) //Output. cout<<"// WARNING: Autogenerated by \"fontembedder " << argv[1] << "\".\n"; cout<<"// You probably do not want to hand-edit this!\n\n"; - cout<<"static const TQ_UINT32 LineChars[] = {\n"; + cout<<"static const Q_UINT32 LineChars[] = {\n"; //Nicely formatted: 8 per line, 16 lines for (int line = 0; line < 128; line += 8) diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index af97b0a85..36e299bc0 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -41,8 +41,8 @@ instances represent the individual assignments */ -KeyTrans::KeyEntry::KeyEntry(int _ref, int _key, int _bits, int _tqmask, int _cmd, TQString _txt) -: ref(_ref), key(_key), bits(_bits), tqmask(_tqmask), cmd(_cmd), txt(_txt) +KeyTrans::KeyEntry::KeyEntry(int _ref, int _key, int _bits, int _mask, int _cmd, TQString _txt) +: ref(_ref), key(_key), bits(_bits), mask(_mask), cmd(_cmd), txt(_txt) { } @@ -50,20 +50,20 @@ KeyTrans::KeyEntry::~KeyEntry() { } -bool KeyTrans::KeyEntry::matches(int _key, int _bits, int _tqmask) -{ int m = tqmask & _tqmask; +bool KeyTrans::KeyEntry::matches(int _key, int _bits, int _mask) +{ int m = mask & _mask; return _key == key && (bits & m) == (_bits & m); } bool KeyTrans::KeyEntry::metaspecified(void) { - return ((tqmask & (1 << BITS_Alt)) && (bits & (1 << BITS_Alt))) || - ((tqmask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod))); + return ((mask & (1 << BITS_Alt)) && (bits & (1 << BITS_Alt))) || + ((mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod))); } bool KeyTrans::KeyEntry::anymodspecified(void) { - return (tqmask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod)); + return (mask & (1 << BITS_AnyMod)) && (bits & (1 << BITS_AnyMod)); } TQString KeyTrans::KeyEntry::text() @@ -110,17 +110,17 @@ KeyTrans::~KeyTrans() { } -KeyTrans::KeyEntry* KeyTrans::addEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt) +KeyTrans::KeyEntry* KeyTrans::addEntry(int ref, int key, int bits, int mask, int cmd, TQString txt) // returns conflicting entry { for (TQPtrListIterator<KeyEntry> it(tableX); it.current(); ++it) { - if (it.current()->matches(key,bits,tqmask)) + if (it.current()->matches(key,bits,mask)) { return it.current(); } } - tableX.append(new KeyEntry(ref,key,bits,tqmask,cmd,txt)); + tableX.append(new KeyEntry(ref,key,bits,mask,cmd,txt)); return (KeyEntry*)NULL; } @@ -141,10 +141,10 @@ bool KeyTrans::findEntry(int key, int bits, int* cmd, const char** txt, int* len { static char buf[16]; char *c; - char tqmask = '1' + BITS(0, bits&(1<<BITS_Shift)) + BITS(1, bits&(1<<BITS_Alt)) + BITS(2, bits&(1<<BITS_Control)); + char mask = '1' + BITS(0, bits&(1<<BITS_Shift)) + BITS(1, bits&(1<<BITS_Alt)) + BITS(2, bits&(1<<BITS_Control)); strcpy(buf, it.current()->txt.ascii()); c = (char*)strchr(buf, '*'); - if (c) *c = tqmask; + if (c) *c = mask; *txt = buf; } else @@ -402,7 +402,7 @@ Loop: //printf(" key %s (%04x)",res.latin1(),(int)syms->keysyms[res]-1); getSymbol(); // + - : int mode = 0; - int tqmask = 0; + int mask = 0; while (sym == SYMOpr && (!strcmp(res.latin1(),"+") || !strcmp(res.latin1(),"-"))) { bool on = !strcmp(res.latin1(),"+"); @@ -411,14 +411,14 @@ Loop: assertSyntax(sym == SYMName, "Name expected") assertSyntax(syms->modsyms[res], "Unknown mode name") ptrdiff_t bits = (ptrdiff_t)(syms->modsyms[res]) - 1; - if (tqmask & (1 << bits)) + if (mask & (1 << bits)) { fprintf(stderr,"%s(%d,%d): mode name used multiple times.\n",path.ascii(),slinno,scolno); } else { mode |= (on << bits); - tqmask |= (1 << bits); + mask |= (1 << bits); } //printf(", mode %s(%d) %s",res.latin1(),(int)syms->modsyms[res]-1,on?"on":"off"); getSymbol(); @@ -441,8 +441,8 @@ Loop: //for (unsigned i = 0; i < res.length(); i++) //printf(" %02x(%c)",res.latin1()[i],res.latin1()[i]>=' '?res.latin1()[i]:'?'); } -//printf(". summary %04x,%02x,%02x,%d\n",key,mode,tqmask,cmd); - KeyTrans::KeyEntry* ke = kt->addEntry(slinno,key,mode,tqmask,cmd,res); +//printf(". summary %04x,%02x,%02x,%d\n",key,mode,mask,cmd); + KeyTrans::KeyEntry* ke = kt->addEntry(slinno,key,mode,mask,cmd,res); if (ke) { fprintf(stderr,"%s(%d): keystroke already assigned in line %d.\n",path.ascii(),slinno,ke->ref); diff --git a/konsole/konsole/keytrans.h b/konsole/konsole/keytrans.h index c5268c4fd..2ddf5f776 100644 --- a/konsole/konsole/keytrans.h +++ b/konsole/konsole/keytrans.h @@ -68,9 +68,9 @@ class KeyTrans class KeyEntry { public: - KeyEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt); + KeyEntry(int ref, int key, int bits, int mask, int cmd, TQString txt); ~KeyEntry(); - bool matches(int key, int bits, int tqmask); + bool matches(int key, int bits, int mask); bool metaspecified(void); bool anymodspecified(void); TQString text(); @@ -78,14 +78,14 @@ class KeyTrans private: int key; int bits; - int tqmask; + int mask; public: int cmd; TQString txt; }; private: - KeyEntry* addEntry(int ref, int key, int bits, int tqmask, int cmd, TQString txt); + KeyEntry* addEntry(int ref, int key, int bits, int mask, int cmd, TQString txt); void addKeyTrans(); void readConfig(); TQPtrList<KeyEntry> tableX; diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index 5badd652d..ecef79d4a 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -789,7 +789,7 @@ void Konsole::makeGUI() KeyTrans* ktr = kt_map[*it]; assert( ktr ); TQString title=ktr->hdr(); - m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb()); + m_keytab->insertItem(title.replace('&',"&&"),ktr->numb()); } applySettingsToGUI(); @@ -1280,7 +1280,7 @@ void Konsole::setColLin(int columns, int lines) te->setSize(columns, lines); adjustSize(); if (b_fixedSize) - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); notifySize(columns, lines); // set menu items } } @@ -1316,7 +1316,7 @@ void Konsole::slotTabContextMenu(TQWidget* _te, const TQPoint & pos) int counter=0; for (TESession *ses = sessions.first(); ses; ses = sessions.next()) { TQString title=ses->Title(); - m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++); + m_tabPopupTabsMenu->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++); } m_tabPopupMenu->popup( pos ); @@ -1382,7 +1382,7 @@ void Konsole::slotTabSetViewOptions(int mode) else title = sessions.at(i)->Title(); - title=title.tqreplace('&',"&&"); + title=title.replace('&',"&&"); switch(mode) { case ShowIconAndText: tabwidget->changeTab(page, icon, title); @@ -1428,7 +1428,7 @@ void Konsole::slotSaveSessionsProfile() TQString::null, &ok, this ); if ( ok ) { TQString path = locateLocal( "data", - TQString::tqfromLatin1( "konsole/profiles/" ) + prof, + TQString::fromLatin1( "konsole/profiles/" ) + prof, KGlobal::instance() ); if ( TQFile::exists( path ) ) @@ -1635,7 +1635,7 @@ void Konsole::readProperties(KConfig* config, const TQString &schema, bool globa delete rootxpms[te]; rootxpms.remove(te); } - pixmap_menu_activated(sch->tqalignment()); + pixmap_menu_activated(sch->alignment()); } te->setColorTable(sch->table()); //FIXME: set twice here to work around a bug @@ -1874,7 +1874,7 @@ void Konsole::updateSchemaMenu() ColorSchema* s = (ColorSchema*)colors->at(i); assert( s ); TQString title=s->title(); - m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); + m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); } if (te && se) @@ -1912,7 +1912,7 @@ void Konsole::slotToggleMenubar() { if (b_fixedSize) { adjustSize(); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); @@ -1987,12 +1987,12 @@ void Konsole::slotSelectTabbar() { /* FIXME: Still necessary ? */ TQPtrDictIterator<KRootPixmap> it(rootxpms); for (;it.current();++it) - it.current()->tqrepaint(true); + it.current()->repaint(true); if (b_fixedSize) { adjustSize(); - setFixedSize(tqsizeHint()); + setFixedSize(sizeHint()); } } @@ -2224,7 +2224,7 @@ void Konsole::updateTitle(TESession* _se) if (m_tabViewMode == ShowIconOnly) tabwidget->changeTab( _se->widget(), TQString::null ); else if (b_matchTabWinTitle) - tabwidget->setTabLabel( _se->widget(), _se->fullTitle().tqreplace('&',"&&")); + tabwidget->setTabLabel( _se->widget(), _se->fullTitle().replace('&',"&&")); } void Konsole::initSessionFont(TQFont font) { @@ -2362,7 +2362,7 @@ void Konsole::enterURL(const TQString& URL, const TQString&) KRun::shellQuote(newtext); te->emitText("cd "+newtext+"\r"); } - else if (URL.tqcontains("://", true)) { + else if (URL.contains("://", true)) { KURL u(URL); newtext = u.protocol(); bool isSSH = (newtext == "ssh"); @@ -2445,7 +2445,7 @@ void Konsole::addSession(TESession* s) s->setTitle(newTitle); // create an action for the session - KRadioAction *ra = new KRadioAction(newTitle.tqreplace('&',"&&"), + KRadioAction *ra = new KRadioAction(newTitle.replace('&',"&&"), s->IconName(), 0, this, @@ -2496,7 +2496,7 @@ void Konsole::listSessions() m_sessionList->setKeyboardShortcutsEnabled(true); for (TESession *ses = sessions.first(); ses; ses = sessions.next()) { TQString title=ses->Title(); - m_sessionList->insertItem(SmallIcon(ses->IconName()),title.tqreplace('&',"&&"),counter++); + m_sessionList->insertItem(SmallIcon(ses->IconName()),title.replace('&',"&&"),counter++); } m_sessionList->adjustSize(); m_sessionList->popup(mapToGlobal(TQPoint((width()/2)-(m_sessionList->width()/2),(height()/2)-(m_sessionList->height()/2)))); @@ -2575,7 +2575,7 @@ void Konsole::activateSession(TESession *s) s_schema = cs->relPath(); curr_schema = cs->numb(); pmPath = cs->imagePath(); - n_render = cs->tqalignment(); + n_render = cs->alignment(); // BR 106464 temporary fix... // only 2 sessions opened, 2nd session viewable, right-click on 1st tab and @@ -3138,7 +3138,7 @@ void Konsole::moveSessionLeft() tabwidget->blockSignals(false); TQString title = se->Title(); createSessionTab(se->widget(), iconSetForSession(se), - title.tqreplace('&', "&&"), position-1); + title.replace('&', "&&"), position-1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); @@ -3171,7 +3171,7 @@ void Konsole::moveSessionRight() tabwidget->blockSignals(false); TQString title = se->Title(); createSessionTab(se->widget(), iconSetForSession(se), - title.tqreplace('&', "&&"), position+1); + title.replace('&', "&&"), position+1); tabwidget->showPage(se->widget()); tabwidget->setTabColor(se->widget(),oldcolor); @@ -3383,7 +3383,7 @@ void Konsole::addSessionCommand(const TQString &path) TQString name = comment; name.prepend("SSC_"); // Allows easy searching for Session ShortCuts - name.tqreplace(" ", "_"); + name.replace(" ", "_"); sl_sessionShortCuts << name; // Is there already this shortcut? @@ -3433,13 +3433,13 @@ void Konsole::createSessionMenus() TQString txt = cfg->readEntry("Name"); TQString icon = cfg->readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), - txt.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID ); + txt.replace('&',"&&"), SESSION_NEW_SHELL_ID ); TQString comment = cfg->readEntry("Comment"); if (comment.isEmpty()) comment=txt.prepend(i18n("New ")); insertItemSorted(m_session, SmallIconSet(icon), - comment.tqreplace('&',"&&"), SESSION_NEW_SHELL_ID); + comment.replace('&',"&&"), SESSION_NEW_SHELL_ID); m_session->insertItem(SmallIconSet("window_new"), i18n("New &Window"), SESSION_NEW_WINDOW_ID); m_tabbarSessionsCommands->insertItem(SmallIconSet("window_new"), @@ -3455,12 +3455,12 @@ void Konsole::createSessionMenus() TQString txt = (*it).readEntry("Name"); TQString icon = (*it).readEntry("Icon", "konsole"); insertItemSorted(m_tabbarSessionsCommands, SmallIconSet(icon), - txt.tqreplace('&',"&&"), it.currentKey() ); + txt.replace('&',"&&"), it.currentKey() ); TQString comment = (*it).readEntry("Comment"); if (comment.isEmpty()) comment=txt.prepend(i18n("New ")); insertItemSorted(m_session, SmallIconSet(icon), - comment.tqreplace('&',"&&"), it.currentKey()); + comment.replace('&',"&&"), it.currentKey()); } if (m_bookmarksSession) @@ -3483,7 +3483,7 @@ void Konsole::addScreenSession(const TQString &path, const TQString &socket) co->writeEntry("Name", socket); TQString txt = i18n("Screen is a program controlling screens!", "Screen at %1").arg(socket); co->writeEntry("Comment", txt); - co->writePathEntry("Exec", TQString::tqfromLatin1("SCREENDIR=%1 screen -r %2") + co->writePathEntry("Exec", TQString::fromLatin1("SCREENDIR=%1 screen -r %2") .arg(path).arg(socket)); TQString icon = "konsole"; cmd_serial++; @@ -3616,7 +3616,7 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget) rootxpms.insert( tewidget, new KRootPixmap(tewidget) ); rootxpms[tewidget]->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); } else { - tewidget->setBlendColor(tqRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); + tewidget->setBlendColor(qRgba(s->tr_r(), s->tr_g(), s->tr_b(), int(s->tr_x() * 255))); tewidget->setErasePixmap( TQPixmap() ); // make sure any background pixmap is unset } } else { @@ -3624,8 +3624,8 @@ void Konsole::setSchema(ColorSchema* s, TEWidget* tewidget) delete rootxpms[tewidget]; rootxpms.remove(tewidget); } - pixmap_menu_activated(s->tqalignment(), tewidget); - tewidget->setBlendColor(tqRgba(0, 0, 0, 0xff)); + pixmap_menu_activated(s->alignment(), tewidget); + tewidget->setBlendColor(qRgba(0, 0, 0, 0xff)); } tewidget->setColorTable(s->table()); @@ -3749,7 +3749,7 @@ void Konsole::attachSession(TESession* session) } TQString title=session->Title(); - KRadioAction *ra = new KRadioAction(title.tqreplace('&',"&&"), session->IconName(), + KRadioAction *ra = new KRadioAction(title.replace('&',"&&"), session->IconName(), 0, this, TQT_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); @@ -3811,7 +3811,7 @@ void Konsole::slotRenameSession(TESession* ses, const TQString &name) { KRadioAction *ra = session2action.find(ses); TQString title=name; - title=title.tqreplace('&',"&&"); + title=title.replace('&',"&&"); ra->setText(title); ra->setIcon( ses->IconName() ); // I don't know why it is needed here if (m_tabViewMode!=ShowIconOnly) @@ -4192,7 +4192,7 @@ void Konsole::toggleBidi() TQPtrList<TEWidget> tes = activeTEs(); for (TEWidget *_te = tes.first(); _te; _te = tes.next()) { _te->setBidiEnabled(b_bidiEnabled); - _te->tqrepaint(); + _te->repaint(); } } diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index b251007d1..620a0ebdb 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -76,12 +76,12 @@ konsoleFactory::~konsoleFactory() s_aboutData = 0; } -KParts::Part *konsoleFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName, +KParts::Part *konsoleFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList&) { -// kdDebug(1211) << "konsoleFactory::createPart tqparentWidget=" << tqparentWidget << " parent=" << parent << endl; - KParts::Part *obj = new konsolePart(tqparentWidget, widgetName, parent, name, classname); +// kdDebug(1211) << "konsoleFactory::createPart parentWidget=" << parentWidget << " parent=" << parent << endl; + KParts::Part *obj = new konsolePart(parentWidget, widgetName, parent, name, classname); return obj; } @@ -97,7 +97,7 @@ KInstance *konsoleFactory::instance() #define DEFAULT_HISTORY_SIZE 1000 -konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname) +konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname) : KParts::ReadOnlyPart(parent, name) ,te(0) ,se(0) @@ -120,7 +120,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb ,m_histSize(DEFAULT_HISTORY_SIZE) ,m_runningShell( false ) { - tqparentWidget=_tqparentWidget; + parentWidget=_parentWidget; setInstance(konsoleFactory::instance()); m_extension = new konsoleBrowserExtension(this); @@ -137,7 +137,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb const char* shell = getenv("SHELL"); if (shell == NULL || *shell == '\0') shell = "/bin/sh"; eargs.append(shell); - te = new TEWidget(tqparentWidget,widgetName); + te = new TEWidget(parentWidget,widgetName); te->setMinimumSize(150,70); // allow resizing, cause resize in TEWidget setWidget(te); @@ -197,7 +197,7 @@ konsolePart::konsolePart(TQWidget *_tqparentWidget, const char *widgetName, TQOb KeyTrans* ktr = kt_map[*it]; assert( ktr ); TQString title=ktr->hdr(); - m_keytab->insertItem(title.tqreplace('&',"&&"),ktr->numb()); + m_keytab->insertItem(title.replace('&',"&&"),ktr->numb()); } } @@ -317,13 +317,13 @@ void konsolePart::makeGUI() if (!kapp->authorizeKAction("konsole_rmb")) return; - actions = new KActionCollection( (KMainWindow*)tqparentWidget ); - settingsActions = new KActionCollection( (KMainWindow*)tqparentWidget ); + actions = new KActionCollection( (KMainWindow*)parentWidget ); + settingsActions = new KActionCollection( (KMainWindow*)parentWidget ); // Send Signal Menu ------------------------------------------------------------- if (kapp->authorizeKAction("send_signal")) { - m_signals = new KPopupMenu((KMainWindow*)tqparentWidget); + m_signals = new KPopupMenu((KMainWindow*)parentWidget); m_signals->insertItem( i18n( "&Suspend Task" ) + " (STOP)", SIGSTOP); m_signals->insertItem( i18n( "&Continue Task" ) + " (CONT)", SIGCONT); m_signals->insertItem( i18n( "&Hangup" ) + " (HUP)", SIGHUP); @@ -338,7 +338,7 @@ void konsolePart::makeGUI() // Settings Menu ---------------------------------------------------------------- if (kapp->authorizeKAction("settings")) { - m_options = new KPopupMenu((KMainWindow*)tqparentWidget); + m_options = new KPopupMenu((KMainWindow*)parentWidget); // Scrollbar selectScrollbar = new KSelectAction(i18n("Sc&rollbar"), 0, this, @@ -379,7 +379,7 @@ void konsolePart::makeGUI() // Keyboard Options Menu --------------------------------------------------- if (kapp->authorizeKAction("keyboard")) { - m_keytab = new KPopupMenu((KMainWindow*)tqparentWidget); + m_keytab = new KPopupMenu((KMainWindow*)parentWidget); m_keytab->setCheckable(true); connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); @@ -388,7 +388,7 @@ void konsolePart::makeGUI() // Schema Options Menu ----------------------------------------------------- if (kapp->authorizeKAction("schema")) { - m_schema = new KPopupMenu((KMainWindow*)tqparentWidget); + m_schema = new KPopupMenu((KMainWindow*)parentWidget); m_schema->setCheckable(true); connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); @@ -452,7 +452,7 @@ void konsolePart::makeGUI() } // Popup Menu ------------------------------------------------------------------- - m_popupMenu = new KPopupMenu((KMainWindow*)tqparentWidget); + m_popupMenu = new KPopupMenu((KMainWindow*)parentWidget); KAction* selectionEnd = new KAction(i18n("Set Selection End"), 0, te, TQT_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); @@ -590,7 +590,7 @@ void konsolePart::readProperties() rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(sch->tr_x(), TQColor(sch->tr_r(), sch->tr_g(), sch->tr_b())); rootxpm->start(); - rootxpm->tqrepaint(true); + rootxpm->repaint(true); } else { if (rootxpm) { @@ -598,7 +598,7 @@ void konsolePart::readProperties() delete rootxpm; rootxpm=0; } - pixmap_menu_activated(sch->tqalignment()); + pixmap_menu_activated(sch->alignment()); } te->setBellMode(n_bell); @@ -733,7 +733,7 @@ void konsolePart::updateSchemaMenu() for (int i = 0; i < (int) colors->count(); i++) { ColorSchema* s = (ColorSchema*)colors->at(i); TQString title=s->title(); - m_schema->insertItem(title.tqreplace('&',"&&"),s->numb(),0); + m_schema->insertItem(title.replace('&',"&&"),s->numb(),0); } if (te && se) { @@ -778,7 +778,7 @@ void konsolePart::setSchema(ColorSchema* s) rootxpm = new KRootPixmap(te); rootxpm->setFadeEffect(s->tr_x(), TQColor(s->tr_r(), s->tr_g(), s->tr_b())); rootxpm->start(); - rootxpm->tqrepaint(true); + rootxpm->repaint(true); } else { if (rootxpm) { @@ -786,7 +786,7 @@ void konsolePart::setSchema(ColorSchema* s) delete rootxpm; rootxpm=0; } - pixmap_menu_activated(s->tqalignment()); + pixmap_menu_activated(s->alignment()); } te->setColorTable(s->table()); @@ -797,8 +797,8 @@ void konsolePart::notifySize(int /* columns */, int /* lines */) { ColorSchema *sch=colors->find(s_schema); - if (sch && sch->tqalignment() >= 3) - pixmap_menu_activated(sch->tqalignment()); + if (sch && sch->alignment() >= 3) + pixmap_menu_activated(sch->alignment()); } void konsolePart::pixmap_menu_activated(int item) @@ -847,7 +847,7 @@ void konsolePart::pixmap_menu_activated(int item) void konsolePart::slotHistoryType() { if ( ! se ) return; - HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)tqparentWidget); + HistoryTypeDialog dlg(se->history(), m_histSize, (KMainWindow*)parentWidget); if (dlg.exec()) { if (dlg.isOn()) { if (dlg.nbLines() > 0) { @@ -917,7 +917,7 @@ void konsolePart::slotWordSeps() { bool ok; TQString seps = KInputDialog::getText( i18n( "Word Connectors" ), - i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, tqparentWidget ); + i18n( "Characters other than alphanumerics considered part of a word when double clicking:" ), s_word_seps, &ok, parentWidget ); if ( ok ) { s_word_seps = seps; @@ -1077,7 +1077,7 @@ bool konsolePart::setPtyFd( int master_pty ) void konsolePart::newSession() { if ( se ) delete se; - se = new TESession(te, "xterm", tqparentWidget->winId()); + se = new TESession(te, "xterm", parentWidget->winId()); connect( se,TQT_SIGNAL(done(TESession*)), this,TQT_SLOT(doneSession(TESession*)) ); connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), @@ -1107,7 +1107,7 @@ void konsolePart::newSession() // se->run(); connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); // setFont( n_font ); // we do this here, to make TEWidget recalculate - // its tqgeometry.. + // its geometry.. } void konsolePart::showShellInDir( const TQString& dir ) @@ -1125,7 +1125,7 @@ void konsolePart::showShellInDir( const TQString& dir ) { TQString text = dir; KRun::shellQuote(text); - text = TQString::tqfromLatin1("cd ") + text + '\n'; + text = TQString::fromLatin1("cd ") + text + '\n'; te->emitText( text ); }; } diff --git a/konsole/konsole/konsole_part.h b/konsole/konsole/konsole_part.h index db7533178..1f65106ad 100644 --- a/konsole/konsole/konsole_part.h +++ b/konsole/konsole/konsole_part.h @@ -52,7 +52,7 @@ public: konsoleFactory(); virtual ~konsoleFactory(); - virtual KParts::Part* createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0, + virtual KParts::Part* createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, const char* classname = "KParts::Part", const TQStringList &args = TQStringList()); @@ -70,7 +70,7 @@ class konsolePart: public KParts::ReadOnlyPart, public TerminalInterface, public { Q_OBJECT public: - konsolePart(TQWidget *tqparentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0); + konsolePart(TQWidget *parentWidget, const char *widgetName, TQObject * parent, const char *name, const char *classname = 0); virtual ~konsolePart(); signals: @@ -140,7 +140,7 @@ signals: bool doWriteStream( const TQByteArray& ); bool doCloseStream(); - TQWidget* tqparentWidget; + TQWidget* parentWidget; TEWidget* te; TESession* se; ColorSchemaList* colors; diff --git a/konsole/konsole/konsole_wcwidth.cpp b/konsole/konsole/konsole_wcwidth.cpp index 63abe8dd1..73d7c7131 100644 --- a/konsole/konsole/konsole_wcwidth.cpp +++ b/konsole/konsole/konsole_wcwidth.cpp @@ -19,7 +19,7 @@ struct interval { }; /* auxiliary function for binary search in interval table */ -static int bisearch(TQ_UINT16 ucs, const struct interval *table, int max) { +static int bisearch(Q_UINT16 ucs, const struct interval *table, int max) { int min = 0; int mid; @@ -65,11 +65,11 @@ static int bisearch(TQ_UINT16 ucs, const struct interval *table, int max) { * ISO 8859-1 and WGL4 characters, Unicode control characters, * etc.) have a column width of 1. * - * This implementation assumes that TQ_UINT16 characters are encoded + * This implementation assumes that Q_UINT16 characters are encoded * in ISO 10646. */ -int konsole_wcwidth_normal(TQ_UINT16 ucs) +int konsole_wcwidth_normal(Q_UINT16 ucs) { /* sorted list of non-overlapping intervals of non-spacing characters */ static const struct interval combining[] = { @@ -143,7 +143,7 @@ int konsole_wcwidth_normal(TQ_UINT16 ucs) * encodings who want to migrate to UCS. It is not otherwise * recommended for general use. */ -int konsole_wcwidth_cjk(TQ_UINT16 ucs) +int konsole_wcwidth_cjk(Q_UINT16 ucs) { /* sorted list of non-overlapping intervals of East Asian Ambiguous * characters */ @@ -214,13 +214,13 @@ int string_width( const TQString &txt ) int w = 0; for ( uint i = 1; i < txt.length(); ++i ) { - w += konsole_wcwidth(txt[i].tqunicode()); + w += konsole_wcwidth(txt[i].unicode()); } return w; } -int konsole_wcwidth(TQ_UINT16 ucs) { +int konsole_wcwidth(Q_UINT16 ucs) { static int use_wcwidth_cjk = (getenv("KONSOLE_WCWIDTH_CJK")) ? 1: 0; diff --git a/konsole/konsole/konsole_wcwidth.h b/konsole/konsole/konsole_wcwidth.h index a7ca9ad4f..b070beb02 100644 --- a/konsole/konsole/konsole_wcwidth.h +++ b/konsole/konsole/konsole_wcwidth.h @@ -9,8 +9,8 @@ #include <tqglobal.h> #include <tqstring.h> -int konsole_wcwidth(TQ_UINT16 ucs); -//int konsole_wcwidth_cjk(TQ_UINT16 ucs); +int konsole_wcwidth(Q_UINT16 ucs); +//int konsole_wcwidth_cjk(Q_UINT16 ucs); int string_width( const TQString &txt ); diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index 25a71d4e9..0686cfbf1 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -90,14 +90,14 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() addNewFolder(); } - KBookmarkGroup parentBookmark = m_pManager->tqfindByAddress( m_parentAddress ).toGroup(); + KBookmarkGroup parentBookmark = m_pManager->findByAddress( m_parentAddress ).toGroup(); Q_ASSERT(!parentBookmark.isNull()); bool separatorInserted = false; for ( KBookmark bm = parentBookmark.first(); !bm.isNull(); bm = parentBookmark.next(bm) ) { TQString text = bm.text(); - text.tqreplace( '&', "&&" ); + text.replace( '&', "&&" ); if ( !separatorInserted && m_bIsRoot) { // inserted before the first konq bookmark, to avoid the separator if no konq bookmark m_parentMenu->insertSeparator(); separatorInserted = true; diff --git a/konsole/konsole/linefont.h b/konsole/konsole/linefont.h index a68457023..9873c43d4 100644 --- a/konsole/konsole/linefont.h +++ b/konsole/konsole/linefont.h @@ -1,7 +1,7 @@ // WARNING: Autogenerated by "fontembedder ./linefont.src". // You probably do not want to hand-edit this! -static const TQ_UINT32 LineChars[] = { +static const Q_UINT32 LineChars[] = { 0x00007c00, 0x000fffe0, 0x00421084, 0x00e739ce, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00427000, 0x004e7380, 0x00e77800, 0x00ef7bc0, 0x00421c00, 0x00439ce0, 0x00e73c00, 0x00e7bde0, 0x00007084, 0x000e7384, 0x000079ce, 0x000f7bce, diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index a14372ce2..7be5e5146 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -324,7 +324,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) TQString term = ""; if(args->isSet("tn")) { - term=TQString::tqfromLatin1(args->getOption("tn")); + term=TQString::fromLatin1(args->getOption("tn")); } login_shell = args->isSet("ls"); @@ -644,13 +644,13 @@ extern "C" int KDE_EXPORT kdemain(int argc, char* argv[]) //// Temporary code, waiting for Qt to do this properly // Delete all toplevel widgets that have WDestructiveClose - TQWidgetList *list = TQApplication::tqtopLevelWidgets(); + TQWidgetList *list = TQApplication::topLevelWidgets(); // remove all toplevel widgets that have a parent (i.e. they // got WTopLevel explicitly), they'll be deleted by the parent list->first(); while( list->current()) { - if( list->current()->tqparentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) ) + if( list->current()->parentWidget() != NULL || !list->current()->testWFlags( Qt::WDestructiveClose ) ) { list->remove(); continue; diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 825d13efe..8d85329eb 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -101,7 +101,7 @@ static const char *colornames[TABLE_COLORS] = static const ColorEntry default_table[TABLE_COLORS] = // The following are almost IBM standard color codes, with some slight // gamma correction for the dim colors to compensate for bright X screens. - // It tqcontains the 8 ansiterm/xterm colors in 2 intensities. + // It contains the 8 ansiterm/xterm colors in 2 intensities. { ColorEntry( TQColor(0x00,0x00,0x00), 0, 0 ), ColorEntry( TQColor(0xFF,0xFF,0xFF), 1, 0 ), // Dfore, Dback @@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname) ,lastRead(new TQDateTime()) { //start with a valid time, aleXXX - *lastRead = TQDateTime::tqcurrentDateTime(); + *lastRead = TQDateTime::currentDateTime(); TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname); if (fPath.isEmpty() || !TQFile::exists(fPath)) { @@ -169,7 +169,7 @@ ColorSchema::ColorSchema(KConfig& c) m_title = c.readEntry("Title",i18n("[no title]")); m_imagePath = c.readEntry("ImagePath"); - m_tqalignment = c.readNumEntry("ImageAlignment",1); + m_alignment = c.readNumEntry("ImageAlignment",1); m_useTransparency = c.readBoolEntry("UseTransparency",false); m_tr_r = c.readNumEntry("TransparentR",0); @@ -203,7 +203,7 @@ void ColorSchema::clearSchema() } m_title = i18n("[no title]"); m_imagePath = ""; - m_tqalignment = 1; + m_alignment = 1; m_useTransparency = false; m_tr_x = 0.0; m_tr_r = 0; @@ -216,7 +216,7 @@ void ColorSchema::setDefaultSchema() m_numb = 0; m_title = i18n("Konsole Default"); m_imagePath = ""; // background pixmap - m_tqalignment = 1; // none + m_alignment = 1; // none m_useTransparency = false; // not use pseudo-transparency by default m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side m_tr_x = 0.0; @@ -273,7 +273,7 @@ void ColorSchema::writeConfig(const TQString& path) const c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); c.writeEntry("ImagePath",m_imagePath); - c.writeEntry("ImageAlignment",m_tqalignment); + c.writeEntry("ImageAlignment",m_alignment); c.writeEntry("UseTransparency",m_useTransparency); c.writeEntry("TransparentR",m_tr_r); @@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile() char line[100]; - *lastRead = TQDateTime::tqcurrentDateTime(); + *lastRead = TQDateTime::currentDateTime(); while (fscanf(sysin,"%80[^\n]\n",line) > 0) { @@ -334,7 +334,7 @@ bool ColorSchema::rereadSchemaFile() TQString qline(line); m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) ); - m_tqalignment = attr; + m_alignment = attr; } if (!strncmp(line,"transparency",12)) { float rx; @@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas() // now. // // - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); r = updateAllSchemaTimes(now); diff --git a/konsole/konsole/schema.h b/konsole/konsole/schema.h index 42cdfe1ed..904767df6 100644 --- a/konsole/konsole/schema.h +++ b/konsole/konsole/schema.h @@ -150,7 +150,7 @@ protected: int numb() {if (!m_fileRead) rereadSchemaFile();return m_numb;}; const TQString& title() {if (!m_fileRead) rereadSchemaFile();return m_title;}; const TQString& imagePath() {if (!m_fileRead) rereadSchemaFile();return m_imagePath;}; - int tqalignment() {if (!m_fileRead) rereadSchemaFile();return m_tqalignment;}; + int alignment() {if (!m_fileRead) rereadSchemaFile();return m_alignment;}; const ColorEntry* table() {if (!m_fileRead) rereadSchemaFile();return m_table;}; bool useTransparency() {if (!m_fileRead) rereadSchemaFile();return m_useTransparency;}; double tr_x() {if (!m_fileRead) rereadSchemaFile();return m_tr_x;}; @@ -162,7 +162,7 @@ protected: private: int m_numb; int m_tr_r, m_tr_g, m_tr_b; - int m_tqalignment; + int m_alignment; TQString m_title; TQString m_imagePath; ColorEntry m_table[TABLE_COLORS]; @@ -234,7 +234,7 @@ private: /** * This isn't really used, but it could be. A newly - * constructed ColorSchemaList tqcontains one element: + * constructed ColorSchemaList contains one element: * the defaultSchema, with serial number 0. */ ColorSchema *defaultSchema; diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index a4d8ff4f5..53990af2f 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -133,11 +133,11 @@ void TESession::ptyError() { // FIXME: sh->error() is always empty if ( sh->error().isEmpty() ) - KMessageBox::error( te->tqtopLevelWidget(), + KMessageBox::error( te->topLevelWidget(), i18n("Konsole is unable to open a PTY (pseudo teletype). It is likely that this is due to an incorrect configuration of the PTY devices. Konsole needs to have read/write access to the PTY devices."), i18n("A Fatal Error Has Occurred") ); else - KMessageBox::error(te->tqtopLevelWidget(), sh->error()); + KMessageBox::error(te->topLevelWidget(), sh->error()); emit done(this); } @@ -232,7 +232,7 @@ void TESession::setUserTitle( int what, const TQString &caption ) renameSession(caption); if (what == 31) { cwd=caption; - cwd=cwd.tqreplace( TQRegExp("^~"), TQDir::homeDirPath() ); + cwd=cwd.replace( TQRegExp("^~"), TQDir::homeDirPath() ); emit openURLRequest(cwd); } if (what == 32) { // change icon via \033]32;Icon\007 @@ -637,7 +637,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T connect(zmodemProc,TQT_SIGNAL (receivedStdout (KProcess *, char *, int)), this, TQT_SLOT(zmodemSendBlock(KProcess *, char *, int))); connect(zmodemProc,TQT_SIGNAL (receivedStderr (KProcess *, char *, int)), - this, TQT_SLOT(zmodemtqStatus(KProcess *, char *, int))); + this, TQT_SLOT(zmodemStatus(KProcess *, char *, int))); connect(zmodemProc,TQT_SIGNAL (processExited(KProcess *)), this, TQT_SLOT(zmodemDone())); @@ -645,7 +645,7 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - zmodemProgress = new ZModemDialog(te->tqtopLevelWidget(), false, + zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, i18n("ZModem Progress")); connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), @@ -671,7 +671,7 @@ void TESession::zmodemContinue() // qWarning("ZModem resume"); } -void TESession::zmodemtqStatus(KProcess *, char *data, int len) +void TESession::zmodemStatus(KProcess *, char *data, int len) { TQCString msg(data, len+1); while(!msg.isEmpty()) @@ -767,7 +767,7 @@ QCStringList TESession::functionsDynamic() void TESession::onRcvBlock( const char* buf, int len ) { em->onRcvBlock( buf, len ); - emit receivedData( TQString::tqfromLatin1( buf, len ) ); + emit receivedData( TQString::fromLatin1( buf, len ) ); } void TESession::print( TQPainter &paint, bool friendly, bool exact ) diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h index 69be6cb86..cbe41ab50 100644 --- a/konsole/konsole/session.h +++ b/konsole/konsole/session.h @@ -137,7 +137,7 @@ public slots: void slotZModemDetected(); void emitZModemDetected(); - void zmodemtqStatus(KProcess *, char *data, int len); + void zmodemStatus(KProcess *, char *data, int len); void zmodemSendBlock(KProcess *, char *data, int len); void zmodemRcvBlock(const char *data, int len); void zmodemDone(); diff --git a/konsole/kwrited.desktop b/konsole/kwrited.desktop index 61da36e0e..d5bc977c4 100644 --- a/konsole/kwrited.desktop +++ b/konsole/kwrited.desktop @@ -79,7 +79,7 @@ Comment[be]=Ðазірае за паведамленнÑмі ад мÑÑцовы Comment[bg]=Ðаблюдение за ÑÑŠÐ¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚ локални потребители, изпратени Ñ write(1) или wall(1) Comment[bs]=Prati poruke od lokalnih korisnika poslane koristeći write(1) ili wall(1) Comment[ca]=Fes atenció als missatges dels usuaris locals enviats amb write(1) o wall(1) -Comment[cs]=Sledovánà zpráv od mÃstnÃch uživatelů poslaných potqmocà write(1) nebo wall(1) +Comment[cs]=Sledovánà zpráv od mÃstnÃch uživatelů poslaných pomocà write(1) nebo wall(1) Comment[csb]=Dozérô wiadłów òd môlowëch brëkòwników wësłónëch przez write(1) abò wall(1) Comment[cy]=Gwylio am negeseuon oddiwrth defnyddwyr lleol a anfonwyd efo write(1) neu wall(1) Comment[da]=Kig efter beskeder fra lokale brugere sendt med write(1) eller wall(1) @@ -116,14 +116,14 @@ Comment[ne]=सनà¥à¤¦à¥‡à¤¶à¤•à¤¾ लागि सà¥à¤¥à¤¾à¤¨à¥€à¤¯ पà¥à¤ Comment[nl]=Observeer berichten van lokale gebruikers verzonden met write(1) of wall(1) Comment[nn]=SjÃ¥ etter meldingar frÃ¥ lokale brukarar sende med write(1) eller wall(1) Comment[pa]=ਸਥਾਨਕ ਉਪà¨à©‹à¨—à©€ ਰਾਹੀਂ write(1) or wall(1) ਨਾਲ à¨à©‡à¨œà©‡ ਸà©à¨¨à©‡à¨¹à©‡ ਵੇਖੋ -Comment[pl]=Åšledzi wiadomoÅ›ci od użytkowników lokalnych wysyÅ‚ane za potqmocÄ… write(1) lub wall(1) +Comment[pl]=Åšledzi wiadomoÅ›ci od użytkowników lokalnych wysyÅ‚ane za pomocÄ… write(1) lub wall(1) Comment[pt]=Escutar as mensagens dos utilizadores locais, enviadas com o write(1) ou o wall(1) Comment[pt_BR]=Observa mensagens de usuários locais, enviadas com o write(1) ou o wall(1) Comment[ro]=AÈ™teaptă mesaje de la utilizatori, trimise cu write(1) sau wall(1) Comment[ru]=Приём ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ локальной Ñети, отправленных командами write(1) или wall(1) Comment[rw]=Kugenzura ubutumwa buva ku bakoresha bahafi bwoherejwe hakoreshejwe kwandika(1) cyangwa urukuta(1) Comment[se]=Gozit dieÄ‘uid mat báikkalaÅ¡ geavaheaddjit sáddejit «write» dahje «wall» -Comment[sk]=Sledovanie správ od lokálnych použÃvateľov poslaných potqmocou prÃkazu write (1) alebo wall (1) +Comment[sk]=Sledovanie správ od lokálnych použÃvateľov poslaných pomocou prÃkazu write (1) alebo wall (1) Comment[sl]=Opazuj sporoÄila od krajevnih uporabnikov, poslanih z write(1) ali wall(1) Comment[sr]=Чека поруке од локалних кориÑника поÑлатих помоћу write(1) или wall(1) Comment[sr@Latn]=ÄŒeka poruke od lokalnih korisnika poslatih pomoću write(1) ili wall(1) diff --git a/konsole/tests/esc.c b/konsole/tests/esc.c index c8837409e..520946b50 100644 --- a/konsole/tests/esc.c +++ b/konsole/tests/esc.c @@ -81,7 +81,7 @@ decswl() { /* Single With Line */ dectst(pn) int pn; { /* Invoke Confidence Test */ brc2(2, pn, 'y'); } -dsr(pn) int pn; { /* Device tqStatus Report */ +dsr(pn) int pn; { /* Device Status Report */ brc(pn, 'n'); } ed(pn) int pn; { /* Erase in Display */ diff --git a/konsole/tests/main.c b/konsole/tests/main.c index 87a288056..c80b0426c 100644 --- a/konsole/tests/main.c +++ b/konsole/tests/main.c @@ -534,7 +534,7 @@ tst_keyboard() { - DECKPAM (Keypad Application Mode) - DECKPNM (Keypad Numeric Mode) -The standard VT100 keayboard tqlayout: +The standard VT100 keayboard layout: UP DN LE RI @@ -562,7 +562,7 @@ TAB* qQ wW eE rR tT yY uU iI oO pP [{ ]} DEL char *ledmsg[6], *ledseq[6]; int i, j, okflag; - int kbtqlayout; + int kblayout; int ckeymode; int fkeymode; char kbdc; @@ -768,10 +768,10 @@ TAB* qQ wW eE rR tT yY uU iI oO pP [{ ]} DEL }; static char *keyboardmenu[] = { - "Standard American ASCII tqlayout", - "Swedish national tqlayout D47", - "Swedish national tqlayout E47", - /* add new keyboard tqlayouts here */ + "Standard American ASCII layout", + "Swedish national layout D47", + "Swedish national layout E47", + /* add new keyboard layouts here */ "" }; @@ -833,16 +833,16 @@ TAB* qQ wW eE rR tT yY uU iI oO pP [{ ]} DEL ed(2); cup(5,10); - println("Choose keyboard tqlayout:"); - kbtqlayout = menu(keyboardmenu); - if (kbtqlayout) { - kbtqlayout--; - for (j = 0; natkeytab[kbtqlayout][j].natc != '\0'; j++) { + println("Choose keyboard layout:"); + kblayout = menu(keyboardmenu); + if (kblayout) { + kblayout--; + for (j = 0; natkeytab[kblayout][j].natc != '\0'; j++) { for (i = 0; keytab[i].c != '\0'; i++) { - if (keytab[i].row == natkeytab[kbtqlayout][j].natrow && - keytab[i].col == natkeytab[kbtqlayout][j].natcol) { - keytab[i].c = natkeytab[kbtqlayout][j].natc; - keytab[i].symbol = natkeytab[kbtqlayout][j].natsymbol; + if (keytab[i].row == natkeytab[kblayout][j].natrow && + keytab[i].col == natkeytab[kblayout][j].natcol) { + keytab[i].c = natkeytab[kblayout][j].natc; + keytab[i].symbol = natkeytab[kblayout][j].natsymbol; break; } } @@ -1102,7 +1102,7 @@ tst_reports() { /* Test of: <ENQ> (AnswerBack Message) SM RM (Set/Reset Mode) - LineFeed / Newline - DSR (Device tqStatus Report) + DSR (Device Status Report) DA (Device Attributes) DECREQTPARM (Request Terminal Parameters) */ @@ -1204,7 +1204,7 @@ tst_reports() { ed(2); cup(1,1); - printf("Test of Device tqStatus Report 5 (report terminal status)."); + printf("Test of Device Status Report 5 (report terminal status)."); cup(2,1); dsr(5); report = instr(); @@ -1217,7 +1217,7 @@ tst_reports() { else printf(" -- Unknown response!"); cup(4,1); - println("Test of Device tqStatus Report 6 (report cursor position)."); + println("Test of Device Status Report 6 (report cursor position)."); cup(5,1); dsr(6); report = instr(); @@ -1445,7 +1445,7 @@ tst_vt52() { tst_insdel() { /* Test of: - SM/RM(4) (= IRM (Insertion/tqreplacement mode)) + SM/RM(4) (= IRM (Insertion/replacement mode)) ICH (Insert Character) DCH (Delete character) IL (Insert line) diff --git a/konsole/tests/vttest.1 b/konsole/tests/vttest.1 index af0558cd9..c4104925d 100644 --- a/konsole/tests/vttest.1 +++ b/konsole/tests/vttest.1 @@ -9,5 +9,5 @@ is a program designed to test the functionality of a VT100 terminal (or emulator thereof). It tests both display (escape sequence handling) and keyboard. .PP -The program is menu\-driven and tqcontains full on\-line operating +The program is menu\-driven and contains full on\-line operating instructions. diff --git a/kpager/config.cpp b/kpager/config.cpp index 12e638688..5ff0d3def 100644 --- a/kpager/config.cpp +++ b/kpager/config.cpp @@ -121,9 +121,9 @@ void KPagerConfigDialog::setWindowDrawMode(int type) m_tmpWindowDrawMode=type; } -void KPagerConfigDialog::setLayout(int tqlayout) +void KPagerConfigDialog::setLayout(int layout) { - m_tmpLayoutType=tqlayout; + m_tmpLayoutType=layout; } void KPagerConfigDialog::loadConfiguration() @@ -133,14 +133,14 @@ void KPagerConfigDialog::loadConfiguration() m_chkShowBackground->setChecked(m_showBackground); m_chkShowWindows->setChecked(m_showWindows); m_grpWindowDrawMode->setButton(m_windowDrawMode); - m_grpLayoutType->setButton(m_tqlayoutType); + m_grpLayoutType->setButton(m_layoutType); m_chkWindowDragging->setChecked( m_windowDragging ); m_tmpShowName=m_showName; m_tmpShowNumber=m_showNumber; m_tmpShowBackground=m_showBackground; m_tmpShowWindows=m_showWindows; m_tmpWindowDrawMode=m_windowDrawMode; - m_tmpLayoutType=m_tqlayoutType; + m_tmpLayoutType=m_layoutType; m_tmpWindowDragging=m_windowDragging; } @@ -154,7 +154,7 @@ void KPagerConfigDialog::initConfiguration(void) m_showNumber=cfg->readBoolEntry("showNumber", Desktop::c_defShowNumber); m_showBackground=cfg->readBoolEntry("showBackground", Desktop::c_defShowBackground); m_showWindows=cfg->readBoolEntry("showWindows", Desktop::c_defShowWindows); - m_tqlayoutType=cfg->readNumEntry("tqlayoutType", KPager::c_defLayout); + m_layoutType=cfg->readNumEntry("layoutType", KPager::c_defLayout); m_windowDragging=cfg->readBoolEntry("windowDragging", true ); } @@ -165,7 +165,7 @@ void KPagerConfigDialog::slotOk() m_showBackground=m_tmpShowBackground; m_showWindows=m_tmpShowWindows; m_windowDrawMode=m_tmpWindowDrawMode; - m_tqlayoutType=m_tmpLayoutType; + m_layoutType=m_tmpLayoutType; m_windowDragging=m_tmpWindowDragging; accept(); } @@ -176,5 +176,5 @@ bool KPagerConfigDialog::m_showBackground=Desktop::c_defShowBackground; bool KPagerConfigDialog::m_showWindows=Desktop::c_defShowWindows; bool KPagerConfigDialog::m_windowDragging=Desktop::c_defWindowDragging; int KPagerConfigDialog::m_windowDrawMode=Desktop::c_defWindowDrawMode; -int KPagerConfigDialog::m_tqlayoutType=KPager::c_defLayout; +int KPagerConfigDialog::m_layoutType=KPager::c_defLayout; diff --git a/kpager/config.h b/kpager/config.h index 8cf503507..2b8b095d3 100644 --- a/kpager/config.h +++ b/kpager/config.h @@ -42,7 +42,7 @@ public slots: void setShowWindows(bool show); void setWindowDrawMode(int mode); - void setLayout(int tqlayout); + void setLayout(int layout); void enableWindowDragging(bool); @@ -55,7 +55,7 @@ public: static bool m_showBackground; static bool m_showWindows; static int m_windowDrawMode; - static int m_tqlayoutType; + static int m_layoutType; static bool m_windowDragging; protected: diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index 5b2aa73c9..3319418a1 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -81,7 +81,7 @@ void Desktop::mouseMoveEvent( TQMouseEvent *ev ) if ( (ev->state() & LeftButton) == 0 ) return; TQPoint p( ev->pos() - pressPos ); - if ( p.manhattanLength() >= tqApp->startDragDistance() ) + if ( p.manhattanLength() >= qApp->startDragDistance() ) startDrag( pressPos ); } @@ -120,7 +120,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev ) KWin::forceActiveWindow(info->win()); // if ( static_cast<WindowDrawMode>( KPagerConfigDialog::m_windowDrawMode ) == Pixmap ) - // m_windowPixmapsDirty.tqreplace(info->win,true); + // m_windowPixmapsDirty.replace(info->win,true); } } } @@ -138,9 +138,9 @@ KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalp KWin::WindowInfo* info = pager()->info( *it ); if (shouldPaintWindow(info)) { - r=info->tqgeometry(); + r=info->geometry(); convertRectS2P(r); - if (r.tqcontains(p)) + if (r.contains(p)) { if (internalpos) { @@ -295,7 +295,7 @@ TQPixmap *Desktop::paintNewWindow(const KWin::WindowInfo *info) p.begin(pixmap); p.setFont(font()); - p.fillRect( r, tqcolorGroup().brush(TQColorGroup::Dark)); + p.fillRect( r, colorGroup().brush(TQColorGroup::Dark)); paintWindow(p, info, false); p.end(); @@ -425,7 +425,7 @@ void Desktop::paintEvent( TQPaintEvent * ) p.begin(&pixmap); // p.setFont(font()); -// p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Dark)); +// p.fillRect(rect(), colorGroup().brush(TQColorGroup::Dark)); // p.setPen(Qt::black); // p.drawRect(rect()); @@ -450,7 +450,7 @@ void Desktop::paintEvent( TQPaintEvent * ) else pixmap.fill(Qt::gray); } else - p.fillRect(rect(), tqcolorGroup().brush(TQColorGroup::Mid)); + p.fillRect(rect(), colorGroup().brush(TQColorGroup::Mid)); // set in/active pen if (isCurrent()) @@ -523,8 +523,8 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool TQBrush brush; - if ( isActive ) brush=tqcolorGroup().brush( TQColorGroup::Highlight ); - else brush=tqcolorGroup().brush( TQColorGroup::Button ); + if ( isActive ) brush=colorGroup().brush( TQColorGroup::Highlight ); + else brush=colorGroup().brush( TQColorGroup::Button ); if ( m_transparentMode==AllWindows || (m_transparentMode==MaximizedWindows && ( info->state() & NET::Max )) ) @@ -532,12 +532,12 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool if ( isActive ) { - qDrawShadeRect( &p, r, tqcolorGroup(), false, 1, 0, &brush ); + qDrawShadeRect( &p, r, colorGroup(), false, 1, 0, &brush ); } else { p.fillRect( r, brush ); - qDrawShadeRect( &p, r, tqcolorGroup(), true, 1, 0 ); + qDrawShadeRect( &p, r, colorGroup(), true, 1, 0 ); } } @@ -602,8 +602,8 @@ void Desktop::paintWindowPixmap(TQPainter &p, const KWin::WindowInfo *info, nHg = rSmall.height(); } pixmap=new TQPixmap(fastScalePixmap(tmp, nWd, nHg)); - m_windowPixmaps.tqreplace(info->win(),pixmap); - m_windowPixmapsDirty.tqreplace(info->win(),false); + m_windowPixmaps.replace(info->win(),pixmap); + m_windowPixmapsDirty.replace(info->win(),false); } } @@ -669,7 +669,7 @@ void Desktop::backgroundLoaded(bool b) } else kdDebug() << "Error getting the background\n"; } -TQSize Desktop::tqsizeHint() const +TQSize Desktop::sizeHint() const { return TQSize(67,50); } diff --git a/kpager/desktop.h b/kpager/desktop.h index 60f90698e..74997dba3 100644 --- a/kpager/desktop.h +++ b/kpager/desktop.h @@ -74,7 +74,7 @@ public: static void removeCachedPixmap(int nWin) { m_windowPixmaps.remove(nWin); }; - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * active is a bool that specifies if the frame is the active diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index 4d2dbe046..e521f1e28 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -70,13 +70,13 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) KConfig *cfg = kapp->config(); cfg->setGroup("KPager"); - // Update the last used tqgeometry + // Update the last used geometry int w = cfg->readNumEntry(m_pPager->lWidth(),-1); int h = cfg->readNumEntry(m_pPager->lHeight(),-1); if (w > 0 && h > 0) resize(w,h); else - resize(m_pPager->tqsizeHint()); + resize(m_pPager->sizeHint()); // resize(cfg->readNumEntry(lWidth(),200),cfg->readNumEntry(lHeight(),90)); int xpos=cfg->readNumEntry("xPos",-1); @@ -91,7 +91,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) // rect.pos.y+rect.size.height-m_pPager->height()); // antonio:The above lines don't work. I should look at them when I have // more time - move(kapp->desktop()->width()-m_pPager->tqsizeHint().width()-5,kapp->desktop()->height()-m_pPager->tqsizeHint().height()-25); + move(kapp->desktop()->width()-m_pPager->sizeHint().width()-5,kapp->desktop()->height()-m_pPager->sizeHint().height()-25); } // Set the wm flags to this window @@ -125,7 +125,7 @@ bool KPagerMainWindow::queryClose() KConfig *cfg=KGlobal::config(); cfg->setGroup("KPager"); - cfg->writeEntry("tqlayoutType", static_cast<int>(m_pPager->m_tqlayoutType)); + cfg->writeEntry("layoutType", static_cast<int>(m_pPager->m_layoutType)); cfg->writeEntry(m_pPager->lWidth(),width()); cfg->writeEntry(m_pPager->lHeight(),height()); cfg->writeEntry("xPos",x()); @@ -179,7 +179,7 @@ void KPagerMainWindow::toggleShow(int x, int y) KPager::KPager(KPagerMainWindow *parent, const char *name) : TQFrame (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_Tool) - , m_tqlayout(0) + , m_layout(0) , m_mnu(0) , m_smnu(0) , m_dmnu(0) @@ -206,7 +206,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) m_desktops.append(dsk); } - m_tqlayoutType=static_cast<enum KPager::LayoutTypes>( KPagerConfigDialog::m_tqlayoutType ); + m_layoutType=static_cast<enum KPager::LayoutTypes>( KPagerConfigDialog::m_layoutType ); connect( m_winmodule, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT(slotActiveWindowChanged(WId))); @@ -244,20 +244,20 @@ KPager::~KPager() const TQString KPager::lWidth() { - switch (m_tqlayoutType) { - case (Classical) : return "tqlayoutClassicalWidth";break; - case (Horizontal) : return "tqlayoutHorizontalWidth";break; - case (Vertical) : return "tqlayoutVerticalWidth";break; + switch (m_layoutType) { + case (Classical) : return "layoutClassicalWidth";break; + case (Horizontal) : return "layoutHorizontalWidth";break; + case (Vertical) : return "layoutVerticalWidth";break; }; return "Width"; } const TQString KPager::lHeight() { - switch (m_tqlayoutType) { - case (Classical) : return "tqlayoutClassicalHeight";break; - case (Horizontal) : return "tqlayoutHorizontalHeight";break; - case (Vertical) : return "tqlayoutVerticalHeight";break; + switch (m_layoutType) { + case (Classical) : return "layoutClassicalHeight";break; + case (Horizontal) : return "layoutHorizontalHeight";break; + case (Vertical) : return "layoutVerticalHeight";break; }; return "Height"; } @@ -267,13 +267,13 @@ void KPager::updateLayout() int w=m_desktops[0]->width(); int h=m_desktops[0]->height(); - delete m_tqlayout; + delete m_layout; - switch (m_tqlayoutType) + switch (m_layoutType) { - case (Classical) : m_tqlayout=new TQGridLayout(this, 2, 0); break; - case (Horizontal) : m_tqlayout=new TQGridLayout(this, 0, 1); break; - case (Vertical) : m_tqlayout=new TQGridLayout(this, 1, 0); break; + case (Classical) : m_layout=new TQGridLayout(this, 2, 0); break; + case (Horizontal) : m_layout=new TQGridLayout(this, 0, 1); break; + case (Vertical) : m_layout=new TQGridLayout(this, 1, 0); break; }; TQValueList <Desktop *>::Iterator it; @@ -283,9 +283,9 @@ void KPager::updateLayout() int halfdesks = (m_desktops.count() + 1) / 2; for( it = m_desktops.begin(); it != m_desktops.end(); ++it ) { - m_tqlayout->addWidget(*it,i,j); + m_layout->addWidget(*it,i,j); ndesks++; - switch (m_tqlayoutType) + switch (m_layoutType) { case (Classical) : i= ndesks / halfdesks; j = ndesks % halfdesks; break; case (Horizontal) : j++; break; @@ -293,10 +293,10 @@ void KPager::updateLayout() }; } - m_tqlayout->activate(); + m_layout->activate(); updateGeometry(); - switch (m_tqlayoutType) + switch (m_layoutType) { case (Classical) : resize(w*(ndesks/2+(ndesks%2)),h*2);break; case (Horizontal) : resize(w*ndesks,h);break; @@ -355,7 +355,7 @@ void KPager::configureDialog() KPagerConfigDialog *dialog= new KPagerConfigDialog(this); if (dialog->exec()) { - m_tqlayoutType=static_cast<enum KPager::LayoutTypes>(KPagerConfigDialog::m_tqlayoutType); + m_layoutType=static_cast<enum KPager::LayoutTypes>(KPagerConfigDialog::m_layoutType); KConfig *cfg=KGlobal::config(); int nWd = (parent() ? ((TQWidget *)parent())->width() : width()); int nHg = (parent() ? ((TQWidget *)parent())->width() : width()); @@ -365,7 +365,7 @@ void KPager::configureDialog() cfg->writeEntry(lWidth(),nWd); cfg->writeEntry(lHeight(),nHg); cfg->writeEntry("windowDrawMode",KPagerConfigDialog::m_windowDrawMode); - cfg->writeEntry("tqlayoutType",KPagerConfigDialog::m_tqlayoutType); + cfg->writeEntry("layoutType",KPagerConfigDialog::m_layoutType); cfg->writeEntry("showNumber",KPagerConfigDialog::m_showNumber); cfg->writeEntry("showName",KPagerConfigDialog::m_showName); cfg->writeEntry("showWindows",KPagerConfigDialog::m_showWindows); @@ -374,7 +374,7 @@ void KPager::configureDialog() updateLayout(); for( TQValueList <Desktop *>::Iterator it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } } @@ -409,7 +409,7 @@ void KPager::slotActiveWindowChanged( WId win ) { if ( (inf1 && inf1->isOnDesktop(i)) || (inf2 && inf2->isOnDesktop(i) ) ) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } @@ -422,7 +422,7 @@ void KPager::slotWindowAdded( WId win) for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ( inf->isOnDesktop( i )) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } @@ -438,14 +438,14 @@ void KPager::slotWindowRemoved( WId win ) for (int i = 1; i <= (int) m_desktops.count(); ++i) { if (onAllDesktops || desktop == i) - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } } void KPager::slotWindowChanged( WId win , unsigned int prop) { - bool tqrepaint=false; + bool repaint=false; KWin::WindowInfo* inf = m_windows[win]; if (!inf) @@ -453,7 +453,7 @@ void KPager::slotWindowChanged( WId win , unsigned int prop) inf=info(win); prop=0; // info already calls KWin::info, so there's no need // to update anything else. - tqrepaint=true; + repaint=true; }; bool onAllDesktops = inf ? inf->onAllDesktops() : false; @@ -466,15 +466,15 @@ void KPager::slotWindowChanged( WId win , unsigned int prop) } if((prop & ~( NET::WMName | NET::WMVisibleName )) != 0 ) - tqrepaint = true; + repaint = true; - if (tqrepaint) + if (repaint) for ( int i=1; i <= (int) m_desktops.count(); ++i) { if ((inf && (inf->isOnDesktop(i))) || onAllDesktops || desktop == i ) { - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } } // redrawDesktops(); @@ -485,9 +485,9 @@ void KPager::slotStackingOrderChanged() m_desktops[m_currentDesktop-1]->m_grabWindows=true; for ( int i=1; i <= (int) m_desktops.count(); ++i) { - m_desktops[i-1]->tqrepaint(false); + m_desktops[i-1]->repaint(false); } -// tqrepaint(true); +// repaint(true); } void KPager::slotDesktopNamesChanged() @@ -521,7 +521,7 @@ void KPager::slotNumberOfDesktopsChanged(int ndesktops) { int i,j; i=j=m_desktops.count(); - switch (m_tqlayoutType) + switch (m_layoutType) { case (Classical) : i%=2;j/=2; break; case (Horizontal) : i=0; break; @@ -547,8 +547,8 @@ void KPager::slotCurrentDesktopChanged(int desk) m_desktops[m_currentDesktop-1]->update(); m_desktops[desk-1]->paintFrame( true ); m_desktops[desk-1]->update(); -// m_desktops[m_currentDesktop-1]->tqrepaint(); -// m_desktops[desk-1]->tqrepaint(); +// m_desktops[m_currentDesktop-1]->repaint(); +// m_desktops[desk-1]->repaint(); m_currentDesktop=desk; @@ -643,24 +643,24 @@ void KPager::redrawDesktops() { TQValueList <Desktop *>::Iterator it; for( it = m_desktops.begin(); it != m_desktops.end(); ++it ) - (*it)->tqrepaint(); + (*it)->repaint(); } void KPager::slotGrabWindows() { m_desktops[m_currentDesktop-1]->m_grabWindows=true; - m_desktops[m_currentDesktop-1]->tqrepaint(); + m_desktops[m_currentDesktop-1]->repaint(); } -TQSize KPager::tqsizeHint() const +TQSize KPager::sizeHint() const { int n=m_desktops.count(); int w=-1,h=-1; - TQSize size=m_desktops[0]->tqsizeHint(); + TQSize size=m_desktops[0]->sizeHint(); int wDsk=size.width(); int hDsk=size.height(); - switch (m_tqlayoutType) + switch (m_layoutType) { case (Classical) : w=wDsk*(n/2+(n%2)); h=hDsk*2;break; case (Horizontal) : w=wDsk*n; h=hDsk;break; diff --git a/kpager/kpager.h b/kpager/kpager.h index 22b3c2fea..8911e1619 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -76,7 +76,7 @@ public: KWin::WindowInfo* info( WId win ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; enum LayoutTypes { Classical=0, Horizontal, Vertical }; @@ -119,9 +119,9 @@ protected: const TQString lWidth(); const TQString lHeight(); - LayoutTypes m_tqlayoutType; + LayoutTypes m_layoutType; - class TQGridLayout *m_tqlayout; + class TQGridLayout *m_layout; KPopupMenu *m_mnu; TQPopupMenu *m_smnu, *m_dmnu; KAction *m_quit_action; diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am index 7b9c81d9e..d6ec8281a 100644 --- a/kpersonalizer/Makefile.am +++ b/kpersonalizer/Makefile.am @@ -19,12 +19,12 @@ install-data-local: uninstall.desktop SUBDIRS = pics # this 10 paths are KDE specific. Use them: -# kde_htmldir Where your docs should go to. (tqcontains lang subdirs) +# kde_htmldir Where your docs should go to. (contains lang subdirs) # kde_appsdir Where your application file (.kdelnk) should go to. # kde_icondir Where your icon should go to. # kde_minidir Where your mini icon should go to. # kde_datadir Where you install application data. (Use a subdir) -# kde_locale Where translation files should go to.(tqcontains lang subdirs) +# kde_locale Where translation files should go to.(contains lang subdirs) # kde_cgidir Where cgi-bin executables should go to. # kde_confdir Where config files should go to. # kde_mimedir Where mimetypes should go to. diff --git a/kpersonalizer/README b/kpersonalizer/README index 5b404870a..96224a955 100644 --- a/kpersonalizer/README +++ b/kpersonalizer/README @@ -85,7 +85,7 @@ Microsoft Windows (TM): - WindowList-menu on MMB - Walk trough windows mode: KDE - NOT underline IconText -- NOT change pointer tqshape over an icon +- NOT change pointer shape over an icon UNIX (TM): - Single Click @@ -97,7 +97,7 @@ UNIX (TM): - Application-menu on MMB like in FVWM - Walk trough windows mode: CDE - NOT underline IconText -- NOT change pointer tqshape over an icon +- NOT change pointer shape over an icon MacOS: - Single Click @@ -110,7 +110,7 @@ MacOS: - WindowList-menu on MMB - Walk trough windows mode: KDE - NOT underline IconText -- change pointer tqshape over an icon +- change pointer shape over an icon Step 3: Eyecandy-O-Meter =================== diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index bb7b5e6e7..4e30c7363 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -76,7 +76,7 @@ KCountryPage::~KCountryPage(){ void KCountryPage::loadCountryList(KLanguageButton *combo) { - TQString sub = TQString::tqfromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list combo->clear(); @@ -86,8 +86,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString tag = *it; int index; @@ -113,8 +113,8 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(TQString::tqfromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString submenu = '-' + entry.readEntry("Region"); TQString tag = *it; @@ -123,7 +123,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { index = tag.findRev('/'); tag = tag.mid(index+1); - TQPixmap flag( locate( "locale", TQString::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) ); + TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) ); TQIconSet icon( flag ); combo->insertItem( icon, name, tag, submenu ); } @@ -138,7 +138,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) { for ( it = langlist.begin(); it != langlist.end(); ++it ) { if ((*it).isNull()) { combo->insertSeparator(); - submenu = TQString::tqfromLatin1("all"); + submenu = TQString::fromLatin1("all"); combo->insertSubmenu(i18n("All"), submenu, TQString::null); continue; } @@ -151,9 +151,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan kdDebug() << "KCountryPage::save()" << endl; KConfigBase *config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Locale")); - config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true); - config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true); + config->setGroup(TQString::fromLatin1("Locale")); + config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true); + config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true); config->sync(); // only make the system reload the language, if the selected one deferes from the old saved one. @@ -167,7 +167,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan kapp->dcopClient()->attach(); // ksycoca needs to be rebuilt KProcess proc; - proc << TQString::tqfromLatin1("kbuildsycoca"); + proc << TQString::fromLatin1("kbuildsycoca"); proc.start(KProcess::DontCare); kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language @@ -182,13 +182,13 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan void KCountryPage::setLangForCountry(const TQString &country) { KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); - ent.setGroup(TQString::tqfromLatin1("KCM Locale")); - langs = ent.readListEntry(TQString::tqfromLatin1("Languages")); + ent.setGroup(TQString::fromLatin1("KCM Locale")); + langs = ent.readListEntry(TQString::fromLatin1("Languages")); - TQString lang = TQString::tqfromLatin1("en_US"); + TQString lang = TQString::fromLatin1("en_US"); // use the first INSTALLED langauge in the list, or default to C for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { - if (cb_language->tqcontains(*it)) { + if (cb_language->contains(*it)) { lang = *it; break; } diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui index e5ffc93c6..72ab5f5cd 100644 --- a/kpersonalizer/kcountrypagedlg.ui +++ b/kpersonalizer/kcountrypagedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KCountryPageDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -36,7 +36,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -84,7 +84,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -120,7 +120,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -160,7 +160,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -237,6 +237,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui index 67f7f9ad3..4f94df4ed 100644 --- a/kpersonalizer/keyecandypagedlg.ui +++ b/kpersonalizer/keyecandypagedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KEyeCandyPageDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -63,7 +63,7 @@ <string><P>Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. </P> If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -98,7 +98,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -136,7 +136,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <string>Fast Processor (more effects)</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> <property name="hAlign" stdset="0"> @@ -222,7 +222,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>120</height> @@ -258,6 +258,6 @@ If you have a fast, new processor, you might want to turn them all on, but for t <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index 3c3193c95..a23f98322 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -38,14 +38,14 @@ KFindLanguage::KFindLanguage() { m_country = config->readEntry("Country", "C"); if (m_country == "C") { - m_country = TQString::tqfromLatin1(getenv("LANG")); + m_country = TQString::fromLatin1(getenv("LANG")); if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY m_country = "no"; - if(m_country.tqcontains("_")) + if(m_country.contains("_")) m_country = m_country.mid(m_country.find("_")+1); - if(m_country.tqcontains(".")) + if(m_country.contains(".")) m_country = m_country.left(m_country.find(".")); - if(m_country.tqcontains("@")) + if(m_country.contains("@")) m_country = m_country.left(m_country.find("@")); if(m_country != "C") m_country = m_country.lower(); @@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() { } // get the users primary Languages - KSimpleConfig ent(locate("locale", TQString::tqfromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); + KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); ent.setGroup("KCM Locale"); TQStringList langs = ent.readListEntry("Languages"); if (langs.isEmpty()) @@ -96,7 +96,7 @@ KFindLanguage::KFindLanguage() { if (m_oldlang.isEmpty()) { compare = langs.first(); for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) { - if (*it == TQString::tqfromLatin1(getenv("LANG")).mid(3, 2).lower()) + if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower()) compare = *it; } } @@ -112,7 +112,7 @@ KFindLanguage::KFindLanguage() { TQString l = (*it).left((*it).find(";")); if (l == "C") match++; - if(l.tqcontains(compare)) + if(l.contains(compare)) match+=2; if(l.left(compare.length()) == compare) match+=10; diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index f13cdf428..3d92f2f4e 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -134,7 +134,7 @@ void KOSPage::saveCheckState(bool currSettings){ } - /** write the settings for KDE-Behavior (called by saveChecktqStatus) */ + /** write the settings for KDE-Behavior (called by saveCheckStatus) */ void KOSPage::writeKDE(){ kdDebug() << "KOSPage::writeKDE()" << endl; @@ -175,7 +175,7 @@ void KOSPage::writeKDE(){ } - /** write the settings for fvwm-like-behavior (called by saveChecktqStatus) */ + /** write the settings for fvwm-like-behavior (called by saveCheckStatus) */ void KOSPage::writeUNIX(){ kdDebug() << "KOSPage::writeUNIX()" << endl; @@ -216,7 +216,7 @@ void KOSPage::writeUNIX(){ } - /** write the settings for windows-like-behavior (called by saveChecktqStatus) */ + /** write the settings for windows-like-behavior (called by saveCheckStatus) */ void KOSPage::writeWindows(){ kdDebug() << "KOSPage::writeWindows()" << endl; @@ -263,7 +263,7 @@ void KOSPage::writeWindows(){ } - /** write the settings for MacOS-like-behavior (called by saveChecktqStatus) */ + /** write the settings for MacOS-like-behavior (called by saveCheckStatus) */ void KOSPage::writeMacOS(){ kdDebug() << "KOSPage::writeMacOS()" << endl; diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui index f49039db4..e4c5fd4b3 100644 --- a/kpersonalizer/kospagedlg.ui +++ b/kpersonalizer/kospagedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KOSPageDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -136,7 +136,7 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>22</width> <height>10</height> @@ -153,7 +153,7 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>22</width> <height>16</height> @@ -167,7 +167,7 @@ Trinity allows you to customize its behavior according to your needs.</string> <property name="text"> <string>For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -216,6 +216,6 @@ Trinity allows you to customize its behavior according to your needs.</string> <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index 9d7fa2e0a..e28848cc0 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -97,7 +97,7 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name) setPosition(); /* hide the detail-box on eyecandypage. we need to call it from here, to be - able, to call it at last. Else we would run into tqlayout-problems later. */ + able, to call it at last. Else we would run into layout-problems later. */ eyecandy->klv_features->hide(); } @@ -232,11 +232,11 @@ void KPersonalizer::setBeforeSession(){ /** there seems to be a bug in TQWizard, that makes this evil hack necessary */ void KPersonalizer::setPosition() { - TQSize hint = countrypage->tqsizeHint(); - TQSize os_size = ospage->tqsizeHint(); - TQSize candy_size = eyecandy->tqsizeHint(); - TQSize style_size = stylepage->tqsizeHint(); - TQSize refine_size = refinepage->tqsizeHint(); + TQSize hint = countrypage->sizeHint(); + TQSize os_size = ospage->sizeHint(); + TQSize candy_size = eyecandy->sizeHint(); + TQSize style_size = stylepage->sizeHint(); + TQSize refine_size = refinepage->sizeHint(); // get the width of the broadest child-widget if ( hint.width() < os_size.width() ) diff --git a/kpersonalizer/krefinepagedlg.ui b/kpersonalizer/krefinepagedlg.ui index 32c88fd8e..8d5b58357 100644 --- a/kpersonalizer/krefinepagedlg.ui +++ b/kpersonalizer/krefinepagedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KRefinePageDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -32,7 +32,7 @@ <string><h3>Finished</h3> <p>After closing this dialog you can always restart this Wizard by choosing the entry <b>Desktop Settings Wizard</b> from the Settings menu.</p></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -80,7 +80,7 @@ <property name="text"> <string>You can refine the settings you made by starting the Trinity Control Center by choosing the entry <b>Control Center</b> in the K menu.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> @@ -98,7 +98,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -132,7 +132,7 @@ <property name="text"> <string>You can also start the Trinity Control Center using the button below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignCenter</set> </property> </widget> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>16</height> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -244,6 +244,6 @@ <includes> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 7479947b7..1323d94fe 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) { for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) { if (groups[i] == 0L) break; - KGlobal::config()->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons"); + KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); } KGlobal::config()->sync(); @@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() { // go ahead setStyleRecursive( stylePreview, palette, style ); // this flickers, but reliably draws the widgets corretly. - stylePreview->resize( stylePreview->tqsizeHint() ); + stylePreview->resize( stylePreview->sizeHint() ); delete appliedStyle; appliedStyle = style; diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui index 12d80d7a1..e32074ca3 100644 --- a/kpersonalizer/kstylepagedlg.ui +++ b/kpersonalizer/kstylepagedlg.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KStylePageDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -31,7 +31,7 @@ <property name="text"> <string>Please choose the way your computer should look by selecting one of the items below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>170</width> <height>430</height> @@ -123,5 +123,5 @@ <include location="global" impldecl="in declaration">klistview.h</include> <include location="local" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index 297d726c5..20a089b8f 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -57,9 +57,9 @@ void KSysInfo::initXInfo() { // vendor m_xvendor = !dpy ? TQString::null : (TQString)ServerVendor(dpy); // XFree-Inc? - m_xfree_inc = m_xvendor.tqcontains("XFree86"); + m_xfree_inc = m_xvendor.contains("XFree86"); // X.org ? - m_xorg = m_xvendor.tqcontains("X.Org"); + m_xorg = m_xvendor.contains("X.Org"); // release-number m_xrelease = !dpy ? 0 : VendorRelease(dpy); // RENDER-support @@ -106,22 +106,22 @@ void KSysInfo::initFontFamilies() { for (uint i=0; i < families.count(); i++) { TQString font = *families.at(i); //add further NORMAL fonts here - if ( (font.tqcontains("Arial [") || font=="Arial") && normal_priority < 15 ) { + if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; normal_priority = 15; - } else if ( font.tqcontains("Vera Sans") && normal_priority < 12 ) { + } else if ( font.contains("Vera Sans") && normal_priority < 12 ) { m_normal_font = font; normal_priority = 12; - } else if ( (font.tqcontains("Luxi Sans") || font.tqcontains("Lucidux Sans")) && normal_priority < 10 ) { + } else if ( (font.contains("Luxi Sans") || font.contains("Lucidux Sans")) && normal_priority < 10 ) { m_normal_font = font; normal_priority = 10; - } else if ( font.tqcontains("Helmet") && normal_priority < 7 ) { + } else if ( font.contains("Helmet") && normal_priority < 7 ) { m_normal_font = font; normal_priority = 7; - } else if ( font.tqcontains("Nimbus Sans") && normal_priority < 5 ) { + } else if ( font.contains("Nimbus Sans") && normal_priority < 5 ) { m_normal_font = font; normal_priority = 5; - } else if ( font.tqcontains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) { + } else if ( font.contains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) { m_normal_font = font; normal_priority = 3; } else if ( m_fdb->isSmoothlyScalable(font) && !(m_fdb->isFixedPitch(font,"Normal") && m_fdb->isFixedPitch(font,"Bold")) && normal_priority < 2) { @@ -132,16 +132,16 @@ void KSysInfo::initFontFamilies() { normal_priority = 1; } //add further FIXED fonts here - if (font.tqcontains("Courier New") && fixed_priority < 15){ + if (font.contains("Courier New") && fixed_priority < 15){ m_fixed_font = font; fixed_priority = 15; - } else if ( (font.tqcontains("Luxi Mono") || font.tqcontains("Lucidux Mono")) && fixed_priority < 10 ) { + } else if ( (font.contains("Luxi Mono") || font.contains("Lucidux Mono")) && fixed_priority < 10 ) { m_fixed_font = font; fixed_priority = 10; - } else if (font.tqcontains("Andale Mono") && fixed_priority < 5) { + } else if (font.contains("Andale Mono") && fixed_priority < 5) { m_fixed_font = font; fixed_priority = 5; - } else if ( font.tqcontains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) { + } else if ( font.contains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) { m_fixed_font = font; fixed_priority = 3; } else if ( m_fdb->isSmoothlyScalable(font) && m_fdb->isFixedPitch(font,"Normal") && fixed_priority < 2 ) { @@ -205,7 +205,7 @@ TQFont KSysInfo::getFixedWidthFont(){ s1.truncate(s1.find(":")); s1=s1.stripWhiteSpace(); s2=s2.stripWhiteSpace(); - if(s1.tqcontains("MHz")){ + if(s1.contains("MHz")){ float fspeed = s2.toFloat(0); fspeed = floor(fspeed); m_cpu_speed = (int)fspeed; diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui index f3b2ca16b..0f0972b8a 100644 --- a/kpersonalizer/stylepreview.ui +++ b/kpersonalizer/stylepreview.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>StylePreview</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -181,6 +181,6 @@ <slot returnType="bool">eventFilter( QObject * obj, QEvent * ev )</slot> </slots> -<tqlayoutdefaults spacing="3" margin="6"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="3" margin="6"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 586222e48..83d1afe23 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -52,7 +52,7 @@ int main(int argc, char **argv) KConfig *konfig; if (file.isEmpty()) - konfig = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false); + konfig = new KConfig(TQString::fromLatin1("kdeglobals"), false, false); else konfig = new KConfig(file, false, false); diff --git a/kscreensaver/ChangeLog b/kscreensaver/ChangeLog index bc3f31d23..52a485af7 100644 --- a/kscreensaver/ChangeLog +++ b/kscreensaver/ChangeLog @@ -6,8 +6,8 @@ * banner.h, banner.cpp: -added cycling color option -added "show current time" option - -tqreplaced the readEntry()'s with the appropriate read*Entry()'s - * tqreplaced the glocale->translate with i18n in + -replaced the readEntry()'s with the appropriate read*Entry()'s + * replaced the glocale->translate with i18n in attraction.cpp, banner.cpp, bat.cpp, blankscrn.cpp, blob.cpp, bouboule.cpp, flame.cpp, forest.cpp, hop.cpp, laser.cpp, lines.cpp, lissie.cpp, main.cpp, morph3d.cpp, pipes.cpp, polygon.cpp, pyro.cpp, rock.cpp, @@ -43,7 +43,7 @@ Version 0.3.7 -added tqgeometry management to all screensaver setups except kmorph3d (Mario +added geometry management to all screensaver setups except kmorph3d (Mario Weilguni <mweilguni@kde.org>) Version 0.3.6 diff --git a/kscreensaver/blankscrn.cpp b/kscreensaver/blankscrn.cpp index 114bff145..1f57726b2 100644 --- a/kscreensaver/blankscrn.cpp +++ b/kscreensaver/blankscrn.cpp @@ -69,7 +69,7 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) grid->setRowStretch( 2, 10 ); grid->setRowStretch( 3, 20 ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } // read settings from config file diff --git a/kscreensaver/random.cpp b/kscreensaver/random.cpp index 84f4ab419..cd984a145 100644 --- a/kscreensaver/random.cpp +++ b/kscreensaver/random.cpp @@ -160,7 +160,7 @@ int main(int argc, char *argv[]) int howoften = 1; if ( defaults.count() != 0 ) { TQFileInfo fi( tempSaverFileList[i] ); - if ( def_numbers.tqcontains( fi.fileName() ) ) + if ( def_numbers.contains( fi.fileName() ) ) howoften = def_numbers[fi.fileName()]; else howoften = 0; @@ -271,7 +271,7 @@ KRandomSetup::KRandomSetup( TQWidget *parent, const char *name ) manipulateScreen = new TQCheckBox(i18n("Use screen savers that manipulate the screen"), main); grid->addWidget(manipulateScreen, 1, 0); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); KConfig config("krandom.kssrc"); config.setGroup("Settings"); diff --git a/ksmserver/README b/ksmserver/README index 818005c4f..1c74111ae 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -38,7 +38,7 @@ usually restarted when the session is restored. To be *really* sure that this happens, even if the wm might have crashed during the previous session, ksmserver ensures that. The option specifies, which windowmanager shall be launched for sure. But again: if the stored -session tqcontains a window manager, the restored one will be used, not +session contains a window manager, the restored one will be used, not the specified one. As a special feature, ksmserver always starts the specified window manager first, which results in a much nicer startup sequence (less flashy). diff --git a/ksmserver/client.cpp b/ksmserver/client.cpp index b1927890a..2f6708963 100644 --- a/ksmserver/client.cpp +++ b/ksmserver/client.cpp @@ -146,7 +146,7 @@ TQString KSMClient::program() const SmProp* p = property( SmProgram ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::tqfromLatin1( (const char*) p->vals[0].value ); + return TQString::fromLatin1( (const char*) p->vals[0].value ); } TQStringList KSMClient::restartCommand() const @@ -156,7 +156,7 @@ TQStringList KSMClient::restartCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); + result +=TQString::fromLatin1( (const char*) p->vals[i].value ); return result; } @@ -167,7 +167,7 @@ TQStringList KSMClient::discardCommand() const if ( !p || qstrcmp( p->type, SmLISTofARRAY8) || p->num_vals < 1) return result; for ( int i = 0; i < p->num_vals; i++ ) - result +=TQString::tqfromLatin1( (const char*) p->vals[i].value ); + result +=TQString::fromLatin1( (const char*) p->vals[i].value ); return result; } @@ -184,7 +184,7 @@ TQString KSMClient::userId() const SmProp* p = property( SmUserID ); if ( !p || qstrcmp( p->type, SmARRAY8) || p->num_vals < 1) return TQString::null; - return TQString::tqfromLatin1( (const char*) p->vals[0].value ); + return TQString::fromLatin1( (const char*) p->vals[0].value ); } diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index 3d908f6fd..773cd514d 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -103,7 +103,7 @@ void KSMServer::performLegacySessionSave() for ( TQValueList<WId>::ConstIterator it = module.windows().begin(); it != module.windows().end(); ++it) { WId leader = windowWmClientLeader( *it ); - if (!legacyWindows.tqcontains(leader) && windowSessionId( *it, leader ).isEmpty()) { + if (!legacyWindows.contains(leader) && windowSessionId( *it, leader ).isEmpty()) { SMType wtype = SM_WMCOMMAND; int nprotocols = 0; Atom *protocols = 0; @@ -219,8 +219,8 @@ void KSMServer::storeLegacySession( KConfig* config ) int count = 0; for (WindowMap::ConstIterator it = legacyWindows.begin(); it != legacyWindows.end(); ++it) { if ( (*it).type != SM_ERROR) { - if( excludeApps.tqcontains( (*it).wmclass1.lower()) - || excludeApps.tqcontains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") + if( excludeApps.contains( (*it).wmclass1.lower()) + || excludeApps.contains( (*it).wmclass2.lower()) || (*it).wmCommand[0] == "compiz" || (*it).wmCommand[0] == "beryl" || (*it).wmCommand[0] == "aquamarine" || (*it).wmCommand[0] == "beryl-manager" || (*it).wmCommand[0] == "beryl-settings" || (*it).wmCommand[0] == "kde-window-decorator" || (*it).wmCommand[0] == "emerald") continue; if ( !(*it).wmCommand.isEmpty() && !(*it).wmClientMachine.isEmpty() ) { count++; @@ -317,7 +317,7 @@ static TQStringList getQStringListProperty(WId w, Atom prop) if (!data) return result; for (int i=0; i<(int)nitems; i++) { - result << TQString::tqfromLatin1( (const char*)data + i ); + result << TQString::fromLatin1( (const char*)data + i ); while(data[i]) i++; } XFree(data); @@ -365,7 +365,7 @@ TQString KSMServer::windowWmClientMachine(WId w) } } } - return TQString::tqfromLatin1(result); + return TQString::fromLatin1(result); } WId KSMServer::windowWmClientLeader(WId w) diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 797edae96..d41cfc1fa 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -170,7 +170,7 @@ void sanity_check( int argc, char* argv[] ) qmsg.sprintf(msg.data(), path.data()); qmsg = msg_pre+qmsg+msg_post; TQMessageBox::critical(0, "KDE Installation Problem!", - TQString::tqfromLatin1(qmsg.data())); + TQString::fromLatin1(qmsg.data())); exit(255); } } @@ -218,7 +218,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) only_local = false; #endif - KSMServer *server = new KSMServer( TQString::tqfromLatin1(wm), only_local); + KSMServer *server = new KSMServer( TQString::fromLatin1(wm), only_local); kapp->dcopClient()->setDefaultObject( server->objId() ); IceSetIOErrorHandler( IoErrorHandler ); diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index e5fef2f84..d98faf09a 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -154,7 +154,7 @@ static Bool HostBasedAuthProc ( char* /*hostname*/) } -tqStatus KSMRegisterClientProc ( +Status KSMRegisterClientProc ( SmsConn /* smsConn */, SmPointer managerData, char * previousId @@ -297,7 +297,7 @@ void KSMGetPropertiesProc ( } -class KSMListener : public TQSocketNotifier +class KSMListener : public QSocketNotifier { public: KSMListener( IceListenObj obj ) @@ -310,7 +310,7 @@ public: IceListenObj listenObj; }; -class KSMConnection : public TQSocketNotifier +class KSMConnection : public QSocketNotifier { public: KSMConnection( IceConn conn ) @@ -360,7 +360,7 @@ static void write_iceauth (FILE *addfp, FILE *removefp, IceAuthDataEntry *entry) #define MAGIC_COOKIE_LEN 16 -tqStatus SetAuthentication_local (int count, IceListenObj *listenObjs) +Status SetAuthentication_local (int count, IceListenObj *listenObjs) { int i; for (i = 0; i < count; i ++) { @@ -387,7 +387,7 @@ tqStatus SetAuthentication_local (int count, IceListenObj *listenObjs) return 1; } -tqStatus SetAuthentication (int count, IceListenObj *listenObjs, +Status SetAuthentication (int count, IceListenObj *listenObjs, IceAuthDataEntry **authDataEntries) { KTempFile addAuthFile; @@ -532,8 +532,8 @@ void KSMWatchProc ( IceConn iceConn, IcePointer client_data, Bool opening, IcePo } } -static tqStatus KSMNewClientProc ( SmsConn conn, SmPointer manager_data, - unsigned long* tqmask_ret, SmsCallbacks* cb, char** failure_reason_ret) +static Status KSMNewClientProc ( SmsConn conn, SmPointer manager_data, + unsigned long* mask_ret, SmsCallbacks* cb, char** failure_reason_ret) { *failure_reason_ret = 0; @@ -560,7 +560,7 @@ static tqStatus KSMNewClientProc ( SmsConn conn, SmPointer manager_data, cb->get_properties.callback = KSMGetPropertiesProc; cb->get_properties.manager_data = client; - *tqmask_ret = SmsRegisterClientProcMask | + *mask_ret = SmsRegisterClientProcMask | SmsInteractRequestProcMask | SmsInteractDoneProcMask | SmsSaveYourselfRequestProcMask | @@ -632,7 +632,7 @@ KSMServer::KSMServer( const TQString& windowManager, bool _only_local ) TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); int i; while( (i = display.find(':')) >= 0) display[i] = '_'; @@ -697,7 +697,7 @@ void KSMServer::cleanUp() TQCString fName = TQFile::encodeName(locateLocal("socket", "KSMserver")); TQCString display = ::getenv("DISPLAY"); // strip the screen number from the display - display.tqreplace(TQRegExp("\\.[0-9]+$"), ""); + display.replace(TQRegExp("\\.[0-9]+$"), ""); int i; while( (i = display.find(':')) >= 0) display[i] = '_'; @@ -868,7 +868,7 @@ void KSMServer::storeSession() TQStringList restartCommand = c->restartCommand(); if (program.isEmpty() && restartCommand.isEmpty()) continue; - if (excludeApps.tqcontains( program.lower())) + if (excludeApps.contains( program.lower())) continue; count++; @@ -911,7 +911,7 @@ bool KSMServer::isWM( const TQString& program ) const { // KWin relies on ksmserver's special treatment in phase1, // therefore make sure it's recognized even if ksmserver - // was initially started with different WM, and kwin tqreplaced + // was initially started with different WM, and kwin replaced // it later return program == wm || program == "kwin"; } diff --git a/ksmserver/server.h b/ksmserver/server.h index ac6b1fd81..0fc900042 100644 --- a/ksmserver/server.h +++ b/ksmserver/server.h @@ -93,7 +93,7 @@ public: virtual void suspendStartup( TQCString app ); virtual void resumeStartup( TQCString app ); - bool checktqStatus( bool &logoutConfirmed, bool &maysd, + bool checkStatus( bool &logoutConfirmed, bool &maysd, KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype, KApplication::ShutdownMode sdmode ); diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 80521b7b0..a850d40be 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -93,7 +93,7 @@ void KSMServer::logout( int confirm, int sdtype, int sdmode ) (KApplication::ShutdownMode)sdmode ); } -bool KSMServer::checktqStatus( bool &logoutConfirmed, bool &maysd, +bool KSMServer::checkStatus( bool &logoutConfirmed, bool &maysd, KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype, KApplication::ShutdownMode sdmode ) @@ -144,7 +144,7 @@ void KSMServer::shutdownInternal( KApplication::ShutdownConfirm confirm, { bool maysd = false; bool logoutConfirmed = false; - if ( !checktqStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) ) + if ( !checkStatus( logoutConfirmed, maysd, confirm, sdtype, sdmode ) ) return; KConfig *config = KGlobal::config(); diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 44f2612d7..0c7211efd 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -118,7 +118,7 @@ void KSMShutdownFeedback::slotPaintEffect() { m_greyImageCreated = true; setBackgroundMode( TQWidget::NoBackground ); - setGeometry( TQApplication::desktop()->tqgeometry() ); + setGeometry( TQApplication::desktop()->geometry() ); m_root.resize( width(), height() ); // for the default logout m_unfadedImage = m_grayImage.copy(); @@ -274,7 +274,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, TQFrame* frame = new TQFrame( this ); frame->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); - frame->setLineWidth( style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); + frame->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, frame ) ); // we need to set the minimum size for the logout box, since it // gets too small if there isn't all options available frame->setMinimumWidth(400); @@ -301,7 +301,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, vbox->addWidget( label, 0, AlignHCenter ); } - // for the basic tqlayout, within this box either the ubuntu dialog or + // for the basic layout, within this box either the ubuntu dialog or // standard konqy+buttons will be placed. TQHBoxLayout* hbox = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); @@ -315,7 +315,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // first line of buttons hbuttonbox = new TQHBoxLayout( hbox, factor * KDialog::spacingHint() ); - hbuttonbox->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox->setAlignment( Qt::AlignHCenter ); // End session FlatButton* btnLogout = new FlatButton( frame ); btnLogout->setTextLabel( TQString("&") + i18n("Log out"), false ); @@ -335,12 +335,12 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, hbox->addWidget( lfrm, AlignCenter ); buttonlay = new TQVBoxLayout( hbox, factor * KDialog::spacingHint() ); - buttonlay->tqsetAlignment( Qt::AlignHCenter ); + buttonlay->setAlignment( Qt::AlignHCenter ); TQLabel* icon = new TQLabel( lfrm ); icon->setPixmap( UserIcon( "shutdownkonq" ) ); - lfrm->setFixedSize( icon->tqsizeHint()); - icon->setFixedSize( icon->tqsizeHint()); + lfrm->setFixedSize( icon->sizeHint()); + icon->setFixedSize( icon->sizeHint()); buttonlay->addStretch( 1 ); // End session @@ -454,7 +454,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // bottom buttons TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox2->tqsetAlignment( Qt::AlignHCenter ); + hbuttonbox2->setAlignment( Qt::AlignHCenter ); // Reboot FlatButton* btnReboot = new FlatButton( frame ); @@ -479,7 +479,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.tqreplace('&',"&&"); + label=label.replace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else @@ -504,7 +504,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->tqsetAlignment( Qt::AlignRight ); + hbuttonbox3->setAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -544,7 +544,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, for (TQStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index) { TQString label = (*it); - label=label.tqreplace('&',"&&"); + label=label.replace('&',"&&"); if (index == cur) targets->insertItem( label + i18n("current option in boot loader", " (current)"), index); else @@ -591,7 +591,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, { // cancel buttonbox TQHBoxLayout* hbuttonbox3 = new TQHBoxLayout( vbox, factor * KDialog::spacingHint() ); - hbuttonbox3->tqsetAlignment( Qt::AlignRight ); + hbuttonbox3->setAlignment( Qt::AlignRight ); // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); @@ -716,7 +716,7 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sd maysd, sdtype ); // Show dialog (will save the background in showEvent) - TQSize sh = l->tqsizeHint(); + TQSize sh = l->sizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); l->move(rect.x() + (rect.width() - sh.width())/2, @@ -798,7 +798,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( KApplication::ShutdownType sdtype, c adjustSize(); if ( double( height() ) / width() < 0.25 ) { - setFixedHeight( tqRound( width() * 0.3 ) ); + setFixedHeight( qRound( width() * 0.3 ) ); adjustSize(); } TQTimer *timer = new TQTimer( this ); @@ -822,7 +822,7 @@ bool KSMDelayedMessageBox::showTicker( KApplication::ShutdownType sdtype, const { kapp->enableStyles(); KSMDelayedMessageBox msg( sdtype, bootOption, confirmDelay ); - TQSize sh = msg.tqsizeHint(); + TQSize sh = msg.sizeHint(); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); msg.move(rect.x() + (rect.width() - sh.width())/2, diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 57cec37fb..2778b9dd9 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -267,7 +267,7 @@ void KSMServer::tryRestoreNext() if ( wm == config->readEntry( TQString("program")+n ) ) continue; // wm already started if( config->readBoolEntry( TQString( "wasWm" )+n, false )) - continue; // it was wm before, but not now, don't run it (some have --tqreplace in command :( ) + continue; // it was wm before, but not now, don't run it (some have --replace in command :( ) startApplication( restartCommand, config->readEntry( TQString("clientMachine")+n ), config->readEntry( TQString("userId")+n )); @@ -363,14 +363,14 @@ bool KSMServer::checkStartupSuspend() void KSMServer::suspendStartup( TQCString app ) { - if( !startupSuspendCount.tqcontains( app )) + if( !startupSuspendCount.contains( app )) startupSuspendCount[ app ] = 0; ++startupSuspendCount[ app ]; } void KSMServer::resumeStartup( TQCString app ) { - if( !startupSuspendCount.tqcontains( app )) + if( !startupSuspendCount.contains( app )) return; if( --startupSuspendCount[ app ] == 0 ) { startupSuspendCount.remove( app ); diff --git a/ksmserver/timed.ui b/ksmserver/timed.ui index b048463f5..23d7aa2a0 100644 --- a/ksmserver/timed.ui +++ b/ksmserver/timed.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TimedLogoutDlg</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -66,7 +66,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -80,7 +80,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -88,7 +88,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -129,7 +129,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>48</width> <height>48</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>2</height> @@ -160,7 +160,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <vbox> <property name="name"> @@ -192,7 +192,7 @@ <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -215,7 +215,7 @@ after X automatically.</string> <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -229,7 +229,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>0</height> @@ -242,7 +242,7 @@ after X automatically.</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -258,7 +258,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -286,7 +286,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -319,7 +319,7 @@ after X automatically.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -348,5 +348,5 @@ after X automatically.</string> <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index b4c7b0f71..335611a9f 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -99,7 +99,7 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( leftbox, 1 ); mThemesList = new ThemeListBox(this); - mThemesList->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); + mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int))); connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&))); leftbox->addWidget(mThemesList); @@ -120,16 +120,16 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn hbox->setStretchFactor( rightbox, 3 ); mPreview = new TQLabel(this); - mPreview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + mPreview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); mPreview->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); mPreview->setMinimumSize(TQSize(320,240)); - mPreview->tqsetAlignment(Qt::AlignHCenter|Qt::AlignVCenter); + mPreview->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter); rightbox->addWidget(mPreview); rightbox->setStretchFactor( mPreview, 3 ); mText = new TQTextEdit(this); - mText->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); - mText->setMinimumSize(mText->tqsizeHint()); + mText->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ); + mText->setMinimumSize(mText->sizeHint()); mText->setReadOnly(true); rightbox->addWidget(mText); rightbox->setStretchFactor( mText, 1 ); @@ -234,7 +234,7 @@ void SplashInstaller::readThemesList() continue; subdirs = dir.entryList( TQDir::Dirs ); // kdDebug() << "readThemesList: " << subdirs << endl; - // TODO: Make sure it tqcontains a *.rc file. + // TODO: Make sure it contains a *.rc file. for (TQStringList::Iterator l = subdirs.begin(); l != subdirs.end(); l++ ) if ( !(*l).startsWith(TQString(".")) ) { @@ -275,7 +275,7 @@ void SplashInstaller::save() if (cur < 0) return; TQString path = mThemesList->text(cur); - if ( mThemesList->text2path.tqcontains( path ) ) + if ( mThemesList->text2path.contains( path ) ) path = mThemesList->text2path[path]; cur = path.findRev('/'); cnf.writeEntry("Theme", path.mid(cur+1) ); @@ -331,7 +331,7 @@ void SplashInstaller::slotSetTheme(int id) { TQString error = i18n("(Could not load theme)"); path = mThemesList->text(id); - if ( mThemesList->text2path.tqcontains( path ) ) + if ( mThemesList->text2path.contains( path ) ) path = mThemesList->text2path[path]; enabled = false; KURL url; @@ -438,7 +438,7 @@ void SplashInstaller::slotFilesDropped(const KURL::List &urls) //----------------------------------------------------------------------------- int SplashInstaller::findTheme( const TQString &theme ) { - // theme is untranslated, but the listbox tqcontains translated items + // theme is untranslated, but the listbox contains translated items TQString tmp(i18n( theme.utf8() )); int id = mThemesList->count()-1; diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp index bbcd0681d..7b4557608 100644 --- a/ksplashml/kcmksplash/main.cpp +++ b/ksplashml/kcmksplash/main.cpp @@ -69,7 +69,7 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt about->addAuthor("Ravikiran Rajagopal", 0, "ravi@ee.eng.ohio-state.edu"); about->addCredit("Brian Ledbetter", I18N_NOOP("Original KSplash/ML author"), "brian@shadowcom.net"); about->addCredit(I18N_NOOP("KDE Theme Manager authors" ), I18N_NOOP("Original installer code") ); - // Once string freeze is over, tqreplace second argument with "Icon" + // Once string freeze is over, replace second argument with "Icon" about->addCredit("Hans Karlsson", 0, "karlsson.h@home.se" ); setAboutData(about); } diff --git a/ksplashml/pics/themes/default/Theme.rc b/ksplashml/pics/themes/default/Theme.rc index bc5e3fad7..fbae7f956 100644 --- a/ksplashml/pics/themes/default/Theme.rc +++ b/ksplashml/pics/themes/default/Theme.rc @@ -15,5 +15,5 @@ Icons Flashing = true # Show progress bar? Always Show Progress = false -# tqStatus text colour +# Status text colour Label Foreground = #FFFFFF diff --git a/ksplashml/pics/themes/default/locolor/Theme.rc b/ksplashml/pics/themes/default/locolor/Theme.rc index bc5e3fad7..fbae7f956 100644 --- a/ksplashml/pics/themes/default/locolor/Theme.rc +++ b/ksplashml/pics/themes/default/locolor/Theme.rc @@ -15,5 +15,5 @@ Icons Flashing = true # Show progress bar? Always Show Progress = false -# tqStatus text colour +# Status text colour Label Foreground = #FFFFFF diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index f3f1707ab..77274da99 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -164,7 +164,7 @@ void ThemeDefault::_initUi() mProgressBar->setPaletteBackgroundPixmap( blimage ); bottom_label->setFixedWidth( QMAX(blimage.width(),tlimage.width()) ); - bottom_label->setFixedHeight( mLabel->tqsizeHint().height()+4 ); + bottom_label->setFixedHeight( mLabel->sizeHint().height()+4 ); // 3 pixels of whitespace between the label and the progressbar. mLabel->resize( bottom_label->width(), bottom_label->height() ); diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index dfcec5c4d..9aa6d2b26 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -41,7 +41,7 @@ ObjKsTheme::ObjKsTheme( const TQString& theme ) if (desktop->isVirtualDesktop() && mXineramaScreen != -2) { TQRect rect = desktop->screenGeometry( mXineramaScreen ); - if (!rect.tqcontains(TQCursor::pos())) + if (!rect.contains(TQCursor::pos())) TQCursor::setPos(rect.center()); } diff --git a/ksplashml/themeengine/redmond/previewredmond.cpp b/ksplashml/themeengine/redmond/previewredmond.cpp index 1fcf0161f..3bfb80203 100644 --- a/ksplashml/themeengine/redmond/previewredmond.cpp +++ b/ksplashml/themeengine/redmond/previewredmond.cpp @@ -43,7 +43,7 @@ PreviewRedmond::PreviewRedmond( TQWidget* parent ) m_showWelcomeString (true), m_showUserString (true), m_showUserIcon (true), - m_showtqStatusString (true) + m_showStatusString (true) { _updateCache(); } @@ -99,7 +99,7 @@ void PreviewRedmond::_updateCache() if( m_showUserIcon ) p.drawPixmap( rect().width()/2 + 10, rect().height()/2, m_icon ); - if( m_showtqStatusString ) + if( m_showStatusString ) { TQPoint statusTextPos( rect().width()/2 + m_icon.width() + 20, rect().height()/2 + (int)(p.fontMetrics().height()*0.85) + 15 ); diff --git a/ksplashml/themeengine/redmond/previewredmond.h b/ksplashml/themeengine/redmond/previewredmond.h index 253da329a..69bef6b43 100644 --- a/ksplashml/themeengine/redmond/previewredmond.h +++ b/ksplashml/themeengine/redmond/previewredmond.h @@ -98,7 +98,7 @@ protected: TQColor m_welcomeColor, m_welcomeShadowColor, m_userColor, m_statusColor; TQPixmap m_icon; - bool m_showWelcomeString, m_showUserString, m_showUserIcon, m_showtqStatusString; + bool m_showWelcomeString, m_showUserString, m_showUserIcon, m_showStatusString; }; #endif diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 175863f74..5c7118441 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -199,11 +199,11 @@ void ThemeRedmond::_initUi() kdmconfig->setGroup("X-*-Greeter"); TQString userPicsDir = kdmconfig->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/'; TQString fs = kdmconfig->readEntry( "FaceSource" ); - if (fs == TQString::tqfromLatin1("UserOnly")) + if (fs == TQString::fromLatin1("UserOnly")) faceSource = fUserOnly; - else if (fs == TQString::tqfromLatin1("PreferUser")) + else if (fs == TQString::fromLatin1("PreferUser")) faceSource = fUserFirst; - else if (fs == TQString::tqfromLatin1("PreferAdmin")) + else if (fs == TQString::fromLatin1("PreferAdmin")) faceSource = fAdminFirst; else faceSource = fAdminOnly; // Admin Only diff --git a/ksplashml/themeengine/redmond/themeredmond.h b/ksplashml/themeengine/redmond/themeredmond.h index 3ae82031a..6f8cc1550 100644 --- a/ksplashml/themeengine/redmond/themeredmond.h +++ b/ksplashml/themeengine/redmond/themeredmond.h @@ -57,7 +57,7 @@ public slots: if( mText != s ) { mText = s; - tqrepaint( false ); + repaint( false ); } }; diff --git a/ksplashml/themeengine/standard/Preview.png b/ksplashml/themeengine/standard/Preview.png Binary files differindex da08b938e..58603e1e6 100644 --- a/ksplashml/themeengine/standard/Preview.png +++ b/ksplashml/themeengine/standard/Preview.png diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index 0c72b7222..c7e9220e2 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -81,7 +81,7 @@ void ThemeStandard::_initUi() move( rect.x() + (rect.width() - size().width())/2, rect.y() + (rect.height() - size().height())/2 ); - mtqStatus = new WndtqStatus( TQPalette(), mTheme->xineramaScreen(), mSbAtTop, mSbPbVisible, mSbFont, mSbFg, mSbBg, mSbIcon ); + mStatus = new WndStatus( TQPalette(), mTheme->xineramaScreen(), mSbAtTop, mSbPbVisible, mSbFont, mSbFg, mSbBg, mSbIcon ); } void ThemeStandard::showEvent( TQShowEvent * ) @@ -91,8 +91,8 @@ void ThemeStandard::showEvent( TQShowEvent * ) if( mSbVisible ) { - mtqStatus->show(); - mStatusBarHeight = mtqStatus->height(); + mStatus->show(); + mStatusBarHeight = mStatus->height(); } else { @@ -143,22 +143,22 @@ void ThemeStandard::_readSettings() // return; cfg->setGroup( TQString("KSplash Theme: %1").arg(mTheme->theme()) ); - TQString sbpos = cfg->readEntry( "tqStatusbar Position", "Bottom" ).upper(); + TQString sbpos = cfg->readEntry( "Statusbar Position", "Bottom" ).upper(); mSbAtTop = ( sbpos == "TOP" ); - mSbVisible = cfg->readBoolEntry( "tqStatusbar Visible", true); + mSbVisible = cfg->readBoolEntry( "Statusbar Visible", true); mSbPbVisible = cfg->readBoolEntry( "Progress Visible", true); - mSbFontName = cfg->readEntry( "tqStatusbar Font", "Sans Serif" ); - mSbFontSz = cfg->readNumEntry( "tqStatusbar Font Size", 16 ); - mSbFontBold = cfg->readBoolEntry( "tqStatusbar Font Bold", true ); - mSbFontItalic = cfg->readBoolEntry( "tqStatusbar Font Italic", false ); + mSbFontName = cfg->readEntry( "Statusbar Font", "Sans Serif" ); + mSbFontSz = cfg->readNumEntry( "Statusbar Font Size", 16 ); + mSbFontBold = cfg->readBoolEntry( "Statusbar Font Bold", true ); + mSbFontItalic = cfg->readBoolEntry( "Statusbar Font Italic", false ); mSbFont = TQFont( mSbFontName, mSbFontSz, ( mSbFontBold? TQFont::Bold : TQFont::Normal ) ); if( mSbFontItalic ) mSbFont.setItalic( true ); - mSbFg = cfg->readColorEntry( "tqStatusbar Foreground", &Qt::white ); - mSbBg = cfg->readColorEntry( "tqStatusbar Background", &Qt::black ); - mSbIcon = cfg->readEntry( "tqStatusbar Icon", "run" ); + mSbFg = cfg->readColorEntry( "Statusbar Foreground", &Qt::white ); + mSbBg = cfg->readColorEntry( "Statusbar Background", &Qt::black ); + mSbIcon = cfg->readEntry( "Statusbar Icon", "run" ); mIconsVisible = cfg->readBoolEntry( "Icons Visible", true); mIconsJumping = cfg->readBoolEntry( "Icons Jumping", true); mIconPos = (WndIcon::Position)cfg->readNumEntry( "Icon Position", 0 ); diff --git a/ksplashml/themeengine/standard/themestandard.h b/ksplashml/themeengine/standard/themestandard.h index 7bdcc4c1e..2e5d1aeb0 100644 --- a/ksplashml/themeengine/standard/themestandard.h +++ b/ksplashml/themeengine/standard/themestandard.h @@ -50,15 +50,15 @@ public: public slots: inline void slotUpdateProgress( int i ) { - if( mtqStatus ) mtqStatus->slotUpdateProgress( i ); + if( mStatus ) mStatus->slotUpdateProgress( i ); } inline void slotUpdateSteps( int i ) { - if( mtqStatus ) mtqStatus->slotUpdateSteps( i ); + if( mStatus ) mStatus->slotUpdateSteps( i ); } inline void slotSetText( const TQString& s ) { - if( mtqStatus ) mtqStatus->slotSetMessage( s ); + if( mStatus ) mStatus->slotSetMessage( s ); } void slotSetPixmap( const TQString& ); @@ -67,7 +67,7 @@ private: void _readSettings(); void _initUi(); - WndtqStatus *mtqStatus; + WndStatus *mStatus; WndIcon *mIcon, *mPrevIcon; int mIconCount; int mStatusBarHeight; diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 70dda6408..ce153e461 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -43,9 +43,9 @@ WndIcon::WndIcon( bool statusAtTop, bool iconsJumping ) :TQHBox( 0, "wndSplash", WStyle_Customize|WX11BypassWM ), - mtqStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0), + mStatusText(text), mIconPos(icon_position), mXineramaScreen( xineramaScreen ), mPosX(0), mPosY(0), mGroundX(0), mGroundY(0), mVelocity(8.0), mInitialVelocity(8.0), mGravity(0.8), - mIconNum(icon_num), mtqStatusHeight(status_height), mIconSize(icon_std_width), mtqStatusAtTop(statusAtTop), + mIconNum(icon_num), mStatusHeight(status_height), mIconSize(icon_std_width), mStatusAtTop(statusAtTop), mStopJump(false), mIconJumping(iconsJumping) { setFrameStyle( TQFrame::NoFrame ); @@ -53,10 +53,10 @@ WndIcon::WndIcon( TQLabel *w = new TQLabel( this ); w->setFixedSize( pix.width(), pix.height() ); w->setPixmap( pix ); - if(pix.tqmask()) + if(pix.mask()) { - setMask(*pix.tqmask()); - w->setMask(*pix.tqmask()); + setMask(*pix.mask()); + w->setMask(*pix.mask()); } resize( pix.width(), pix.height() ); @@ -77,14 +77,14 @@ WndIcon::WndIcon( void WndIcon::show() { - emit setStatusText( mtqStatusText ); + emit setStatusText( mStatusText ); TQHBox::show(); } // Emit our EXTRA signal without becoming visible. void WndIcon::noshow() { - emit setStatusText( mtqStatusText ); + emit setStatusText( mStatusText ); } /* @@ -102,15 +102,15 @@ TQPoint WndIcon::determinePosition() // KGlobalSettings::splashScreenDesktopGeometry(); cannot be used here. DW = srect.width(); DH = srect.height(); - SBH = mtqStatusHeight; + SBH = mStatusHeight; wid = mIconSize; x = mIconNum; y = 1; - if(mtqStatusAtTop) - topshift = mtqStatusHeight; + if(mStatusAtTop) + topshift = mStatusHeight; else - bottomshift = mtqStatusHeight; + bottomshift = mStatusHeight; // Different starting positions require different positioning // rules. The horizontal rules and the vertical rules can be diff --git a/ksplashml/themeengine/standard/wndicon.h b/ksplashml/themeengine/standard/wndicon.h index d6b907c95..d488f85df 100644 --- a/ksplashml/themeengine/standard/wndicon.h +++ b/ksplashml/themeengine/standard/wndicon.h @@ -58,13 +58,13 @@ private: TQPoint determinePosition(); protected: - TQString mtqStatusText; + TQString mStatusText; Position mIconPos; int mXineramaScreen; int mPosX, mPosY, mGroundX, mGroundY; float mVelocity, mInitialVelocity, mGravity; - int mIconNum, mtqStatusHeight, mIconSize; - bool mtqStatusAtTop, mStopJump, mIconJumping; + int mIconNum, mStatusHeight, mIconSize; + bool mStatusAtTop, mStopJump, mIconJumping; }; #endif diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index f8bc3d964..04685d9cf 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -27,17 +27,17 @@ #include "wndstatus.h" #include "wndstatus.moc" -// WndtqStatus::WndtqStatus(): Display a nifty status bar at +// WndStatus::WndStatus(): Display a nifty status bar at // the bottom of the screen, so the user always knows what's // happening to his system. -WndtqStatus::WndtqStatus( TQPalette /*pal*/, +WndStatus::WndStatus( TQPalette /*pal*/, int xineramaScreen, bool atTop, bool pbVisible, const TQFont& font, const TQColor& fgc, const TQColor & bgc, const TQString& icon ) - :TQHBox( 0, "wndtqStatus", WStyle_Customize|WX11BypassWM ) + :TQHBox( 0, "wndStatus", WStyle_Customize|WX11BypassWM ) { setFrameStyle( TQFrame::NoFrame ); //setPalette( pal ); @@ -83,19 +83,19 @@ WndtqStatus::WndtqStatus( TQPalette /*pal*/, m_progress->hide(); } -void WndtqStatus::slotSetMessage( const TQString& msg ) +void WndStatus::slotSetMessage( const TQString& msg ) { raise(); m_label->setText( msg ); } -void WndtqStatus::slotUpdateProgress( int i ) +void WndStatus::slotUpdateProgress( int i ) { raise(); m_progress->setProgress( i ); } -void WndtqStatus::slotUpdateSteps( int i ) +void WndStatus::slotUpdateSteps( int i ) { m_progress->setTotalSteps( i ); } diff --git a/ksplashml/themeengine/standard/wndstatus.h b/ksplashml/themeengine/standard/wndstatus.h index ddf0f5222..63e253d1d 100644 --- a/ksplashml/themeengine/standard/wndstatus.h +++ b/ksplashml/themeengine/standard/wndstatus.h @@ -24,16 +24,16 @@ class TQLabel; class KProgress; /** @short Window displaying status and progress bar. */ -class WndtqStatus: +class WndStatus: public QHBox { Q_OBJECT public: - WndtqStatus( TQPalette, + WndStatus( TQPalette, int, // Xinerama screen bool, // At top? bool, // Progress indicator visible? - const TQFont&, // tqStatus bar font + const TQFont&, // Status bar font const TQColor&, const TQColor &, // Foreground/Background color const TQString& // Icon ); diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index 0f4ae2720..79e47bfe1 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -87,7 +87,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) { if( !w->isTopLevel()) return; - if( d->mSplashWindows.tqcontains( w->winId())) + if( d->mSplashWindows.contains( w->winId())) return; if( !w->testWFlags( WX11BypassWM )) { // All toplevel widgets should be probably required to be WX11BypassWM diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h index b931d7c75..c1fa4ae45 100644 --- a/ksplashml/wndmain.h +++ b/ksplashml/wndmain.h @@ -31,7 +31,7 @@ typedef struct TQString ItemText; } Action; -class WndtqStatus; +class WndStatus; class ObjKsTheme; class ThemeEngine; class KConfig; diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 3c0f61c1d..f3be8e607 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -41,7 +41,7 @@ static bool iconify = false; static bool toSysTray = false; static bool fullscreen = false; static unsigned long state = 0; -static unsigned long tqmask = 0; +static unsigned long mask = 0; static NET::WindowType windowtype = NET::Unknown; static KWinModule* kwinmodule; @@ -87,8 +87,8 @@ void KStart::sendRule() { if( windowclass ) message += "wmclass=" + windowclass + "\nwmclassmatch=1\n" // 1 = exact match + "wmclasscomplete=" - // if windowclass tqcontains a space (i.e. 2 words, use whole WM_CLASS) - + ( windowclass.tqcontains( ' ' ) ? "true" : "false" ) + "\n"; + // if windowclass contains a space (i.e. 2 words, use whole WM_CLASS) + + ( windowclass.contains( ' ' ) ? "true" : "false" ) + "\n"; if( windowtitle || windowclass ) { // always ignore these window types message += "types=" + TQCString().setNum( -1U & @@ -153,7 +153,7 @@ void KStart::windowAdded(WId w){ XClassHint hint; if( !XGetClassHint( qt_xdisplay(), w, &hint )) return; - TQCString cls = windowclass.tqcontains( ' ' ) + TQCString cls = windowclass.contains( ' ' ) ? TQCString( hint.res_name ) + ' ' + hint.res_class : TQCString( hint.res_class ); cls = cls.lower(); XFree( hint.res_name ); @@ -185,7 +185,7 @@ static bool wstate_withdrawn( WId winid ) &length, &after, &data ); bool withdrawn = TRUE; if ( r == Success && data && format == 32 ) { - TQ_UINT32 *wstate = (TQ_UINT32*)data; + Q_UINT32 *wstate = (Q_UINT32*)data; withdrawn = (*wstate == WithdrawnState ); XFree( (char *)data ); } @@ -225,7 +225,7 @@ void KStart::applyStyle(WId w ) { } if ( state ) - info.setState( state, tqmask ); + info.setState( state, mask ); if ( toSysTray ) { TQApplication::beep(); @@ -233,7 +233,7 @@ void KStart::applyStyle(WId w ) { } if ( fullscreen ) { - TQRect r = TQApplication::desktop()->tqgeometry(); + TQRect r = TQApplication::desktop()->geometry(); XMoveResizeWindow( qt_xdisplay(), w, r.x(), r.y(), r.width(), r.height() ); } @@ -351,35 +351,35 @@ int main( int argc, char *argv[] ) if ( args->isSet( "keepabove" ) ) { state |= NET::KeepAbove; - tqmask |= NET::KeepAbove; + mask |= NET::KeepAbove; } else if ( args->isSet( "keepbelow" ) ) { state |= NET::KeepBelow; - tqmask |= NET::KeepBelow; + mask |= NET::KeepBelow; } if ( args->isSet( "skiptaskbar" ) ) { state |= NET::SkipTaskbar; - tqmask |= NET::SkipTaskbar; + mask |= NET::SkipTaskbar; } if ( args->isSet( "skippager" ) ) { state |= NET::SkipPager; - tqmask |= NET::SkipPager; + mask |= NET::SkipPager; } activate = args->isSet("activate"); if ( args->isSet("maximize") ) { state |= NET::Max; - tqmask |= NET::Max; + mask |= NET::Max; } if ( args->isSet("maximize-vertically") ) { state |= NET::MaxVert; - tqmask |= NET::MaxVert; + mask |= NET::MaxVert; } if ( args->isSet("maximize-horizontally") ) { state |= NET::MaxHoriz; - tqmask |= NET::MaxHoriz; + mask |= NET::MaxHoriz; } iconify = args->isSet("iconify"); @@ -388,7 +388,7 @@ int main( int argc, char *argv[] ) NETRootInfo i( qt_xdisplay(), NET::Supported ); if( i.isSupported( NET::FullScreen )) { state |= NET::FullScreen; - tqmask |= NET::FullScreen; + mask |= NET::FullScreen; } else { windowtype = NET::Override; fullscreen = true; diff --git a/ksysguard/Makefile.in.temp b/ksysguard/Makefile.in.temp index fbf54fb7b..b8e021dc2 100644 --- a/ksysguard/Makefile.in.temp +++ b/ksysguard/Makefile.in.temp @@ -23,7 +23,7 @@ bindir = @bindir@ all_includes = @all_includes@ all_libraries = @all_libraries@ -TQMOC = @TQMOC@ +MOC = @MOC@ XGETTEXT = @XGETTEXT@ CXX = @CXX@ LDFLAGS = @LDFLAGS@ @@ -48,11 +48,11 @@ LDFLAGS += $(all_libraries) $(CXX) $(CXXFLAGS) $(DEFS) $(INCLUDES) -c $< OBJECTS = hexfile.o hexwidget.o -SRCTQMOCS = hexwidget.moc hexfile.moc +SRCMOCS = hexwidget.moc hexfile.moc all: $(TARGET) -$(TARGET): $(SRCTQMOCS) $(OBJECTS) +$(TARGET): $(SRCMOCS) $(OBJECTS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) # recreate the Makefile @@ -89,11 +89,11 @@ clean: -rm -f $(TARGET) $(OBJECTS) *~ core distclean: clean - -rm -f Makefile $(SRCTQMOCS) + -rm -f Makefile $(SRCMOCS) -# add a dependcy for all tqmoc files to help some FreeBSD users ;) +# add a dependcy for all moc files to help some FreeBSD users ;) hexwidget.moc: hexwidget.h - $(TQMOC) hexwidget.h -o hexwidget.moc + $(MOC) hexwidget.h -o hexwidget.moc hexfile.moc: hexfile.h - $(TQMOC) hexfile.h -o hexfile.moc + $(MOC) hexfile.h -o hexfile.moc diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cc index 5aef8a26f..5160dbddb 100644 --- a/ksysguard/gui/KSGAppletSettings.cc +++ b/ksysguard/gui/KSGAppletSettings.cc @@ -65,7 +65,7 @@ KSGAppletSettings::KSGAppletSettings( TQWidget *parent, const char *name ) topLayout->addWidget( mInterval, 2, 1 ); label->setBuddy( mInterval ); - resize( TQSize( 250, 130 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 250, 130 ).expandedTo( minimumSizeHint() ) ); KAcceleratorManager::manage( page ); } diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cc index 4d0d3a0c7..245600cb6 100644 --- a/ksysguard/gui/KSysGuardApplet.cc +++ b/ksysguard/gui/KSysGuardApplet.cc @@ -110,7 +110,7 @@ int KSysGuardApplet::heightForWidth( int width ) const void KSysGuardApplet::resizeEvent( TQResizeEvent* ) { - tqlayout(); + layout(); } void KSysGuardApplet::preferences() @@ -154,7 +154,7 @@ void KSysGuardApplet::sensorDisplayModified( bool modified ) save(); } -void KSysGuardApplet::tqlayout() +void KSysGuardApplet::layout() { if ( orientation() == Horizontal ) { int h = height(); @@ -230,7 +230,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) if ( wdg ) { delete mDockList[ dock ]; mDockList[ dock ] = wdg; - tqlayout(); + layout(); connect( wdg, TQT_SIGNAL( modified( bool ) ), TQT_SLOT( sensorDisplayModified( bool ) ) ); @@ -242,7 +242,7 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) i18n( "The KSysGuard applet does not support displaying of " "this type of sensor. Please choose another sensor." ) ); - tqlayout(); + layout(); } } @@ -487,7 +487,7 @@ void KSysGuardApplet::addEmptyDisplay( TQWidget **dock, uint pos ) TQToolTip::add( dock[ pos ], i18n( "Drag sensors from the KDE System Guard into this cell." ) ); - tqlayout(); + layout(); if ( isVisible() ) dock[ pos ]->show(); } diff --git a/ksysguard/gui/KSysGuardApplet.h b/ksysguard/gui/KSysGuardApplet.h index b4608631e..43027b05c 100644 --- a/ksysguard/gui/KSysGuardApplet.h +++ b/ksysguard/gui/KSysGuardApplet.h @@ -66,7 +66,7 @@ class KSysGuardApplet : public KPanelApplet, public KSGRD::SensorBoard void preferencesFinished(); private: - void tqlayout(); + void layout(); void resizeDocks( uint newDockCount ); void addEmptyDisplay( TQWidget **dock, uint pos ); diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cc index 63e217660..1e51a5631 100644 --- a/ksysguard/gui/SensorBrowser.cc +++ b/ksysguard/gui/SensorBrowser.cc @@ -225,13 +225,13 @@ void SensorBrowser::answerReceived( int id, const TQString &answer ) parent = lvi; // The child indicator might need to be updated. - tqrepaintItem( parent ); + repaintItem( parent ); } else parent = sibling; } } - tqrepaintItem( (*it)->listViewItem() ); + repaintItem( (*it)->listViewItem() ); } void SensorBrowser::viewportMouseMoveEvent( TQMouseEvent *e ) diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cc index 8c6ed7910..8d2b5e302 100644 --- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc +++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cc @@ -52,7 +52,7 @@ BarGraph::BarGraph( TQWidget *parent, const char *name ) // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); } @@ -111,7 +111,7 @@ void BarGraph::paintEvent( TQPaintEvent* ) /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( tqcolorGroup().light() ) ); + p.setPen( TQColor( colorGroup().light() ) ); p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cc index e2b3917f5..3917fc86b 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cc @@ -53,7 +53,7 @@ DancingBars::DancingBars( TQWidget *parent, const char *name, const TQString &ti else mPlotter = new BarGraph( frame() ); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ @@ -147,7 +147,7 @@ void DancingBars::applySettings() removeSensor( i ); } - tqrepaint(); + repaint(); setModified( true ); } @@ -158,7 +158,7 @@ void DancingBars::applyStyle() mPlotter->backgroundColor = KSGRD::Style->backgroundColor(); mPlotter->fontSize = KSGRD::Style->fontSize(); - tqrepaint(); + repaint(); setModified( true ); } @@ -231,12 +231,12 @@ void DancingBars::resizeEvent( TQResizeEvent* ) frame()->setGeometry( 0, 0, width(), height() ); } -TQSize DancingBars::tqsizeHint() +TQSize DancingBars::sizeHint() { if ( noFrame() ) - return ( mPlotter->tqsizeHint() ); + return ( mPlotter->sizeHint() ); else - return ( frame()->tqsizeHint() ); + return ( frame()->sizeHint() ); } void DancingBars::answerReceived( int id, const TQString &answer ) diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.h b/ksysguard/gui/SensorDisplayLib/DancingBars.h index 35feaa07f..3ccc03f86 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.h +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.h @@ -54,7 +54,7 @@ class DancingBars : public KSGRD::SensorDisplay void updateSamples( const TQMemArray<double> &samples ); - virtual TQSize tqsizeHint(); + virtual TQSize sizeHint(); virtual void answerReceived( int id, const TQString &answer ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc index 1a1476d8a..1b97cc25f 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc @@ -48,7 +48,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQGridLayout *pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 1 ); + TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 1, 1 ); mTitle = new KLineEdit( groupBox ); TQWhatsThis::add( mTitle, i18n( "Enter the title of the display here." ) ); @@ -57,7 +57,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Display Range" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 5 ); + boxLayout = new TQGridLayout( groupBox->layout(), 1, 5 ); boxLayout->setColStretch( 2, 1 ); TQLabel *label = new TQLabel( i18n( "Minimum value:" ), groupBox ); @@ -85,7 +85,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Minimum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseLowerLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); @@ -103,7 +103,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Alarm for Maximum Value" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 1, 4 ); + boxLayout = new TQGridLayout( groupBox->layout(), 1, 4 ); boxLayout->setColStretch( 1, 1 ); mUseUpperLimit = new TQCheckBox( i18n( "Enable alarm" ), groupBox ); @@ -167,7 +167,7 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) mSensorView->addColumn( i18n( "Sensor" ) ); mSensorView->addColumn( i18n( "Label" ) ); mSensorView->addColumn( i18n( "Unit" ) ); - mSensorView->addColumn( i18n( "tqStatus" ) ); + mSensorView->addColumn( i18n( "Status" ) ); mSensorView->setAllColumnsShowFocus( true ); pageLayout->addMultiCellWidget( mSensorView, 0, 2, 0, 0 ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc index 912a85e42..0434877bb 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc @@ -52,7 +52,7 @@ FancyPlotter::FancyPlotter( TQWidget* parent, const char* name, mPlotter->setTitle( title ); mPlotter->setThinFrame(!isApplet); //if we aren't an applet, draw a thin white frame on the left and bottom, for a 3d effect - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); /* All RMB clicks to the mPlotter widget will be handled by * SensorDisplay::eventFilter. */ @@ -182,7 +182,7 @@ void FancyPlotter::applySettings() for ( uint i = 0; i < sensors().count(); ++i ) mPlotter->beamColors()[ i ] = TQColor( list[i][ 5 ] ); - mPlotter->tqrepaint(); + mPlotter->repaint(); setModified( true ); } @@ -281,12 +281,12 @@ void FancyPlotter::resizeEvent( TQResizeEvent* ) frame()->setGeometry( 0, 0, width(), height() ); } -TQSize FancyPlotter::tqsizeHint() +TQSize FancyPlotter::sizeHint() { if ( noFrame() ) - return mPlotter->tqsizeHint(); + return mPlotter->sizeHint(); else - return frame()->tqsizeHint(); + return frame()->sizeHint(); } void FancyPlotter::answerReceived( int id, const TQString &answer ) diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h index 00d88223a..2f0e36c60 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.h +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.h @@ -66,7 +66,7 @@ class FancyPlotter : public KSGRD::SensorDisplay bool removeSensor( uint pos ); - virtual TQSize tqsizeHint(void); + virtual TQSize sizeHint(void); virtual void answerReceived( int id, const TQString &answer ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc index 0609a139c..de345e7b8 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc @@ -79,7 +79,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 2, 1, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Vertical Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 2, 1 ); mUseAutoRange = new TQCheckBox( i18n( "Automatic range detection" ), groupBox ); @@ -90,7 +90,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) boxLayout->addWidget( label, 1, 0 ); mMinValue = new KLineEdit( groupBox ); - mMinValue->tqsetAlignment( AlignRight ); + mMinValue->setAlignment( AlignRight ); mMinValue->setEnabled( false ); TQWhatsThis::add( mMinValue, i18n( "Enter the minimum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMinValue, 1, 1 ); @@ -100,7 +100,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) boxLayout->addWidget( label, 1, 3 ); mMaxValue = new KLineEdit( groupBox ); - mMaxValue->tqsetAlignment( AlignRight ); + mMaxValue->setAlignment( AlignRight ); mMaxValue->setEnabled( false ); TQWhatsThis::add( mMaxValue, i18n( "Enter the maximum value for the display here. If both values are 0, automatic range detection is enabled." ) ); boxLayout->addWidget( mMaxValue, 1, 4 ); @@ -109,7 +109,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 0, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Horizontal Scale" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 2, 2, spacingHint() ); boxLayout->setRowStretch( 1, 1 ); mHorizontalScale = new KIntNumInput( 1, groupBox ); @@ -127,7 +127,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout = new TQGridLayout( page, 3, 2, 0, spacingHint() ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Lines" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 2, 5, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowVerticalLines = new TQCheckBox( i18n( "Vertical lines" ), groupBox ); @@ -166,7 +166,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addMultiCellWidget( groupBox, 0, 0, 0, 1 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Text" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 3, 4, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 3, 4, spacingHint() ); boxLayout->setColStretch( 1, 1 ); mShowLabels = new TQCheckBox( i18n( "Labels" ), groupBox ); @@ -191,7 +191,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) pageLayout->addWidget( groupBox, 1, 0 ); groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Colors" ), page ); - boxLayout = new TQGridLayout( groupBox->tqlayout(), 4, 2, spacingHint() ); + boxLayout = new TQGridLayout( groupBox->layout(), 4, 2, spacingHint() ); label = new TQLabel( i18n( "Vertical lines:" ), groupBox ); boxLayout->addWidget( label, 0, 0 ); @@ -231,7 +231,7 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) mSensorView->addColumn( i18n( "Host" ) ); mSensorView->addColumn( i18n( "Sensor" ) ); mSensorView->addColumn( i18n( "Unit" ) ); - mSensorView->addColumn( i18n( "tqStatus" ) ); + mSensorView->addColumn( i18n( "Status" ) ); mSensorView->setResizeMode(TQListView::LastColumn); mSensorView->header()->setResizeEnabled(false, 0); mSensorView->hideColumn(0); @@ -532,7 +532,7 @@ TQValueList< TQStringList > FancyPlotterSettings::sensors() const entry << it.current()->text( 3 ); entry << it.current()->text( 4 ); QRgb rgb = it.current()->pixmap( 2 )->convertToImage().pixel( 1, 1 ); - TQColor color( tqRed( rgb ), tqGreen( rgb ), tqBlue( rgb ) ); + TQColor color( qRed( rgb ), qGreen( rgb ), qBlue( rgb ) ); entry << ( color.name() ); list.prepend( entry ); @@ -549,7 +549,7 @@ void FancyPlotterSettings::editSensor() return; TQColor color = lvi->pixmap( 2 )->convertToImage().pixel( 1, 1 ); - int result = KColorDialog::getColor( color, tqparentWidget() ); + int result = KColorDialog::getColor( color, parentWidget() ); if ( result == KColorDialog::Accepted ) { TQPixmap newPm( 12, 12 ); newPm.fill( color ); diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cc index cd14bccfb..c980196e6 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cc +++ b/ksysguard/gui/SensorDisplayLib/ListView.cc @@ -105,7 +105,7 @@ int PrivateListViewItem::compare( TQListViewItem *item, int col, bool ascending PrivateListView::PrivateListView(TQWidget *parent, const char *name) : TQListView(parent, name) { - TQColorGroup cg = tqcolorGroup(); + TQColorGroup cg = colorGroup(); cg.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); cg.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); @@ -251,7 +251,7 @@ ListView::answerReceived(int id, const TQString& answer) switch (id) { case 100: { - /* We have received the answer to a '?' command that tqcontains + /* We have received the answer to a '?' command that contains * the information about the table headers. */ KSGRD::SensorTokenizer lines(answer, '\n'); if (lines.count() != 2) @@ -290,12 +290,12 @@ ListView::restoreSettings(TQDomElement& element) { addSensor(element.attribute("hostName"), element.attribute("sensorName"), (element.attribute("sensorType").isEmpty() ? "listview" : element.attribute("sensorType")), element.attribute("title")); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); - tqcolorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); - tqcolorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, restoreColor(element, "gridColor", KSGRD::Style->firstForegroundColor())); + colorGroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", KSGRD::Style->secondForegroundColor())); + colorGroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", KSGRD::Style->backgroundColor())); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); SensorDisplay::restoreSettings(element); @@ -311,10 +311,10 @@ ListView::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) element.setAttribute("sensorName", sensors().at(0)->name()); element.setAttribute("sensorType", sensors().at(0)->type()); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - saveColor(element, "gridColor", tqcolorGroup.color(TQColorGroup::Link)); - saveColor(element, "textColor", tqcolorGroup.color(TQColorGroup::Text)); - saveColor(element, "backgroundColor", tqcolorGroup.color(TQColorGroup::Base)); + TQColorGroup colorGroup = monitor->colorGroup(); + saveColor(element, "gridColor", colorGroup.color(TQColorGroup::Link)); + saveColor(element, "textColor", colorGroup.color(TQColorGroup::Text)); + saveColor(element, "backgroundColor", colorGroup.color(TQColorGroup::Base)); SensorDisplay::saveSettings(doc, element); @@ -331,10 +331,10 @@ ListView::configureSettings() Q_CHECK_PTR(lvs); connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - lvs->setGridColor(tqcolorGroup.color(TQColorGroup::Link)); - lvs->setTextColor(tqcolorGroup.color(TQColorGroup::Text)); - lvs->setBackgroundColor(tqcolorGroup.color(TQColorGroup::Base)); + TQColorGroup colorGroup = monitor->colorGroup(); + lvs->setGridColor(colorGroup.color(TQColorGroup::Link)); + lvs->setTextColor(colorGroup.color(TQColorGroup::Text)); + lvs->setBackgroundColor(colorGroup.color(TQColorGroup::Base)); lvs->setTitle(title()); if (lvs->exec()) @@ -347,11 +347,11 @@ ListView::configureSettings() void ListView::applySettings() { - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); - tqcolorGroup.setColor(TQColorGroup::Text, lvs->textColor()); - tqcolorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, lvs->gridColor()); + colorGroup.setColor(TQColorGroup::Text, lvs->textColor()); + colorGroup.setColor(TQColorGroup::Base, lvs->backgroundColor()); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); setTitle(lvs->title()); @@ -361,11 +361,11 @@ ListView::applySettings() void ListView::applyStyle() { - TQColorGroup tqcolorGroup = monitor->tqcolorGroup(); - tqcolorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); - tqcolorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); - tqcolorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); - monitor->setPalette(TQPalette(tqcolorGroup, tqcolorGroup, tqcolorGroup)); + TQColorGroup colorGroup = monitor->colorGroup(); + colorGroup.setColor(TQColorGroup::Link, KSGRD::Style->firstForegroundColor()); + colorGroup.setColor(TQColorGroup::Text, KSGRD::Style->secondForegroundColor()); + colorGroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); + monitor->setPalette(TQPalette(colorGroup, colorGroup, colorGroup)); setModified(true); } diff --git a/ksysguard/gui/SensorDisplayLib/ListView.h b/ksysguard/gui/SensorDisplayLib/ListView.h index 61d59e101..1c63d95cb 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.h +++ b/ksysguard/gui/SensorDisplayLib/ListView.h @@ -57,9 +57,9 @@ class PrivateListViewItem : public QListViewItem public: PrivateListViewItem(PrivateListView *parent = 0); - void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int tqalignment) { - TQColorGroup cgroup = _parent->tqcolorGroup(); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + void paintCell(TQPainter *p, const TQColorGroup &, int column, int width, int alignment) { + TQColorGroup cgroup = _parent->colorGroup(); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); p->setPen(cgroup.color(TQColorGroup::Link)); p->drawLine(0, height() - 1, width - 1, height() - 1); } diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui index 8e3bd6bff..f61f30dd7 100644 --- a/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/ListViewSettingsWidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ListViewSettingsWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -55,7 +55,7 @@ <property name="title"> <string>Colors</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -68,7 +68,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -102,7 +102,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -173,6 +173,6 @@ <function specifier="non virtual">setTextColor( const QColor & c )</function> <function specifier="non virtual">setGridColor( const QColor & c )</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cc index ac3170ff3..7de7899ab 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cc +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cc @@ -79,7 +79,7 @@ LogFile::addSensor(const TQString& hostName, const TQString& sensorName, const T void LogFile::configureSettings(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); lfs = new LogFileSettings(this); Q_CHECK_PTR(lfs); @@ -147,7 +147,7 @@ void LogFile::settingsRuleListSelected(int index) void LogFile::applySettings(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, lfs->fgColor->color()); cgroup.setColor(TQColorGroup::Base, lfs->bgColor->color()); @@ -166,7 +166,7 @@ void LogFile::applySettings(void) void LogFile::applyStyle() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -179,7 +179,7 @@ bool LogFile::restoreSettings(TQDomElement& element) { TQFont font; - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -212,8 +212,8 @@ LogFile::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) element.setAttribute("font", monitor->font().toString()); - saveColor(element, "textColor", monitor->tqcolorGroup().text()); - saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); + saveColor(element, "textColor", monitor->colorGroup().text()); + saveColor(element, "backgroundColor", monitor->colorGroup().base()); for (TQStringList::Iterator it = filterRules.begin(); it != filterRules.end(); it++) diff --git a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui index 8a021af46..b5dcff0ee 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui +++ b/ksysguard/gui/SensorDisplayLib/LogFileSettings.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>LogFileSettings</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -72,7 +72,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -106,7 +106,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -264,7 +264,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -313,7 +313,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -340,6 +340,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc index 3a54aefd3..8a9cc9b60 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cc @@ -53,7 +53,7 @@ MultiMeter::MultiMeter(TQWidget* parent, const char* name, Q_CHECK_PTR(lcd); lcd->setSegmentStyle(TQLCDNumber::Filled); setDigitColor(KSGRD::Style->backgroundColor()); - lcd->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, + lcd->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, false)); setBackgroundColor(KSGRD::Style->backgroundColor()); @@ -225,7 +225,7 @@ MultiMeter::applySettings() alarmDigitColor = mms->alarmDigitColor(); setBackgroundColor(mms->meterBackgroundColor()); - tqrepaint(); + repaint(); setModified(true); } @@ -234,7 +234,7 @@ MultiMeter::applyStyle() { normalDigitColor = KSGRD::Style->firstForegroundColor(); setBackgroundColor(KSGRD::Style->backgroundColor()); - tqrepaint(); + repaint(); setModified(true); } diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui index 9cc904ca1..7ecdef88f 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettingsWidget.ui @@ -5,7 +5,7 @@ <property name="name"> <cstring>MultiMeterSettingsWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -96,7 +96,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -121,7 +121,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -162,7 +162,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -187,7 +187,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -211,7 +211,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -245,7 +245,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -334,14 +334,14 @@ <slot access="public" specifier="">update()</slot> <slot access="public" specifier="">update(int,int,int,int)</slot> <slot access="public" specifier="">update(const QRect&)</slot> - <slot access="public" specifier="">tqrepaint()</slot> - <slot access="public" specifier="">tqrepaint(bool)</slot> - <slot access="public" specifier="">tqrepaint(int,int,int,int)</slot> - <slot access="public" specifier="">tqrepaint(int,int,int,int,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&)</slot> - <slot access="public" specifier="">tqrepaint(const QRect&,bool)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&)</slot> - <slot access="public" specifier="">tqrepaint(const QRegion&,bool)</slot> + <slot access="public" specifier="">repaint()</slot> + <slot access="public" specifier="">repaint(bool)</slot> + <slot access="public" specifier="">repaint(int,int,int,int)</slot> + <slot access="public" specifier="">repaint(int,int,int,int,bool)</slot> + <slot access="public" specifier="">repaint(const QRect&)</slot> + <slot access="public" specifier="">repaint(const QRect&,bool)</slot> + <slot access="public" specifier="">repaint(const QRegion&)</slot> + <slot access="public" specifier="">repaint(const QRegion&,bool)</slot> <slot access="public" specifier="">show()</slot> <slot access="public" specifier="">hide()</slot> <slot access="public" specifier="">setShown(bool)</slot> @@ -375,10 +375,10 @@ <slot access="protected" specifier="">chooseColor()</slot> <property type="CString">name</property> <property type="Bool">enabled</property> - <property type="Rect">tqgeometry</property> + <property type="Rect">geometry</property> <property type="SizePolicy">sizePolicy</property> - <property type="Size">tqminimumSize</property> - <property type="Size">tqmaximumSize</property> + <property type="Size">minimumSize</property> + <property type="Size">maximumSize</property> <property type="Size">sizeIncrement</property> <property type="Size">baseSize</property> <property type="Color">paletteForegroundColor</property> @@ -467,8 +467,8 @@ <function specifier="non virtual">setNormalDigitColor( const QColor & c )</function> <function specifier="non virtual">setAlarmDigitColor( const QColor & c )</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index ba607b7fe..f02b02af9 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cc @@ -56,7 +56,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T dict.insert("PPID", new TQString(i18n("PPID"))); dict.insert("UID", new TQString(i18n("UID"))); dict.insert("GID", new TQString(i18n("GID"))); - dict.insert("tqStatus", new TQString(i18n("tqStatus"))); + dict.insert("Status", new TQString(i18n("Status"))); dict.insert("User%", new TQString(i18n("User%"))); dict.insert("System%", new TQString(i18n("System%"))); dict.insert("Nice", new TQString(i18n("Nice"))); @@ -65,7 +65,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T dict.insert("Login", new TQString(i18n("Login"))); dict.insert("Command", new TQString(i18n("Command"))); - // Setup the tqgeometry management. + // Setup the geometry management. gm = new TQVBoxLayout(this, 10); Q_CHECK_PTR(gm); gm->addSpacing(15); @@ -98,11 +98,11 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T cbFilter->insertItem(i18n("System Processes"), 1); cbFilter->insertItem(i18n("User Processes"), 2); cbFilter->insertItem(i18n("Own Processes"), 3); - cbFilter->setMinimumSize(cbFilter->tqsizeHint()); + cbFilter->setMinimumSize(cbFilter->sizeHint()); // Create the check box to switch between tree view and list view. xbTreeView = new TQCheckBox(i18n("&Tree"), this, "xbTreeView"); Q_CHECK_PTR(xbTreeView); - xbTreeView->setMinimumSize(xbTreeView->tqsizeHint()); + xbTreeView->setMinimumSize(xbTreeView->sizeHint()); connect(xbTreeView, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setTreeView(bool))); @@ -116,13 +116,13 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), this, "bRefresh" ); Q_CHECK_PTR(bRefresh); - bRefresh->setMinimumSize(bRefresh->tqsizeHint()); + bRefresh->setMinimumSize(bRefresh->sizeHint()); connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); // Create the 'Kill' button. bKill = new KPushButton(i18n("&Kill"), this, "bKill"); Q_CHECK_PTR(bKill); - bKill->setMinimumSize(bKill->tqsizeHint()); + bKill->setMinimumSize(bKill->sizeHint()); connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); /* Disable the kill button until we know that the daemon supports the * kill command. */ @@ -147,7 +147,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T setPlotterWidget(pList); - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); fixTabOrder(); } @@ -247,7 +247,7 @@ ProcessController::killProcess() KDialogBase *dlg = new KDialogBase ( i18n ("Kill Process"), KDialogBase::Yes | KDialogBase::Cancel, - KDialogBase::Yes, KDialogBase::Cancel, this->tqparentWidget(), + KDialogBase::Yes, KDialogBase::Cancel, this->parentWidget(), "killconfirmation", true, true, KGuiItem(i18n("Kill"))); @@ -298,7 +298,7 @@ ProcessController::answerReceived(int id, const TQString& answer) { case 1: { - /* We have received the answer to a ps? command that tqcontains + /* We have received the answer to a ps? command that contains * the information about the table headers. */ KSGRD::SensorTokenizer lines(answer, '\n'); if (lines.count() != 2) @@ -325,7 +325,7 @@ ProcessController::answerReceived(int id, const TQString& answer) break; } case 2: - /* We have received the answer to a ps command that tqcontains a + /* We have received the answer to a ps command that contains a * list of processes with various additional information. */ pList->update(answer); pListSearchLine->searchLine()->updateSearch(); //re-apply the filter diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h index f1b623780..4e2bba034 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h @@ -44,7 +44,7 @@ extern KApplication* Kapp; /** * This widget implements a process list page. Besides the process - * list which is implemented as a ProcessList, it tqcontains two + * list which is implemented as a ProcessList, it contains two * comboxes and two buttons. The combo boxes are used to set the * update rate and the process filter. The buttons are used to force * an immediate update and to kill a process. diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cc index 1a0dd5ee5..2f5b3fe51 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cc @@ -611,7 +611,7 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli) pix = KGlobal::iconLoader()->loadIcon(name, KIcon::Small, KIcon::SizeSmall, KIcon::DefaultState, 0L, true); - if (pix.isNull() || !pix.tqmask()) + if (pix.isNull() || !pix.mask()) pix = KGlobal::iconLoader()->loadIcon("unknownapp", KIcon::User, KIcon::SizeSmall); @@ -634,9 +634,9 @@ ProcessList::addProcess(KSGRD::SensorPSLine* p, ProcessLVI* pli) { icon.fill(); bitBlt(&icon, 4, 0, &pix, 0, 0, pix.width(), pix.height()); - TQBitmap tqmask(24, 16, true); - bitBlt(&tqmask, 4, 0, pix.tqmask(), 0, 0, pix.width(), pix.height()); - icon.setMask(tqmask); + TQBitmap mask(24, 16, true); + bitBlt(&mask, 4, 0, pix.mask(), 0, 0, pix.width(), pix.height()); + icon.setMask(mask); pix = icon; } iconCache.insert(name, new TQPixmap(pix)); @@ -909,7 +909,7 @@ ProcessList::selectAllItems(bool select) for ( ; it.current(); ++it ) { it.current()->setSelected(select); - tqrepaintItem(it.current()); + repaintItem(it.current()); if (select) selectedPIds.append(it.current()->text(1).toInt()); } @@ -928,7 +928,7 @@ ProcessList::selectAllChilds(int pid, bool select) { int currPId = it.current()->text(1).toInt(); it.current()->setSelected(select); - tqrepaintItem(it.current()); + repaintItem(it.current()); if (select) selectedPIds.append(currPId); else diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.h b/ksysguard/gui/SensorDisplayLib/ProcessList.h index 07c3aca20..370fe23fd 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.h @@ -106,7 +106,7 @@ public: /** * The udpate function can be used to update the displayed process * list. A current list of processes is requested from the OS. In - * case the list tqcontains invalid or corrupted info, FALSE is + * case the list contains invalid or corrupted info, FALSE is * returned. */ bool update(const TQString& list); diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc index 8ba9129d0..dfd535883 100644 --- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc +++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc @@ -43,12 +43,12 @@ ReniceDlg::ReniceDlg(TQWidget* parent, const char* name, int currentPPrio, "the number is the higher the priority.\n\n" "Please enter the desired nice level:").arg(pid); message = new TQLabel(msg, page); - message->setMinimumSize(message->tqsizeHint()); + message->setMinimumSize(message->sizeHint()); vLay->addWidget(message); /* * Create a slider with an LCD display to the right using a horizontal - * tqlayout. The slider and the LCD are kept in sync through signals + * layout. The slider and the LCD are kept in sync through signals */ input = new KIntNumInput(currentPPrio, page, 10); input->setRange(-20, 19); diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index a2bc6bb7a..c80ad65ee 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc @@ -66,7 +66,7 @@ SensorDisplay::SensorDisplay( TQWidget *parent, const char *name, if(!nf) { mFrame = new TQGroupBox( 2, Qt::Vertical, "", this, "displayFrame"); mFrame->setFlat(true); - mFrame->tqsetAlignment(Qt::AlignHCenter); + mFrame->setAlignment(Qt::AlignHCenter); mFrame->setInsideMargin(2); setTitle( title ); @@ -124,7 +124,7 @@ void SensorDisplay::configureUpdateInterval() if ( dlg.useGlobalUpdate() ) { mUseGlobalUpdateInterval = true; - SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() ); + SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() ); if ( !sb ) { kdDebug(1215) << "dynamic cast lacks" << endl; setUpdateInterval( 2 ); @@ -247,7 +247,7 @@ void SensorDisplay::updateWhatsThis() void SensorDisplay::hosts( TQStringList& list ) { for ( SensorProperties *s = mSensors.first(); s; s = mSensors.next() ) - if ( !list.tqcontains( s->hostName() ) ) + if ( !list.contains( s->hostName() ) ) list.append( s->hostName() ); } @@ -344,7 +344,7 @@ bool SensorDisplay::restoreSettings( TQDomElement &element ) } else { mUseGlobalUpdateInterval = true; - SensorBoard* sb = dynamic_cast<SensorBoard*>( tqparentWidget() ); + SensorBoard* sb = dynamic_cast<SensorBoard*>( parentWidget() ); if ( !sb ) { kdDebug(1215) << "dynamic cast lacks" << endl; setUpdateInterval( 2 ); @@ -447,8 +447,8 @@ void SensorDisplay::setSensorOk( bool ok ) mErrorIndicator = new TQWidget( mPlotterWdg ); mErrorIndicator->setErasePixmap( errorIcon ); mErrorIndicator->resize( errorIcon.size() ); - if ( errorIcon.tqmask() ) - mErrorIndicator->setMask( *errorIcon.tqmask() ); + if ( errorIcon.mask() ) + mErrorIndicator->setMask( *errorIcon.mask() ); mErrorIndicator->move( 0, 0 ); mErrorIndicator->show(); } @@ -463,7 +463,7 @@ void SensorDisplay::setTitle( const TQString &title ) } /* Changing the frame title may increase the width of the frame and - * hence breaks the tqlayout. To avoid this, we save the original size + * hence breaks the layout. To avoid this, we save the original size * and restore it after we have set the frame title. */ TQSize s = mFrame->size(); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc index 362f518e2..383bf525e 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc @@ -50,7 +50,7 @@ LogSensor::LogSensor(TQListView *parent) pixmap_waiting = UserIcon( "waiting" ); lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->tqcolorGroup().text()); + lvi->setTextColor(monitor->colorGroup().text()); monitor->insertItem(lvi); } @@ -72,8 +72,8 @@ void LogSensor::stopLogging(void) { lvi->setPixmap(0, pixmap_waiting); - lvi->setTextColor(monitor->tqcolorGroup().text()); - lvi->tqrepaint(); + lvi->setTextColor(monitor->colorGroup().text()); + lvi->repaint(); timerOff(); } @@ -104,21 +104,21 @@ LogSensor::answerReceived(int id, const TQString& answer) { timerOff(); lowerLimitActive = false; - lvi->setTextColor(monitor->tqcolorGroup().foreground()); - lvi->tqrepaint(); + lvi->setTextColor(monitor->colorGroup().foreground()); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached lower limit").arg(sensorName).arg(hostName)); timerOn(); } else if (upperLimitActive && value > upperLimit) { timerOff(); upperLimitActive = false; - lvi->setTextColor(monitor->tqcolorGroup().foreground()); - lvi->tqrepaint(); + lvi->setTextColor(monitor->colorGroup().foreground()); + lvi->repaint(); KNotifyClient::event(monitor->winId(), "sensor_alarm", TQString("sensor '%1' at '%2' reached upper limit").arg(sensorName).arg(hostName)); timerOn(); } - TQDate date = TQDateTime::tqcurrentDateTime().date(); - TQTime time = TQDateTime::tqcurrentDateTime().time(); + TQDate date = TQDateTime::currentDateTime().date(); + TQTime time = TQDateTime::currentDateTime().time(); stream << TQString("%1 %2 %3 %4 %5: %6\n").arg(date.shortMonthName(date.month())).arg(date.day()).arg(time.toString()).arg(hostName).arg(sensorName).arg(value); } @@ -139,7 +139,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t monitor->addColumn(i18n("Host Name")); monitor->addColumn(i18n("Log File")); - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); cgroup.setColor(TQColorGroup::Foreground, KSGRD::Style->alarmColor()); @@ -232,7 +232,7 @@ SensorLogger::editSensor(LogSensor* sensor) void SensorLogger::configureSettings() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); Q_CHECK_PTR(sls); @@ -254,7 +254,7 @@ SensorLogger::configureSettings() void SensorLogger::applySettings() { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); setTitle(sls->title()); @@ -269,7 +269,7 @@ SensorLogger::applySettings() void SensorLogger::applyStyle(void) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, KSGRD::Style->firstForegroundColor()); cgroup.setColor(TQColorGroup::Base, KSGRD::Style->backgroundColor()); @@ -282,7 +282,7 @@ SensorLogger::applyStyle(void) bool SensorLogger::restoreSettings(TQDomElement& element) { - TQColorGroup cgroup = monitor->tqcolorGroup(); + TQColorGroup cgroup = monitor->colorGroup(); cgroup.setColor(TQColorGroup::Text, restoreColor(element, "textColor", Qt::green)); cgroup.setColor(TQColorGroup::Base, restoreColor(element, "backgroundColor", Qt::black)); @@ -319,9 +319,9 @@ SensorLogger::restoreSettings(TQDomElement& element) bool SensorLogger::saveSettings(TQDomDocument& doc, TQDomElement& element, bool save) { - saveColor(element, "textColor", monitor->tqcolorGroup().text()); - saveColor(element, "backgroundColor", monitor->tqcolorGroup().base()); - saveColor(element, "alarmColor", monitor->tqcolorGroup().foreground()); + saveColor(element, "textColor", monitor->colorGroup().text()); + saveColor(element, "backgroundColor", monitor->colorGroup().base()); + saveColor(element, "alarmColor", monitor->colorGroup().foreground()); for (LogSensor* sensor = logSensors.first(); sensor != 0; sensor = logSensors.next()) { diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.h b/ksysguard/gui/SensorDisplayLib/SensorLogger.h index c134da005..018e36bf9 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.h +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.h @@ -44,10 +44,10 @@ public: void setTextColor(const TQColor& color) { textColor = color; } - void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { + void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) { TQColorGroup cgroup(cg); cgroup.setColor(TQColorGroup::Text, textColor); - TQListViewItem::paintCell(p, cgroup, column, width, tqalignment); + TQListViewItem::paintCell(p, cgroup, column, width, alignment); } diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui index a281bb84b..26d3b2d49 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlgWidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SensorLoggerDlgWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -127,7 +127,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -193,7 +193,7 @@ <property name="enabled"> <bool>false</bool> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -251,8 +251,8 @@ <function specifier="non virtual">setUpperLimit( double d )</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui index 849062674..c86e671b2 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui +++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettingsWidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>SensorLoggerSettingsWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -61,7 +61,7 @@ <property name="title"> <string>Colors</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -77,7 +77,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <vbox> <property name="name"> @@ -111,7 +111,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <vbox> <property name="name"> @@ -175,6 +175,6 @@ <function specifier="non virtual">setBackgroundColor( const QColor & c )</function> <function specifier="non virtual">setAlarmColor( const QColor & c )</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc index 835f072b2..3d4d9c6f6 100644 --- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc +++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc @@ -50,7 +50,7 @@ SignalPlotter::SignalPlotter( TQWidget *parent, const char *name ) // Anything smaller than this does not make sense. setMinimumSize( 16, 16 ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding, false ) ); mShowVerticalLines = true; @@ -390,7 +390,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) uint w = width(); uint h = height(); - /* Do not do tqrepaints when the widget is not yet setup properly. */ + /* Do not do repaints when the widget is not yet setup properly. */ if ( w <= 2 ) return; @@ -401,7 +401,7 @@ void SignalPlotter::paintEvent( TQPaintEvent* ) pm.fill( mBackgroundColor ); /* Draw white line along the bottom and the right side of the * widget to create a 3D like look. */ - p.setPen( TQColor( tqcolorGroup().light() ) ); + p.setPen( TQColor( colorGroup().light() ) ); if(mShowThinFrame) { p.drawLine( 0, h - 1, w - 1, h - 1 ); p.drawLine( w - 1, 0, w - 1, h - 1 ); diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cc index c7cac3127..8d53edb6b 100644 --- a/ksysguard/gui/WorkSheet.cc +++ b/ksysguard/gui/WorkSheet.cc @@ -73,7 +73,7 @@ WorkSheet::WorkSheet( uint rows, uint columns, uint interval, TQWidget* parent, // Initialize worksheet with dummy displays. for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) - tqreplaceDisplay( r, c ); + replaceDisplay( r, c ); mGridLayout->activate(); @@ -159,14 +159,14 @@ bool WorkSheet::load( const TQString &fileName ) return false; } - tqreplaceDisplay( row, column, element ); + replaceDisplay( row, column, element ); } // Fill empty cells with dummy displays for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) if ( !mDisplayList[ r ][ c ] ) - tqreplaceDisplay( r, c ); + replaceDisplay( r, c ); setModified( false ); @@ -276,7 +276,7 @@ void WorkSheet::paste() } TQDomElement element = doc.documentElement(); - tqreplaceDisplay( row, column, element ); + replaceDisplay( row, column, element ); } void WorkSheet::setFileName( const TQString &fileName ) @@ -319,7 +319,7 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const TQString &hostName, } /* If the by 'row' and 'column' specified display is a TQGroupBox dummy - * display we tqreplace the widget. Otherwise we just try to add + * display we replace the widget. Otherwise we just try to add * the new sensor to an existing display. */ if ( mDisplayList[ row ][ column ]->isA( "DummyDisplay" ) ) { KSGRD::SensorDisplay* newDisplay = 0; @@ -362,7 +362,7 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const TQString &hostName, return 0; } - tqreplaceDisplay( row, column, newDisplay ); + replaceDisplay( row, column, newDisplay ); } mDisplayList[ row ][ column ]->addSensor( hostName, sensorName, sensorType, sensorDescr ); @@ -447,17 +447,17 @@ void WorkSheet::dropEvent( TQDropEvent *e ) } /* Find the sensor display that is supposed to get the drop - * event and tqreplace or add sensor. */ + * event and replace or add sensor. */ for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) - if ( mDisplayList[ r ][ c ]->tqgeometry().tqcontains( e->pos() ) ) { + if ( mDisplayList[ r ][ c ]->geometry().contains( e->pos() ) ) { addDisplay( hostName, sensorName, sensorType, sensorDescr, r, c ); return; } } } -TQSize WorkSheet::tqsizeHint() const +TQSize WorkSheet::sizeHint() const { return TQSize( 200,150 ); } @@ -471,7 +471,7 @@ void WorkSheet::customEvent( TQCustomEvent *e ) } } -bool WorkSheet::tqreplaceDisplay( uint row, uint column, TQDomElement& element ) +bool WorkSheet::replaceDisplay( uint row, uint column, TQDomElement& element ) { TQString classType = element.attribute( "class" ); KSGRD::SensorDisplay* newDisplay; @@ -501,12 +501,12 @@ bool WorkSheet::tqreplaceDisplay( uint row, uint column, TQDomElement& element ) if ( !newDisplay->restoreSettings( element ) ) return false; - tqreplaceDisplay( row, column, newDisplay ); + replaceDisplay( row, column, newDisplay ); return true; } -void WorkSheet::tqreplaceDisplay( uint row, uint column, KSGRD::SensorDisplay* newDisplay ) +void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* newDisplay ) { // remove the old display at this location delete mDisplayList[ row ][ column ]; @@ -531,7 +531,7 @@ void WorkSheet::tqreplaceDisplay( uint row, uint column, KSGRD::SensorDisplay* n mDisplayList[ row ][ column ]->show(); } - setMinimumSize(tqsizeHint()); + setMinimumSize(sizeHint()); setModified( true ); } @@ -544,7 +544,7 @@ void WorkSheet::removeDisplay( KSGRD::SensorDisplay *display ) for ( uint r = 0; r < mRows; ++r ) for ( uint c = 0; c < mColumns; ++c ) if ( mDisplayList[ r ][ c ] == display ) { - tqreplaceDisplay( r, c ); + replaceDisplay( r, c ); setModified( true ); return; } @@ -563,7 +563,7 @@ void WorkSheet::createGrid( uint rows, uint columns ) mRows = rows; mColumns = columns; - // create grid tqlayout with specified dimentions + // create grid layout with specified dimentions mGridLayout = new TQGridLayout( this, mRows, mColumns, 5 ); mDisplayList = new KSGRD::SensorDisplay**[ mRows ]; @@ -612,7 +612,7 @@ void WorkSheet::resizeGrid( uint newRows, uint newColumns ) for ( r = 0; r < newRows; ++r ) for ( c = 0; c < newColumns; ++c ) if ( r >= mRows || c >= mColumns ) - tqreplaceDisplay( r, c ); + replaceDisplay( r, c ); /* set stretch factors for new rows and columns (if any) */ for ( r = mRows; r < newRows; ++r ) diff --git a/ksysguard/gui/WorkSheet.h b/ksysguard/gui/WorkSheet.h index 3f8e84575..37bafbda3 100644 --- a/ksysguard/gui/WorkSheet.h +++ b/ksysguard/gui/WorkSheet.h @@ -36,10 +36,10 @@ class TQString; class TQStringList; /** - A WorkSheet tqcontains the displays to visualize the sensor results. When + A WorkSheet contains the displays to visualize the sensor results. When creating the WorkSheet you must specify the number of columns. Displays - can be added and removed on the fly. The grid tqlayout will handle the - tqlayout. The number of columns can not be changed. Displays are added by + can be added and removed on the fly. The grid layout will handle the + layout. The number of columns can not be changed. Displays are added by dragging a sensor from the sensor browser over the WorkSheet. */ class WorkSheet : public TQWidget, public KSGRD::SensorBoard @@ -90,7 +90,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard void titleChanged( TQWidget *sheet ); protected: - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; void dragEnterEvent( TQDragEnterEvent* ); void dropEvent( TQDropEvent* ); void customEvent( TQCustomEvent* ); @@ -98,9 +98,9 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard private: void removeDisplay( KSGRD::SensorDisplay *display ); - bool tqreplaceDisplay( uint row, uint column, TQDomElement& element ); + bool replaceDisplay( uint row, uint column, TQDomElement& element ); - void tqreplaceDisplay( uint row, uint column, + void replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* display = 0 ); void collectHosts( TQStringList &list ); @@ -127,7 +127,7 @@ class WorkSheet : public TQWidget, public KSGRD::SensorBoard /** This two dimensional array stores the pointers to the sensor displays or if no sensor is present at a position a pointer to a dummy widget. - The size of the array corresponds to the size of the grid tqlayout. + The size of the array corresponds to the size of the grid layout. */ KSGRD::SensorDisplay*** mDisplayList; }; diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cc index aaa0c77b2..3e4c28e50 100644 --- a/ksysguard/gui/WorkSheetSettings.cc +++ b/ksysguard/gui/WorkSheetSettings.cc @@ -46,11 +46,11 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) TQVBoxLayout *topLayout = new TQVBoxLayout( page, 0, spacingHint() ); TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, i18n( "Title" ), page ); - group->tqlayout()->setMargin( marginHint() ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setMargin( marginHint() ); + group->layout()->setSpacing( spacingHint() ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 1, 1 ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 1, 1 ); + groupLayout->setAlignment( Qt::AlignTop ); mSheetTitle = new KLineEdit( group ); groupLayout->addWidget( mSheetTitle, 0, 0 ); @@ -58,11 +58,11 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) topLayout->addWidget( group ); group = new TQGroupBox( 0, Qt::Vertical, i18n( "Properties" ), page ); - group->tqlayout()->setMargin( marginHint() ); - group->tqlayout()->setSpacing( spacingHint() ); + group->layout()->setMargin( marginHint() ); + group->layout()->setSpacing( spacingHint() ); - groupLayout = new TQGridLayout( group->tqlayout(), 3, 2 ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout = new TQGridLayout( group->layout(), 3, 2 ); + groupLayout->setAlignment( Qt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Rows:" ), group ); groupLayout->addWidget( label, 0, 0 ); @@ -103,7 +103,7 @@ WorkSheetSettings::WorkSheetSettings( TQWidget* parent, const char* name ) mSheetTitle->setFocus(); - resize( TQSize( 250, 230 ).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize( 250, 230 ).expandedTo( minimumSizeHint() ) ); } WorkSheetSettings::~WorkSheetSettings() diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cc index 54b756f49..3c1a92a56 100644 --- a/ksysguard/gui/Workspace.cc +++ b/ksysguard/gui/Workspace.cc @@ -162,7 +162,7 @@ bool Workspace::saveOnQuit() if ( (*it)->modified() ) { if ( !mAutoSave || (*it)->fileName().isEmpty() ) { int res = KMessageBox::warningYesNoCancel( this, - i18n( "The worksheet '%1' tqcontains unsaved data.\n" + i18n( "The worksheet '%1' contains unsaved data.\n" "Do you want to save the worksheet?") .arg( tabLabel( *it ) ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); if ( res == KMessageBox::Yes ) @@ -302,7 +302,7 @@ void Workspace::deleteWorkSheet() if ( current->modified() ) { if ( !mAutoSave || current->fileName().isEmpty() ) { int res = KMessageBox::warningYesNoCancel( this, - i18n( "The worksheet '%1' tqcontains unsaved data.\n" + i18n( "The worksheet '%1' contains unsaved data.\n" "Do you want to save the worksheet?" ) .arg( tabLabel( current ) ), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); if ( res == KMessageBox::Cancel ) diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index 0b4536f41..3885a9518 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -38,30 +38,30 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) parent, name, true, true ) { TQFrame *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, 0, spacingHint() ); - tqlayout->setColStretch( 1, 1 ); + TQGridLayout *layout = new TQGridLayout( page, 2, 2, 0, spacingHint() ); + layout->setColStretch( 1, 1 ); TQLabel *label = new TQLabel( i18n( "Host:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mHostNames = new KComboBox( true, page ); mHostNames->setMaxCount( 20 ); mHostNames->setInsertionPolicy( TQComboBox::AtTop ); mHostNames->setAutoCompletion( true ); mHostNames->setDuplicatesEnabled( false ); - tqlayout->addWidget( mHostNames, 0, 1 ); + layout->addWidget( mHostNames, 0, 1 ); label->setBuddy( mHostNames ); TQWhatsThis::add( mHostNames, i18n( "Enter the name of the host you want to connect to." ) ); mHostNameLabel = new TQLabel( page ); mHostNameLabel->hide(); - tqlayout->addWidget( mHostNameLabel, 0, 1 ); + layout->addWidget( mHostNameLabel, 0, 1 ); TQButtonGroup *group = new TQButtonGroup( 0, Qt::Vertical, i18n( "Connection Type" ), page ); - TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 4, 4, + TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 4, 4, spacingHint() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->setAlignment( Qt::AlignTop ); mUseSsh = new TQRadioButton( i18n( "ssh" ), group ); mUseSsh->setEnabled( true ); @@ -109,7 +109,7 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) label = new TQLabel( i18n( "e.g. ssh -l root remote.host.org ksysguardd" ), group ); groupLayout->addMultiCellWidget( label, 3, 3, 2, 3 ); - tqlayout->addMultiCellWidget( group, 1, 1, 0, 1 ); + layout->addMultiCellWidget( group, 1, 1, 0, 1 ); connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ), mCommands, TQT_SLOT( setEnabled( bool ) ) ); diff --git a/ksysguard/gui/ksgrd/SensorClient.h b/ksysguard/gui/ksgrd/SensorClient.h index e2831ebf3..d4e286cb1 100644 --- a/ksysguard/gui/ksgrd/SensorClient.h +++ b/ksysguard/gui/ksgrd/SensorClient.h @@ -103,7 +103,7 @@ class SensorTokenizer }; /** - An integer info tqcontains 4 fields seperated by TABS, a description + An integer info contains 4 fields seperated by TABS, a description (name), the minimum and the maximum values and the unit. e.g. Swap Memory 0 133885952 KB */ @@ -137,7 +137,7 @@ class SensorIntegerInfo : public SensorTokenizer }; /** - An float info tqcontains 4 fields seperated by TABS, a description + An float info contains 4 fields seperated by TABS, a description (name), the minimum and the maximum values and the unit. e.g. CPU Voltage 0.0 5.0 V */ diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cc index 03d911464..6c7faf771 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cc +++ b/ksysguard/gui/ksgrd/StyleSettings.cc @@ -42,55 +42,55 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name ) Cancel, Ok, parent, name, true, true ) { TQFrame *page = addPage( i18n( "Display Style" ) ); - TQGridLayout *tqlayout = new TQGridLayout( page, 6, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 6, 2, 0, spacingHint() ); TQLabel *label = new TQLabel( i18n( "First foreground color:" ), page ); - tqlayout->addWidget( label, 0, 0 ); + layout->addWidget( label, 0, 0 ); mFirstForegroundColor = new KColorButton( page ); - tqlayout->addWidget( mFirstForegroundColor, 0, 1 ); + layout->addWidget( mFirstForegroundColor, 0, 1 ); label->setBuddy( mFirstForegroundColor ); label = new TQLabel( i18n( "Second foreground color:" ), page ); - tqlayout->addWidget( label, 1, 0 ); + layout->addWidget( label, 1, 0 ); mSecondForegroundColor = new KColorButton( page ); - tqlayout->addWidget( mSecondForegroundColor, 1, 1 ); + layout->addWidget( mSecondForegroundColor, 1, 1 ); label->setBuddy( mSecondForegroundColor ); label = new TQLabel( i18n( "Alarm color:" ), page ); - tqlayout->addWidget( label, 2, 0 ); + layout->addWidget( label, 2, 0 ); mAlarmColor = new KColorButton( page ); - tqlayout->addWidget( mAlarmColor, 2, 1 ); + layout->addWidget( mAlarmColor, 2, 1 ); label->setBuddy( mAlarmColor ); label = new TQLabel( i18n( "Background color:" ), page ); - tqlayout->addWidget( label, 3, 0 ); + layout->addWidget( label, 3, 0 ); mBackgroundColor = new KColorButton( page ); - tqlayout->addWidget( mBackgroundColor, 3, 1 ); + layout->addWidget( mBackgroundColor, 3, 1 ); label->setBuddy( mBackgroundColor ); label = new TQLabel( i18n( "Font size:" ), page ); - tqlayout->addWidget( label, 4, 0 ); + layout->addWidget( label, 4, 0 ); mFontSize = new TQSpinBox( 7, 48, 1, page ); mFontSize->setValue( 8 ); - tqlayout->addWidget( mFontSize, 4, 1 ); + layout->addWidget( mFontSize, 4, 1 ); label->setBuddy( mFontSize ); - tqlayout->setRowStretch( 5, 1 ); + layout->setRowStretch( 5, 1 ); page = addPage( i18n( "Sensor Colors" ) ); - tqlayout = new TQGridLayout( page, 1, 2, 0, spacingHint() ); + layout = new TQGridLayout( page, 1, 2, 0, spacingHint() ); mColorListBox = new TQListBox( page ); - tqlayout->addWidget( mColorListBox, 0, 0 ); + layout->addWidget( mColorListBox, 0, 0 ); mEditColorButton = new TQPushButton( i18n( "Change Color..." ), page ); mEditColorButton->setEnabled( false ); - tqlayout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop ); + layout->addWidget( mEditColorButton, 0, 1, Qt::AlignTop ); connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cc index f52b2e2d8..5e1d8d8b2 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.cc +++ b/ksysguard/gui/ksgrd/TimerSettings.cc @@ -38,18 +38,18 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name ) { TQFrame *page = plainPage(); - TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, 0, spacingHint() ); + TQGridLayout *layout = new TQGridLayout( page, 2, 2, 0, spacingHint() ); mUseGlobalUpdate = new TQCheckBox( i18n( "Use update interval of worksheet" ), page ); - tqlayout->addMultiCellWidget( mUseGlobalUpdate, 0, 0, 0, 1 ); + layout->addMultiCellWidget( mUseGlobalUpdate, 0, 0, 0, 1 ); mLabel = new TQLabel( i18n( "Update interval:" ), page ); - tqlayout->addWidget( mLabel, 1, 0 ); + layout->addWidget( mLabel, 1, 0 ); mInterval = new TQSpinBox( 1, 300, 1, page ); mInterval->setValue( 2 ); mInterval->setSuffix( i18n( " sec" ) ); - tqlayout->addWidget( mInterval, 1, 1 ); + layout->addWidget( mInterval, 1, 1 ); mLabel->setBuddy( mInterval ); TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) ); diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 0deeec4a2..2be851232 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -140,7 +140,7 @@ TopLevel::TopLevel( const char *name ) new KAction( i18n( "Configure &Style..." ), "colorize", 0, this, TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); - // TODO remove resize and fix so tqsizeHints() determines default size. + // TODO remove resize and fix so sizeHints() determines default size. if (!initialGeometrySet()) resize( 640, 480 ); setupGUI(ToolBar | Keys | StatusBar | Create); diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index f8e8c15c6..f41e6afb1 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -116,7 +116,7 @@ typedef unsigned long CARD32; class DCOPClientTransaction { public: - TQ_INT32 id; + Q_INT32 id; CARD32 key; TQCString senderId; }; diff --git a/ksysguard/ksysguardd/FreeBSD/ProcessList.c b/ksysguard/ksysguardd/FreeBSD/ProcessList.c index ecd8ce4a6..f8d2c3ba6 100644 --- a/ksysguard/ksysguardd/FreeBSD/ProcessList.c +++ b/ksysguard/ksysguardd/FreeBSD/ProcessList.c @@ -405,7 +405,7 @@ updateProcessList(void) void printProcessListInfo(const char* cmd) { - fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\ttqStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); + fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); fprintf(CurrentClient, "s\td\td\td\td\tS\tf\tf\td\tD\tD\ts\ts\n"); } diff --git a/ksysguard/ksysguardd/Irix/ProcessList.c b/ksysguard/ksysguardd/Irix/ProcessList.c index 1575e0153..523d87d26 100644 --- a/ksysguard/ksysguardd/Irix/ProcessList.c +++ b/ksysguard/ksysguardd/Irix/ProcessList.c @@ -317,7 +317,7 @@ int updateProcessList( void ) { } void printProcessListInfo( const char *cmd ) { - fprintf(CurrentClient, "Name\tPID\tPPID\tGID\ttqStatus\tUser" + fprintf(CurrentClient, "Name\tPID\tPPID\tGID\tStatus\tUser" "\tSize\tResident\t%% CPU\tPriority\tCommand\n" ); fprintf(CurrentClient, "s\td\td\td\ts\ts\tD\tD\tf\td\ts\n" ); } diff --git a/ksysguard/ksysguardd/Linux/Memory.c b/ksysguard/ksysguardd/Linux/Memory.c index ba69a9fb6..93c8d9edb 100644 --- a/ksysguard/ksysguardd/Linux/Memory.c +++ b/ksysguard/ksysguardd/Linux/Memory.c @@ -103,7 +103,7 @@ int updateMemory( void ) { /** The amount of total and used memory is read from the /proc/meminfo. - It also tqcontains the information about the swap space. + It also contains the information about the swap space. The 'file' looks like this: MemTotal: 516560 kB diff --git a/ksysguard/ksysguardd/Linux/ProcessList.c b/ksysguard/ksysguardd/Linux/ProcessList.c index 069e931b1..e9e8c1315 100644 --- a/ksysguard/ksysguardd/Linux/ProcessList.c +++ b/ksysguard/ksysguardd/Linux/ProcessList.c @@ -137,7 +137,7 @@ static void validateStr( char* str ) ++s; } - /* Make sure that string tqcontains at least one character (blank). */ + /* Make sure that string contains at least one character (blank). */ if ( str[ 0 ] == '\0' ) strcpy( str, " " ); } @@ -407,7 +407,7 @@ void exitProcessList( void ) void printProcessListInfo( const char* cmd ) { (void)cmd; - fprintf( CurrentClient, "Name\tPID\tPPID\tUID\tGID\ttqStatus\tUser%%\tSystem%%\tNice\tVmSize" + fprintf( CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tUser%%\tSystem%%\tNice\tVmSize" "\tVmRss\tLogin\tCommand\n" ); fprintf( CurrentClient, "s\td\td\td\td\tS\tf\tf\td\tD\tD\ts\ts\n" ); } diff --git a/ksysguard/ksysguardd/Linux/lmsensors.c b/ksysguard/ksysguardd/Linux/lmsensors.c index 0d34d735f..37e41d2a1 100644 --- a/ksysguard/ksysguardd/Linux/lmsensors.c +++ b/ksysguard/ksysguardd/Linux/lmsensors.c @@ -151,7 +151,7 @@ void initLmSensors( struct SensorModul* sm ) strlen( label ) + 1 ); snprintf( p->fullName, BUFFER_SIZE_LMSEN, "lmsensors/%s/%s", scn->prefix, label ); - /* Make sure that name tqcontains only proper characters. */ + /* Make sure that name contains only proper characters. */ for ( s = p->fullName; *s; s++ ) if ( *s == ' ' ) *s = '_'; diff --git a/ksysguard/ksysguardd/Linux/stat.c b/ksysguard/ksysguardd/Linux/stat.c index c1eb48c7d..9bc576deb 100644 --- a/ksysguard/ksysguardd/Linux/stat.c +++ b/ksysguard/ksysguardd/Linux/stat.c @@ -550,7 +550,7 @@ static void processStat( void ) void initStat( struct SensorModul* sm ) { /* The CPU load is calculated from the values in /proc/stat. The cpu - * entry tqcontains 4 counters. These counters count the number of ticks + * entry contains 4 counters. These counters count the number of ticks * the system has spend on user processes, system processes, nice * processes and idle time. * diff --git a/ksysguard/ksysguardd/NetBSD/ProcessList.c b/ksysguard/ksysguardd/NetBSD/ProcessList.c index 5c7499f2f..54ab65513 100644 --- a/ksysguard/ksysguardd/NetBSD/ProcessList.c +++ b/ksysguard/ksysguardd/NetBSD/ProcessList.c @@ -306,7 +306,7 @@ updateProcessList(void) void printProcessListInfo(const char* cmd) { - fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\ttqStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); + fprintf(CurrentClient, "Name\tPID\tPPID\tUID\tGID\tStatus\tUser%%\tSystem%%\tNice\tVmSize\tVmRss\tLogin\tCommand\n"); fprintf(CurrentClient, "s\td\td\td\td\tS\tf\tf\td\tD\tD\ts\ts\n"); } diff --git a/ksysguard/ksysguardd/Porting-HOWTO b/ksysguard/ksysguardd/Porting-HOWTO index 75bb2b3c2..4576783bc 100644 --- a/ksysguard/ksysguardd/Porting-HOWTO +++ b/ksysguard/ksysguardd/Porting-HOWTO @@ -70,7 +70,7 @@ auto-range feature of the display. -------- ksysguardd> ps? -Name PID PPID UID GID tqStatus User% System% Nice VmSize VmRss VmLib Login Command +Name PID PPID UID GID Status User% System% Nice VmSize VmRss VmLib Login Command s d d d d S f f d d sksysguardd> -------- @@ -105,7 +105,7 @@ ksysguardd may support dynamic monitor sets. If a CPU is added or an interface disabled, monitors may be added or removed. To notify the front-end about this, you need to send the string "RECONFIGURE\n" over stderr. This causes the front-end to request the list of monitors -again and adapt it's tqlayout accordingly. If ksysguardd receives a +again and adapt it's layout accordingly. If ksysguardd receives a command it doesn't know it has to reply with "UNKNOWN COMMAND\nksysguardd> ". diff --git a/ksysguard/ksysguardd/Solaris/ProcessList.c b/ksysguard/ksysguardd/Solaris/ProcessList.c index 1d6809aa9..771371b76 100644 --- a/ksysguard/ksysguardd/Solaris/ProcessList.c +++ b/ksysguard/ksysguardd/Solaris/ProcessList.c @@ -290,7 +290,7 @@ int updateProcessList( void ) { } void printProcessListInfo( const char *cmd ) { - fprintf(CurrentClient, "Name\tPID\tPPID\tGID\ttqStatus\tUser\tThreads" + fprintf(CurrentClient, "Name\tPID\tPPID\tGID\tStatus\tUser\tThreads" "\tSize\tResident\t%% CPU\tPriority\tCommand\n" ); fprintf(CurrentClient, "s\td\td\td\ts\ts\td\tD\tD\tf\td\ts\n" ); } diff --git a/ksysguard/ksysguardd/ksysguardd.c b/ksysguard/ksysguardd/ksysguardd.c index eebb44a53..faea19492 100644 --- a/ksysguard/ksysguardd/ksysguardd.c +++ b/ksysguard/ksysguardd/ksysguardd.c @@ -91,7 +91,7 @@ int QuitApp = 0; int RunAsDaemon = 0; /** - This pointer is used by all modules. It tqcontains the file pointer of + This pointer is used by all modules. It contains the file pointer of the currently served client. This is stdout for non-daemon mode. */ FILE* CurrentClient = 0; diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 0308fa97f..f912c1221 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -25,7 +25,7 @@ KSysTrayCmd::KSysTrayCmd() isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), win(0), client(0), kwinmodule(0), top(0), left(0) { - tqsetAlignment( AlignCenter ); + setAlignment( AlignCenter ); kwinmodule = new KWinModule( this ); refresh(); } @@ -195,7 +195,7 @@ void KSysTrayCmd::clientExited() if ( lazyStart && noquit ) refresh(); else - tqApp->quit(); + qApp->quit(); } void KSysTrayCmd::quitClient() @@ -212,11 +212,11 @@ void KSysTrayCmd::quitClient() // That's why when the application is closed we aren't informed. // So we quit now. if ( !command ) { - tqApp->quit(); + qApp->quit(); } } else { - tqApp->quit(); + qApp->quit(); } } @@ -225,7 +225,7 @@ void KSysTrayCmd::quit() if ( !isVisible ) { showWindow(); } - tqApp->quit(); + qApp->quit(); } void KSysTrayCmd::execContextMenu( const TQPoint &pos ) diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 213b4189f..85fb78324 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) app.dcopClient()->send("ksplash", "ksplash", "close()", TQByteArray()); // Close splash screen tipDialog->show(); - TQObject::connect(tqApp, TQT_SIGNAL(lastWindowClosed()), tqApp, TQT_SLOT(quit())); + TQObject::connect(qApp, TQT_SIGNAL(lastWindowClosed()), qApp, TQT_SLOT(quit())); app.setMainWidget(tipDialog); diff --git a/kwin/COMPLIANCE b/kwin/COMPLIANCE index 39cb70607..e63455e4f 100644 --- a/kwin/COMPLIANCE +++ b/kwin/COMPLIANCE @@ -53,7 +53,7 @@ version 1.2 are listed here. CHECKME : check it's complete / 3.2. - The spec requires that _NET_CLIENT_LIST tqcontains the windows in their + The spec requires that _NET_CLIENT_LIST contains the windows in their initial mapping order, which is currently not true for NET::Desktop windows. Note that xprop lists only first element in WINDOW type properties. @@ -70,7 +70,7 @@ version 1.2 + 3.7. + 3.8. KWin currently extends the message a bit, with data.l[0] being 1 or 2, - meaning 'from application'/'from pager', and data.l[1] tqcontains + meaning 'from application'/'from pager', and data.l[1] contains timestamp. This is used for focus stealing prevention purposes, and will be proposed for next version of the spec. + 3.9. @@ -138,14 +138,14 @@ version 1.2 - 5.13. Property is not used in KWin, KWin never provides icons for iconified windows. Kicker or its taskbar don't set it either. However, the property is flawed, - and should be tqreplaced by manager selection or similar mechanism. + and should be replaced by manager selection or similar mechanism. + 6.1. + 6. (rest) + 7.4. The urgency hint is mapped to the _NET_WM_DEMANDS_ATTENTION flag. * 7.5. Qt often sets maximum size smaller than minimum size. This seems to be caused - by delayed tqlayout calculations. + by delayed layout calculations. * 7.6. Kicker should be checked. ? 7.7. @@ -176,7 +176,7 @@ version 2.0 ? 4.1.2.3 ? - PSize, PPosition, USize, UPosition ? - clients - Qt simply sets both -+ - PWinGravity - window tqgeometry constraints have higher priority than gravity ++ - PWinGravity - window geometry constraints have higher priority than gravity / - PBaseSize - PMinSize is not used as a fallback for size increments + - (the rest) / 4.1.2.4 diff --git a/kwin/HACKING b/kwin/HACKING index 82d588916..1665aea56 100644 --- a/kwin/HACKING +++ b/kwin/HACKING @@ -36,7 +36,7 @@ Restarting KWin: ================ Since KWin takes care of focus handling, first killing KWin and then launching new instance -can cause focus trouble. Therefore it's possible to run 'kwin --tqreplace', which will start +can cause focus trouble. Therefore it's possible to run 'kwin --replace', which will start new KWin instance and tell the old one to quit. @@ -46,11 +46,11 @@ Handling the case when KWin crashes: Again, without KWin running there may be focus problems. The simplest way to solve them is to add the 'Run Command' applet to Kicker - it can receive focus even without KWin running. If you can't add the applet or can reach it for some reason, switch to text console, and run -'DISPLAY=:0 kwin --tqreplace' (and then you can run 'kwin --tqreplace' again from X). +'DISPLAY=:0 kwin --replace' (and then you can run 'kwin --replace' again from X). If KWin is temporarily unusable because of some change and e.g. crashes during startup, it is possible to run another window manager, for example Metacity, OpenBox or FVWM (the command -is similar to restarting KWin, i.e. 'metacity --tqreplace', 'openbox --tqreplace' or 'fvwm -tqreplace'). +is similar to restarting KWin, i.e. 'metacity --replace', 'openbox --replace' or 'fvwm -replace'). Debugging KWin: @@ -85,7 +85,7 @@ of their source files these some functionality is in separate .cpp file grouped - client.* - core of class Client - activation.cpp - focus handling and window activation - events.cpp - event handling is in events.cpp -- tqgeometry.cpp - tqgeometry-related code +- geometry.cpp - geometry-related code - layers.cpp - stacking-related code - manage.cpp - code dealing with new windows - placement.cpp - window placements algorithms @@ -97,7 +97,7 @@ The rest of the files contain additional helper classes: - atoms.* - so-called atoms (symbolic names for constants in X) - bridge.* - communication with the decoration plugin -- tqgeometrytip.* - window displaying window tqgeometry while moving/resizing +- geometrytip.* - window displaying window geometry while moving/resizing - group.* - grouping related windows together (warning! This is currently really messy and scary code that should be rewritten). - killwindow.* - handling of the Ctrl+Esc feature diff --git a/kwin/activation.cpp b/kwin/activation.cpp index d6ffad437..c0f578634 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to window activation and focus + This file contains things relevant to window activation and focus stealing prevention. */ @@ -82,7 +82,7 @@ namespace KWinInternal the new mapped window (done in Client::readUserTimeMapTimestamp()) : - the window may have the _NET_WM_USER_TIME property. This way the application may either explicitly request that the window is not - activated (by using 0 timestamp), or the property tqcontains the time + activated (by using 0 timestamp), or the property contains the time of last user action in the application. - KWin itself tries to detect time of last user action in every window, by watching KeyPress and ButtonPress events on windows. This way some @@ -287,7 +287,7 @@ void Workspace::activateClient( Client* c, bool force ) if( c->isMinimized()) c->unminimize(); -// TODO force should perhaps allow this only if the window already tqcontains the mouse +// TODO force should perhaps allow this only if the window already contains the mouse if( options->focusPolicyIsReasonable() || force ) requestFocus( c, force ); @@ -433,7 +433,7 @@ bool Workspace::activateNextClient( Client* c ) if( c == NULL && !(*it)->isOnScreen( activeScreen())) continue; } - if( mainwindows.tqcontains( *it )) + if( mainwindows.contains( *it )) { get_focus = *it; break; @@ -486,7 +486,7 @@ void Workspace::setCurrentScreen( int new_screen ) void Workspace::gotFocusIn( const Client* c ) { - if( should_get_focus.tqcontains( const_cast< Client* >( c ))) + if( should_get_focus.contains( const_cast< Client* >( c ))) { // remove also all sooner elements that should have got FocusIn, // but didn't for some reason (and also won't anymore, because they were sooner) while( should_get_focus.first() != c ) @@ -523,7 +523,7 @@ bool Workspace::allowClientActivation( const Client* c, Time time, bool focus_in Client* ac = mostRecentlyActivatedClient(); if( focus_in ) { - if( should_get_focus.tqcontains( const_cast< Client* >( c ))) + if( should_get_focus.contains( const_cast< Client* >( c ))) return true; // FocusIn was result of KWin's action // Before getting FocusIn, the active Client already // got FocusOut, and therefore got deactivated. @@ -712,7 +712,7 @@ void Client::demandAttention( bool set ) { // Demand attention flag is often set right from manage(), when focus stealing prevention // steps in. At that time the window has no taskbar entry yet, so KNotify cannot place - // e.g. the passive popup next to it. So wait up to 1 second for the icon tqgeometry + // e.g. the passive popup next to it. So wait up to 1 second for the icon geometry // to be set. // Delayed call to KNotify also solves the problem of having X server grab in manage(), // which may deadlock when KNotify (or KLauncher when launching KNotify) need to access X. @@ -755,7 +755,7 @@ Time Client::readUserTimeMapTimestamp( const KStartupInfoId* asn_id, const KStar { Time time = info->userTime(); // kdDebug( 1212 ) << "User timestamp, initial:" << time << endl; - // newer ASN timestamp always tqreplaces user timestamp, unless user timestamp is 0 + // newer ASN timestamp always replaces user timestamp, unless user timestamp is 0 // helps e.g. with konqy reusing if( asn_data != NULL && time != 0 ) { @@ -935,7 +935,7 @@ void Client::startupIdChanged() bool asn_valid = workspace()->checkStartupNotification( window(), asn_id, asn_data ); if( !asn_valid ) return; - // If the ASN tqcontains desktop, move it to the desktop, otherwise move it to the current + // If the ASN contains desktop, move it to the desktop, otherwise move it to the current // desktop (since the new ASN should make the window act like if it's a new application // launched). However don't affect the window's desktop if it's set to be on all desktops. int desktop = workspace()->currentDesktop(); diff --git a/kwin/bridge.cpp b/kwin/bridge.cpp index df610dd53..49840e248 100644 --- a/kwin/bridge.cpp +++ b/kwin/bridge.cpp @@ -43,7 +43,7 @@ BRIDGE_HELPER( bool, isMovable,,, const ) BRIDGE_HELPER( bool, isResizable,,, const ) BRIDGE_HELPER( TQString, caption,,, const ) BRIDGE_HELPER( void, processMousePressEvent, TQMouseEvent* e, e, ) -BRIDGE_HELPER( TQRect, tqgeometry,,, const ) +BRIDGE_HELPER( TQRect, geometry,,, const ) BRIDGE_HELPER( void, closeWindow,,, ) BRIDGE_HELPER( void, maximize, MaximizeMode m, m, ) BRIDGE_HELPER( void, minimize,,, ) @@ -178,12 +178,12 @@ TQRegion Bridge::unobscuredRegion( const TQRegion& r ) const if( !(*it)->isOnDesktop( c->desktop())) continue; } - /* the clients all have their tqmask-regions in local coords + /* the clients all have their mask-regions in local coords so we have to translate them to a shared coord system we choose ours */ int dx = (*it)->x() - c->x(); int dy = (*it)->y() - c->y(); - TQRegion creg = (*it)->tqmask(); + TQRegion creg = (*it)->mask(); creg.translate(dx, dy); reg -= creg; if (reg.isEmpty()) diff --git a/kwin/bridge.h b/kwin/bridge.h index acb0f095f..0989a64b5 100644 --- a/kwin/bridge.h +++ b/kwin/bridge.h @@ -46,7 +46,7 @@ class Bridge : public KDecorationBridge virtual void performWindowOperation( WindowOperation ); virtual void setMask( const TQRegion&, int ); virtual bool isPreview() const; - virtual TQRect tqgeometry() const; + virtual TQRect geometry() const; virtual TQRect iconGeometry() const; virtual TQRegion unobscuredRegion( const TQRegion& r ) const; virtual TQWidget* workspaceWidget() const; diff --git a/kwin/client.cpp b/kwin/client.cpp index aef8500ae..0d2c5cfbf 100644 --- a/kwin/client.cpp +++ b/kwin/client.cpp @@ -105,9 +105,9 @@ Client::Client( Workspace *ws ) process_killer( NULL ), user_time( CurrentTime ), // not known yet allowed_actions( 0 ), - postpone_tqgeometry_updates( 0 ), - pending_tqgeometry_update( false ), - shade_tqgeometry_change( false ), + postpone_geometry_updates( 0 ), + pending_geometry_update( false ), + shade_geometry_change( false ), border_left( 0 ), border_right( 0 ), border_top( 0 ), @@ -141,7 +141,7 @@ Client::Client( Workspace *ws ) deleting = false; keep_above = FALSE; keep_below = FALSE; - is_tqshape = FALSE; + is_shape = FALSE; motif_noborder = false; motif_may_move = TRUE; motif_may_resize = TRUE; @@ -172,7 +172,7 @@ Client::Client( Workspace *ws ) cmap = None; - frame_tqgeometry = TQRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0) + frame_geometry = TQRect( 0, 0, 100, 100 ); // so that decorations don't start with size being (0,0) client_size = TQSize( 100, 100 ); custom_opacity = false; rule_opacity_active = 0;; //translucency rules @@ -190,7 +190,7 @@ Client::~Client() assert( client == None ); assert( frame == None && wrapper == None ); assert( decoration == NULL ); - assert( postpone_tqgeometry_updates == 0 ); + assert( postpone_geometry_updates == 0 ); assert( !check_active_modal ); delete info; delete bridge; @@ -217,7 +217,7 @@ void Client::releaseWindow( bool on_shutdown ) removeShadow(); drawIntersectingShadows(); finishWindowRules(); - ++postpone_tqgeometry_updates; + ++postpone_geometry_updates; // grab X during the release to make removing of properties, setting to withdrawn state // and repareting to root an atomic operation (http://lists.kde.org/?l=kde-devel&m=116448102901184&w=2) grabXServer(); @@ -260,7 +260,7 @@ void Client::releaseWindow( bool on_shutdown ) wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); frame = None; - --postpone_tqgeometry_updates; // don't use GeometryUpdatesBlocker, it would now set the tqgeometry + --postpone_geometry_updates; // don't use GeometryUpdatesBlocker, it would now set the geometry checkNonExistentClients(); deleteClient( this, Allowed ); ungrabXServer(); @@ -279,19 +279,19 @@ void Client::destroyClient() removeShadow(); drawIntersectingShadows(); finishWindowRules(); - ++postpone_tqgeometry_updates; + ++postpone_geometry_updates; setModal( false ); hidden = true; // so that it's not considered visible anymore workspace()->clientHidden( this ); destroyDecoration(); cleanGrouping(); workspace()->removeClient( this, Allowed ); - client = None; // tqinvalidate + client = None; // invalidate XDestroyWindow( qt_xdisplay(), wrapper ); wrapper = None; XDestroyWindow( qt_xdisplay(), frame ); frame = None; - --postpone_tqgeometry_updates; // don't use GeometryUpdatesBlocker, it would now set the tqgeometry + --postpone_geometry_updates; // don't use GeometryUpdatesBlocker, it would now set the geometry checkNonExistentClients(); deleteClient( this, Allowed ); } @@ -307,7 +307,7 @@ void Client::updateDecoration( bool check_workspace_pos, bool force ) destroyDecoration(); if( !noBorder()) { - setMask( TQRegion()); // reset tqshape tqmask + setMask( TQRegion()); // reset shape mask decoration = workspace()->createDecoration( bridge ); // TODO check decoration's minimum size? decoration->init(); @@ -345,7 +345,7 @@ void Client::destroyDecoration() decoration = NULL; TQPoint grav = calculateGravitation( true ); border_left = border_right = border_top = border_bottom = 0; - setMask( TQRegion()); // reset tqshape tqmask + setMask( TQRegion()); // reset shape mask int save_workarea_diff_x = workarea_diff_x; int save_workarea_diff_y = workarea_diff_y; plainResize( sizeForClientSize( clientSize()), ForceGeometrySet ); @@ -451,7 +451,7 @@ void Client::updateFrameExtents() // Resizes the decoration, and makes sure the decoration widget gets resize event // even if the size hasn't changed. This is needed to make sure the decoration -// re-tqlayouts (e.g. when options()->moveResizeMaximizedWindows() changes, +// re-layouts (e.g. when options()->moveResizeMaximizedWindows() changes, // the decoration may turn on/off some borders, but the actual size // of the decoration stays the same). void Client::resizeDecoration( const TQSize& s ) @@ -502,32 +502,32 @@ void Client::setUserNoBorder( bool set ) void Client::updateShape() { - // workaround for #19644 - tqshaped windows shouldn't have decoration - if( tqshape() && !noBorder()) + // workaround for #19644 - shaped windows shouldn't have decoration + if( shape() && !noBorder()) { noborder = true; updateDecoration( true ); } updateOpacityCache(); - if ( tqshape() ) + if ( shape() ) { XShapeCombineShape(qt_xdisplay(), frameId(), ShapeBounding, clientPos().x(), clientPos().y(), window(), ShapeBounding, ShapeSet); setShapable(TRUE); } - // !tqshape() tqmask setting is done in setMask() when the decoration + // !shape() mask setting is done in setMask() when the decoration // calls it or when the decoration is created/destroyed - if( Shape::version() >= 0x11 ) // 1.1, has input tqshape support + if( Shape::version() >= 0x11 ) // 1.1, has input shape support { // There appears to be no way to find out if a window has input - // tqshape set or not, so always propagate the input tqshape - // (it's the same like the bounding tqshape by default). - // Also, build the tqshape using a helper window, not directly - // in the frame window, because the sequence set-tqshape-to-frame, - // remove-tqshape-of-client, add-input-tqshape-of-client has the problem - // that after the second step there's a hole in the input tqshape - // until the real tqshape of the client is added and that can make + // shape set or not, so always propagate the input shape + // (it's the same like the bounding shape by default). + // Also, build the shape using a helper window, not directly + // in the frame window, because the sequence set-shape-to-frame, + // remove-shape-of-client, add-input-shape-of-client has the problem + // that after the second step there's a hole in the input shape + // until the real shape of the client is added and that can make // the window lose focus (which is a problem with mouse focus policies) static Window helper_window = None; if( helper_window == None ) @@ -549,7 +549,7 @@ void Client::updateShape() void Client::setMask( const TQRegion& reg, int mode ) { - _tqmask = reg; + _mask = reg; if( reg.isNull()) XShapeCombineMask( qt_xdisplay(), frameId(), ShapeBounding, 0, 0, None, ShapeSet ); @@ -576,11 +576,11 @@ void Client::setMask( const TQRegion& reg, int mode ) updateShape(); } -TQRegion Client::tqmask() const +TQRegion Client::mask() const { - if( _tqmask.isEmpty()) + if( _mask.isEmpty()) return TQRegion( 0, 0, width(), height()); - return _tqmask; + return _mask; } void Client::setShapable(bool b) @@ -838,7 +838,7 @@ void Client::setShade( ShadeMode mode ) XChangeProperty(qt_xdisplay(), frameId(), atoms->net_wm_window_shade, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &_shade, 1L); // shade int h = height(); - shade_tqgeometry_change = true; + shade_geometry_change = true; TQSize s( sizeForClientSize( TQSize( clientSize()))); s.setHeight( border_top + border_bottom ); XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify @@ -847,7 +847,7 @@ void Client::setShade( ShadeMode mode ) XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); //as we hid the unmap event, xcompmgr didn't recognize the client wid has vanished, so we'll extra inform it //done xcompmgr workaround -// FRAME tqrepaint( FALSE ); +// FRAME repaint( FALSE ); // bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); int step = QMAX( 4, QABS( h - s.height() ) / as )+1; @@ -861,7 +861,7 @@ void Client::setShade( ShadeMode mode ) // if ( !wasStaticContents ) // clearWFlags( WStaticContents ); plainResize( s ); - shade_tqgeometry_change = false; + shade_geometry_change = false; if( isActive()) { if( was_shade_mode == ShadeHover ) @@ -876,7 +876,7 @@ void Client::setShade( ShadeMode mode ) else { int h = height(); - shade_tqgeometry_change = true; + shade_geometry_change = true; TQSize s( sizeForClientSize( clientSize())); // FRAME bool wasStaticContents = testWFlags( WStaticContents ); // setWFlags( WStaticContents ); @@ -888,12 +888,12 @@ void Client::setShade( ShadeMode mode ) resizeDecoration( TQSize( s.width(), h )); // assume a border // we do not have time to wait for X to send us paint events -// FRAME tqrepaint( 0, h - step-5, width(), step+5, TRUE); +// FRAME repaint( 0, h - step-5, width(), step+5, TRUE); TQApplication::syncX(); } while ( h < s.height() - step ); // if ( !wasStaticContents ) // clearWFlags( WStaticContents ); - shade_tqgeometry_change = false; + shade_geometry_change = false; plainResize( s ); if( shade_mode == ShadeHover || shade_mode == ShadeActivated ) setActive( TRUE ); @@ -1051,7 +1051,7 @@ void Client::drawIntersectingShadows() { // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; // Generate list of Clients whose shadows need to be redrawn. That is, // those that are currently intersecting or intersected by other windows or @@ -1089,7 +1089,7 @@ void Client::drawOverlappingShadows(bool waitForMe) // active window has a shadow. return; - region = tqshapeBoundingRegion; + region = shapeBoundingRegion; stacking_order = workspace()->stackingOrder(); for (it = stacking_order.fromLast(); it != stacking_order.end(); --it) { @@ -1140,7 +1140,7 @@ void Client::drawOverlappingShadows(bool waitForMe) /*! Draw shadow after some time has elapsed, to give recently exposed windows a - chance to tqrepaint before a shadow gradient is drawn over them. + chance to repaint before a shadow gradient is drawn over them. */ void Client::drawDelayedShadow() { @@ -1163,7 +1163,7 @@ void Client::drawShadowAfter(Client *after) void Client::drawShadow() { Window shadows[2]; - XRectangle *tqshapes; + XRectangle *shapes; int i, count, ordering; // If we are waiting for another Client's shadow to be drawn, stop waiting now @@ -1179,31 +1179,31 @@ void Client::drawShadow() * this type of window. Otherwise, drawIntersectingShadows() won't update * properly when this window is moved/resized/hidden/closed. */ - tqshapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, + shapes = XShapeGetRectangles(qt_xdisplay(), frameId(), ShapeBounding, &count, &ordering); - if (!tqshapes) + if (!shapes) // XShape extension not supported - tqshapeBoundingRegion = TQRegion(x(), y(), width(), height()); + shapeBoundingRegion = TQRegion(x(), y(), width(), height()); else { - tqshapeBoundingRegion = TQRegion(); + shapeBoundingRegion = TQRegion(); for (i = 0; i < count; i++) { // Translate XShaped window into a TQRegion - TQRegion tqshapeRectangle(tqshapes[i].x, tqshapes[i].y, tqshapes[i].width, - tqshapes[i].height); - tqshapeBoundingRegion += tqshapeRectangle; + TQRegion shapeRectangle(shapes[i].x, shapes[i].y, shapes[i].width, + shapes[i].height); + shapeBoundingRegion += shapeRectangle; } if (isShade()) // Since XResize() doesn't change a window's XShape regions, ensure that - // tqshapeBoundingRegion is not taller than the window's shaded height, + // shapeBoundingRegion is not taller than the window's shaded height, // or the bottom shadow will appear to be missing - tqshapeBoundingRegion &= TQRegion(0, 0, width(), height()); - tqshapeBoundingRegion.translate(x(), y()); + shapeBoundingRegion &= TQRegion(0, 0, width(), height()); + shapeBoundingRegion.translate(x(), y()); } if (!isShadowed() || hidden || isMinimized() || maximizeMode() == MaximizeFull || !options->shadowWindowType(windowType())) { - XFree(tqshapes); + XFree(shapes); // Tell whatever Clients are listening that this Client's shadow has been drawn. // It hasn't, but there's no sense waiting for something that won't happen. @@ -1237,9 +1237,9 @@ void Client::drawShadow() ButtonPressMask | ButtonReleaseMask | StructureNotifyMask); shadowWidget->installEventFilter(this); - if (!tqshapes) { + if (!shapes) { // XShape extension not supported - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1247,7 +1247,7 @@ void Client::drawShadow() shadowRegions.append(shadowRegion); if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else @@ -1258,7 +1258,7 @@ void Client::drawShadow() TQMemArray<TQRect>::Iterator it, itEnd; XRectangle *shadowShapes; - exposedRegion = getExposedRegion(tqshapeBoundingRegion, shadow.x(), + exposedRegion = getExposedRegion(shapeBoundingRegion, shadow.x(), shadow.y(), shadow.width(), shadow.height(), thickness, xOffset, yOffset); shadowRegion.region = exposedRegion; @@ -1284,14 +1284,14 @@ void Client::drawShadow() delete [] shadowShapes; if (opacityCache->isNull()) - imposeRegionShadow(shadowPixmap, tqshapeBoundingRegion, + imposeRegionShadow(shadowPixmap, shapeBoundingRegion, exposedRegion, thickness, options->shadowOpacity(isActive())); else imposeCachedShadow(shadowPixmap, exposedRegion); } - XFree(tqshapes); + XFree(shapes); // Set the background pixmap //shadowPixmap.convertFromImage(shadowImage); @@ -1367,9 +1367,9 @@ TQRegion Client::getExposedRegion(TQRegion occludedRegion, int x, int y, int w, occludedRects = occludedRegion.rects(); itEnd = occludedRects.end(); for (it = occludedRects.begin(); it != itEnd; ++it) { - // Expand each of the occluded region's tqshape rectangles to contain + // Expand each of the occluded region's shape rectangles to contain // where a shadow of the specified thickness will be drawn. Create - // a new TQRegion that tqcontains the expanded occluded region + // a new TQRegion that contains the expanded occluded region it->setTop(it->top() - thickness + yOffset); it->setLeft(it->left() - thickness + xOffset); it->setRight(it->right() + thickness + xOffset); @@ -1423,11 +1423,11 @@ void Client::imposeCachedShadow(TQPixmap &pixmap, TQRegion exposed) for (y = 0; y < subH; y++) { opacity = (*(opacityCache))[(zeroY + y) * w + zeroX + x]; pixel = image.pixel(x, y); - pixelRed = tqRed(pixel); - pixelGreen = tqGreen(pixel); - pixelBlue = tqBlue(pixel); + pixelRed = qRed(pixel); + pixelGreen = qGreen(pixel); + pixelBlue = qBlue(pixel); image.setPixel(x, y, - tqRgb((int)(pixelRed + (red - pixelRed) * opacity), + qRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); } @@ -1515,7 +1515,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, // irTop is not necessarily larger than irBottom and // yIncrement isn't necessarily positive for (i = irLeft; i <= irRight; i++) { - if (occluded.tqcontains(TQPoint(i, j))) + if (occluded.contains(TQPoint(i, j))) intersectCount++; } } @@ -1525,7 +1525,7 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, intersectCount = 0; for (i = irLeft; i <= irRight; i++) { - if (occluded.tqcontains(TQPoint(i, irBottom))) + if (occluded.contains(TQPoint(i, irBottom))) intersectCount++; } } @@ -1535,16 +1535,16 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, (*(opacityCache))[(zeroY + y) * w + zeroX + x] = opacity; pixel = image.pixel(x, y); - pixelRed = tqRed(pixel); - pixelGreen = tqGreen(pixel); - pixelBlue = tqBlue(pixel); + pixelRed = qRed(pixel); + pixelGreen = qGreen(pixel); + pixelBlue = qBlue(pixel); image.setPixel(x, y, - tqRgb((int)(pixelRed + (red - pixelRed) * opacity), + qRgb((int)(pixelRed + (red - pixelRed) * opacity), (int)(pixelGreen + (green - pixelGreen) * opacity), (int)(pixelBlue + (blue - pixelBlue) * opacity))); for (i = irLeft; i <= irRight; i++) { - if (occluded.tqcontains(TQPoint(i, irTop))) + if (occluded.contains(TQPoint(i, irTop))) intersectCount--; } @@ -1554,12 +1554,12 @@ void Client::imposeRegionShadow(TQPixmap &pixmap, TQRegion occluded, irTop += yIncrement; for (j = irTop; j != irBottom; j += yIncrement) { - if (occluded.tqcontains(TQPoint(irLeft, j))) + if (occluded.contains(TQPoint(irLeft, j))) intersectCount--; } irRight++; for (j = irTop; j != irBottom; j += yIncrement) { - if (occluded.tqcontains(TQPoint(irRight, j))) + if (occluded.contains(TQPoint(irRight, j))) intersectCount++; } @@ -1602,7 +1602,7 @@ void Client::setMappingState(int s) XChangeProperty(qt_xdisplay(), window(), qt_wm_state, qt_wm_state, 32, PropModeReplace, (unsigned char *)data, 2); - if( was_unmanaged ) // manage() did postpone_tqgeometry_updates = 1, now it's ok to finally set the tqgeometry + if( was_unmanaged ) // manage() did postpone_geometry_updates = 1, now it's ok to finally set the geometry postponeGeometryUpdates( false ); } @@ -1652,7 +1652,7 @@ void Client::rawHide() void Client::sendClientMessage(Window w, Atom a, Atom protocol, long data1, long data2, long data3) { XEvent ev; - long tqmask; + long mask; memset(&ev, 0, sizeof(ev)); ev.xclient.type = ClientMessage; @@ -1664,10 +1664,10 @@ void Client::sendClientMessage(Window w, Atom a, Atom protocol, long data1, long ev.xclient.data.l[2] = data1; ev.xclient.data.l[3] = data2; ev.xclient.data.l[4] = data3; - tqmask = 0L; + mask = 0L; if (w == qt_xrootwin()) - tqmask = SubstructureRedirectMask; /* magic! */ - XSendEvent(qt_xdisplay(), w, False, tqmask, &ev); + mask = SubstructureRedirectMask; /* magic! */ + XSendEvent(qt_xdisplay(), w, False, mask, &ev); } /* @@ -1894,14 +1894,14 @@ int Client::screen() const { if( !options->xineramaEnabled ) return 0; - return workspace()->screenNumber( tqgeometry().center()); + return workspace()->screenNumber( geometry().center()); } bool Client::isOnScreen( int screen ) const { if( !options->xineramaEnabled ) return screen == 0; - return workspace()->screenGeometry( screen ).intersects( tqgeometry()); + return workspace()->screenGeometry( screen ).intersects( geometry()); } // performs activation and/or raising of the window @@ -2391,7 +2391,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const // TODO change this to rule const char* const oo_prefix = "openoffice.org"; // TQCString has no startsWith() // oo_prefix is lowercase, because resourceClass() is forced to be lowercase - if( tqstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog ) + if( qstrncmp( resourceClass(), oo_prefix, strlen( oo_prefix )) == 0 && wt == NET::Dialog ) wt = NET::Normal; // see bug #66065 if( wt == NET::Unknown ) // this is more or less suggested in NETWM spec wt = isTransient() ? NET::Dialog : NET::Normal; @@ -2399,7 +2399,7 @@ NET::WindowType Client::windowType( bool direct, int supported_types ) const } /*! - Sets an appropriate cursor tqshape for the logical mouse position \a m + Sets an appropriate cursor shape for the logical mouse position \a m */ void Client::setCursor( Position m ) diff --git a/kwin/client.h b/kwin/client.h index c36a641fe..1c4d45f51 100644 --- a/kwin/client.h +++ b/kwin/client.h @@ -76,7 +76,7 @@ class Client : public TQObject, public KDecorationDefines void applyWindowRules(); void updateWindowRules(); - TQRect tqgeometry() const; + TQRect geometry() const; TQSize size() const; TQSize minSize() const; TQSize maxSize() const; @@ -86,7 +86,7 @@ class Client : public TQObject, public KDecorationDefines int y() const; int width() const; int height() const; - TQPoint clientPos() const; // inside of tqgeometry() + TQPoint clientPos() const; // inside of geometry() TQSize clientSize() const; bool windowEvent( XEvent* e ); @@ -132,7 +132,7 @@ class Client : public TQObject, public KDecorationDefines bool isMinimized() const; bool isMaximizable() const; - TQRect tqgeometryRestore() const; + TQRect geometryRestore() const; MaximizeMode maximizeModeRestore() const; MaximizeMode maximizeMode() const; bool isMinimizable() const; @@ -142,7 +142,7 @@ class Client : public TQObject, public KDecorationDefines bool isFullScreen() const; bool isFullScreenable( bool fullscreen_hack = false ) const; bool userCanSetFullScreen() const; - TQRect tqgeometryFSRestore() const { return geom_fs_restore; } // only for session saving + TQRect geometryFSRestore() const { return geom_fs_restore; } // only for session saving int fullScreenMode() const { return fullscreen_mode; } // only for session saving bool isUserNoBorder() const; @@ -162,7 +162,7 @@ class Client : public TQObject, public KDecorationDefines void setKeepBelow( bool ); Layer layer() const; Layer belongsToLayer() const; - void tqinvalidateLayer(); + void invalidateLayer(); void setModal( bool modal ); bool isModal() const; @@ -195,7 +195,7 @@ class Client : public TQObject, public KDecorationDefines void demandAttention( bool set = true ); void setMask( const TQRegion& r, int mode = X::Unsorted ); - TQRegion tqmask() const; + TQRegion mask() const; void updateDecoration( bool check_workspace_pos, bool force = false ); void checkBorderSizes(); @@ -213,8 +213,8 @@ class Client : public TQObject, public KDecorationDefines // window to be redrawn. friend void Workspace::updateOverlappingShadows(WId); - // tqshape extensions - bool tqshape() const; + // shape extensions + bool shape() const; void updateShape(); void setGeometry( int x, int y, int w, int h, ForceGeometry_t force = NormalGeometrySet ); @@ -416,7 +416,7 @@ class Client : public TQObject, public KDecorationDefines void updateWorkareaDiffs(); void checkDirection( int new_diff, int old_diff, TQRect& rect, const TQRect& area ); static int computeWorkareaDiff( int left, int right, int a_left, int a_right ); - void configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ); + void configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ); NETExtendedStrut strut() const; int checkShadeGeometry( int w, int h ); void postponeGeometryUpdates( bool postpone ); @@ -500,7 +500,7 @@ class Client : public TQObject, public KDecorationDefines uint active :1; uint deleting : 1; // true when doing cleanup and destroying the client uint keep_above : 1; // NET::KeepAbove (was stays_on_top) - uint is_tqshape :1; + uint is_shape :1; uint skip_taskbar :1; uint original_skip_taskbar :1; // unaffected by KWin uint Pdeletewindow :1; // does the window understand the DeleteWindow protocol? @@ -557,11 +557,11 @@ class Client : public TQObject, public KDecorationDefines Time ping_timestamp; Time user_time; unsigned long allowed_actions; - TQRect frame_tqgeometry; + TQRect frame_geometry; TQSize client_size; - int postpone_tqgeometry_updates; // >0 - new tqgeometry is remembered, but not actually set - bool pending_tqgeometry_update; - bool shade_tqgeometry_change; + int postpone_geometry_updates; // >0 - new geometry is remembered, but not actually set + bool pending_geometry_update; + bool shade_geometry_change; int border_left, border_right, border_top, border_bottom; Client* shadowAfterClient; @@ -569,11 +569,11 @@ class Client : public TQObject, public KDecorationDefines TQMemArray<double> activeOpacityCache; TQMemArray<double> inactiveOpacityCache; TQMemArray<double>* opacityCache; - TQRegion tqshapeBoundingRegion; + TQRegion shapeBoundingRegion; TQTimer* shadowDelayTimer; bool shadowMe; - TQRegion _tqmask; + TQRegion _mask; static bool check_active_modal; // see Client::checkActiveModal() KShortcut _shortcut; friend struct FetchNameInternalPredicate; @@ -616,7 +616,7 @@ class WinInfo : public NETWinInfo WinInfo( Client* c, Display * display, Window window, Window rwin, const unsigned long pr[], int pr_size ); virtual void changeDesktop(int desktop); - virtual void changeState( unsigned long state, unsigned long tqmask ); + virtual void changeState( unsigned long state, unsigned long mask ); private: Client * m_client; }; @@ -766,7 +766,7 @@ inline TQPixmap Client::miniIcon() const return miniicon_pix; } -inline TQRect Client::tqgeometryRestore() const +inline TQRect Client::geometryRestore() const { return geom_restore; } @@ -801,9 +801,9 @@ inline bool Client::keepBelow() const return keep_below; } -inline bool Client::tqshape() const +inline bool Client::shape() const { - return is_tqshape; + return is_shape; } @@ -832,7 +832,7 @@ inline pid_t Client::pid() const return info->pid(); } -inline void Client::tqinvalidateLayer() +inline void Client::invalidateLayer() { in_layer = UnknownLayer; } @@ -857,39 +857,39 @@ inline TQCString Client::windowRole() const return window_role; } -inline TQRect Client::tqgeometry() const +inline TQRect Client::geometry() const { - return frame_tqgeometry; + return frame_geometry; } inline TQSize Client::size() const { - return frame_tqgeometry.size(); + return frame_geometry.size(); } inline TQPoint Client::pos() const { - return frame_tqgeometry.topLeft(); + return frame_geometry.topLeft(); } inline int Client::x() const { - return frame_tqgeometry.x(); + return frame_geometry.x(); } inline int Client::y() const { - return frame_tqgeometry.y(); + return frame_geometry.y(); } inline int Client::width() const { - return frame_tqgeometry.width(); + return frame_geometry.width(); } inline int Client::height() const { - return frame_tqgeometry.height(); + return frame_geometry.height(); } inline TQRect Client::rect() const diff --git a/kwin/clients/PORTING b/kwin/clients/PORTING index 3b4259e34..9a5fb9f6b 100644 --- a/kwin/clients/PORTING +++ b/kwin/clients/PORTING @@ -3,7 +3,7 @@ Also, the API is documented in the .h header files. Makefile.am: - Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES). -- Make sure LDFLAGS tqcontains $(KDE_PLUGIN) and -module . +- Make sure LDFLAGS contains $(KDE_PLUGIN) and -module . - Add -lkdecorations to LIBADD. - Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ). @@ -66,7 +66,7 @@ bool MyClient::eventFilter( QObject* o, QEvent* e ) } } ===== -- In MyClient, 'this' will have to be often tqreplaced with 'widget()', pay special attention +- In MyClient, 'this' will have to be often replaced with 'widget()', pay special attention to cases where this won't cause compile error (e.g. in connect() calls, which take QObject* ). - Also, many calls may need 'widget()->' prepended. - Layout is created in init(), so call createLayout() directly there (if it's implemented). @@ -91,18 +91,18 @@ inline const KDecorationOptions* options() { return KDecoration::options(); } Make sure it doesn't reenter the event loop (no kapp->processEvents()). - Buttons should use explicit setCursor() if they don't want cursor set by mousePosition(). I.e. usually call setCursor( ArrowCursor ) in your MyButton. -- In the part where you insert windowWrapper() into the tqlayout, i.e. something like +- In the part where you insert windowWrapper() into the layout, i.e. something like ===== - tqlayout->addWidget( windowWrapper()); + layout->addWidget( windowWrapper()); ===== - tqreplace it with something like + replace it with something like ===== if( isPreview()) - tqlayout->addWidget( new QLabel( i18n( "<center><b>MyDecoration</b></center>" ), widget())); + layout->addWidget( new QLabel( i18n( "<center><b>MyDecoration</b></center>" ), widget())); else - tqlayout->addItem( new QSpacerItem( 0, 0 )); + layout->addItem( new QSpacerItem( 0, 0 )); ===== -- Implement MyClient::tqminimumSize(). +- Implement MyClient::minimumSize(). - Handling maximization - to change vertical or horizontal maximalization, use e.g. 'maximize( maximizeMode() ^ MaximizeVertical', to change normal maximalization, i.e. after left-clicking on the button, use @@ -120,7 +120,7 @@ inline const KDecorationOptions* options() { return KDecoration::options(); } check values like 'maximizeMode() == MaximizeFull && !options()->moveResizeMaximizedWindows()' to check whether you can disable some borders completely. Note that your painting code must of course match these sizes. -- If your code uses XGrabServer() or XUnGrabServer(), tqreplace them with (un)grabXServer(). +- If your code uses XGrabServer() or XUnGrabServer(), replace them with (un)grabXServer(). - In cases where you call some function from the KDecoration API that can possibly destroy the decoration (e.g. showWindowMenu() or closeWindow()), make sure to use exists() if some more code will follow this call. Refer to showWindowMenu() documentation for an example. @@ -142,10 +142,10 @@ extern "C" ===== - The reset handling has changed: There's no signal resetClients(), and no slotResetAllClientsDelayed(). If your MyClient has some slotReset(), make it - reset( unsigned long ), where the argument is tqmask of things that have changed ( SettingXYZ ). + reset( unsigned long ), where the argument is mask of things that have changed ( SettingXYZ ). If you have some global function that handles resetting, make it MyFactory::reset( unsigned long ). Try to minimize the effects of the changed things, - e.g. if only the color setting has changed, doing a tqrepaint is often enough, and there's no need + e.g. if only the color setting has changed, doing a repaint is often enough, and there's no need to recreate the decorations. If you need to recreate the decorations, return true from MyFactory::reset(), otherwise, you may call resetDecorations() to call reset() in all MyClient instances. diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp index 0bd9a4535..97d049ffb 100644 --- a/kwin/clients/b2/b2client.cpp +++ b/kwin/clients/b2/b2client.cpp @@ -146,7 +146,7 @@ static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down) TQColor hColor = primary.light(150); TQColor lColor = primary.dark(150); - if (down) tqSwap(hColor, lColor); + if (down) qSwap(hColor, lColor); if (TQPixmap::defaultDepth() > 8) { KPixmapEffect::gradient(*pix, hColor, lColor, @@ -199,40 +199,40 @@ static void create_pixmaps() } // there seems to be no way to load X bitmaps from data properly, so - // we need to create new ones for each tqmask :P - TQBitmap pinupMask(16, 16, pinup_tqmask_bits, true); + // we need to create new ones for each mask :P + TQBitmap pinupMask(16, 16, pinup_mask_bits, true); PIXMAP_A(P_PINUP)->setMask(pinupMask); PIXMAP_I(P_PINUP)->setMask(pinupMask); - TQBitmap pindownMask(16, 16, pindown_tqmask_bits, true); + TQBitmap pindownMask(16, 16, pindown_mask_bits, true); PIXMAP_AD(P_PINUP)->setMask(pindownMask); PIXMAP_ID(P_PINUP)->setMask(pindownMask); - TQBitmap menuMask(16, 16, menu_tqmask_bits, true); + TQBitmap menuMask(16, 16, menu_mask_bits, true); for (i = 0; i < NumStates; i++) pixmap[P_MENU * NumStates + i]->setMask(menuMask); - TQBitmap helpMask(16, 16, help_tqmask_bits, true); + TQBitmap helpMask(16, 16, help_mask_bits, true); for (i = 0; i < NumStates; i++) pixmap[P_HELP * NumStates + i]->setMask(helpMask); TQBitmap normalizeMask(16, 16, true); - // draw normalize icon tqmask - TQPainter tqmask; - tqmask.begin(&normalizeMask); + // draw normalize icon mask + TQPainter mask; + mask.begin(&normalizeMask); TQBrush one(Qt::color1); - tqmask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, + mask.fillRect(normalizeMask.width() - 12, normalizeMask.height() - 12, 12, 12, one); - tqmask.fillRect(0, 0, 10, 10, one); - tqmask.end(); + mask.fillRect(0, 0, 10, 10, one); + mask.end(); for (i = 0; i < NumStates; i++) pixmap[P_NORMALIZE * NumStates + i]->setMask(normalizeMask); TQBitmap shadeMask(bsize, bsize, true); - tqmask.begin(&shadeMask); - tqmask.fillRect(0, 0, bsize, 6, one); - tqmask.end(); + mask.begin(&shadeMask); + mask.fillRect(0, 0, bsize, 6, one); + mask.end(); for (i = 0; i < NumStates; i++) pixmap[P_SHADE * NumStates + i]->setMask(shadeMask); @@ -418,7 +418,7 @@ void B2Client::init() titleLayout->addSpacing(3); - TQColor c = options()->tqcolorGroup(KDecoration::ColorTitleBar, isActive()). + TQColor c = options()->colorGroup(KDecoration::ColorTitleBar, isActive()). color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) { @@ -537,7 +537,7 @@ bool B2Client::mustDrawHandle() const void B2Client::iconChange() { if (button[BtnMenu]) - button[BtnMenu]->tqrepaint(false); + button[BtnMenu]->repaint(false); } // Gallium: New button show/hide magic for customizable @@ -578,7 +578,7 @@ void B2Client::calcHiddenButtons() void B2Client::resizeEvent(TQResizeEvent * /*e*/) { calcHiddenButtons(); - titlebar->tqlayout()->activate(); + titlebar->layout()->activate(); positionButtons(); /* may be the resize cut off some space occupied by titlebar, which @@ -586,7 +586,7 @@ void B2Client::resizeEvent(TQResizeEvent * /*e*/) titleMoveAbs(bar_x_ofs); doShape(); - widget()->tqrepaint(); // the frame is misrendered without this + widget()->repaint(); // the frame is misrendered without this } void B2Client::captionChange() @@ -595,7 +595,7 @@ void B2Client::captionChange() titleMoveAbs(bar_x_ofs); doShape(); titlebar->recalcBuffer(); - titlebar->tqrepaint(false); + titlebar->repaint(false); } void B2Client::paintEvent(TQPaintEvent* e) @@ -605,7 +605,7 @@ void B2Client::paintEvent(TQPaintEvent* e) KDecoration::ColorType frameColorGroup = colored_frame ? KDecoration::ColorTitleBar : KDecoration::ColorFrame; - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); // Frame height, this is used a lot of times int fHeight = height() - t.height(); @@ -614,7 +614,7 @@ void B2Client::paintEvent(TQPaintEvent* e) int bb = mustDrawHandle() ? 4 : 0; int bDepth = thickness + bb; - TQColorGroup fillColor = options()->tqcolorGroup(frameColorGroup, isActive()); + TQColorGroup fillColor = options()->colorGroup(frameColorGroup, isActive()); TQBrush fillBrush(options()->color(frameColorGroup, isActive())); // outer frame rect @@ -689,7 +689,7 @@ void B2Client::paintEvent(TQPaintEvent* e) visibilitinotify events until its state changes, so we just try */ if (titlebar->isFullyObscured()) { - /* We first see, if our tqrepaint contained the titlebar area */ + /* We first see, if our repaint contained the titlebar area */ TQRegion reg(TQRect(0, 0, width(), buttonSize + 4)); reg = reg.intersect(e->region()); if (!reg.isEmpty()) @@ -699,36 +699,36 @@ void B2Client::paintEvent(TQPaintEvent* e) void B2Client::doShape() { - TQRect t = titlebar->tqgeometry(); - TQRegion tqmask(widget()->rect()); + TQRect t = titlebar->geometry(); + TQRegion mask(widget()->rect()); // top to the tilebar right if (bar_x_ofs) { // left from bar - tqmask -= TQRect(0, 0, bar_x_ofs, t.height() - thickness); + mask -= TQRect(0, 0, bar_x_ofs, t.height() - thickness); // top left point - tqmask -= TQRect(0, t.height() - thickness, 1, 1); + mask -= TQRect(0, t.height() - thickness, 1, 1); } if (t.right() < width() - 1) { - tqmask -= TQRect(width() - 1, + mask -= TQRect(width() - 1, t.height() - thickness, 1, 1); //top right point - tqmask -= TQRect(t.right() + 1, 0, + mask -= TQRect(t.right() + 1, 0, width() - t.right() - 1, t.height() - thickness); } // bottom right point - tqmask -= TQRect(width() - 1, height() - 1, 1, 1); + mask -= TQRect(width() - 1, height() - 1, 1, 1); if (mustDrawHandle()) { // bottom left point - tqmask -= TQRect(0, height() - 5, 1, 1); + mask -= TQRect(0, height() - 5, 1, 1); // handle left point - tqmask -= TQRect(width() - 40, height() - 1, 1, 1); + mask -= TQRect(width() - 40, height() - 1, 1, 1); // bottom left - tqmask -= TQRect(0, height() - 4, width() - 40, 4); + mask -= TQRect(0, height() - 4, width() - 40, 4); } else { // bottom left point - tqmask -= TQRect(0, height() - 1, 1, 1); + mask -= TQRect(0, height() - 1, 1, 1); } - setMask(tqmask); + setMask(mask); } void B2Client::showEvent(TQShowEvent *) @@ -741,7 +741,7 @@ void B2Client::showEvent(TQShowEvent *) KDecoration::Position B2Client::mousePosition(const TQPoint& p) const { const int range = 16; - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); t.setHeight(buttonSize + 4 - thickness); int ly = t.bottom(); int lx = t.right(); @@ -794,8 +794,8 @@ void B2Client::titleMoveAbs(int new_ofs) bar_x_ofs = new_ofs; positionButtons(); doShape(); - widget()->tqrepaint(0, 0, width(), buttonSize + 4, false); - titlebar->tqrepaint(false); + widget()->repaint(0, 0, width(), buttonSize + 4, false); + titlebar->repaint(false); } } @@ -820,7 +820,7 @@ void B2Client::maximizeChange() bool m = maximizeMode() == MaximizeFull; if (button[BtnMax]) { button[BtnMax]->setPixmaps(m ? P_NORMALIZE : P_MAX); - button[BtnMax]->tqrepaint(); + button[BtnMax]->repaint(); TQToolTip::remove(button[BtnMax]); TQToolTip::add(button[BtnMax], m ? i18n("Restore") : i18n("Maximize")); @@ -830,21 +830,21 @@ void B2Client::maximizeChange() g->activate(); doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void B2Client::activeChange() { - widget()->tqrepaint(false); - titlebar->tqrepaint(false); + widget()->repaint(false); + titlebar->repaint(false); - TQColor c = options()->tqcolorGroup( + TQColor c = options()->colorGroup( KDecoration::ColorTitleBar, isActive()).color(TQColorGroup::Button); for (int i = 0; i < BtnCount; i++) if (button[i]) { button[i]->setBg(c); - button[i]->tqrepaint(false); + button[i]->repaint(false); } } @@ -860,7 +860,7 @@ void B2Client::shadeChange() } } -TQSize B2Client::tqminimumSize() const +TQSize B2Client::minimumSize() const { int left, right, top, bottom; borders(left, right, top, bottom); @@ -918,7 +918,7 @@ void B2Client::unobscureTitlebar() { /* we just noticed, that we got obscured by other windows so we look at all windows above us (stacking_order) merging their - tqmasks, intersecting it with our titlebar area, and see if we can + masks, intersecting it with our titlebar area, and see if we can find a place not covered by any window */ if (in_unobs) { return; @@ -939,8 +939,8 @@ void B2Client::unobscureTitlebar() static void redraw_pixmaps() { int i; - TQColorGroup aGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); - TQColorGroup iGrp = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + TQColorGroup aGrp = options()->colorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup iGrp = options()->colorGroup(KDecoration::ColorButtonBg, false); // close drawB2Rect(PIXMAP_A(P_CLOSE), aGrp.button(), false); @@ -1096,7 +1096,7 @@ void B2Client::positionButtons() cap = "XXXXX"; // area for dragging the window int textLen = fm.width(cap); - TQRect t = titlebar->captionSpacer->tqgeometry(); + TQRect t = titlebar->captionSpacer->geometry(); int titleWidth = titlebar->width() - t.width() + textLen + 2; if (titleWidth > width()) titleWidth = width(); @@ -1107,7 +1107,7 @@ void B2Client::positionButtons() // Transparent bound stuff. static TQRect *visible_bound; -static TQPointArray bound_tqshape; +static TQPointArray bound_shape; bool B2Client::drawbound(const TQRect& geom, bool clear) { @@ -1117,7 +1117,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) if (!visible_bound) { visible_bound = new TQRect(geom); - TQRect t = titlebar->tqgeometry(); + TQRect t = titlebar->geometry(); int frameTop = geom.top() + t.bottom(); int barLeft = geom.left() + bar_x_ofs; int barRight = barLeft + t.width() - 1; @@ -1132,7 +1132,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) barLeft += 2; barRight -= 2; - bound_tqshape.putPoints(0, 8, + bound_shape.putPoints(0, 8, g.left(), frameTop, barLeft, frameTop, barLeft, g.top(), @@ -1147,7 +1147,7 @@ bool B2Client::drawbound(const TQRect& geom, bool clear) TQPainter p(workspaceWidget()); p.setPen(TQPen(Qt::white, 5)); p.setRasterOp(Qt::XorROP); - p.drawPolygon(bound_tqshape); + p.drawPolygon(bound_shape); if (clear) { delete visible_bound; @@ -1201,7 +1201,7 @@ B2Button::B2Button(B2Client *_client, TQWidget *parent, } -TQSize B2Button::tqsizeHint() const +TQSize B2Button::sizeHint() const { return TQSize(buttonSize, buttonSize); } @@ -1252,7 +1252,7 @@ void B2Button::setPixmaps(int button_id) for (int i = 0; i < NumStates; i++) { icon[i] = B2::pixmap[button_id + i]; } - tqrepaint(false); + repaint(false); } void B2Button::mousePressEvent(TQMouseEvent * e) @@ -1276,14 +1276,14 @@ void B2Button::mouseReleaseEvent(TQMouseEvent * e) void B2Button::enterEvent(TQEvent *e) { hover = true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } void B2Button::leaveEvent(TQEvent *e) { hover = false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -1292,7 +1292,7 @@ void B2Button::leaveEvent(TQEvent *e) B2Titlebar::B2Titlebar(B2Client *parent) : TQWidget(parent->widget(), 0, WStyle_Customize | WRepaintNoErase), client(parent), - set_x11tqmask(false), isfullyobscured(false), shift_move(false) + set_x11mask(false), isfullyobscured(false), shift_move(false) { setBackgroundMode(NoBackground); captionSpacer = new TQSpacerItem(buttonSize, buttonSize + 4, @@ -1301,8 +1301,8 @@ B2Titlebar::B2Titlebar(B2Client *parent) bool B2Titlebar::x11Event(XEvent *e) { - if (!set_x11tqmask) { - set_x11tqmask = true; + if (!set_x11mask) { + set_x11mask = true; XSelectInput(qt_xdisplay(), winId(), KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | @@ -1342,7 +1342,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) // titlebar fill const TQColorGroup cg = - options()->tqcolorGroup(KDecoration::ColorTitleBar, state); + options()->colorGroup(KDecoration::ColorTitleBar, state); TQBrush brush(cg.background()); if (gradient) brush.setPixmap(*gradient); qDrawShadeRect(&p, 1, 1, t.right() - 1, t.height() - 1, @@ -1351,7 +1351,7 @@ void B2Titlebar::drawTitlebar(TQPainter &p, bool state) // and the caption p.setPen(options()->color(KDecoration::ColorFont, state)); p.setFont(options()->font(state)); - t = captionSpacer->tqgeometry(); + t = captionSpacer->geometry(); p.drawText(t, AlignLeft | AlignVCenter, client->caption()); } @@ -1367,7 +1367,7 @@ void B2Titlebar::recalcBuffer() void B2Titlebar::resizeEvent(TQResizeEvent *) { recalcBuffer(); - tqrepaint(false); + repaint(false); } @@ -1391,7 +1391,7 @@ void B2Titlebar::mouseDoubleClickEvent(TQMouseEvent *e) void B2Titlebar::wheelEvent(TQWheelEvent *e) { - if (client->isSetShade() || rect().tqcontains(e->pos())) + if (client->isSetShade() || rect().contains(e->pos())) client->titlebarMouseWheelOperation( e->delta()); } diff --git a/kwin/clients/b2/b2client.h b/kwin/clients/b2/b2client.h index 4439bf1a1..198dfbb9b 100644 --- a/kwin/clients/b2/b2client.h +++ b/kwin/clients/b2/b2client.h @@ -38,7 +38,7 @@ public: void setToggle(){setToggleType(Toggle);} void setActive(bool on){setOn(on);} void setUseMiniIcon(){useMiniIcon = true;} - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSizePolicy sizePolicy() const; protected: virtual void drawButton(TQPainter *p); @@ -86,7 +86,7 @@ private: TQString oldTitle; KPixmap titleBuffer; TQPoint moveOffset; - bool set_x11tqmask; + bool set_x11mask; bool isfullyobscured; bool shift_move; }; @@ -119,7 +119,7 @@ protected: Position mousePosition( const TQPoint& p ) const; void resize(const TQSize&); void borders(int &, int &, int &, int &) const; - TQSize tqminimumSize() const; + TQSize minimumSize() const; bool eventFilter(TQObject *, TQEvent *); private slots: void menuButtonPressed(); diff --git a/kwin/clients/b2/bitmaps.h b/kwin/clients/b2/bitmaps.h index f521de292..2f610f4b2 100644 --- a/kwin/clients/b2/bitmaps.h +++ b/kwin/clients/b2/bitmaps.h @@ -28,7 +28,7 @@ static const unsigned char menu_dgray_bits[] = { 0x00, 0x00, 0x00, 0x20, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char menu_tqmask_bits[] = { +static const unsigned char menu_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -48,7 +48,7 @@ static const unsigned char pindown_dgray_bits[] = { 0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pindown_tqmask_bits[] = { +static const unsigned char pindown_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -68,12 +68,12 @@ static const unsigned char pinup_dgray_bits[] = { 0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pinup_tqmask_bits[] = { +static const unsigned char pinup_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char help_tqmask_bits[] = { +static const unsigned char help_mask_bits[] = { 0x00,0x00,0x00,0x00,0xe0,0x03,0xf0,0x07,0x70,0x0e,0x60,0x0e,0x00,0x0f,0x80, 0x07,0xc0,0x03,0xc0,0x01,0x80,0x01,0xc0,0x00,0xc0,0x01,0x80,0x01,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x4c,0x0b,0x08,0x58,0x65,0x09,0x08,0x90,0x00,0x00, diff --git a/kwin/clients/b2/config/config.cpp b/kwin/clients/b2/config/config.cpp index 3a42b9eba..ca1dccc65 100644 --- a/kwin/clients/b2/config/config.cpp +++ b/kwin/clients/b2/config/config.cpp @@ -1,5 +1,5 @@ /* - * This file tqcontains the B2 configuration widget + * This file contains the B2 configuration widget * * Copyright (c) 2001 * Karol Szwed <gallium@kde.org> diff --git a/kwin/clients/b2/config/config.h b/kwin/clients/b2/config/config.h index cf8c95736..92c255ae6 100644 --- a/kwin/clients/b2/config/config.h +++ b/kwin/clients/b2/config/config.h @@ -1,5 +1,5 @@ /* - * This file tqcontains the B2 configuration widget + * This file contains the B2 configuration widget * * Copyright (c) 2001 * Karol Szwed <gallium@kde.org> diff --git a/kwin/clients/default/kdedefault.cpp b/kwin/clients/default/kdedefault.cpp index 0feb00725..d91ccf56b 100644 --- a/kwin/clients/default/kdedefault.cpp +++ b/kwin/clients/default/kdedefault.cpp @@ -89,7 +89,7 @@ static const unsigned char pindown_dgray_bits[] = { 0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pindown_tqmask_bits[] = { +static const unsigned char pindown_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f, 0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -109,7 +109,7 @@ static const unsigned char pinup_dgray_bits[] = { 0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char pinup_tqmask_bits[] = { +static const unsigned char pinup_mask_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; @@ -240,7 +240,7 @@ unsigned long KDEDefaultHandler::readConfig( bool update ) || new_useGradients != useGradients || new_titleHeight != normalTitleHeight || new_toolTitleHeight != toolTitleHeight ) - changed |= SettingColors; // just recreate the pixmaps and tqrepaint + changed |= SettingColors; // just recreate the pixmaps and repaint } showGrabBar = new_showGrabBar; @@ -263,28 +263,28 @@ void KDEDefaultHandler::createPixmaps() if (showTitleBarStipple) { TQPainter p; - TQPainter tqmaskPainter; + TQPainter maskPainter; int i, x, y; titlePix = new TQPixmap(132, normalTitleHeight+2); - TQBitmap tqmask(132, normalTitleHeight+2); - tqmask.fill(Qt::color0); + TQBitmap mask(132, normalTitleHeight+2); + mask.fill(Qt::color0); p.begin(titlePix); - tqmaskPainter.begin(&tqmask); - tqmaskPainter.setPen(Qt::color1); + maskPainter.begin(&mask); + maskPainter.setPen(Qt::color1); for(i=0, y=2; i < 9; ++i, y+=4) for(x=1; x <= 132; x+=3) { p.setPen(options()->color(ColorTitleBar, true).light(150)); p.drawPoint(x, y); - tqmaskPainter.drawPoint(x, y); + maskPainter.drawPoint(x, y); p.setPen(options()->color(ColorTitleBar, true).dark(150)); p.drawPoint(x+1, y+1); - tqmaskPainter.drawPoint(x+1, y+1); + maskPainter.drawPoint(x+1, y+1); } - tqmaskPainter.end(); + maskPainter.end(); p.end(); - titlePix->setMask(tqmask); + titlePix->setMask(mask); } else titlePix = NULL; @@ -328,14 +328,14 @@ void KDEDefaultHandler::createPixmaps() TQPainter p; // Active pins - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); p.begin( pinUpPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); - pinUpPix->setMask( TQBitmap(16, 16, pinup_tqmask_bits, true) ); + pinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) ); pinDownPix = new KPixmap(); pinDownPix->resize(16, 16); @@ -343,17 +343,17 @@ void KDEDefaultHandler::createPixmaps() kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); p.end(); - pinDownPix->setMask( TQBitmap(16, 16, pindown_tqmask_bits, true) ); + pinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Inactive pins - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); p.begin( ipinUpPix ); kColorBitmaps( &p, g, 0, 0, 16, 16, true, pinup_white_bits, pinup_gray_bits, NULL, NULL, pinup_dgray_bits, NULL ); p.end(); - ipinUpPix->setMask( TQBitmap(16, 16, pinup_tqmask_bits, true) ); + ipinUpPix->setMask( TQBitmap(16, 16, pinup_mask_bits, true) ); ipinDownPix = new KPixmap(); ipinDownPix->resize(16, 16); @@ -361,7 +361,7 @@ void KDEDefaultHandler::createPixmaps() kColorBitmaps( &p, g, 0, 0, 16, 16, true, pindown_white_bits, pindown_gray_bits, NULL, NULL, pindown_dgray_bits, NULL ); p.end(); - ipinDownPix->setMask( TQBitmap(16, 16, pindown_tqmask_bits, true) ); + ipinDownPix->setMask( TQBitmap(16, 16, pindown_mask_bits, true) ); // Create a title buffer for flicker-free painting titleBuffer = new KPixmap(); @@ -404,25 +404,25 @@ void KDEDefaultHandler::createPixmaps() irightBtnDownPix[false]->resize(toolTitleHeight, toolTitleHeight); // Draw the button state pixmaps - g = options()->tqcolorGroup( ColorTitleBar, true ); + g = options()->colorGroup( ColorTitleBar, true ); drawButtonBackground( leftBtnUpPix[true], g, false ); drawButtonBackground( leftBtnDownPix[true], g, true ); drawButtonBackground( leftBtnUpPix[false], g, false ); drawButtonBackground( leftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, true ); + g = options()->colorGroup( ColorButtonBg, true ); drawButtonBackground( rightBtnUpPix[true], g, false ); drawButtonBackground( rightBtnDownPix[true], g, true ); drawButtonBackground( rightBtnUpPix[false], g, false ); drawButtonBackground( rightBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorTitleBar, false ); + g = options()->colorGroup( ColorTitleBar, false ); drawButtonBackground( ileftBtnUpPix[true], g, false ); drawButtonBackground( ileftBtnDownPix[true], g, true ); drawButtonBackground( ileftBtnUpPix[false], g, false ); drawButtonBackground( ileftBtnDownPix[false], g, true ); - g = options()->tqcolorGroup( ColorButtonBg, false ); + g = options()->colorGroup( ColorButtonBg, false ); drawButtonBackground( irightBtnUpPix[true], g, false ); drawButtonBackground( irightBtnDownPix[true], g, true ); drawButtonBackground( irightBtnUpPix[false], g, false ); @@ -676,7 +676,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) // otherwise we paint a menu button (with mini icon), or a sticky button. if( deco ) { // Select the appropriate button decoration color - bool darkDeco = tqGray( KDecoration::options()->color( + bool darkDeco = qGray( KDecoration::options()->color( isLeft() ? KDecoration::ColorTitleBar : KDecoration::ColorButtonBg, active).rgb() ) > 127; @@ -720,7 +720,7 @@ void KDEDefaultButton::drawButton(TQPainter *p) void KDEDefaultButton::enterEvent(TQEvent *e) { isMouseOver=true; - tqrepaint(false); + repaint(false); TQButton::enterEvent(e); } @@ -728,7 +728,7 @@ void KDEDefaultButton::enterEvent(TQEvent *e) void KDEDefaultButton::leaveEvent(TQEvent *e) { isMouseOver=false; - tqrepaint(false); + repaint(false); TQButton::leaveEvent(e); } @@ -771,7 +771,7 @@ bool KDEDefaultClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int KDEDefaultClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int KDEDefaultClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { switch (lm) { case LM_BorderLeft: @@ -810,7 +810,7 @@ int KDEDefaultClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, c return borderWidth/2; // fall though default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -856,7 +856,7 @@ void KDEDefaultClient::init() void KDEDefaultClient::reset( unsigned long changed) { - widget()->tqrepaint(); + widget()->repaint(); KCommonDecoration::reset(changed); } @@ -909,7 +909,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawRect(x,y,w,h); // Draw part of the frame that is the titlebar color - g = options()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(ColorTitleBar, isActive()); p.setPen(g.light()); p.drawLine(x+1, y+1, rightOffset-1, y+1); p.drawLine(x+1, y+1, x+1, leftFrameStart+borderWidth-4); @@ -929,7 +929,7 @@ void KDEDefaultClient::paintEvent( TQPaintEvent* ) p.drawLine(x+borderWidth-2, y+titleHeight+3, x+borderWidth-2, leftFrameStart-2); // Fill out the border edges - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(rightOffset, y+1, x2-1, y+1); p.drawLine(x+1, leftFrameStart+borderWidth-3, x+1, y2-1); diff --git a/kwin/clients/default/kdedefault.h b/kwin/clients/default/kdedefault.h index 6dfaf6ac8..70b8847fa 100644 --- a/kwin/clients/default/kdedefault.h +++ b/kwin/clients/default/kdedefault.h @@ -80,7 +80,7 @@ class KDEDefaultClient : public KCommonDecoration virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual TQRegion cornerShape(WindowCorner corner); diff --git a/kwin/clients/keramik/config/keramikconfig.ui b/kwin/clients/keramik/config/keramikconfig.ui index 6f7d84e90..f074a00b8 100644 --- a/kwin/clients/keramik/config/keramikconfig.ui +++ b/kwin/clients/keramik/config/keramikconfig.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KeramikConfigUI</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -71,6 +71,6 @@ <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/clients/keramik/embedtool.cpp b/kwin/clients/keramik/embedtool.cpp index fe34ffcb4..4f5135a3f 100644 --- a/kwin/clients/keramik/embedtool.cpp +++ b/kwin/clients/keramik/embedtool.cpp @@ -60,7 +60,7 @@ private: KeramikEmbedder::KeramikEmbedder() { - TQDateTime date( TQDateTime::tqcurrentDateTime() ); + TQDateTime date( TQDateTime::currentDateTime() ); TQString datestring( date.toString() ); file = new TQFile( "tiles.h" ); @@ -100,19 +100,19 @@ void KeramikEmbedder::embed( const char *name ) TQString codename( basename ); TQImage image( name ); - codename = codename.tqreplace( TQRegExp("[^a-zA-Z0-9]"), "_" ); + codename = codename.replace( TQRegExp("[^a-zA-Z0-9]"), "_" ); stream << "\tstatic const QRgb " << codename << "_data[] = {" << endl << "\t\t"; stream.setf( TQTextStream::hex | TQTextStream::right ); stream.fill( '0' ); int pixels = image.width() * image.height(); - TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( image.bits() ); + Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( image.bits() ); bool hasAlpha = false; for ( int i = 0, j = 0; i < pixels; i++ ) { - if ( tqAlpha( *data ) && tqAlpha( *data ) != 0xff ) + if ( qAlpha( *data ) && qAlpha( *data ) != 0xff ) hasAlpha = true; stream << "0x" << qSetW(8) << *(data++); diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp index 64592a3cd..48a187098 100644 --- a/kwin/clients/keramik/keramik.cpp +++ b/kwin/clients/keramik/keramik.cpp @@ -62,7 +62,7 @@ namespace Keramik const int buttonSpacing = 4; // Spacing between the titlebar buttons const int iconSpacing = 5; // Spacing between the icon and the text label - // Default button tqlayout + // Default button layout const char default_left[] = "M"; const char default_right[] = "HIAX"; @@ -201,7 +201,7 @@ KeramikHandler::KeramikHandler() buttonDecos[ ShadeOn ] = new TQBitmap( 17, 17, shade_on_bits, true ); buttonDecos[ ShadeOff ] = new TQBitmap( 17, 17, shade_off_bits, true ); - // Selftqmask the bitmaps + // Selfmask the bitmaps for ( int i = 0; i < NumButtonDecos; i++ ) buttonDecos[i]->setMask( *buttonDecos[i] ); @@ -585,39 +585,39 @@ TQPixmap *KeramikHandler::composite( TQImage *over, TQImage *under ) int width = over->width(), height = over->height(); // Clear the destination image - TQ_UINT32 *data = reinterpret_cast<TQ_UINT32*>( dest.bits() ); + Q_UINT32 *data = reinterpret_cast<Q_UINT32*>( dest.bits() ); for (int i = 0; i < width * height; i++) *(data++) = 0; // Copy the under image (bottom aligned) to the destination image for (int y1 = height - under->height(), y2 = 0; y1 < height; y1++, y2++ ) { - register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.scanLine(y1) ); - register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( under->scanLine(y2) ); + register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.scanLine(y1) ); + register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( under->scanLine(y2) ); for ( int x = 0; x < width; x++ ) *(dst++) = *(src++); } // Blend the over image onto the destination - register TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( dest.bits() ); - register TQ_UINT32 *src = reinterpret_cast<TQ_UINT32*>( over->bits() ); + register Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( dest.bits() ); + register Q_UINT32 *src = reinterpret_cast<Q_UINT32*>( over->bits() ); for ( int i = 0; i < width * height; i++ ) { - int r1 = tqRed( *dst ), g1 = tqGreen( *dst ), b1 = tqBlue( *dst ); - int r2 = tqRed( *src ), g2 = tqGreen( *src ), b2 = tqBlue( *src ); - int a = tqAlpha( *src ); + int r1 = qRed( *dst ), g1 = qGreen( *dst ), b1 = qBlue( *dst ); + int r2 = qRed( *src ), g2 = qGreen( *src ), b2 = qBlue( *src ); + int a = qAlpha( *src ); if ( a == 0xff ) *dst = *src; else if ( a != 0x00 ) - *dst = tqRgba( TQ_UINT8( r1 + (((r2 - r1) * a) >> 8) ), - TQ_UINT8( g1 + (((g2 - g1) * a) >> 8) ), - TQ_UINT8( b1 + (((b2 - b1) * a) >> 8) ), + *dst = qRgba( Q_UINT8( r1 + (((r2 - r1) * a) >> 8) ), + Q_UINT8( g1 + (((g2 - g1) * a) >> 8) ), + Q_UINT8( b1 + (((b2 - b1) * a) >> 8) ), 0xff ); - else if ( tqAlpha(*dst) == 0x00 ) + else if ( qAlpha(*dst) == 0x00 ) *dst = 0; src++; dst++; @@ -783,7 +783,7 @@ void KeramikButton::enterEvent( TQEvent *e ) TQButton::enterEvent( e ); hover = true; - tqrepaint( false ); + repaint( false ); } @@ -792,7 +792,7 @@ void KeramikButton::leaveEvent( TQEvent *e ) TQButton::leaveEvent( e ); hover = false; - tqrepaint( false ); + repaint( false ); } @@ -831,14 +831,14 @@ void KeramikButton::drawButton( TQPainter *p ) if ( isDown() ) { // Pressed - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(2*size, 0, size, size), pix->rect() ) ); p->translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); } else if ( hover ) // Mouse over - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(size, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(size, 0, size, size), pix->rect() ) ); else // Normal - p->drawPixmap( TQPoint(), *pix, TQStyle::tqvisualRect( TQRect(0, 0, size, size), pix->rect() ) ); + p->drawPixmap( TQPoint(), *pix, TQStyle::visualRect( TQRect(0, 0, size, size), pix->rect() ) ); // Draw the button deco on the bevel @@ -900,7 +900,7 @@ void KeramikButton::drawButton( TQPainter *p ) KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* factory ) : KDecoration( bridge, factory ), - activeIcon( NULL ), inactiveIcon( NULL ), captionBufferDirty( true ), tqmaskDirty( true ) + activeIcon( NULL ), inactiveIcon( NULL ), captionBufferDirty( true ), maskDirty( true ) { } @@ -987,7 +987,7 @@ void KeramikClient::reset( unsigned long ) largeTitlebar = true; largeCaption = isActive(); - widget()->tqlayout()->activate(); + widget()->layout()->activate(); // Compensate for the titlebar size change @@ -1002,7 +1002,7 @@ void KeramikClient::reset( unsigned long ) topSpacer->changeSize( 10, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); largeTitlebar = largeCaption = false; - widget()->tqlayout()->activate(); + widget()->layout()->activate(); // Compensate for the titlebar size change // FRAME @@ -1011,20 +1011,20 @@ void KeramikClient::reset( unsigned long ) calculateCaptionRect(); - captionBufferDirty = tqmaskDirty = true; + captionBufferDirty = maskDirty = true; - // Only tqrepaint the window if it's visible + // Only repaint the window if it's visible // (i.e. not minimized and on the current desktop) if ( widget()->isVisible() ) { - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i = 0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } } -void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) +void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) { for ( uint i=0; i < s.length(); i++ ) { @@ -1035,7 +1035,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[MenuButton] ) { button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), LeftButton|RightButton ); connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); - tqlayout->addWidget( button[MenuButton] ); + layout->addWidget( button[MenuButton] ); } break; @@ -1047,7 +1047,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if(isOnAllDesktops()) button[OnAllDesktopsButton]->toggle(); connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) ); - tqlayout->addWidget( button[OnAllDesktopsButton] ); + layout->addWidget( button[OnAllDesktopsButton] ); } break; @@ -1056,7 +1056,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[HelpButton] && providesContextHelp() ) { button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") ); connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) ); - tqlayout->addWidget( button[HelpButton] ); + layout->addWidget( button[HelpButton] ); } break; @@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[MinButton] && isMinimizable() ) { button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") ); connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) ); - tqlayout->addWidget( button[MinButton] ); + layout->addWidget( button[MinButton] ); } break; @@ -1074,7 +1074,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[MaxButton] && isMaximizable() ) { button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), LeftButton|MidButton|RightButton ); connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); - tqlayout->addWidget( button[MaxButton] ); + layout->addWidget( button[MaxButton] ); } break; @@ -1083,7 +1083,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[CloseButton] && isCloseable() ) { button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") ); connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) ); - tqlayout->addWidget( button[CloseButton] ); + layout->addWidget( button[CloseButton] ); } break; @@ -1092,7 +1092,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[AboveButton]) { button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") ); connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) ); - tqlayout->addWidget( button[AboveButton] ); + layout->addWidget( button[AboveButton] ); } break; @@ -1101,7 +1101,7 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) if ( !button[BelowButton]) { button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") ); connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) ); - tqlayout->addWidget( button[BelowButton] ); + layout->addWidget( button[BelowButton] ); } break; @@ -1111,13 +1111,13 @@ void KeramikClient::addButtons( TQBoxLayout *tqlayout, const TQString &s ) button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton, isSetShade() ? i18n("Unshade") : i18n( "Shade" )); connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) ); - tqlayout->addWidget( button[ShadeButton] ); + layout->addWidget( button[ShadeButton] ); } break; // Additional spacing case '_' : - tqlayout->addSpacing( buttonSpacing ); + layout->addSpacing( buttonSpacing ); break; } } @@ -1130,8 +1130,8 @@ void KeramikClient::updateMask() return; // To maximize performance this code uses precalculated bounding rects - // to set the window tqmask. This saves us from having to allocate a 1bpp - // pixmap, paint the tqmask on it and then have the X server iterate + // to set the window mask. This saves us from having to allocate a 1bpp + // pixmap, paint the mask on it and then have the X server iterate // over the pixels to compute the bounding rects from it. TQRegion r; @@ -1206,7 +1206,7 @@ void KeramikClient::updateMask() setMask( r, YXBanded ); - tqmaskDirty = false; + maskDirty = false; } @@ -1260,7 +1260,7 @@ void KeramikClient::updateCaptionBuffer() ( clientHandler->showAppIcons() ? 16 + iconSpacing : 0 ); int xpos = QMAX( (captionRect.width() - tw) / 3, 8 ); - TQRect tr = TQStyle::tqvisualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, + TQRect tr = TQStyle::visualRect( TQRect(xpos, 1, captionRect.width() - xpos - 10, captionRect.height() - 4), captionBuffer.rect() ); //p.setPen( Qt::red ); // debug @@ -1269,7 +1269,7 @@ void KeramikClient::updateCaptionBuffer() // Application icon if ( clientHandler->showAppIcons() ) { - TQRect iconRect = TQStyle::tqvisualRect( TQRect(tr.x(), + TQRect iconRect = TQStyle::visualRect( TQRect(tr.x(), 1 + (captionRect.height() - 4 - 16) / 2, 16, 16), tr ); TQRect r( icon->rect() ); r.moveCenter( iconRect.center() ); @@ -1304,7 +1304,7 @@ void KeramikClient::updateCaptionBuffer() { p.translate( TQApplication::reverseLayout() ? -1 : 1, 1 ); //p.setPen( options()->color(ColorTitleBar, active).dark() ); - if (tqGray(options()->color(ColorFont, active).rgb()) < 100) + if (qGray(options()->color(ColorFont, active).rgb()) < 100) p.setPen( TQColor(200,200,200) ); else p.setPen( black ); @@ -1328,10 +1328,10 @@ void KeramikClient::calculateCaptionRect() if ( clientHandler->showAppIcons() ) cw += 16 + 4; // icon width + space - cw = QMIN( cw, titlebar->tqgeometry().width() ); - captionRect = TQStyle::tqvisualRect( TQRect(titlebar->tqgeometry().x(), (largeCaption ? 0 : titleBaseY), + cw = QMIN( cw, titlebar->geometry().width() ); + captionRect = TQStyle::visualRect( TQRect(titlebar->geometry().x(), (largeCaption ? 0 : titleBaseY), cw, clientHandler->titleBarHeight(largeCaption) ), - titlebar->tqgeometry() ); + titlebar->geometry() ); } @@ -1341,11 +1341,11 @@ void KeramikClient::captionChange() calculateCaptionRect(); if ( r.size() != captionRect.size() ) - tqmaskDirty = true; + maskDirty = true; captionBufferDirty = true; - widget()->tqrepaint( r | captionRect, false ); + widget()->repaint( r | captionRect, false ); } @@ -1361,7 +1361,7 @@ void KeramikClient::iconChange() activeIcon = inactiveIcon = NULL; captionBufferDirty = true; - widget()->tqrepaint( captionRect, false ); + widget()->repaint( captionRect, false ); } } @@ -1375,15 +1375,15 @@ void KeramikClient::activeChange() if ( largeTitlebar ) { largeCaption = ( active && !maximizedVertical() ); calculateCaptionRect(); - tqmaskDirty = true; + maskDirty = true; } captionBufferDirty = true; - widget()->tqrepaint( false ); + widget()->repaint( false ); for ( int i=0; i < NumButtons; i++ ) - if ( button[i] ) button[i]->tqrepaint( false ); + if ( button[i] ) button[i]->repaint( false ); } @@ -1397,27 +1397,27 @@ void KeramikClient::maximizeChange() largeCaption = largeTitlebar = false; calculateCaptionRect(); - captionBufferDirty = tqmaskDirty = true; + captionBufferDirty = maskDirty = true; - widget()->tqlayout()->activate(); - widget()->tqrepaint( false ); + widget()->layout()->activate(); + widget()->repaint( false ); } else if (( maximizeMode() & MaximizeVertical ) == 0 && !largeTitlebar ) { // We've been restored - enlarge the titlebar by 3 pixels topSpacer->changeSize( 10, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); largeCaption = largeTitlebar = true; calculateCaptionRect(); - captionBufferDirty = tqmaskDirty = true; + captionBufferDirty = maskDirty = true; - widget()->tqlayout()->activate(); - widget()->tqrepaint( false ); + widget()->layout()->activate(); + widget()->repaint( false ); } } if ( button[ MaxButton ] ) { TQToolTip::remove( button[ MaxButton ] ); TQToolTip::add( button[ MaxButton ], maximizeMode() == MaximizeFull ? i18n("Restore") : i18n("Maximize") ); - button[ MaxButton ]->tqrepaint(); + button[ MaxButton ]->repaint(); } } @@ -1426,7 +1426,7 @@ void KeramikClient::desktopChange() { if ( button[ OnAllDesktopsButton ] ) { - button[ OnAllDesktopsButton ]->tqrepaint( true ); + button[ OnAllDesktopsButton ]->repaint( true ); TQToolTip::remove( button[ OnAllDesktopsButton ] ); TQToolTip::add( button[ OnAllDesktopsButton ], isOnAllDesktops() ? i18n("Not on all desktops") : i18n("On all desktops") ); } @@ -1437,7 +1437,7 @@ void KeramikClient::shadeChange() { if ( button[ ShadeButton ] ) { - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); TQToolTip::remove( button[ ShadeButton ] ); TQToolTip::add( button[ ShadeButton ], isSetShade() ? i18n("Unshade") : i18n("Shade") ); } @@ -1447,14 +1447,14 @@ void KeramikClient::shadeChange() void KeramikClient::keepAboveChange( bool ) { if ( button[ AboveButton ] ) - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::keepBelowChange( bool ) { if ( button[ BelowButton ] ) - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } @@ -1482,21 +1482,21 @@ void KeramikClient::slotMaximize() void KeramikClient::slotAbove() { setKeepAbove( !keepAbove()); - button[ AboveButton ]->tqrepaint( true ); + button[ AboveButton ]->repaint( true ); } void KeramikClient::slotBelow() { setKeepBelow( !keepBelow()); - button[ BelowButton ]->tqrepaint( true ); + button[ BelowButton ]->repaint( true ); } void KeramikClient::slotShade() { setShade( !isSetShade()); - button[ ShadeButton ]->tqrepaint( true ); + button[ ShadeButton ]->repaint( true ); } @@ -1515,7 +1515,7 @@ void KeramikClient::paintEvent( TQPaintEvent *e ) int leftBorderWidth = clientHandler->tile( BorderLeft, active )->width(); int rightBorderWidth = clientHandler->tile( BorderRight, active )->width(); - if ( tqmaskDirty ) + if ( maskDirty ) updateMask(); // Titlebar @@ -1624,7 +1624,7 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) if ( r.size() != captionRect.size() ) captionBufferDirty = true; - tqmaskDirty = true; + maskDirty = true; if ( widget()->isVisible() ) { @@ -1644,11 +1644,11 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) if ( dx ) { widget()->update( width() - dx + 1, 0, dx, height() ); - widget()->update( TQRect( TQPoint(4,4), titlebar->tqgeometry().bottomLeft() - TQPoint(1,0) ) ); - widget()->update( TQRect( titlebar->tqgeometry().topRight(), TQPoint( width() - 4, - titlebar->tqgeometry().bottom() ) ) ); + widget()->update( TQRect( TQPoint(4,4), titlebar->geometry().bottomLeft() - TQPoint(1,0) ) ); + widget()->update( TQRect( titlebar->geometry().topRight(), TQPoint( width() - 4, + titlebar->geometry().bottom() ) ) ); // Titlebar needs no paint event - TQApplication::postEvent( this, new TQPaintEvent( titlebar->tqgeometry(), FALSE ) ); + TQApplication::postEvent( this, new TQPaintEvent( titlebar->geometry(), FALSE ) ); } } } @@ -1657,14 +1657,14 @@ void KeramikClient::resizeEvent( TQResizeEvent *e ) void KeramikClient::mouseDoubleClickEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton - && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) + && TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarDblClickOperation(); } void KeramikClient::wheelEvent( TQWheelEvent *e ) { if (isSetShade() - || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).tqcontains( e->pos() ) ) + || TQRect( 0, 0, width(), clientHandler->titleBarHeight( largeTitlebar ) ).contains( e->pos() ) ) titlebarMouseWheelOperation( e->delta()); } @@ -1774,9 +1774,9 @@ void KeramikClient::borders( int& left, int& right, int& top, int& bottom ) cons } -TQSize KeramikClient::tqminimumSize() const +TQSize KeramikClient::minimumSize() const { - return widget()->tqminimumSize(); + return widget()->minimumSize(); } diff --git a/kwin/clients/keramik/keramik.h b/kwin/clients/keramik/keramik.h index 0ff31dbda..c90d3509f 100644 --- a/kwin/clients/keramik/keramik.h +++ b/kwin/clients/keramik/keramik.h @@ -148,7 +148,7 @@ namespace Keramik { virtual Position mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual bool eventFilter( TQObject* o, TQEvent* e ); virtual void activeChange(); virtual void captionChange(); @@ -190,7 +190,7 @@ namespace Keramik { TQRect captionRect; TQPixmap captionBuffer; TQPixmap *activeIcon, *inactiveIcon; - bool captionBufferDirty:1, tqmaskDirty:1; + bool captionBufferDirty:1, maskDirty:1; bool largeCaption:1, largeTitlebar:1; }; // class KeramikClient diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp index 56de8c9fe..abf2bad3d 100644 --- a/kwin/clients/kwmtheme/cli_installer/main.cpp +++ b/kwin/clients/kwmtheme/cli_installer/main.cpp @@ -73,36 +73,36 @@ int main(int argc, char **argv) input.setGroup("Window Border"); output->setGroup("General"); - tmpStr = input.readEntry("tqshapePixmapTop"); + tmpStr = input.readEntry("shapePixmapTop"); if(!tmpStr.isEmpty()){ copy(srcStr+tmpStr, localDirStr+tmpStr); } output->writeEntry("wm_top", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottom"); + tmpStr = input.readEntry("shapePixmapBottom"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottom", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapLeft"); + tmpStr = input.readEntry("shapePixmapLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_left", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapRight"); + tmpStr = input.readEntry("shapePixmapRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_right", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopLeft"); + tmpStr = input.readEntry("shapePixmapTopLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapTopRight"); + tmpStr = input.readEntry("shapePixmapTopRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_topright", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomLeft"); + tmpStr = input.readEntry("shapePixmapBottomLeft"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomleft", tmpStr, true, true); - tmpStr = input.readEntry("tqshapePixmapBottomRight"); + tmpStr = input.readEntry("shapePixmapBottomRight"); if(!tmpStr.isEmpty()) copy(srcStr+tmpStr, localDirStr+tmpStr); output->writeEntry("wm_bottomright", tmpStr, true, true); diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp index 23f8b73e2..89dc6a564 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.cpp +++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp @@ -46,9 +46,9 @@ namespace KWMTheme { p.drawTiledPixmap(0, 0, w2, h2, src); p.end(); - srcMask = (TQBitmap*)src.tqmask(); + srcMask = (TQBitmap*)src.mask(); if (srcMask){ - destMask = (TQBitmap*)dest.tqmask(); + destMask = (TQBitmap*)dest.mask(); p.begin(destMask); p.drawTiledPixmap(0, 0, w2, h2, *srcMask); p.end(); @@ -231,7 +231,7 @@ void MyButton::drawButtonLabel(TQPainter *p) int offset = (isDown() && ((pixmap()->width() >= width()) || (pixmap()->height() >= height()))) ? 1 : 0; style().drawItem(p, TQRect( offset, offset, width(), height() ), - AlignCenter, tqcolorGroup(), + AlignCenter, colorGroup(), true, pixmap(), TQString::null); } } @@ -247,28 +247,28 @@ void KWMThemeClient::init() widget()->installEventFilter( this ); stickyBtn = maxBtn = mnuBtn = 0; - tqlayout = new TQGridLayout(widget()); - tqlayout->addColSpacing(0, maxExtent); - tqlayout->addColSpacing(2, maxExtent); + layout = new TQGridLayout(widget()); + layout->addColSpacing(0, maxExtent); + layout->addColSpacing(2, maxExtent); - tqlayout->addRowSpacing(0, maxExtent); + layout->addRowSpacing(0, maxExtent); - tqlayout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, + layout->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding)); if( isPreview()) - tqlayout->addWidget( new TQLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1); + layout->addWidget( new TQLabel( i18n( "<center><b>KWMTheme</b></center>" ), widget()), 2, 1); else - tqlayout->addItem( new TQSpacerItem( 0, 0 ), 2, 1); + layout->addItem( new TQSpacerItem( 0, 0 ), 2, 1); // Without the next line, shading flickers - tqlayout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding) ); - tqlayout->addRowSpacing(3, maxExtent); - tqlayout->setRowStretch(2, 10); - tqlayout->setColStretch(1, 10); + layout->addItem( new TQSpacerItem(0, 0, TQSizePolicy::Fixed, TQSizePolicy::Expanding) ); + layout->addRowSpacing(3, maxExtent); + layout->setRowStretch(2, 10); + layout->setColStretch(1, 10); TQBoxLayout* hb = new TQBoxLayout(0, TQBoxLayout::LeftToRight, 0, 0, 0); - tqlayout->addLayout( hb, 1, 1 ); + layout->addLayout( hb, 1, 1 ); KConfig *config = KGlobal::config(); config->setGroup("Buttons"); @@ -352,7 +352,7 @@ void KWMThemeClient::init() void KWMThemeClient::drawTitle(TQPainter &dest) { - TQRect titleRect = titlebar->tqgeometry(); + TQRect titleRect = titlebar->geometry(); TQRect r(0, 0, titleRect.width(), titleRect.height()); TQPixmap buffer; @@ -364,7 +364,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.begin(&buffer); if(titleSunken){ - qDrawShadeRect(&p, r, options()->tqcolorGroup(KDecorationOptions::ColorFrame, isActive()), + qDrawShadeRect(&p, r, options()->colorGroup(KDecorationOptions::ColorFrame, isActive()), true, 1, 0); r.setRect(r.x()+1, r.y()+1, r.width()-2, r.height()-2); } @@ -384,7 +384,7 @@ void KWMThemeClient::drawTitle(TQPainter &dest) p.drawTiledPixmap(r, *fill); } else{ - p.fillRect(r, options()->tqcolorGroup(KDecorationOptions::ColorTitleBar, isActive()). + p.fillRect(r, options()->colorGroup(KDecorationOptions::ColorTitleBar, isActive()). brush(TQColorGroup::Button)); } p.setFont(options()->font(isActive())); @@ -402,12 +402,12 @@ void KWMThemeClient::drawTitle(TQPainter &dest) void KWMThemeClient::resizeEvent( TQResizeEvent* ) { doShape(); - widget()->tqrepaint(); + widget()->repaint(); } void KWMThemeClient::captionChange() { - widget()->tqrepaint( titlebar->tqgeometry(), false ); + widget()->repaint( titlebar->geometry(), false ); } void KWMThemeClient::paintEvent( TQPaintEvent *) @@ -557,7 +557,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) } drawTitle(p); - TQColor c = widget()->tqcolorGroup().background(); + TQColor c = widget()->colorGroup().background(); // KWM evidently had a 1 pixel border around the client window. We // emulate it here, but should be removed at some point in order to @@ -568,7 +568,7 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) // We fill the area behind the wrapped widget to ensure that // shading animation is drawn as smoothly as possible - TQRect r(tqlayout->cellGeometry(2, 1)); + TQRect r(layout->cellGeometry(2, 1)); p.fillRect( r.x(), r.y(), r.width(), r.height(), c); p.end(); } @@ -576,10 +576,10 @@ void KWMThemeClient::paintEvent( TQPaintEvent *) void KWMThemeClient::doShape() { - TQBitmap tqshapetqmask(width(), height()); - tqshapetqmask.fill(color0); + TQBitmap shapemask(width(), height()); + shapemask.fill(color0); TQPainter p; - p.begin(&tqshapetqmask); + p.begin(&shapemask); p.setBrush(color1); p.setPen(color1); int x,y; @@ -588,8 +588,8 @@ void KWMThemeClient::doShape() int h1 = framePixmaps[FrameTopLeft]->height(); if (w1 > width()/2) w1 = width()/2; if (h1 > height()/2) h1 = height()/2; - if (framePixmaps[FrameTopLeft]->tqmask()) - p.drawPixmap(0,0,*framePixmaps[FrameTopLeft]->tqmask(), + if (framePixmaps[FrameTopLeft]->mask()) + p.drawPixmap(0,0,*framePixmaps[FrameTopLeft]->mask(), 0,0,w1, h1); else p.fillRect(0,0,w1,h1,color1); @@ -597,8 +597,8 @@ void KWMThemeClient::doShape() int h2 = framePixmaps[FrameTopRight]->height(); if (w2 > width()/2) w2 = width()/2; if (h2 > height()/2) h2 = height()/2; - if (framePixmaps[FrameTopRight]->tqmask()) - p.drawPixmap(width()-w2,0,*framePixmaps[FrameTopRight]->tqmask(), + if (framePixmaps[FrameTopRight]->mask()) + p.drawPixmap(width()-w2,0,*framePixmaps[FrameTopRight]->mask(), framePixmaps[FrameTopRight]->width()-w2,0,w2, h2); else p.fillRect(width()-w2,0,w2, h2,color1); @@ -607,8 +607,8 @@ void KWMThemeClient::doShape() int h3 = framePixmaps[FrameBottomLeft]->height(); if (w3 > width()/2) w3 = width()/2; if (h3 > height()/2) h3 = height()/2; - if (framePixmaps[FrameBottomLeft]->tqmask()) - p.drawPixmap(0,height()-h3,*framePixmaps[FrameBottomLeft]->tqmask(), + if (framePixmaps[FrameBottomLeft]->mask()) + p.drawPixmap(0,height()-h3,*framePixmaps[FrameBottomLeft]->mask(), 0,framePixmaps[FrameBottomLeft]->height()-h3,w3, h3); else p.fillRect(0,height()-h3,w3,h3,color1); @@ -617,8 +617,8 @@ void KWMThemeClient::doShape() int h4 = framePixmaps[FrameBottomRight]->height(); if (w4 > width()/2) w4 = width()/2; if (h4 > height()/2) h4 = height()/2; - if (framePixmaps[FrameBottomRight]->tqmask()) - p.drawPixmap(width()-w4,height()-h4,*framePixmaps[FrameBottomRight]->tqmask(), + if (framePixmaps[FrameBottomRight]->mask()) + p.drawPixmap(width()-w4,height()-h4,*framePixmaps[FrameBottomRight]->mask(), framePixmaps[FrameBottomRight]->width()-w4, framePixmaps[FrameBottomRight]->height()-h4, w4, h4); @@ -629,9 +629,9 @@ void KWMThemeClient::doShape() TQWMatrix m; int n,s,w; //top - if (framePixmaps[FrameTop]->tqmask()) + if (framePixmaps[FrameTop]->mask()) { - pm = *framePixmaps[FrameTop]->tqmask(); + pm = *framePixmaps[FrameTop]->mask(); s = width()-w2-w1; n = s/pm.width(); @@ -657,9 +657,9 @@ void KWMThemeClient::doShape() } //bottom - if (framePixmaps[FrameBottom]->tqmask()) + if (framePixmaps[FrameBottom]->mask()) { - pm = *framePixmaps[FrameBottom]->tqmask(); + pm = *framePixmaps[FrameBottom]->mask(); s = width()-w4-w3; n = s/pm.width(); @@ -683,9 +683,9 @@ void KWMThemeClient::doShape() } //left - if (framePixmaps[FrameLeft]->tqmask()) + if (framePixmaps[FrameLeft]->mask()) { - pm = *framePixmaps[FrameLeft]->tqmask(); + pm = *framePixmaps[FrameLeft]->mask(); s = height()-h3-h1; n = s/pm.height(); @@ -712,9 +712,9 @@ void KWMThemeClient::doShape() } //right - if (framePixmaps[FrameRight]->tqmask()) + if (framePixmaps[FrameRight]->mask()) { - pm = *framePixmaps[FrameRight]->tqmask(); + pm = *framePixmaps[FrameRight]->mask(); s = height()-h4-h2; n = s/pm.height(); @@ -740,19 +740,19 @@ void KWMThemeClient::doShape() } } p.fillRect(maxExtent-1, maxExtent-1, width()-2*maxExtent+2, height()-2*maxExtent+2, color1); - setMask(tqshapetqmask); + setMask(shapemask); } void KWMThemeClient::showEvent(TQShowEvent *) { doShape(); - widget()->tqrepaint(false); + widget()->repaint(false); } void KWMThemeClient::mouseDoubleClickEvent( TQMouseEvent * e ) { - if (e->button() == LeftButton && titlebar->tqgeometry().tqcontains( e->pos() ) ) + if (e->button() == LeftButton && titlebar->geometry().contains( e->pos() ) ) titlebarDblClickOperation(); } @@ -868,9 +868,9 @@ bool KWMThemeClient::eventFilter( TQObject* o, TQEvent* e ) } } -TQSize KWMThemeClient::tqminimumSize() const +TQSize KWMThemeClient::minimumSize() const { - return widget()->tqminimumSize().expandedTo( TQSize( 100, 50 )); + return widget()->minimumSize().expandedTo( TQSize( 100, 50 )); } void KWMThemeClient::resize( const TQSize& s ) @@ -903,23 +903,23 @@ KDecoration* KWMThemeFactory::createDecoration( KDecorationBridge* b ) return new KWMThemeClient( b, this ); } -bool KWMThemeFactory::reset( unsigned long tqmask ) +bool KWMThemeFactory::reset( unsigned long mask ) { bool needHardReset = false; TODO // doesn't obey the Border size setting - if( tqmask & ( SettingFont | SettingButtons )) + if( mask & ( SettingFont | SettingButtons )) needHardReset = true; - if( tqmask & ( SettingFont | SettingColors )) { + if( mask & ( SettingFont | SettingColors )) { KWMTheme::delete_pixmaps(); KWMTheme::create_pixmaps(); } if( !needHardReset ) - resetDecorations( tqmask ); + resetDecorations( mask ); return needHardReset; } diff --git a/kwin/clients/kwmtheme/kwmthemeclient.h b/kwin/clients/kwmtheme/kwmthemeclient.h index 704162b6b..13914b2f6 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.h +++ b/kwin/clients/kwmtheme/kwmthemeclient.h @@ -30,7 +30,7 @@ public: ~KWMThemeClient(){;} void init(); void resize( const TQSize& s ); - TQSize tqminimumSize() const; + TQSize minimumSize() const; void borders( int& left, int& right, int& top, int& bottom ) const; protected: void doShape(); @@ -56,7 +56,7 @@ private: KPixmap *aGradient, *iGradient; MyButton *maxBtn, *stickyBtn, *mnuBtn; TQSpacerItem *titlebar; - TQGridLayout* tqlayout; + TQGridLayout* layout; }; class KWMThemeFactory : public KDecorationFactory @@ -65,7 +65,7 @@ public: KWMThemeFactory(); ~KWMThemeFactory(); KDecoration* createDecoration( KDecorationBridge* b ); - bool reset( unsigned long tqmask ); + bool reset( unsigned long mask ); }; } diff --git a/kwin/clients/laptop/laptopclient.cpp b/kwin/clients/laptop/laptopclient.cpp index 46786c1cf..db91cf15d 100644 --- a/kwin/clients/laptop/laptopclient.cpp +++ b/kwin/clients/laptop/laptopclient.cpp @@ -117,28 +117,28 @@ static void create_pixmaps() // titlebar TQPainter p; - TQPainter tqmaskPainter; + TQPainter maskPainter; int i, x, y; titlePix = new TQPixmap(33, 12); - TQBitmap tqmask(33, 12); - tqmask.fill(Qt::color0); + TQBitmap mask(33, 12); + mask.fill(Qt::color0); p.begin(titlePix); - tqmaskPainter.begin(&tqmask); - tqmaskPainter.setPen(Qt::color1); + maskPainter.begin(&mask); + maskPainter.setPen(Qt::color1); for(i=0, y=2; i < 3; ++i, y+=4){ for(x=1; x <= 33; x+=3){ p.setPen(options()->color(KDecoration::ColorTitleBar, true).light(150)); p.drawPoint(x, y); - tqmaskPainter.drawPoint(x, y); + maskPainter.drawPoint(x, y); p.setPen(options()->color(KDecoration::ColorTitleBar, true).dark(150)); p.drawPoint(x+1, y+1); - tqmaskPainter.drawPoint(x+1, y+1); + maskPainter.drawPoint(x+1, y+1); } } p.end(); - tqmaskPainter.end(); - titlePix->setMask(tqmask); + maskPainter.end(); + titlePix->setMask(mask); if(TQPixmap::defaultDepth() > 8){ aUpperGradient = new KPixmap; @@ -157,7 +157,7 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons (active/inactive, sunken/unsunken, 2 sizes each) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1 = new KPixmap; btnPix1->resize(btnWidth1, titleHeight); @@ -184,7 +184,7 @@ static void create_pixmaps() KPixmapEffect::DiagonalGradient); KPixmapEffect::gradient(*btnDownPix2, c.dark(130), c.light(120), KPixmapEffect::DiagonalGradient); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(120), c.dark(130), KPixmapEffect::DiagonalGradient); @@ -200,27 +200,27 @@ static void create_pixmaps() btnDownPix1->fill(c.rgb()); btnPix2->fill(c.rgb()); btnDownPix2->fill(c.rgb()); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); iBtnPix2->fill(c.rgb()); iBtnDownPix2->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); c = g.background(); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(btnPix2, g, false); drawButtonFrame(btnDownPix2, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iBtnPix2, g, false); drawButtonFrame(iBtnDownPix2, g, true); - if(tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) + if(qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 128) btnForeground = Qt::black; else btnForeground = Qt::white; @@ -293,7 +293,7 @@ void LaptopButton::setBitmap(const unsigned char *bitmap) deco.fill(Qt::color0); } deco.setMask(deco); - tqrepaint(); + repaint(); } void LaptopButton::drawButton(TQPainter *p) @@ -314,7 +314,7 @@ void LaptopButton::drawButton(TQPainter *p) } } else{ - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, decoration()->isActive()); int w = width(); int h = height(); p->fillRect(1, 1, w-2, h-2, isDown() ? g.mid() : g.button()); @@ -380,7 +380,7 @@ bool LaptopClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int LaptopClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int LaptopClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { switch (lm) { case LM_TitleEdgeLeft: @@ -425,7 +425,7 @@ int LaptopClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const return 0; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -469,7 +469,7 @@ void LaptopClient::captionChange() void LaptopClient::paintEvent( TQPaintEvent* ) { TQPainter p(widget()); - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); TQRect r(widget()->rect()); p.setPen(Qt::black); @@ -478,10 +478,10 @@ void LaptopClient::paintEvent( TQPaintEvent* ) // fill mid frame... p.setPen(g.background() ); p.drawLine(r.x()+2, r.y()+2, r.right()-2, r.y()+2); - p.drawLine(r.left()+2, r.y()+3, r.left()+2, r.bottom()-tqlayoutMetric(LM_BorderBottom)+1 ); - p.drawLine(r.right()-2, r.y()+3, r.right()-2, r.bottom()-tqlayoutMetric(LM_BorderBottom)+1 ); - p.drawLine(r.left()+3, r.y()+3, r.left()+3, r.y()+tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeTop) ); - p.drawLine(r.right()-3, r.y()+3, r.right()-3, r.y()+tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeTop) ); + p.drawLine(r.left()+2, r.y()+3, r.left()+2, r.bottom()-layoutMetric(LM_BorderBottom)+1 ); + p.drawLine(r.right()-2, r.y()+3, r.right()-2, r.bottom()-layoutMetric(LM_BorderBottom)+1 ); + p.drawLine(r.left()+3, r.y()+3, r.left()+3, r.y()+layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeTop) ); + p.drawLine(r.right()-3, r.y()+3, r.right()-3, r.y()+layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeTop) ); if (!mustDrawHandle() ) p.drawLine(r.left()+1, r.bottom()-2, r.right()-1, r.bottom()-2); @@ -546,7 +546,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setFont(options()->font(false, isToolWindow() )); TQFontMetrics fm(options()->font(false)); - g = options()->tqcolorGroup(KDecoration::ColorTitleBar, false); + g = options()->colorGroup(KDecoration::ColorTitleBar, false); if(iUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -564,7 +564,7 @@ void LaptopClient::paintEvent( TQPaintEvent* ) p.setPen(options()->color(KDecoration::ColorFont, false)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); @@ -629,7 +629,7 @@ void LaptopClient::updateActiveBuffer( ) p.setFont(options()->font(true, isToolWindow() )); TQFontMetrics fm(options()->font(true)); - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorTitleBar, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorTitleBar, true); if(aUpperGradient) p.drawTiledPixmap(r.x()+((r.width()-fm.width(caption()))/2)-4, r.y(), fm.width(caption())+8, r.height()-1, @@ -647,7 +647,7 @@ void LaptopClient::updateActiveBuffer( ) p.setPen(options()->color(KDecoration::ColorFont, true)); p.drawText(r.x(), r.y(), r.width(), r.height()-1, AlignCenter, caption() ); - g = options()->tqcolorGroup(KDecoration::ColorFrame, true); + g = options()->colorGroup(KDecoration::ColorFrame, true); p.setPen(g.background()); p.drawPoint(r.x(), r.y()); p.drawPoint(r.right(), r.y()); diff --git a/kwin/clients/laptop/laptopclient.h b/kwin/clients/laptop/laptopclient.h index 2bdd940fb..3413b490a 100644 --- a/kwin/clients/laptop/laptopclient.h +++ b/kwin/clients/laptop/laptopclient.h @@ -38,7 +38,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual TQRegion cornerShape(WindowCorner corner); diff --git a/kwin/clients/modernsystem/buttondata.h b/kwin/clients/modernsystem/buttondata.h index fc01c3840..1af5fb8dd 100644 --- a/kwin/clients/modernsystem/buttondata.h +++ b/kwin/clients/modernsystem/buttondata.h @@ -1,8 +1,8 @@ /* Image bits processed by KPixmap2Bitmaps */ -#define lowcolor_tqmask_width 14 -#define lowcolor_tqmask_height 15 -static const unsigned char lowcolor_tqmask_bits[] = { +#define lowcolor_mask_width 14 +#define lowcolor_mask_height 15 +static const unsigned char lowcolor_mask_bits[] = { 0xf0,0x03,0xf8,0x07,0xfc,0xcf,0xfe,0x1f,0xfe,0x1f,0xff,0xff,0xff,0xff,0xff, 0x3f,0xff,0x3f,0xff,0xbf,0xfe,0xdf,0xfe,0x9f,0xfc,0x0f,0xf8,0x07,0xf0,0x03, 0x00,0x40,0x80,0x00,0x00,0x00,0x29,0x00,0x00,0x00,0x7c,0xfe,0x87,0x40,0x00, diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp index 60ef9a3c7..8a94c1748 100644 --- a/kwin/clients/modernsystem/config/config.cpp +++ b/kwin/clients/modernsystem/config/config.cpp @@ -35,15 +35,15 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par vbox->setMargin(0); handleBox = new TQWidget(mainw); - TQGridLayout* tqlayout = new TQGridLayout(handleBox, 0, KDialog::spacingHint()); + TQGridLayout* layout = new TQGridLayout(handleBox, 0, KDialog::spacingHint()); cbShowHandle = new TQCheckBox(i18n("&Show window resize handle"), handleBox); TQWhatsThis::add(cbShowHandle, i18n("When selected, all windows are drawn with a resize " "handle at the lower right corner. This makes window resizing " - "easier, especially for trackballs and other mouse tqreplacements " + "easier, especially for trackballs and other mouse replacements " "on laptops.")); - tqlayout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); + layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); @@ -59,18 +59,18 @@ ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(par bool rtl = kapp->reverseLayout(); label1 = new TQLabel(i18n("Small"), hbox); - label1->tqsetAlignment(rtl ? AlignRight : AlignLeft); + label1->setAlignment(rtl ? AlignRight : AlignLeft); label2 = new TQLabel(i18n("Medium"), hbox); - label2->tqsetAlignment(AlignHCenter); + label2->setAlignment(AlignHCenter); label3 = new TQLabel(i18n("Large"), hbox); - label3->tqsetAlignment(rtl ? AlignLeft : AlignRight); + label3->setAlignment(rtl ? AlignLeft : AlignRight); vbox->addWidget(handleBox); vbox->addStretch(1); -// tqlayout->setColSpacing(0, 30); - tqlayout->addItem(new TQSpacerItem(30, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed), 1, 0); - tqlayout->addWidget(sliderBox, 1, 1); +// layout->setColSpacing(0, 30); + layout->addItem(new TQSpacerItem(30, 10, TQSizePolicy::Fixed, TQSizePolicy::Fixed), 1, 0); + layout->addWidget(sliderBox, 1, 1); load(conf); mainw->show(); diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp index 1bb9f9815..ce7545cdf 100644 --- a/kwin/clients/modernsystem/modernsys.cpp +++ b/kwin/clients/modernsystem/modernsys.cpp @@ -65,7 +65,7 @@ static unsigned char shade_on_bits[] = { static unsigned char menu_bits[] = { 0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff}; -static unsigned char btnhighcolor_tqmask_bits[] = { +static unsigned char btnhighcolor_mask_bits[] = { 0xe0,0x41,0xf8,0x07,0xfc,0x0f,0xfe,0xdf,0xfe,0x1f,0xff,0x3f,0xff,0xff,0xff, 0x3f,0xff,0x3f,0xff,0xff,0xff,0xff,0xfe,0x9f,0xfe,0x1f,0xfc,0x0f,0xf0,0x03, 0x00,0x40,0x80,0x00,0x00,0x00,0x39,0x00,0x00,0x00,0x20,0x99,0x0f,0x08,0xc4, @@ -127,7 +127,7 @@ static void make_button_fx(const TQColorGroup &g, TQPixmap *pix, bool light=fals } else{ - if(!lcDark1->tqmask()){ + if(!lcDark1->mask()){ lcDark1->setMask(*lcDark1); lcDark2->setMask(*lcDark2); lcDark3->setMask(*lcDark3); @@ -171,20 +171,20 @@ static void create_pixmaps() KPixmapEffect::VerticalGradient); } // buttons - TQColorGroup btnColor(options()->tqcolorGroup(KDecoration::ColorButtonBg, true)); + TQColorGroup btnColor(options()->colorGroup(KDecoration::ColorButtonBg, true)); buttonPix = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPix); buttonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, buttonPixDown, true); - btnColor = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + btnColor = options()->colorGroup(KDecoration::ColorButtonBg, false); iButtonPix = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPix); iButtonPixDown = new TQPixmap(14, 15); make_button_fx(btnColor, iButtonPixDown, true); - if(tqGray(btnColor.background().rgb()) < 150) + if(qGray(btnColor.background().rgb()) < 150) buttonFg = new TQColor(Qt::white); else buttonFg = new TQColor(Qt::black); @@ -289,11 +289,11 @@ ModernButton::ModernButton(ButtonType type, ModernSys *parent, const char *name) { setBackgroundMode( NoBackground ); - TQBitmap tqmask(14, 15, TQPixmap::defaultDepth() > 8 ? - btnhighcolor_tqmask_bits : lowcolor_tqmask_bits, true); + TQBitmap mask(14, 15, TQPixmap::defaultDepth() > 8 ? + btnhighcolor_mask_bits : lowcolor_mask_bits, true); resize(14, 15); - setMask(tqmask); + setMask(mask); } void ModernButton::reset(unsigned long changed) @@ -410,7 +410,7 @@ bool ModernSys::decorationBehaviour(DecorationBehaviour behaviour) const } } -int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int ModernSys::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { // bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -425,9 +425,9 @@ int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC return border_width + handle_width; case LM_TitleEdgeLeft: - return tqlayoutMetric(LM_BorderLeft,respectWindowState)+3; + return layoutMetric(LM_BorderLeft,respectWindowState)+3; case LM_TitleEdgeRight: - return tqlayoutMetric(LM_BorderRight,respectWindowState)+3; + return layoutMetric(LM_BorderRight,respectWindowState)+3; case LM_TitleEdgeTop: return 2; @@ -454,7 +454,7 @@ int ModernSys::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC return 3; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -515,10 +515,10 @@ void ModernSys::recalcTitleBuffer() p.drawTiledPixmap(0, 0, width(), title_height+2, *aUpperGradient); else p.fillRect(0, 0, width(), title_height+2, - options()->tqcolorGroup(ColorTitleBar, true). + options()->colorGroup(ColorTitleBar, true). brush(TQColorGroup::Button)); - TQRect t = titleRect(); // titlebar->tqgeometry(); + TQRect t = titleRect(); // titlebar->geometry(); t.setTop( 2 ); t.setLeft( t.left() ); t.setRight( t.right() - 2 ); @@ -554,7 +554,7 @@ void ModernSys::updateCaption() void ModernSys::drawRoundFrame(TQPainter &p, int x, int y, int w, int h) { kDrawRoundButton(&p, x, y, w, h, - options()->tqcolorGroup(ColorFrame, isActive()), false); + options()->colorGroup(ColorFrame, isActive()), false); } @@ -568,11 +568,11 @@ void ModernSys::paintEvent( TQPaintEvent* ) int hw = handle_width; TQPainter p( widget() ); - TQRect t = titleRect(); // titlebar->tqgeometry(); + TQRect t = titleRect(); // titlebar->geometry(); - TQBrush fillBrush(widget()->tqcolorGroup().brush(TQColorGroup::Background).pixmap() ? - widget()->tqcolorGroup().brush(TQColorGroup::Background) : - options()->tqcolorGroup(ColorFrame, isActive()). + TQBrush fillBrush(widget()->colorGroup().brush(TQColorGroup::Background).pixmap() ? + widget()->colorGroup().brush(TQColorGroup::Background) : + options()->colorGroup(ColorFrame, isActive()). brush(TQColorGroup::Button)); p.fillRect(1, title_height+3, width()-2, height()-(title_height+3), fillBrush); @@ -586,7 +586,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) int h = height() - hw; // titlebar - TQColorGroup g = options()->tqcolorGroup(ColorTitleBar, isActive()); + TQColorGroup g = options()->colorGroup(ColorTitleBar, isActive()); if(isActive()){ p.drawPixmap(1, 1, titleBuffer, 0, 0, w-2, title_height+2); } @@ -609,7 +609,7 @@ void ModernSys::paintEvent( TQPaintEvent* ) p.drawLine(0, title_height+2, w-2, title_height+2); // frame - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); p.setPen(g.light()); p.drawLine(1, title_height+3, 1, h-2); p.setPen(g.dark()); @@ -649,22 +649,22 @@ void ModernSys::updateWindowShape() { int hs = handle_size; int hw = handle_width; - TQRegion tqmask; - tqmask += TQRect(0, 0, width()-hw, height()-hw); + TQRegion mask; + mask += TQRect(0, 0, width()-hw, height()-hw); //single points - tqmask -= TQRect(0, 0, 1, 1); - tqmask -= TQRect(width()-hw-1, 0, 1, 1); - tqmask -= TQRect(0, height()-hw-1, 1, 1); + mask -= TQRect(0, 0, 1, 1); + mask -= TQRect(width()-hw-1, 0, 1, 1); + mask -= TQRect(0, height()-hw-1, 1, 1); if (show_handle) { - tqmask += TQRect(width()-hs, height()-hs, hs-1, hs-1); - tqmask -= TQRect(width()-2, height()-2, 1, 1); - tqmask -= TQRect(width()-2, height()-hs, 1, 1); - tqmask -= TQRect(width()-hs, height()-2, 1, 1); + mask += TQRect(width()-hs, height()-hs, hs-1, hs-1); + mask -= TQRect(width()-2, height()-2, 1, 1); + mask -= TQRect(width()-2, height()-hs, 1, 1); + mask -= TQRect(width()-hs, height()-2, 1, 1); } else - tqmask -= TQRect(width()-1, height()-1, 1, 1); + mask -= TQRect(width()-1, height()-1, 1, 1); - setMask(tqmask); + setMask(mask); } ModernSysFactory::ModernSysFactory() diff --git a/kwin/clients/modernsystem/modernsys.h b/kwin/clients/modernsystem/modernsys.h index 927e1e32e..3e0cf02fd 100644 --- a/kwin/clients/modernsystem/modernsys.h +++ b/kwin/clients/modernsystem/modernsys.h @@ -36,7 +36,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual void updateWindowShape(); diff --git a/kwin/clients/plastik/config/configdialog.ui b/kwin/clients/plastik/config/configdialog.ui index 9970bd254..642891b31 100644 --- a/kwin/clients/plastik/config/configdialog.ui +++ b/kwin/clients/plastik/config/configdialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>ConfigDialog</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -115,5 +115,5 @@ <tabstop>animateButtons</tabstop> <tabstop>titleShadow</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwin/clients/plastik/misc.cpp b/kwin/clients/plastik/misc.cpp index 1b259d383..43786fe46 100644 --- a/kwin/clients/plastik/misc.cpp +++ b/kwin/clients/plastik/misc.cpp @@ -61,9 +61,9 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i if(alpha<0) alpha = 0; int inv_alpha = 255 - alpha; - TQColor result = TQColor( tqRgb(tqRed(rgb_b)*inv_alpha/255 + tqRed(rgb)*alpha/255, - tqGreen(rgb_b)*inv_alpha/255 + tqGreen(rgb)*alpha/255, - tqBlue(rgb_b)*inv_alpha/255 + tqBlue(rgb)*alpha/255) ); + TQColor result = TQColor( qRgb(qRed(rgb_b)*inv_alpha/255 + qRed(rgb)*alpha/255, + qGreen(rgb_b)*inv_alpha/255 + qGreen(rgb)*alpha/255, + qBlue(rgb_b)*inv_alpha/255 + qBlue(rgb)*alpha/255) ); return result; } @@ -73,10 +73,10 @@ TQImage recolorImage(TQImage *img, TQColor color) { destImg.setAlphaBuffer(true); for (int x = 0; x < img->width(); x++) { for (int y = 0; y < img->height(); y++) { - if(img->pixel(x,y) == tqRgb(0,0,255) ) { + if(img->pixel(x,y) == qRgb(0,0,255) ) { destImg.setPixel(x,y,color.rgb() ); // set to the new color } else { - destImg.setPixel(x,y,tqRgba(0,0,0,0) ); // set transparent... + destImg.setPixel(x,y,qRgba(0,0,0,0) ); // set transparent... } } } diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp index 8d905e398..a6313cd1c 100644 --- a/kwin/clients/plastik/plastik.cpp +++ b/kwin/clients/plastik/plastik.cpp @@ -87,7 +87,7 @@ bool PlastikHandler::reset(unsigned long changed) m_borderSize = 4; } - // check if we are in reverse tqlayout mode + // check if we are in reverse layout mode m_reverse = TQApplication::reverseLayout(); // read in the configuration @@ -329,7 +329,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.drawLine(2,h-1, w-1,h-1); } - // outside the region normally tqmasked by doShape + // outside the region normally masked by doShape painter.setPen(TQColor(0,0,0) ); painter.drawLine(0, 0, 1, 0 ); painter.drawPoint(0, 1); @@ -361,7 +361,7 @@ const TQPixmap &PlastikHandler::pixmap(Pixmaps type, bool active, bool toolWindo painter.drawLine(0,h-1, w-3,h-1); } - // outside the region normally tqmasked by doShape + // outside the region normally masked by doShape painter.setPen(TQColor(0,0,0) ); painter.drawLine(w-2, 0, w-1, 0 ); painter.drawPoint(w-1, 1); diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp index 5a3258004..27a3eb127 100644 --- a/kwin/clients/plastik/plastikbutton.cpp +++ b/kwin/clients/plastik/plastikbutton.cpp @@ -140,7 +140,7 @@ void PlastikButton::animate() } } - tqrepaint(false); + repaint(false); } void PlastikButton::enterEvent(TQEvent *e) @@ -269,7 +269,7 @@ void PlastikButton::drawButton(TQPainter *painter) if(!isDown() && Handler()->titleShadow() ) { TQColor shadowColor; - if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) shadowColor = TQColor(255, 255, 255); else shadowColor = TQColor(0,0,0); diff --git a/kwin/clients/plastik/plastikclient.cpp b/kwin/clients/plastik/plastikclient.cpp index 4fdfe8e17..604c66641 100644 --- a/kwin/clients/plastik/plastikclient.cpp +++ b/kwin/clients/plastik/plastikclient.cpp @@ -80,7 +80,7 @@ bool PlastikClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int PlastikClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int PlastikClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -149,7 +149,7 @@ int PlastikClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, cons return 3; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -204,25 +204,25 @@ TQRegion PlastikClient::cornerShape(WindowCorner corner) switch (corner) { case WC_TopLeft: - if (tqlayoutMetric(LM_TitleEdgeLeft) > 0) + if (layoutMetric(LM_TitleEdgeLeft) > 0) return TQRegion(0, 0, 1, 2) + TQRegion(1, 0, 1, 1); else return TQRegion(); case WC_TopRight: - if (tqlayoutMetric(LM_TitleEdgeRight) > 0) + if (layoutMetric(LM_TitleEdgeRight) > 0) return TQRegion(w-1, 0, 1, 2) + TQRegion(w-2, 0, 1, 1); else return TQRegion(); case WC_BottomLeft: - if (tqlayoutMetric(LM_BorderBottom) > 0) + if (layoutMetric(LM_BorderBottom) > 0) return TQRegion(0, h-1, 1, 1); else return TQRegion(); case WC_BottomRight: - if (tqlayoutMetric(LM_BorderBottom) > 0) + if (layoutMetric(LM_BorderBottom) > 0) return TQRegion(w-1, h-1, 1, 1); else return TQRegion(); @@ -254,14 +254,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e) // int r_h = r.height(); int r_x, r_y, r_x2, r_y2; r.coords(&r_x, &r_y, &r_x2, &r_y2); - const int borderLeft = tqlayoutMetric(LM_BorderLeft); - const int borderRight = tqlayoutMetric(LM_BorderRight); - const int borderBottom = tqlayoutMetric(LM_BorderBottom); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); + const int borderLeft = layoutMetric(LM_BorderLeft); + const int borderRight = layoutMetric(LM_BorderRight); + const int borderBottom = layoutMetric(LM_BorderBottom); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); const int borderBottomTop = r_y2-borderBottom+1; const int borderLeftRight = r_x+borderLeft-1; @@ -280,7 +280,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeTop > 0) { tempRect.setRect(r_x+2, r_y, r_w-2*2, titleEdgeTop ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTileTop, active, toolWindow) ); } } @@ -291,7 +291,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeLeft > 0) { tempRect.setRect(r_x, r_y, borderLeft, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarLeft, active, toolWindow) ); titleMarginLeft = borderLeft; } @@ -301,7 +301,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(titleEdgeRight > 0) { tempRect.setRect(borderRightLeft, r_y, borderRight, titleEdgeTop+titleHeight+titleEdgeBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarRight, active, toolWindow) ); titleMarginRight = borderRight; } @@ -312,7 +312,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(Rtitle.width() > 0) { m_captionRect = captionRect(); // also update m_captionRect! - if (m_captionRect.isValid() && region.tqcontains(m_captionRect) ) + if (m_captionRect.isValid() && region.contains(m_captionRect) ) { painter.drawTiledPixmap(m_captionRect, caption); } @@ -320,14 +320,14 @@ void PlastikClient::paintEvent(TQPaintEvent *e) // left to the title tempRect.setRect(r_x+titleMarginLeft, m_captionRect.top(), m_captionRect.left() - (r_x+titleMarginLeft), m_captionRect.height() ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } // right to the title tempRect.setRect(m_captionRect.right()+1, m_captionRect.top(), (r_x2-titleMarginRight) - m_captionRect.right(), m_captionRect.height() ); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(TitleBarTile, active, toolWindow) ); } @@ -337,7 +337,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderLeft > 0 && sideHeight > 0) { tempRect.setCoords(r_x, titleEdgeBottomBottom+1, borderLeftRight, borderBottomTop-1); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderLeftTile, active, toolWindow) ); } } @@ -346,7 +346,7 @@ void PlastikClient::paintEvent(TQPaintEvent *e) if(borderRight > 0 && sideHeight > 0) { tempRect.setCoords(borderRightLeft, titleEdgeBottomBottom+1, r_x2, borderBottomTop-1); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderRightTile, active, toolWindow) ); } } @@ -358,19 +358,19 @@ void PlastikClient::paintEvent(TQPaintEvent *e) int r = r_x2; tempRect.setRect(r_x, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomLeft, active, toolWindow) ); l = tempRect.right()+1; } tempRect.setRect(borderRightLeft, borderBottomTop, borderLeft, borderBottom); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomRight, active, toolWindow) ); r = tempRect.left()-1; } tempRect.setCoords(l, borderBottomTop, r, r_y2); - if (tempRect.isValid() && region.tqcontains(tempRect) ) { + if (tempRect.isValid() && region.contains(tempRect) ) { painter.drawTiledPixmap(tempRect, handler->pixmap(BorderBottomTile, active, toolWindow) ); } } @@ -381,16 +381,16 @@ TQRect PlastikClient::captionRect() const const TQPixmap &caption = captionPixmap(); TQRect r = widget()->rect(); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int marginLeft = tqlayoutMetric(LM_TitleBorderLeft); - const int marginRight = tqlayoutMetric(LM_TitleBorderRight); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int marginLeft = layoutMetric(LM_TitleBorderLeft); + const int marginRight = layoutMetric(LM_TitleBorderRight); const int titleLeft = r.left() + titleEdgeLeft + buttonsLeftWidth() + marginLeft; const int titleWidth = r.width() - - titleEdgeLeft - tqlayoutMetric(LM_TitleEdgeRight) - + titleEdgeLeft - layoutMetric(LM_TitleEdgeRight) - buttonsLeftWidth() - buttonsRightWidth() - marginLeft - marginRight; @@ -435,7 +435,7 @@ void PlastikClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // tqrepaint the whole thing + // repaint the whole thing clearCaptionPixmaps(); widget()->update(); updateButtons(); @@ -445,7 +445,7 @@ void PlastikClient::reset( unsigned long changed ) updateLayout(); - // then tqrepaint + // then repaint clearCaptionPixmaps(); widget()->update(); } @@ -479,7 +479,7 @@ const TQPixmap &PlastikClient::captionPixmap() const int captionWidth = fm.width(c); int captionHeight = fm.height(); - const int th = tqlayoutMetric(LM_TitleHeight, false) + tqlayoutMetric(LM_TitleEdgeBottom, false); + const int th = layoutMetric(LM_TitleHeight, false) + layoutMetric(LM_TitleEdgeBottom, false); TQPainter painter; @@ -496,7 +496,7 @@ const TQPixmap &PlastikClient::captionPixmap() const if(Handler()->titleShadow()) { TQColor shadowColor; - if (tqGray(Handler()->getColor(TitleFont,active).rgb()) < 100) + if (qGray(Handler()->getColor(TitleFont,active).rgb()) < 100) shadowColor = TQColor(255, 255, 255); else shadowColor = TQColor(0,0,0); diff --git a/kwin/clients/plastik/plastikclient.h b/kwin/clients/plastik/plastikclient.h index 6f96664ea..e83bf75a5 100644 --- a/kwin/clients/plastik/plastikclient.h +++ b/kwin/clients/plastik/plastikclient.h @@ -41,7 +41,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual TQRegion cornerShape(WindowCorner corner); virtual KCommonDecorationButton *createButton(ButtonType type); diff --git a/kwin/clients/quartz/config/config.cpp b/kwin/clients/quartz/config/config.cpp index f6b780eeb..d15eb4da1 100644 --- a/kwin/clients/quartz/config/config.cpp +++ b/kwin/clients/quartz/config/config.cpp @@ -1,6 +1,6 @@ /* * - * This file tqcontains the quartz configuration widget + * This file contains the quartz configuration widget * * Copyright (c) 2001 * Karol Szwed <gallium@kde.org> diff --git a/kwin/clients/quartz/config/config.h b/kwin/clients/quartz/config/config.h index d22313ab7..0a952c4e9 100644 --- a/kwin/clients/quartz/config/config.h +++ b/kwin/clients/quartz/config/config.h @@ -1,6 +1,6 @@ /* * - * This file tqcontains the quartz configuration widget + * This file contains the quartz configuration widget * * Copyright (c) 2001 * Karol Szwed <gallium@kde.org> diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp index 489ccd081..82caabb45 100644 --- a/kwin/clients/quartz/quartz.cpp +++ b/kwin/clients/quartz/quartz.cpp @@ -207,7 +207,7 @@ void QuartzHandler::readConfig() extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); // A small hack to make the on all desktops button look nicer - onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().tqcontains( 'S' ); + onAllDesktopsButtonOnLeft = KDecoration::options()->titleButtonsLeft().contains( 'S' ); if ( TQApplication::reverseLayout() ) onAllDesktopsButtonOnLeft = !onAllDesktopsButtonOnLeft; switch(options()->preferredBorderSize(this)) { @@ -291,18 +291,18 @@ void QuartzHandler::drawBlocks( KPixmap *pi, KPixmap &p, const TQColor &c1, cons void QuartzHandler::createPixmaps() { // Obtain titlebar blend colours, and create the block stuff on pixmaps. - TQColorGroup g2 = options()->tqcolorGroup(ColorTitleBlend, true); + TQColorGroup g2 = options()->colorGroup(ColorTitleBlend, true); TQColor c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, true ); + g2 = options()->colorGroup(ColorTitleBar, true ); TQColor c = g2.background().light(130); titleBlocks = new KPixmap(); titleBlocks->resize( normalTitleHeight*25/18, normalTitleHeight ); drawBlocks( titleBlocks, *titleBlocks, c, c2 ); - g2 = options()->tqcolorGroup(ColorTitleBlend, false); + g2 = options()->colorGroup(ColorTitleBlend, false); c2 = g2.background(); - g2 = options()->tqcolorGroup(ColorTitleBar, false ); + g2 = options()->colorGroup(ColorTitleBar, false ); c = g2.background().light(130); ititleBlocks = new KPixmap(); @@ -313,9 +313,9 @@ void QuartzHandler::createPixmaps() TQColorGroup g; TQPainter p; - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, true ); c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, true ); + g2 = options()->colorGroup( ColorButtonBg, true ); pinUpPix = new KPixmap(); pinUpPix->resize(16, 16); @@ -335,9 +335,9 @@ void QuartzHandler::createPixmaps() // Inactive pins - g = options()->tqcolorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); + g = options()->colorGroup( onAllDesktopsButtonOnLeft ? ColorTitleBar : ColorTitleBlend, false ); c = onAllDesktopsButtonOnLeft ? g.background().light(130) : g.background(); - g2 = options()->tqcolorGroup( ColorButtonBg, false ); + g2 = options()->colorGroup( ColorButtonBg, false ); ipinUpPix = new KPixmap(); ipinUpPix->resize(16, 16); @@ -437,7 +437,7 @@ void QuartzButton::setBitmap(const unsigned char *bitmap) if (bitmap) { deco = new TQBitmap(10, 10, bitmap, true); deco->setMask( *deco ); - tqrepaint( false ); + repaint( false ); } } @@ -540,7 +540,7 @@ bool QuartzClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int QuartzClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int QuartzClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -582,7 +582,7 @@ int QuartzClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const return 3; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -643,8 +643,8 @@ void QuartzClient::reset( unsigned long changed ) { if (changed & SettingColors || changed & SettingFont) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(false); } KCommonDecoration::reset(changed); @@ -675,9 +675,9 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the title color if( coloredFrame ) - g = options()->tqcolorGroup(ColorTitleBar, isActive()); + g = options()->colorGroup(ColorTitleBar, isActive()); else - g = options()->tqcolorGroup(ColorFrame, isActive()); + g = options()->colorGroup(ColorFrame, isActive()); // Draw outer highlights and lowlights p.setPen( g.light().light(120) ); @@ -724,11 +724,11 @@ void QuartzClient::paintEvent( TQPaintEvent* ) // =================== int r_x, r_y, r_x2, r_y2; widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int ttlHeight = tqlayoutMetric(LM_TitleHeight); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int ttlHeight = layoutMetric(LM_TitleHeight); const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1; r = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop, r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()), diff --git a/kwin/clients/quartz/quartz.h b/kwin/clients/quartz/quartz.h index 8f357d209..ddb68ced3 100644 --- a/kwin/clients/quartz/quartz.h +++ b/kwin/clients/quartz/quartz.h @@ -74,7 +74,7 @@ class QuartzClient : public KCommonDecoration virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual void init(); diff --git a/kwin/clients/redmond/redmond.cpp b/kwin/clients/redmond/redmond.cpp index aacbd3812..7f74479ed 100644 --- a/kwin/clients/redmond/redmond.cpp +++ b/kwin/clients/redmond/redmond.cpp @@ -149,7 +149,7 @@ static void create_pixmaps () defaultMenuPix = new TQPixmap(kdelogo); // buttons (active/inactive, sunken/unsunken) - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + TQColorGroup g = options()->colorGroup(KDecoration::ColorButtonBg, true); TQColor c = g.background(); btnPix1->resize(normalTitleHeight, normalTitleHeight-2); btnDownPix1->resize(normalTitleHeight, normalTitleHeight-2); @@ -172,7 +172,7 @@ static void create_pixmaps () KPixmapEffect::gradient(*miniBtnDownPix1, c.dark(130), c.light(130), KPixmapEffect::VerticalGradient); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); KPixmapEffect::gradient(*iBtnPix1, c.light(130), c.dark(130), KPixmapEffect::VerticalGradient); @@ -188,7 +188,7 @@ static void create_pixmaps () miniBtnPix1->fill(c.rgb()); miniBtnDownPix1->fill(c.rgb()); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); c = g.background(); iBtnPix1->fill(c.rgb()); iBtnDownPix1->fill(c.rgb()); @@ -196,20 +196,20 @@ static void create_pixmaps () iMiniBtnDownPix1->fill(c.rgb()); } - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, true); + g = options()->colorGroup(KDecoration::ColorButtonBg, true); drawButtonFrame(btnPix1, g, false); drawButtonFrame(btnDownPix1, g, true); drawButtonFrame(miniBtnPix1, g, false); drawButtonFrame(miniBtnDownPix1, g, true); - g = options()->tqcolorGroup(KDecoration::ColorButtonBg, false); + g = options()->colorGroup(KDecoration::ColorButtonBg, false); drawButtonFrame(iBtnPix1, g, false); drawButtonFrame(iBtnDownPix1, g, true); drawButtonFrame(iMiniBtnPix1, g, false); drawButtonFrame(iMiniBtnDownPix1, g, true); // Make sure button pixmaps contrast with the current colour scheme. - if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) + if (qGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127) btnForeground = new TQColor(Qt::black); else btnForeground = new TQColor(Qt::white); @@ -294,7 +294,7 @@ void RedmondButton::setPixmap( const TQPixmap &p ) deco.resize(0, 0); pix = p; - tqrepaint(false); + repaint(false); } @@ -380,7 +380,7 @@ bool RedmondDeco::decorationBehaviour(DecorationBehaviour behaviour) const } } -int RedmondDeco::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int RedmondDeco::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { bool border = !(maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows()); @@ -423,7 +423,7 @@ int RedmondDeco::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const return 2; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -485,7 +485,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* ) // Draw part of the frame that is the frame color // ============================================== - TQColorGroup g = options()->tqcolorGroup(KDecoration::ColorFrame, isActive()); + TQColorGroup g = options()->colorGroup(KDecoration::ColorFrame, isActive()); p.setPen( g.background() ); p.drawLine( x, y, x2-1, y ); p.drawLine( x, y, x, y2-1 ); diff --git a/kwin/clients/redmond/redmond.h b/kwin/clients/redmond/redmond.h index e827ecfbf..fdc5047bc 100644 --- a/kwin/clients/redmond/redmond.h +++ b/kwin/clients/redmond/redmond.h @@ -56,7 +56,7 @@ public: virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); void init(); diff --git a/kwin/clients/test/test.cpp b/kwin/clients/test/test.cpp index 3bb759349..a04437067 100644 --- a/kwin/clients/test/test.cpp +++ b/kwin/clients/test/test.cpp @@ -93,7 +93,7 @@ void Decoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize Decoration::tqminimumSize() const +TQSize Decoration::minimumSize() const { return TQSize( 100, 50 ); } @@ -144,7 +144,7 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - tqApp->syncX(); + qApp->syncX(); TQRect r = iconGeometry(); @@ -153,8 +153,8 @@ bool Decoration::animateMinimize(bool iconify) // Algorithm taken from Window Maker (http://www.windowmaker.org) - int sx = tqgeometry().x(); - int sy = tqgeometry().y(); + int sx = geometry().x(); + int sy = geometry().y(); int sw = width(); int sh = height(); int dx = r.x(); @@ -213,7 +213,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME tqApp->processEvents(); // FRAME ??? +// FRAME qApp->processEvents(); // FRAME ??? cx += xstep; cy += ystep; @@ -236,11 +236,11 @@ bool Decoration::animateMinimize(bool iconify) // Go away quick. helperShowHide( false ); - tqApp->syncX(); + qApp->syncX(); int stepCount = 12; - TQRect r(tqgeometry()); + TQRect r(geometry()); int dx = r.width() / (stepCount * 2); int dy = r.height() / (stepCount * 2); @@ -263,7 +263,7 @@ bool Decoration::animateMinimize(bool iconify) ungrabXServer(); -// FRAME tqApp->processEvents(); +// FRAME qApp->processEvents(); } } break; @@ -276,7 +276,7 @@ bool Decoration::animateMinimize(bool iconify) if (!icongeom.isValid()) return true; - TQRect wingeom = tqgeometry(); + TQRect wingeom = geometry(); TQPainter p( workspaceWidget()); @@ -298,7 +298,7 @@ bool Decoration::animateMinimize(bool iconify) p.flush(); - tqApp->syncX(); + qApp->syncX(); usleep(30000); diff --git a/kwin/clients/test/test.h b/kwin/clients/test/test.h index e1d3d51a6..bfe36fa7c 100644 --- a/kwin/clients/test/test.h +++ b/kwin/clients/test/test.h @@ -22,7 +22,7 @@ class Decoration virtual MousePosition mousePosition( const TQPoint& p ) const; virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void resize( const TQSize& s ); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void activeChange() {}; virtual void captionChange() {}; virtual void maximizeChange() {}; diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp index 1954b960f..43d1b9f42 100644 --- a/kwin/clients/web/Web.cpp +++ b/kwin/clients/web/Web.cpp @@ -80,7 +80,7 @@ bool WebClient::decorationBehaviour(DecorationBehaviour behaviour) const } } -int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const +int WebClient::layoutMetric(LayoutMetric lm, bool respectWindowState, const KCommonDecorationButton *btn) const { // bool maximized = maximizeMode()==MaximizeFull && !options()->moveResizeMaximizedWindows(); @@ -112,7 +112,7 @@ int WebClient::tqlayoutMetric(LayoutMetric lm, bool respectWindowState, const KC return 0; default: - return KCommonDecoration::tqlayoutMetric(lm, respectWindowState, btn); + return KCommonDecoration::layoutMetric(lm, respectWindowState, btn); } } @@ -120,31 +120,31 @@ KCommonDecorationButton *WebClient::createButton(ButtonType type) { switch (type) { case MenuButton: - return new WebButton(MenuButton, this, "menu", tqshape_); + return new WebButton(MenuButton, this, "menu", shape_); case OnAllDesktopsButton: - return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", tqshape_); + return new WebButton(OnAllDesktopsButton, this, "on_all_desktops", shape_); case HelpButton: - return new WebButton(HelpButton, this, "help", tqshape_); + return new WebButton(HelpButton, this, "help", shape_); case MinButton: - return new WebButton(MinButton, this, "minimize", tqshape_); + return new WebButton(MinButton, this, "minimize", shape_); case MaxButton: - return new WebButton(MaxButton, this, "maximize", tqshape_); + return new WebButton(MaxButton, this, "maximize", shape_); case CloseButton: - return new WebButton(CloseButton, this, "close", tqshape_); + return new WebButton(CloseButton, this, "close", shape_); case AboveButton: - return new WebButton(AboveButton, this, "above", tqshape_); + return new WebButton(AboveButton, this, "above", shape_); case BelowButton: - return new WebButton(BelowButton, this, "below", tqshape_); + return new WebButton(BelowButton, this, "below", shape_); case ShadeButton: - return new WebButton(ShadeButton, this, "shade", tqshape_); + return new WebButton(ShadeButton, this, "shade", shape_); default: return 0; @@ -185,7 +185,7 @@ WebClient::init() KConfig c("kwinwebrc"); c.setGroup("General"); - tqshape_ = c.readBoolEntry("Shape", true); + shape_ = c.readBoolEntry("Shape", true); KCommonDecoration::init(); } @@ -195,8 +195,8 @@ WebClient::reset( unsigned long changed ) { if (changed & SettingColors) { - // tqrepaint the whole thing - widget()->tqrepaint(false); + // repaint the whole thing + widget()->repaint(false); } else if (changed & SettingFont) { // font has changed -- update title height // title height @@ -206,7 +206,7 @@ WebClient::reset( unsigned long changed ) if (0 != titleHeight_ % 2) titleHeight_ += 1; - widget()->tqrepaint(false); + widget()->repaint(false); } KCommonDecoration::reset(changed); @@ -217,11 +217,11 @@ WebClient::paintEvent(TQPaintEvent * pe) { int r_x, r_y, r_x2, r_y2; widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int ttlHeight = tqlayoutMetric(LM_TitleHeight); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int ttlHeight = layoutMetric(LM_TitleHeight); const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1; TQRect titleRect = TQRect(r_x+titleEdgeLeft+buttonsLeftWidth(), r_y+titleEdgeTop, r_x2-titleEdgeRight-buttonsRightWidth()-(r_x+titleEdgeLeft+buttonsLeftWidth()), @@ -231,7 +231,7 @@ WebClient::paintEvent(TQPaintEvent * pe) TQPainter p(widget()); p.setPen(Qt::black); - p.setBrush(options()->tqcolorGroup(ColorFrame, isActive()).background()); + p.setBrush(options()->colorGroup(ColorFrame, isActive()).background()); p.setClipRegion(pe->region() - titleRect); @@ -241,12 +241,12 @@ WebClient::paintEvent(TQPaintEvent * pe) p.fillRect(titleRect, options()->color(ColorTitleBar, isActive())); - if (tqshape_) + if (shape_) { int r(width()); int b(height()); - // Draw edge of top-left corner inside the area removed by the tqmask. + // Draw edge of top-left corner inside the area removed by the mask. p.drawPoint(3, 1); p.drawPoint(4, 1); @@ -254,7 +254,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.drawPoint(1, 3); p.drawPoint(1, 4); - // Draw edge of top-right corner inside the area removed by the tqmask. + // Draw edge of top-right corner inside the area removed by the mask. p.drawPoint(r - 5, 1); p.drawPoint(r - 4, 1); @@ -262,7 +262,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.drawPoint(r - 2, 3); p.drawPoint(r - 2, 4); - // Draw edge of bottom-left corner inside the area removed by the tqmask. + // Draw edge of bottom-left corner inside the area removed by the mask. p.drawPoint(1, b - 5); p.drawPoint(1, b - 4); @@ -270,7 +270,7 @@ WebClient::paintEvent(TQPaintEvent * pe) p.drawPoint(3, b - 2); p.drawPoint(4, b - 2); - // Draw edge of bottom-right corner inside the area removed by the tqmask. + // Draw edge of bottom-right corner inside the area removed by the mask. p.drawPoint(r - 2, b - 5); p.drawPoint(r - 2, b - 4); @@ -288,43 +288,43 @@ WebClient::paintEvent(TQPaintEvent * pe) void WebClient::updateWindowShape() { - if (!tqshape_) + if (!shape_) return; - TQRegion tqmask(0, 0, width(), height()); + TQRegion mask(0, 0, width(), height()); int r(width()); int b(height()); // Remove top-left corner. - tqmask -= TQRegion(0, 0, 5, 1); - tqmask -= TQRegion(0, 1, 3, 1); - tqmask -= TQRegion(0, 2, 2, 1); - tqmask -= TQRegion(0, 3, 1, 2); + mask -= TQRegion(0, 0, 5, 1); + mask -= TQRegion(0, 1, 3, 1); + mask -= TQRegion(0, 2, 2, 1); + mask -= TQRegion(0, 3, 1, 2); // Remove top-right corner. - tqmask -= TQRegion(r - 5, 0, 5, 1); - tqmask -= TQRegion(r - 3, 1, 3, 1); - tqmask -= TQRegion(r - 2, 2, 2, 1); - tqmask -= TQRegion(r - 1, 3, 1, 2); + mask -= TQRegion(r - 5, 0, 5, 1); + mask -= TQRegion(r - 3, 1, 3, 1); + mask -= TQRegion(r - 2, 2, 2, 1); + mask -= TQRegion(r - 1, 3, 1, 2); // Remove bottom-left corner. - tqmask -= TQRegion(0, b - 5, 1, 3); - tqmask -= TQRegion(0, b - 3, 2, 1); - tqmask -= TQRegion(0, b - 2, 3, 1); - tqmask -= TQRegion(0, b - 1, 5, 1); + mask -= TQRegion(0, b - 5, 1, 3); + mask -= TQRegion(0, b - 3, 2, 1); + mask -= TQRegion(0, b - 2, 3, 1); + mask -= TQRegion(0, b - 1, 5, 1); // Remove bottom-right corner. - tqmask -= TQRegion(r - 5, b - 1, 5, 1); - tqmask -= TQRegion(r - 3, b - 2, 3, 1); - tqmask -= TQRegion(r - 2, b - 3, 2, 1); - tqmask -= TQRegion(r - 1, b - 5, 1, 2); + mask -= TQRegion(r - 5, b - 1, 5, 1); + mask -= TQRegion(r - 3, b - 2, 3, 1); + mask -= TQRegion(r - 2, b - 3, 2, 1); + mask -= TQRegion(r - 1, b - 5, 1, 2); - setMask(tqmask); + setMask(mask); } KDecoration* WebFactory::createDecoration( KDecorationBridge* b ) @@ -382,4 +382,4 @@ TQValueList< WebFactory::BorderSize > WebFactory::borderSizes() const #include "Web.moc" // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h index 4b24d0da6..c8a8fa2db 100644 --- a/kwin/clients/web/Web.h +++ b/kwin/clients/web/Web.h @@ -46,7 +46,7 @@ namespace Web virtual TQString defaultButtonsLeft() const; virtual TQString defaultButtonsRight() const; virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton * = 0) const; virtual KCommonDecorationButton *createButton(ButtonType type); virtual void updateWindowShape(); @@ -62,7 +62,7 @@ namespace Web int titleHeight_, borderSize_; - bool tqshape_; + bool shape_; TQBitmap _buttonBitmap(ButtonType t) const; }; @@ -84,4 +84,4 @@ namespace Web #endif // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp index b12d7bd84..61811accc 100644 --- a/kwin/clients/web/WebButton.cpp +++ b/kwin/clients/web/WebButton.cpp @@ -69,10 +69,10 @@ namespace Web { 0xff, 0x81, 0x81, 0xff, 0x81, 0xff, 0x81, 0xff }; -WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape) +WebButton::WebButton(ButtonType type, WebClient *parent, const char *name, bool shape) : KCommonDecorationButton (type, parent, name), mouseOver_ (false), - tqshape_ (tqshape), + shape_ (shape), deco_ (parent) { setBackgroundMode(NoBackground); @@ -127,7 +127,7 @@ void WebButton::reset(unsigned long changed) WebButton::enterEvent(TQEvent * e) { mouseOver_ = true; - tqrepaint(); + repaint(); TQButton::enterEvent(e); } @@ -135,7 +135,7 @@ WebButton::enterEvent(TQEvent * e) WebButton::leaveEvent(TQEvent * e) { mouseOver_ = false; - tqrepaint(); + repaint(); TQButton::leaveEvent(e); } @@ -145,17 +145,17 @@ WebButton::drawButton(TQPainter *p) TQPen highlightPen; if (isDown() ) - highlightPen = TQPen(tqcolorGroup().light()); + highlightPen = TQPen(colorGroup().light()); else { if (mouseOver_) - highlightPen = TQPen(tqcolorGroup().highlight()); + highlightPen = TQPen(colorGroup().highlight()); else highlightPen = TQPen(NoPen); } - p->fillRect(rect(), tqcolorGroup().background()); + p->fillRect(rect(), colorGroup().background()); Position position_; if (0 == mapToParent(rect().topLeft() ).x() ) @@ -174,7 +174,7 @@ WebButton::drawButton(TQPainter *p) p->drawLine(0, 0, width(), 0); p->drawLine(0, 1, 0, height() - 1); - if (tqshape_) + if (shape_) { p->drawPoint(3, 1); p->drawPoint(4, 1); @@ -187,11 +187,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(0, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { p->setClipRect(rect()); p->drawPoint(4, 3); @@ -210,7 +210,7 @@ WebButton::drawButton(TQPainter *p) p->setPen(Qt::black); p->drawLine(0, 0, width(), 0); p->drawLine(width() - 1, 1, width() - 1, height() - 1); - if (tqshape_) + if (shape_) { p->drawPoint(width() - 5, 1); p->drawPoint(width() - 4, 1); @@ -223,11 +223,11 @@ WebButton::drawButton(TQPainter *p) p->setBrush(NoBrush); p->setPen(highlightPen); - if (tqshape_) + if (shape_) p->setClipRegion(TQRegion(rect()) - TQRect(width() - 6, 0, 6, 6)); p->drawRect(2, 2, width() - 4, height() - 4); - if (tqshape_) + if (shape_) { p->setClipRect(rect()); p->drawPoint(width() - 5, 3); @@ -284,4 +284,4 @@ WebButton::setBitmap(const unsigned char *bitmap) } // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h index 2e6a54ef1..da94ea3f7 100644 --- a/kwin/clients/web/WebButton.h +++ b/kwin/clients/web/WebButton.h @@ -41,7 +41,7 @@ namespace Web Left, Mid, Right }; - WebButton(ButtonType type, WebClient *parent, const char *name, bool tqshape); + WebButton(ButtonType type, WebClient *parent, const char *name, bool shape); virtual ~WebButton(); @@ -59,7 +59,7 @@ namespace Web bool mouseOver_; - bool tqshape_; + bool shape_; WebClient* deco_; }; } @@ -67,4 +67,4 @@ namespace Web #endif // vim:ts=2:sw=2:tw=78:set et: -// kate: indent-width 2; tqreplace-tabs on; tab-width 2; space-indent on; +// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on; diff --git a/kwin/data/update_window_settings.cpp b/kwin/data/update_window_settings.cpp index ce4a40a59..0a39850d7 100644 --- a/kwin/data/update_window_settings.cpp +++ b/kwin/data/update_window_settings.cpp @@ -24,7 +24,7 @@ struct SessionInfo TQCString resourceName; TQCString resourceClass; - TQRect tqgeometry; + TQRect geometry; TQRect restore; TQRect fsrestore; int maximized; @@ -76,7 +76,7 @@ void loadFakeSessionInfo( KConfig* config ) info->resourceName = config->readEntry( TQString("resourceName")+n ).latin1(); info->resourceClass = config->readEntry( TQString("resourceClass")+n ).lower().latin1(); info->wmClientMachine = config->readEntry( TQString("clientMachine")+n ).latin1(); - info->tqgeometry = config->readRectEntry( TQString("tqgeometry")+n ); + info->geometry = config->readRectEntry( TQString("geometry")+n ); info->restore = config->readRectEntry( TQString("restore")+n ); info->fsrestore = config->readRectEntry( TQString("fsrestore")+n ); info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); @@ -122,9 +122,9 @@ void writeRules( KConfig& cfg ) cfg.writeEntry( "types", NET::NormalMask ); else cfg.writeEntry( "types", 1 << info->windowType ); - cfg.writeEntry( "position", info->tqgeometry.topLeft()); + cfg.writeEntry( "position", info->geometry.topLeft()); cfg.writeEntry( "positionrule", 4 ); // 4 == remember - cfg.writeEntry( "size", info->tqgeometry.size()); + cfg.writeEntry( "size", info->geometry.size()); cfg.writeEntry( "sizerule", 4 ); cfg.writeEntry( "maximizevert", info->maximized & NET::MaxVert ); cfg.writeEntry( "maximizevertrule", 4 ); diff --git a/kwin/events.cpp b/kwin/events.cpp index dba2e5a47..a30e915e1 100644 --- a/kwin/events.cpp +++ b/kwin/events.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to handling incoming events. + This file contains things relevant to handling incoming events. */ @@ -51,37 +51,37 @@ void WinInfo::changeDesktop(int desktop) m_client->workspace()->sendClientToDesktop( m_client, desktop, true ); } -void WinInfo::changeState( unsigned long state, unsigned long tqmask ) +void WinInfo::changeState( unsigned long state, unsigned long mask ) { - tqmask &= ~NET::Sticky; // KWin doesn't support large desktops, ignore - tqmask &= ~NET::Hidden; // clients are not allowed to change this directly - state &= tqmask; // for safety, clear all other bits + mask &= ~NET::Sticky; // KWin doesn't support large desktops, ignore + mask &= ~NET::Hidden; // clients are not allowed to change this directly + state &= mask; // for safety, clear all other bits - if(( tqmask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) == 0 ) + if(( mask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) == 0 ) m_client->setFullScreen( false, false ); - if ( (tqmask & NET::Max) == NET::Max ) + if ( (mask & NET::Max) == NET::Max ) m_client->setMaximize( state & NET::MaxVert, state & NET::MaxHoriz ); - else if ( tqmask & NET::MaxVert ) + else if ( mask & NET::MaxVert ) m_client->setMaximize( state & NET::MaxVert, m_client->maximizeMode() & Client::MaximizeHorizontal ); - else if ( tqmask & NET::MaxHoriz ) + else if ( mask & NET::MaxHoriz ) m_client->setMaximize( m_client->maximizeMode() & Client::MaximizeVertical, state & NET::MaxHoriz ); - if ( tqmask & NET::Shaded ) + if ( mask & NET::Shaded ) m_client->setShade( state & NET::Shaded ? ShadeNormal : ShadeNone ); - if ( tqmask & NET::KeepAbove) + if ( mask & NET::KeepAbove) m_client->setKeepAbove( (state & NET::KeepAbove) != 0 ); - if ( tqmask & NET::KeepBelow) + if ( mask & NET::KeepBelow) m_client->setKeepBelow( (state & NET::KeepBelow) != 0 ); - if( tqmask & NET::SkipTaskbar ) + if( mask & NET::SkipTaskbar ) m_client->setSkipTaskbar( ( state & NET::SkipTaskbar ) != 0, true ); - if( tqmask & NET::SkipPager ) + if( mask & NET::SkipPager ) m_client->setSkipPager( ( state & NET::SkipPager ) != 0 ); - if( tqmask & NET::DemandsAttention ) + if( mask & NET::DemandsAttention ) m_client->demandAttention(( state & NET::DemandsAttention ) != 0 ); - if( tqmask & NET::Modal ) + if( mask & NET::Modal ) m_client->setModal( ( state & NET::Modal ) != 0 ); // unsetting fullscreen first, setting it last (because e.g. maximize works only for !isFullScreen() ) - if(( tqmask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) != 0 ) + if(( mask & NET::FullScreen ) != 0 && ( state & NET::FullScreen ) != 0 ) m_client->setFullScreen( true, false ); } @@ -625,9 +625,9 @@ bool Client::windowEvent( XEvent* e ) default: if( e->xany.window == window()) { - if( e->type == Shape::tqshapeEvent() ) + if( e->type == Shape::shapeEvent() ) { - is_tqshape = Shape::hasShape( window()); // workaround for #19644 + is_shape = Shape::hasShape( window()); // workaround for #19644 updateShape(); } } @@ -925,7 +925,7 @@ void Client::leaveNotifyEvent( XCrossingEvent* e ) mode = PositionCenter; setCursor( arrowCursor ); } - bool lostMouse = !rect().tqcontains( TQPoint( e->x, e->y ) ); + bool lostMouse = !rect().contains( TQPoint( e->x, e->y ) ); // 'lostMouse' wouldn't work with e.g. B2 or Keramik, which have non-rectangular decorations // (i.e. the LeaveNotify event comes before leaving the rect and no LeaveNotify event // comes after leaving the rect) - so lets check if the pointer is really outside the window @@ -1083,7 +1083,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) if (e->type() == TQEvent::MouseButtonRelease) { int buttonMask, buttonPressed, x, y, x_root, y_root; - unsigned int tqmask; + unsigned int mask; TQMouseEvent *qe = (TQMouseEvent *)e; Window inner_window, parent_window, pointer_window, root_window; XButtonEvent xe; @@ -1109,7 +1109,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // simulated events root_window = qt_xrootwin(); XQueryPointer(qt_xdisplay(), root_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); if (pointer_window != None) { @@ -1119,7 +1119,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // which causes KWin to refocus windows properly parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); inner_window = pointer_window; while (pointer_window != None) @@ -1130,7 +1130,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // found the child that will receive the simulated event parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); } pointer_window = parent_window; } @@ -1190,7 +1190,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) else if (e->type() == TQEvent::Wheel) { int x, y, x_root, y_root; - unsigned int buttonMask, buttonPressed, tqmask; + unsigned int buttonMask, buttonPressed, mask; TQWheelEvent *wheelEvent = (TQWheelEvent *)e; Window inner_window, parent_window, pointer_window, root_window; @@ -1207,7 +1207,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // simulated events root_window = qt_xrootwin(); XQueryPointer(qt_xdisplay(), root_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); if (pointer_window != None) { @@ -1217,7 +1217,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // which causes KWin to refocus windows properly parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); inner_window = pointer_window; while (pointer_window != None) @@ -1228,7 +1228,7 @@ bool Client::eventFilter( TQObject* o, TQEvent* e ) // found the child that will receive the simulated event parent_window = pointer_window; XQueryPointer(qt_xdisplay(), parent_window, &root_window, - &pointer_window, &x_root, &y_root, &x, &y, &tqmask); + &pointer_window, &x_root, &y_root, &x, &y, &mask); } pointer_window = parent_window; } @@ -1615,7 +1615,7 @@ void Client::focusInEvent( XFocusInEvent* e ) // from it to its transient, the fullscreen would be kept in the Active layer // at the beginning and at the end, but not in the middle, when the active // client would be temporarily none (see Client::belongToLayer() ). -// Therefore, the events queue is checked, whether it tqcontains the matching +// Therefore, the events queue is checked, whether it contains the matching // FocusIn event, and if yes, deactivation of the previous client will // be skipped, as activation of the new one will automatically deactivate // previously active client. @@ -1711,13 +1711,13 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction ) } else if( direction == NET::KeyboardMove ) { // ignore mouse coordinates given in the message, mouse position is used by the moving algorithm - TQCursor::setPos( tqgeometry().center() ); - performMouseCommand( Options::MouseUnrestrictedMove, tqgeometry().center()); + TQCursor::setPos( geometry().center() ); + performMouseCommand( Options::MouseUnrestrictedMove, geometry().center()); } else if( direction == NET::KeyboardSize ) { // ignore mouse coordinates given in the message, mouse position is used by the resizing algorithm - TQCursor::setPos( tqgeometry().bottomRight()); - performMouseCommand( Options::MouseUnrestrictedResize, tqgeometry().bottomRight()); + TQCursor::setPos( geometry().bottomRight()); + performMouseCommand( Options::MouseUnrestrictedResize, geometry().bottomRight()); } } diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp index 2db1a1853..3fd278360 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to tqgeometry, i.e. workspace size, + This file contains things relevant to geometry, i.e. workspace size, window positions and window sizes. */ @@ -44,11 +44,11 @@ namespace KWinInternal void Workspace::desktopResized() { //printf("Workspace::desktopResized()\n\r"); - TQRect geom = KApplication::desktop()->tqgeometry(); - NETSize desktop_tqgeometry; - desktop_tqgeometry.width = geom.width(); - desktop_tqgeometry.height = geom.height(); - rootInfo->setDesktopGeometry( -1, desktop_tqgeometry ); + TQRect geom = KApplication::desktop()->geometry(); + NETSize desktop_geometry; + desktop_geometry.width = geom.width(); + desktop_geometry.height = geom.height(); + rootInfo->setDesktopGeometry( -1, desktop_geometry ); updateClientArea( true ); checkElectricBorders( true ); @@ -60,11 +60,11 @@ void Workspace::desktopResized() void Workspace::kDestopResized() { //printf("Workspace::kDesktopResized()\n\r"); - TQRect geom = KApplication::desktop()->tqgeometry(); - NETSize desktop_tqgeometry; - desktop_tqgeometry.width = geom.width(); - desktop_tqgeometry.height = geom.height(); - rootInfo->setDesktopGeometry( -1, desktop_tqgeometry ); + TQRect geom = KApplication::desktop()->geometry(); + NETSize desktop_geometry; + desktop_geometry.width = geom.width(); + desktop_geometry.height = geom.height(); + rootInfo->setDesktopGeometry( -1, desktop_geometry ); updateClientArea( true ); checkElectricBorders( true ); @@ -90,7 +90,7 @@ void Workspace::updateClientArea( bool force ) TQRect* new_wareas = new QRect[ numberOfDesktops() + 1 ]; TQRect** new_sareas = new TQRect*[ numberOfDesktops() + 1]; TQRect* screens = new TQRect [ nscreens ]; - TQRect desktopArea = desktopwidget -> tqgeometry (); + TQRect desktopArea = desktopwidget -> geometry (); for( int iS = 0; iS < nscreens; iS ++ ) @@ -223,10 +223,10 @@ void Workspace::updateClientArea() /*! returns the area available for clients. This is the desktop - tqgeometry minus windows on the dock. Placement algorithms should - refer to this rather than tqgeometry(). + geometry minus windows on the dock. Placement algorithms should + refer to this rather than geometry(). - \sa tqgeometry() + \sa geometry() */ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) const { @@ -237,7 +237,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co ? screenarea[ desktop ][ screen ] : desktopwidget->screenGeometry( screen ); TQRect warea = workarea[ desktop ].isNull() - ? kapp->desktop()->tqgeometry() + ? kapp->desktop()->geometry() : workarea[ desktop ]; switch (opt) { @@ -252,19 +252,19 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co case MaximizeFullArea: if (options->xineramaMaximizeEnabled) if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); else - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case FullScreenArea: if (options->xineramaFullscreenEnabled) if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); else - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case PlacementArea: if (options->xineramaPlacementEnabled) if (desktopwidget->numScreens() < 2) @@ -276,18 +276,18 @@ TQRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) co case MovementArea: if (options->xineramaMovementEnabled) if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); else - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case WorkArea: return warea; case FullArea: - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); case ScreenArea: if (desktopwidget->numScreens() < 2) - return desktopwidget->tqgeometry(); + return desktopwidget->geometry(); else return desktopwidget->screenGeometry( screen ); } @@ -306,7 +306,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, const TQPoint& p, int deskto TQRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const { - return clientArea( opt, c->tqgeometry().center(), c->desktop()); + return clientArea( opt, c->geometry().center(), c->desktop()); } @@ -724,11 +724,11 @@ void Client::keepInArea( TQRect area, bool partial ) area.setRight( QMAX( area.right() + width() - 100, area.right())); area.setBottom( QMAX( area.bottom() + height() - 100, area.bottom())); } - if ( tqgeometry().right() > area.right() && width() < area.width() ) + if ( geometry().right() > area.right() && width() < area.width() ) move( area.right() - width(), y() ); - if ( tqgeometry().bottom() > area.bottom() && height() < area.height() ) + if ( geometry().bottom() > area.bottom() && height() < area.height() ) move( x(), area.bottom() - height() ); - if( !area.tqcontains( tqgeometry().topLeft() )) + if( !area.contains( geometry().topLeft() )) { int tx = x(); int ty = y(); @@ -781,29 +781,29 @@ TQRect Client::adjustedClientArea( const TQRect &desktopArea, const TQRect& area // hack, might cause problems... this tries to guess the start/end of a // non-extended strut; only works on windows that have exact same - // tqgeometry as their strut (ie, if the tqgeometry fits the width - // exactly, we will adjust length of strut to match the tqgeometry as well; + // geometry as their strut (ie, if the geometry fits the width + // exactly, we will adjust length of strut to match the geometry as well; // otherwise we use the full-edge strut) - if (stareaT.top() == tqgeometry().top() && stareaT.bottom() == tqgeometry().bottom()) { - stareaT.setLeft(tqgeometry().left()); - stareaT.setRight(tqgeometry().right()); -// kdDebug () << "Trimming top-strut to tqgeometry() to: " << stareaT << endl; + if (stareaT.top() == geometry().top() && stareaT.bottom() == geometry().bottom()) { + stareaT.setLeft(geometry().left()); + stareaT.setRight(geometry().right()); +// kdDebug () << "Trimming top-strut to geometry() to: " << stareaT << endl; } - if (stareaB.top() == tqgeometry().top() && stareaB.bottom() == tqgeometry().bottom()) { - stareaB.setLeft(tqgeometry().left()); - stareaB.setRight(tqgeometry().right()); -// kdDebug () << "Trimming bottom-strut to tqgeometry(): " << stareaB << endl; + if (stareaB.top() == geometry().top() && stareaB.bottom() == geometry().bottom()) { + stareaB.setLeft(geometry().left()); + stareaB.setRight(geometry().right()); +// kdDebug () << "Trimming bottom-strut to geometry(): " << stareaB << endl; } - if (stareaL.left() == tqgeometry().left() && stareaL.right() == tqgeometry().right()) { - stareaL.setTop(tqgeometry().top()); - stareaL.setBottom(tqgeometry().bottom()); -// kdDebug () << "Trimming left-strut to tqgeometry(): " << stareaL << endl; + if (stareaL.left() == geometry().left() && stareaL.right() == geometry().right()) { + stareaL.setTop(geometry().top()); + stareaL.setBottom(geometry().bottom()); +// kdDebug () << "Trimming left-strut to geometry(): " << stareaL << endl; } - if (stareaR.left() == tqgeometry().left() && stareaR.right() == tqgeometry().right()) { - stareaR.setTop(tqgeometry().top()); - stareaR.setBottom(tqgeometry().bottom()); -// kdDebug () << "Trimming right-strut to tqgeometry(): " << stareaR << endl; + if (stareaR.left() == geometry().left() && stareaR.right() == geometry().right()) { + stareaR.setTop(geometry().top()); + stareaR.setBottom(geometry().bottom()); +// kdDebug () << "Trimming right-strut to geometry(): " << stareaR << endl; } } @@ -811,7 +811,7 @@ TQRect Client::adjustedClientArea( const TQRect &desktopArea, const TQRect& area // HACK: workarea handling is not xinerama aware, so if this strut // reserves place at a xinerama edge that's inside the virtual screen, // ignore the strut for workspace setting. - if( area == kapp->desktop()->tqgeometry()) + if( area == kapp->desktop()->geometry()) { if( stareaL.left() < screenarea.left()) stareaL = TQRect(); @@ -898,7 +898,7 @@ bool Client::hasStrut() const void Client::updateWorkareaDiffs() { TQRect area = workspace()->clientArea( WorkArea, this ); - TQRect geom = tqgeometry(); + TQRect geom = geometry(); workarea_diff_x = computeWorkareaDiff( geom.left(), geom.right(), area.left(), area.right()); workarea_diff_y = computeWorkareaDiff( geom.top(), geom.bottom(), area.top(), area.bottom()); } @@ -934,14 +934,14 @@ void Client::checkWorkspacePosition() if( isDesktop()) { TQRect area = workspace()->clientArea( FullArea, this ); - if( tqgeometry() != area ) + if( geometry() != area ) setGeometry( area ); return; } if( isFullScreen()) { TQRect area = workspace()->clientArea( FullScreenArea, this ); - if( tqgeometry() != area ) + if( geometry() != area ) setGeometry( area ); return; } @@ -983,7 +983,7 @@ void Client::checkWorkspacePosition() return; TQRect area = workspace()->clientArea( WorkArea, this ); - TQRect new_geom = tqgeometry(); + TQRect new_geom = geometry(); TQRect tmp_rect_x( new_geom.left(), 0, new_geom.width(), 0 ); TQRect tmp_area_x( area.left(), 0, area.width(), 0 ); checkDirection( workarea_diff_x, old_diff_x, tmp_rect_x, tmp_area_x ); @@ -1000,7 +1000,7 @@ void Client::checkWorkspacePosition() if( old_diff_y != INT_MAX && old_diff_y > 0 ) final_geom.moveBottom( area.bottom() - ( old_diff_y - 1 )); } - if( final_geom != tqgeometry() ) + if( final_geom != geometry() ) setGeometry( final_geom ); // updateWorkareaDiffs(); done already by setGeometry() } @@ -1122,7 +1122,7 @@ TQSize Client::sizeForClientSize( const TQSize& wsize, Sizemode mode, bool nofra TQSize max_size = maxSize(); if( decoration != NULL ) { - TQSize decominsize = decoration->tqminimumSize(); + TQSize decominsize = decoration->minimumSize(); TQSize border_size( border_left + border_right, border_top + border_bottom ); if( border_size.width() > decominsize.width()) // just in case decominsize.setWidth( border_size.width()); @@ -1341,17 +1341,17 @@ void Client::getWmNormalHints() TQSize new_size = adjustedSize(); if( new_size != size() && !isFullScreen()) { - TQRect orig_tqgeometry = tqgeometry(); + TQRect orig_geometry = geometry(); resizeWithChecks( new_size ); if( ( !isSpecialWindow() || isToolbar()) && !isFullScreen()) { // try to keep the window in its xinerama screen if possible, // if that fails at least keep it visible somewhere TQRect area = workspace()->clientArea( MovementArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); } } @@ -1458,16 +1458,16 @@ const TQPoint Client::calculateGravitation( bool invert, int gravity ) const return TQPoint( x() - dx, y() - dy ); } -void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ) +void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, int gravity, bool from_tool ) { if( gravity == 0 ) // default (nonsense) value for the argument gravity = xSizeHint.win_gravity; - if( value_tqmask & ( CWX | CWY )) + if( value_mask & ( CWX | CWY )) { TQPoint new_pos = calculateGravitation( true, gravity ); // undo gravitation - if ( value_tqmask & CWX ) + if ( value_mask & CWX ) new_pos.setX( rx ); - if ( value_tqmask & CWY ) + if ( value_mask & CWY ) new_pos.setY( ry ); // clever(?) workaround for applications like xv that want to set @@ -1483,9 +1483,9 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, int nw = clientSize().width(); int nh = clientSize().height(); - if ( value_tqmask & CWWidth ) + if ( value_mask & CWWidth ) nw = rw; - if ( value_tqmask & CWHeight ) + if ( value_mask & CWHeight ) nh = rh; TQSize ns = sizeForClientSize( TQSize( nw, nh ) ); new_pos = rules()->checkPosition( new_pos ); @@ -1494,7 +1494,7 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, if ( maximizeMode() != MaximizeFull || ns != size()) { - TQRect orig_tqgeometry = tqgeometry(); + TQRect orig_geometry = geometry(); GeometryUpdatesPostponer blocker( this ); move( new_pos ); plainResize( ns ); @@ -1502,7 +1502,7 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, updateFullScreenHack( TQRect( new_pos, TQSize( nw, nh ))); TQRect area = workspace()->clientArea( WorkArea, this ); if( !from_tool && ( !isSpecialWindow() || isToolbar()) && !isFullScreen() - && area.tqcontains( orig_tqgeometry )) + && area.contains( orig_geometry )) keepInArea( area ); // this is part of the kicker-xinerama-hack... it should be @@ -1514,20 +1514,20 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, } } - if ( value_tqmask & (CWWidth | CWHeight ) - && ! ( value_tqmask & ( CWX | CWY )) ) // pure resize + if ( value_mask & (CWWidth | CWHeight ) + && ! ( value_mask & ( CWX | CWY )) ) // pure resize { int nw = clientSize().width(); int nh = clientSize().height(); - if ( value_tqmask & CWWidth ) + if ( value_mask & CWWidth ) nw = rw; - if ( value_tqmask & CWHeight ) + if ( value_mask & CWHeight ) nh = rh; TQSize ns = sizeForClientSize( TQSize( nw, nh ) ); if( ns != size()) // don't restore if some app sets its own size again { - TQRect orig_tqgeometry = tqgeometry(); + TQRect orig_geometry = geometry(); GeometryUpdatesPostponer blocker( this ); int save_gravity = xSizeHint.win_gravity; xSizeHint.win_gravity = gravity; @@ -1539,28 +1539,28 @@ void Client::configureRequest( int value_tqmask, int rx, int ry, int rw, int rh, // try to keep the window in its xinerama screen if possible, // if that fails at least keep it visible somewhere TQRect area = workspace()->clientArea( MovementArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); area = workspace()->clientArea( WorkArea, this ); - if( area.tqcontains( orig_tqgeometry )) + if( area.contains( orig_geometry )) keepInArea( area ); } } } // No need to send synthetic configure notify event here, either it's sent together - // with tqgeometry change, or there's no need to send it. + // with geometry change, or there's no need to send it. // Handling of the real ConfigureRequest event forces sending it, as there it's necessary. } void Client::resizeWithChecks( int w, int h, ForceGeometry_t force ) { - if( shade_tqgeometry_change ) + if( shade_geometry_change ) assert( false ); else if( isShade()) { if( h == border_top + border_bottom ) { - kdWarning() << "Shaded tqgeometry passed for size:" << endl; + kdWarning() << "Shaded geometry passed for size:" << endl; kdWarning() << kdBacktrace() << endl; } } @@ -1637,16 +1637,16 @@ void Client::resizeWithChecks( int w, int h, ForceGeometry_t force ) void Client::NETMoveResizeWindow( int flags, int x, int y, int width, int height ) { int gravity = flags & 0xff; - int value_tqmask = 0; + int value_mask = 0; if( flags & ( 1 << 8 )) - value_tqmask |= CWX; + value_mask |= CWX; if( flags & ( 1 << 9 )) - value_tqmask |= CWY; + value_mask |= CWY; if( flags & ( 1 << 10 )) - value_tqmask |= CWWidth; + value_mask |= CWWidth; if( flags & ( 1 << 11 )) - value_tqmask |= CWHeight; - configureRequest( value_tqmask, x, y, width, height, gravity, true ); + value_mask |= CWHeight; + configureRequest( value_mask, x, y, width, height, gravity, true ); } /*! @@ -1719,23 +1719,23 @@ bool Client::isMaximizable() const void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) { // this code is also duplicated in Client::plainResize() - // Ok, the shading tqgeometry stuff. Generally, code doesn't care about shaded tqgeometry, - // simply because there are too many places dealing with tqgeometry. Those places - // ignore shaded state and use normal tqgeometry, which they usually should get - // from adjustedSize(). Such tqgeometry comes here, and if the window is shaded, - // the tqgeometry is used only for client_size, since that one is not used when - // shading. Then the frame tqgeometry is adjusted for the shaded tqgeometry. + // Ok, the shading geometry stuff. Generally, code doesn't care about shaded geometry, + // simply because there are too many places dealing with geometry. Those places + // ignore shaded state and use normal geometry, which they usually should get + // from adjustedSize(). Such geometry comes here, and if the window is shaded, + // the geometry is used only for client_size, since that one is not used when + // shading. Then the frame geometry is adjusted for the shaded geometry. // This gets more complicated in the case the code does only something like - // setGeometry( tqgeometry()) - tqgeometry() will return the shaded frame tqgeometry. + // setGeometry( geometry()) - geometry() will return the shaded frame geometry. // Such code is wrong and should be changed to handle the case when the window is shaded, // for example using Client::clientSize(). - if( shade_tqgeometry_change ) + if( shade_geometry_change ) ; // nothing else if( isShade()) { if( h == border_top + border_bottom ) { - kdDebug() << "Shaded tqgeometry passed for size:" << endl; + kdDebug() << "Shaded geometry passed for size:" << endl; kdDebug() << kdBacktrace() << endl; } else @@ -1748,13 +1748,13 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) { client_size = TQSize( w - border_left - border_right, h - border_top - border_bottom ); } - if( force == NormalGeometrySet && frame_tqgeometry == TQRect( x, y, w, h )) + if( force == NormalGeometrySet && frame_geometry == TQRect( x, y, w, h )) return; - frame_tqgeometry = TQRect( x, y, w, h ); + frame_geometry = TQRect( x, y, w, h ); updateWorkareaDiffs(); - if( postpone_tqgeometry_updates != 0 ) + if( postpone_geometry_updates != 0 ) { - pending_tqgeometry_update = true; + pending_geometry_update = true; return; } resizeDecoration( TQSize( w, h )); @@ -1779,13 +1779,13 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) void Client::plainResize( int w, int h, ForceGeometry_t force ) { // this code is also duplicated in Client::setGeometry(), and it's also commented there - if( shade_tqgeometry_change ) + if( shade_geometry_change ) ; // nothing else if( isShade()) { if( h == border_top + border_bottom ) { - kdDebug() << "Shaded tqgeometry passed for size:" << endl; + kdDebug() << "Shaded geometry passed for size:" << endl; kdDebug() << kdBacktrace() << endl; } else @@ -1803,13 +1803,13 @@ void Client::plainResize( int w, int h, ForceGeometry_t force ) kdDebug() << "forced size fail:" << TQSize( w,h ) << ":" << rules()->checkSize( TQSize( w, h )) << endl; kdDebug() << kdBacktrace() << endl; } - if( force == NormalGeometrySet && frame_tqgeometry.size() == TQSize( w, h )) + if( force == NormalGeometrySet && frame_geometry.size() == TQSize( w, h )) return; - frame_tqgeometry.setSize( TQSize( w, h )); + frame_geometry.setSize( TQSize( w, h )); updateWorkareaDiffs(); - if( postpone_tqgeometry_updates != 0 ) + if( postpone_geometry_updates != 0 ) { - pending_tqgeometry_update = true; + pending_geometry_update = true; return; } resizeDecoration( TQSize( w, h )); @@ -1835,13 +1835,13 @@ void Client::plainResize( int w, int h, ForceGeometry_t force ) */ void Client::move( int x, int y, ForceGeometry_t force ) { - if( force == NormalGeometrySet && frame_tqgeometry.topLeft() == TQPoint( x, y )) + if( force == NormalGeometrySet && frame_geometry.topLeft() == TQPoint( x, y )) return; - frame_tqgeometry.moveTopLeft( TQPoint( x, y )); + frame_geometry.moveTopLeft( TQPoint( x, y )); updateWorkareaDiffs(); - if( postpone_tqgeometry_updates != 0 ) + if( postpone_geometry_updates != 0 ) { - pending_tqgeometry_update = true; + pending_geometry_update = true; return; } XMoveWindow( qt_xdisplay(), frameId(), x, y ); @@ -1856,21 +1856,21 @@ void Client::postponeGeometryUpdates( bool postpone ) { if( postpone ) { - if( postpone_tqgeometry_updates == 0 ) - pending_tqgeometry_update = false; - ++postpone_tqgeometry_updates; + if( postpone_geometry_updates == 0 ) + pending_geometry_update = false; + ++postpone_geometry_updates; } else { - if( --postpone_tqgeometry_updates == 0 ) + if( --postpone_geometry_updates == 0 ) { - if( pending_tqgeometry_update ) + if( pending_geometry_update ) { if( isShade()) setGeometry( TQRect( pos(), adjustedSize()), ForceGeometrySet ); else - setGeometry( tqgeometry(), ForceGeometrySet ); - pending_tqgeometry_update = false; + setGeometry( geometry(), ForceGeometrySet ); + pending_geometry_update = false; } } } @@ -2003,7 +2003,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust ) case MaximizeRestore: { - TQRect restore = tqgeometry(); + TQRect restore = geometry(); // when only partially maximized, geom_restore may not have the other dimension remembered if( old_mode & MaximizeVertical ) { @@ -2024,7 +2024,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust ) s.setHeight( geom_restore.height()); plainResize( adjustedSize( s )); workspace()->placeSmart( this, clientArea ); - restore = tqgeometry(); + restore = geometry(); if( geom_restore.width() > 0 ) restore.moveLeft( geom_restore.x()); if( geom_restore.height() > 0 ) @@ -2073,7 +2073,7 @@ void Client::resetMaximize() if( isShade()) setGeometry( TQRect( pos(), sizeForClientSize( clientSize())), ForceGeometrySet ); else - setGeometry( tqgeometry(), ForceGeometrySet ); + setGeometry( geometry(), ForceGeometrySet ); if( decoration != NULL ) decoration->maximizeChange(); } @@ -2096,7 +2096,7 @@ void Client::checkMaximizeGeometry() } ++recursion_protection; TQRect max_area = workspace()->clientArea( MaximizeArea, this ); - if( tqgeometry() == max_area ) + if( geometry() == max_area ) { if( max_mode != MaximizeFull ) maximize( MaximizeFull ); @@ -2113,7 +2113,7 @@ void Client::checkMaximizeGeometry() } else if( max_mode != MaximizeRestore ) { - resetMaximize(); // not maximize( MaximizeRestore ), that'd change tqgeometry - this is called from setGeometry() + resetMaximize(); // not maximize( MaximizeRestore ), that'd change geometry - this is called from setGeometry() } --recursion_protection; } @@ -2126,7 +2126,7 @@ bool Client::isFullScreenable( bool fullscreen_hack ) const return isNormalWindow(); if( rules()->checkStrictGeometry( false )) { - // the app wouldn't fit exactly fullscreen tqgeometry due its strict tqgeometry requirements + // the app wouldn't fit exactly fullscreen geometry due its strict geometry requirements TQRect fsarea = workspace()->clientArea( FullScreenArea, this ); if( sizeForClientSize( fsarea.size(), SizemodeAny, true ) != fsarea.size()) return false; @@ -2158,7 +2158,7 @@ void Client::setFullScreen( bool set, bool user ) setShade( ShadeNone ); bool was_fs = isFullScreen(); if( !was_fs ) - geom_fs_restore = tqgeometry(); + geom_fs_restore = geometry(); fullscreen_mode = set ? FullScreenNormal : FullScreenNone; if( was_fs == isFullScreen()) return; @@ -2184,7 +2184,7 @@ void Client::setFullScreen( bool set, bool user ) int Client::checkFullScreenHack( const TQRect& geom ) const { - // if it's noborder window, and has size of one screen or the whole desktop tqgeometry, it's fullscreen hack + // if it's noborder window, and has size of one screen or the whole desktop geometry, it's fullscreen hack if( noBorder() && !isUserNoBorder() && isFullScreenable( true )) { if( geom.size() == workspace()->clientArea( FullArea, geom.center(), desktop()).size()) @@ -2217,14 +2217,14 @@ void Client::updateFullScreenHack( const TQRect& geom ) { fullscreen_mode = FullScreenNone; updateDecoration( false, false ); - // whoever called this must setup correct tqgeometry + // whoever called this must setup correct geometry } StackingUpdatesBlocker blocker( workspace()); workspace()->updateClientLayer( this ); // active fullscreens get different layer } static TQRect* visible_bound = 0; -static GeometryTip* tqgeometryTip = 0; +static GeometryTip* geometryTip = 0; void Client::drawbound( const TQRect& geom ) { @@ -2271,22 +2271,22 @@ void Client::positionGeometryTip() // Position and Size display if (options->showGeometryTip()) { - if( !tqgeometryTip ) + if( !geometryTip ) { // save under is not necessary with opaque, and seem to make things slower bool save_under = ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque ) || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ); - tqgeometryTip = new GeometryTip( &xSizeHint, save_under ); + geometryTip = new GeometryTip( &xSizeHint, save_under ); } TQRect wgeom( moveResizeGeom ); // position of the frame, size of the window itself wgeom.setWidth( wgeom.width() - ( width() - clientSize().width())); wgeom.setHeight( wgeom.height() - ( height() - clientSize().height())); if( isShade()) wgeom.setHeight( 0 ); - tqgeometryTip->setGeometry( wgeom ); - if( !tqgeometryTip->isVisible()) + geometryTip->setGeometry( wgeom ); + if( !geometryTip->isVisible()) { - tqgeometryTip->show(); - tqgeometryTip->raise(); + geometryTip->show(); + geometryTip->raise(); } } } @@ -2296,7 +2296,7 @@ class EatAllPaintEvents { protected: virtual bool eventFilter( TQObject* o, TQEvent* e ) - { return e->type() == TQEvent::Paint && o != tqgeometryTip; } + { return e->type() == TQEvent::Paint && o != geometryTip; } }; static EatAllPaintEvents* eater = 0; @@ -2334,7 +2334,7 @@ bool Client::startMoveResize() removeShadow(); moveResizeMode = true; workspace()->setClientIsMoving(this); - initialMoveResizeGeom = moveResizeGeom = tqgeometry(); + initialMoveResizeGeom = moveResizeGeom = geometry(); checkUnrestrictedMoveResize(); // rule out non opaque windows from useless translucency settings, maybe resizes? if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove)) @@ -2352,7 +2352,7 @@ bool Client::startMoveResize() // unfortunately, that's not completely true, Qt may generate // paint events on some widgets due to FocusIn(?) // eat them, otherwise XOR painting will be broken (#58054) - // paint events for the tqgeometrytip need to be allowed, though + // paint events for the geometrytip need to be allowed, though eater = new EatAllPaintEvents; // not needed anymore? kapp->installEventFilter( eater ); } @@ -2380,11 +2380,11 @@ void Client::leaveMoveResize() if ((isResize() && options->removeShadowsOnResize) || (isMove() && options->removeShadowsOnMove)) updateShadowSize(); clearbound(); - if (tqgeometryTip) + if (geometryTip) { - tqgeometryTip->hide(); - delete tqgeometryTip; - tqgeometryTip = NULL; + geometryTip->hide(); + delete geometryTip; + geometryTip = NULL; } if ( ( isMove() && rules()->checkMoveResizeMode( options->moveMode ) != Options::Opaque ) || ( isResize() && rules()->checkMoveResizeMode( options->resizeMode ) != Options::Opaque ) ) @@ -2479,7 +2479,7 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root ) setShade( ShadeNone ); TQPoint globalPos( x_root, y_root ); - // these two points limit the tqgeometry rectangle, i.e. if bottomleft resizing is done, + // these two points limit the geometry rectangle, i.e. if bottomleft resizing is done, // the bottomleft corner should be at is at (topleft.x(), bottomright().y()) TQPoint topleft = globalPos - moveOffset; TQPoint bottomright = globalPos + invertedMoveOffset; @@ -2636,10 +2636,10 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root ) else if( rules()->checkMoveResizeMode ( isResize() ? options->resizeMode : options->moveMode ) == Options::Transparent ) { - clearbound(); // it's necessary to move the tqgeometry tip when there's no outline - positionGeometryTip(); // shown, otherwise it would cause tqrepaint problems in case + clearbound(); // it's necessary to move the geometry tip when there's no outline + positionGeometryTip(); // shown, otherwise it would cause repaint problems in case drawbound( moveResizeGeom ); // they overlap; the paint event will come after this, - } // so the tqgeometry tip will be painted above the outline + } // so the geometry tip will be painted above the outline } if ( isMove() ) workspace()->clientMoved(globalPos, qt_x_time); diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp index c2606e3aa..8577abfbc 100644 --- a/kwin/geometrytip.cpp +++ b/kwin/geometrytip.cpp @@ -14,14 +14,14 @@ namespace KWinInternal { GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): - TQLabel(NULL, "kwintqgeometry" ) + TQLabel(NULL, "kwingeometry" ) { setMargin(1); setIndent(0); setLineWidth(1); setFrameStyle( TQFrame::Raised | TQFrame::StyledPanel ); - tqsetAlignment( AlignCenter | AlignTop ); - tqsizeHints = xSizeHints; + setAlignment( AlignCenter | AlignTop ); + sizeHints = xSizeHints; if( save_under ) { XSetWindowAttributes attr; @@ -39,12 +39,12 @@ void GeometryTip::setGeometry( const TQRect& geom ) int w = geom.width(); int h = geom.height(); - if (tqsizeHints) + if (sizeHints) { - if (tqsizeHints->flags & PResizeInc) + if (sizeHints->flags & PResizeInc) { - w = ( w - tqsizeHints->base_width ) / tqsizeHints->width_inc; - h = ( h - tqsizeHints->base_height ) / tqsizeHints->height_inc; + w = ( w - sizeHints->base_width ) / sizeHints->width_inc; + h = ( h - sizeHints->base_height ) / sizeHints->height_inc; } } diff --git a/kwin/geometrytip.h b/kwin/geometrytip.h index 8a05b53fd..6dac49f2f 100644 --- a/kwin/geometrytip.h +++ b/kwin/geometrytip.h @@ -26,7 +26,7 @@ class GeometryTip: public QLabel void setGeometry( const TQRect& geom ); private: - const XSizeHints* tqsizeHints; + const XSizeHints* sizeHints; }; } // namespace diff --git a/kwin/group.cpp b/kwin/group.cpp index b8fc9acef..0d543dc4a 100644 --- a/kwin/group.cpp +++ b/kwin/group.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to window grouping. + This file contains things relevant to window grouping. */ @@ -64,7 +64,7 @@ bool performTransiencyCheck() kdDebug() << "TC: " << *it1 << " in not in a group" << endl; ret = false; } - else if( !(*it1)->in_group->members().tqcontains( *it1 )) + else if( !(*it1)->in_group->members().contains( *it1 )) { kdDebug() << "TC: " << *it1 << " has a group " << (*it1)->in_group << " but group does not contain it" << endl; ret = false; @@ -85,15 +85,15 @@ bool performTransiencyCheck() ++it2 ) { if( transiencyCheckNonExistent - && !Workspace::self()->clients.tqcontains( *it2 ) - && !Workspace::self()->desktops.tqcontains( *it2 )) + && !Workspace::self()->clients.contains( *it2 ) + && !Workspace::self()->desktops.contains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent main client " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->transients_list.tqcontains( *it1 )) + if( !(*it2)->transients_list.contains( *it1 )) { kdDebug() << "TC:" << *it1 << " has main client " << *it2 << " but main client does not have it as a transient" << endl; ret = false; @@ -106,15 +106,15 @@ bool performTransiencyCheck() ++it2 ) { if( transiencyCheckNonExistent - && !Workspace::self()->clients.tqcontains( *it2 ) - && !Workspace::self()->desktops.tqcontains( *it2 )) + && !Workspace::self()->clients.contains( *it2 ) + && !Workspace::self()->desktops.contains( *it2 )) { kdDebug() << "TC:" << *it1 << " has non-existent transient " << endl; kdDebug() << "TC2:" << *it2 << endl; // this may crash ret = false; continue; } - if( !(*it2)->mainClients().tqcontains( *it1 )) + if( !(*it2)->mainClients().contains( *it1 )) { kdDebug() << "TC:" << *it1 << " has transient " << *it2 << " but transient does not have it as a main client" << endl; ret = false; @@ -133,7 +133,7 @@ bool performTransiencyCheck() { if( (*it2)->in_group != *it1 ) { - kdDebug() << "TC: Group " << *it1 << " tqcontains client " << *it2 << " but client is not in that group" << endl; + kdDebug() << "TC: Group " << *it1 << " contains client " << *it2 << " but client is not in that group" << endl; ret = false; } } @@ -259,7 +259,7 @@ void Group::removeMember( Client* member_P ) TRANSIENCY_CHECK( member_P ); // kdDebug() << "GROUPREMOVE:" << this << ":" << member_P << endl; // kdDebug() << kdBacktrace() << endl; - Q_ASSERT( _members.tqcontains( member_P )); + Q_ASSERT( _members.contains( member_P )); _members.remove( member_P ); // there are cases when automatic deleting of groups must be delayed, // e.g. when removing a member and doing some operation on the possibly @@ -294,7 +294,7 @@ void Group::gotLeader( Client* leader_P ) void Group::lostLeader() { - assert( !_members.tqcontains( leader_client )); + assert( !_members.contains( leader_client )); leader_client = NULL; if( _members.isEmpty()) { @@ -430,8 +430,8 @@ void Workspace::checkTransients( Window w ) bool Client::resourceMatch( const Client* c1, const Client* c2 ) { // xv has "xv" as resource name, and different strings starting with "XV" as resource class - if( tqstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) - return tqstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv"; + if( qstrncmp( c1->resourceClass(), "xv", 2 ) == 0 && c1->resourceName() == "xv" ) + return qstrncmp( c2->resourceClass(), "xv", 2 ) == 0 && c2->resourceName() == "xv"; // Mozilla has "Mozilla" as resource name, and different strings as resource class if( c1->resourceName() == "mozilla" ) return c2->resourceName() == "mozilla"; @@ -835,7 +835,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) void Client::addTransient( Client* cl ) { TRANSIENCY_CHECK( this ); - assert( !transients_list.tqcontains( cl )); + assert( !transients_list.contains( cl )); // assert( !cl->hasTransient( this, true )); will be fixed in checkGroupTransients() assert( cl != this ); transients_list.append( cl ); @@ -893,7 +893,7 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL return true; if( !indirect ) return false; - if( set.tqcontains( cl )) + if( set.contains( cl )) return false; set.append( cl ); return hasTransientInternal( cl->transientFor(), indirect, set ); @@ -903,11 +903,11 @@ bool Client::hasTransientInternal( const Client* cl, bool indirect, ConstClientL if( group() != cl->group()) return false; // cl is group transient, search from top - if( transients().tqcontains( const_cast< Client* >( cl ))) + if( transients().contains( const_cast< Client* >( cl ))) return true; if( !indirect ) return false; - if( set.tqcontains( this )) + if( set.contains( this )) return false; set.append( this ); for( ClientList::ConstIterator it = transients().begin(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp index 42c618bd2..5d1d96d85 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.cpp +++ b/kwin/kcmkwin/kwindecoration/buttons.cpp @@ -54,7 +54,7 @@ ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name) TQDataStream stream(data, IO_WriteOnly); stream << btn.name; stream << btn.icon; - stream << btn.type.tqunicode(); + stream << btn.type.unicode(); stream << (int) btn.duplicate; stream << (int) btn.supported; setEncodedData( data ); @@ -123,7 +123,7 @@ TQPixmap bitmapPixmap(const TQBitmap& bm, const TQColor& color) ButtonSource::ButtonSource(TQWidget *parent, const char* name) : KListView(parent, name) { - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); setResizeMode(TQListView::AllColumns); setDragEnabled(true); @@ -140,19 +140,19 @@ ButtonSource::~ButtonSource() { } -TQSize ButtonSource::tqsizeHint() const +TQSize ButtonSource::sizeHint() const { - // make the tqsizeHint height a bit smaller than the one of TQListView... + // make the sizeHint height a bit smaller than the one of TQListView... if ( cachedSizeHint().isValid() ) return cachedSizeHint(); constPolish(); - TQSize s( header()->tqsizeHint() ); + TQSize s( header()->sizeHint() ); if ( verticalScrollBar()->isVisible() ) - s.setWidth( s.width() + style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) ); + s.setWidth( s.width() + style().pixelMetric(TQStyle::PM_ScrollBarExtent) ); s += TQSize(frameWidth()*2,frameWidth()*2); // size hint: 4 lines of text... @@ -218,7 +218,7 @@ TQDragObject *ButtonSource::dragObject() if (i) { ButtonDrag *bd = new ButtonDrag(i->button(), viewport(), "button_drag"); - bd->setPixmap(bitmapPixmap(i->button().icon, tqcolorGroup().foreground() )); + bd->setPixmap(bitmapPixmap(i->button().icon, colorGroup().foreground() )); return bd; } @@ -306,15 +306,15 @@ void ButtonDropSite::clearRight() void ButtonDropSite::dragMoveEvent( TQDragMoveEvent* e ) { TQPoint p = e->pos(); - if (leftDropArea().tqcontains(p) || rightDropArea().tqcontains(p) || buttonAt(p) ) { + if (leftDropArea().contains(p) || rightDropArea().contains(p) || buttonAt(p) ) { e->accept(); // 2 pixel wide drop visualizer... TQRect r = contentsRect(); int x = -1; - if (leftDropArea().tqcontains(p) ) { + if (leftDropArea().contains(p) ) { x = leftDropArea().left(); - } else if (rightDropArea().tqcontains(p) ) { + } else if (rightDropArea().contains(p) ) { x = rightDropArea().right()+1; } else { ButtonDropSiteItem *item = buttonAt(p); @@ -373,10 +373,10 @@ void ButtonDropSite::dropEvent( TQDropEvent* e ) ButtonList *buttonList = 0; ButtonList::iterator buttonPosition; - if (leftDropArea().tqcontains(p) ) { + if (leftDropArea().contains(p) ) { buttonList = &buttonsLeft; buttonPosition = buttonsLeft.end(); - } else if (rightDropArea().tqcontains(p) ) { + } else if (rightDropArea().contains(p) ) { buttonList = &buttonsRight; buttonPosition = buttonsRight.begin(); } else { @@ -487,7 +487,7 @@ void ButtonDropSite::mousePressEvent( TQMouseEvent* e ) m_selected = buttonAt(e->pos() ); if (m_selected) { ButtonDrag *bd = new ButtonDrag(m_selected->button(), this); - bd->setPixmap(bitmapPixmap(m_selected->button().icon, tqcolorGroup().foreground() ) ); + bd->setPixmap(bitmapPixmap(m_selected->button().icon, colorGroup().foreground() ) ); bd->dragMove(); } } @@ -501,7 +501,7 @@ void ButtonDropSite::recalcItemGeometry() { TQRect r = contentsRect(); - // update the tqgeometry of the items in the left button list + // update the geometry of the items in the left button list int offset = r.left(); for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) { int w = (*it)->width(); @@ -521,14 +521,14 @@ void ButtonDropSite::recalcItemGeometry() ButtonDropSiteItem *ButtonDropSite::buttonAt(TQPoint p) { // try to find the item in the left button list for (ButtonList::const_iterator it = buttonsLeft.begin(); it != buttonsLeft.end(); ++it) { - if ( (*it)->rect.tqcontains(p) ) { + if ( (*it)->rect.contains(p) ) { return *it; } } // try to find the item in the right button list for (ButtonList::const_iterator it = buttonsRight.begin(); it != buttonsRight.end(); ++it) { - if ( (*it)->rect.tqcontains(p) ) { + if ( (*it)->rect.contains(p) ) { return *it; } } @@ -572,7 +572,7 @@ bool ButtonDropSite::removeSelectedButton() delete m_selected; m_selected = 0; recalcItemGeometry(); - update(); // tqrepaint... + update(); // repaint... } return succ; @@ -581,9 +581,9 @@ bool ButtonDropSite::removeSelectedButton() void ButtonDropSite::drawButtonList(TQPainter *p, const ButtonList& btns, int offset) { for (ButtonList::const_iterator it = btns.begin(); it != btns.end(); ++it) { - TQRect tqitemRect = (*it)->rect; - if (tqitemRect.isValid() ) { - (*it)->draw(p, tqcolorGroup(), tqitemRect); + TQRect itemRect = (*it)->rect; + if (itemRect.isValid() ) { + (*it)->draw(p, colorGroup(), itemRect); } offset += (*it)->width(); } @@ -610,7 +610,7 @@ void ButtonDropSite::drawContents( TQPainter* p ) p->setFont( TQFont( KGlobalSettings::generalFont().family(), 12, TQFont::Bold) ); p->drawText( r, AlignLeft | AlignVCenter, i18n("KDE") ); - offset = tqgeometry().width() - 3 - rightoffset; + offset = geometry().width() - 3 - rightoffset; drawButtonList( p, buttonsRight, offset ); if (m_oldDropVisualizer.isValid() ) @@ -674,20 +674,20 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) : TQWidget(parent,name), m_factory(0) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); - tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint() ); + setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); TQLabel* label = new TQLabel( this ); m_dropSite = new ButtonDropSite( this ); - label->tqsetAlignment( int( TQLabel::WordBreak ) ); + label->setAlignment( int( TQLabel::WordBreak ) ); label->setText( i18n( "To add or remove titlebar buttons, simply <i>drag</i> items " "between the available item list and the titlebar preview. Similarly, " "drag items within the titlebar preview to re-position them.") ); m_buttonSource = new ButtonSource(this, "button_source"); - tqlayout->addWidget(label); - tqlayout->addWidget(m_dropSite); - tqlayout->addWidget(m_buttonSource); + layout->addWidget(label); + layout->addWidget(m_dropSite); + layout->addWidget(m_buttonSource); connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) ); connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) ); @@ -761,7 +761,7 @@ void ButtonPositionWidget::setDecorationFactory(KDecorationFactory *factory) ButtonSourceItem *i = dynamic_cast<ButtonSourceItem*>(it.current() ); if (i) { Button b = i->button(); - b.supported = m_supportedButtons.tqcontains(b.type); + b.supported = m_supportedButtons.contains(b.type); i->setButton(b); } ++it; @@ -777,47 +777,47 @@ Button ButtonPositionWidget::getButton(TQChar type, bool& success) { if (type == 'R') { TQBitmap bmp(resize_width, resize_height, resize_bits, true); bmp.setMask(bmp); - return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.tqcontains('R') ); + return Button(i18n("Resize"), bmp, 'R', false, m_supportedButtons.contains('R') ); } else if (type == 'L') { TQBitmap bmp(shade_width, shade_height, shade_bits, true); bmp.setMask(bmp); - return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.tqcontains('L') ); + return Button(i18n("Shade"), bmp, 'L', false, m_supportedButtons.contains('L') ); } else if (type == 'B') { TQBitmap bmp(keepbelowothers_width, keepbelowothers_height, keepbelowothers_bits, true); bmp.setMask(bmp); - return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.tqcontains('B') ); + return Button(i18n("Keep Below Others"), bmp, 'B', false, m_supportedButtons.contains('B') ); } else if (type == 'F') { TQBitmap bmp(keepaboveothers_width, keepaboveothers_height, keepaboveothers_bits, true); bmp.setMask(bmp); - return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.tqcontains('F') ); + return Button(i18n("Keep Above Others"), bmp, 'F', false, m_supportedButtons.contains('F') ); } else if (type == 'X') { TQBitmap bmp(close_width, close_height, close_bits, true); bmp.setMask(bmp); - return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.tqcontains('X') ); + return Button(i18n("Close"), bmp, 'X', false, m_supportedButtons.contains('X') ); } else if (type == 'A') { TQBitmap bmp(maximize_width, maximize_height, maximize_bits, true); bmp.setMask(bmp); - return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.tqcontains('A') ); + return Button(i18n("Maximize"), bmp, 'A', false, m_supportedButtons.contains('A') ); } else if (type == 'I') { TQBitmap bmp(minimize_width, minimize_height, minimize_bits, true); bmp.setMask(bmp); - return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.tqcontains('I') ); + return Button(i18n("Minimize"), bmp, 'I', false, m_supportedButtons.contains('I') ); } else if (type == 'H') { TQBitmap bmp(help_width, help_height, help_bits, true); bmp.setMask(bmp); - return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.tqcontains('H') ); + return Button(i18n("Help"), bmp, 'H', false, m_supportedButtons.contains('H') ); } else if (type == 'S') { TQBitmap bmp(onalldesktops_width, onalldesktops_height, onalldesktops_bits, true); bmp.setMask(bmp); - return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.tqcontains('S') ); + return Button(i18n("On All Desktops"), bmp, 'S', false, m_supportedButtons.contains('S') ); } else if (type == 'M') { TQBitmap bmp(menu_width, menu_height, menu_bits, true); bmp.setMask(bmp); - return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.tqcontains('M') ); + return Button(i18n("Menu"), bmp, 'M', false, m_supportedButtons.contains('M') ); } else if (type == '_') { TQBitmap bmp(spacer_width, spacer_height, spacer_bits, true); bmp.setMask(bmp); - return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.tqcontains('_') ); + return Button(i18n("--- spacer ---"), bmp, '_', true, m_supportedButtons.contains('_') ); } else { success = false; return Button(); diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h index 8786e4e23..0fcbff085 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.h +++ b/kwin/kcmkwin/kwindecoration/buttons.h @@ -117,7 +117,7 @@ class ButtonSource : public KListView ButtonSource(TQWidget *parent = 0, const char* name = 0); virtual ~ButtonSource(); - TQSize tqsizeHint() const; + TQSize sizeHint() const; void hideAllButtons(); void showAllButtons(); diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 33714ee08..193450086 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp @@ -75,14 +75,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c kwinConfig.setGroup("Style"); plugins = new KDecorationPreviewPlugins( &kwinConfig ); - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); // Save this for later... // cbUseMiniWindows = new TQCheckBox( i18n( "Render mini &titlebars for all windows"), checkGroup ); // TQWhatsThis::add( cbUseMiniWindows, i18n( "Note that this option is not available on all styles yet!" ) ); tabWidget = new TQTabWidget( this ); - tqlayout->addWidget( tabWidget ); + layout->addWidget( tabWidget ); // Page 1 (General Options) TQWidget *pluginPage = new TQWidget( tabWidget ); @@ -99,8 +99,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c TQGroupBox *pluginSettingsGrp = new TQGroupBox( i18n("Decoration Options"), pluginPage ); pluginSettingsGrp->setColumnLayout( 0, Vertical ); pluginSettingsGrp->setFlat( true ); - pluginSettingsGrp->tqlayout()->setMargin( 0 ); - pluginSettingsGrp->tqlayout()->setSpacing( KDialog::spacingHint() ); + pluginSettingsGrp->layout()->setMargin( 0 ); + pluginSettingsGrp->layout()->setSpacing( KDialog::spacingHint() ); pluginLayout->addWidget( pluginSettingsGrp ); pluginLayout->addStretch(); @@ -112,13 +112,13 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c TQWhatsThis::add( cBorder, i18n( "Use this combobox to change the border size of the decoration." )); lBorder->hide(); cBorder->hide(); - TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->tqlayout() ); + TQHBoxLayout *borderSizeLayout = new TQHBoxLayout(pluginSettingsGrp->layout() ); borderSizeLayout->addWidget(lBorder); borderSizeLayout->addWidget(cBorder); borderSizeLayout->addStretch(); pluginConfigWidget = new TQVBox(pluginSettingsGrp); - pluginSettingsGrp->tqlayout()->add( pluginConfigWidget ); + pluginSettingsGrp->layout()->add( pluginConfigWidget ); // Page 2 (Button Selector) TQWidget* buttonPage = new TQWidget( tabWidget ); @@ -148,14 +148,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c // buttonLayout->addStretch(); // preview - TQVBoxLayout* previewLayout = new TQVBoxLayout(tqlayout, KDialog::spacingHint() ); + TQVBoxLayout* previewLayout = new TQVBoxLayout(layout, KDialog::spacingHint() ); previewLayout->setMargin( KDialog::marginHint() ); preview = new KDecorationPreview( this ); previewLayout->addWidget(preview); - preview->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); - tabWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); + preview->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); + tabWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Maximum); // Page 3 (Window Shadows) TQHBox *inactiveShadowColourHBox, *shadowColourHBox; diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop index 9057a6bd4..3c5f12e6f 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop @@ -162,16 +162,16 @@ Comment[zh_CN]=é…置窗å£æ ‡é¢˜çš„观感 Comment[zh_TW]=è¨å®šè¦–窗標題列的外觀與感覺 Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window -Keywords=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration +Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration Keywords[ar]=kwin,ناÙذة,مسيير,الØاÙØ©,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرÙات Keywords[az]=kwin,pÉ™ncÉ™rÉ™,idarəçi,kÉ™nar,tÉ™rz,örtü,görünüş,toxuma,yer,düymÉ™,applet,kÉ™nar,kwm,dekorasiya,bÉ™zÉ™k -Keywords[be]=Ðкно,Кіраўнік,ÐœÑжа,Стыль,ТÑма,Вонкавы выглÑд,Кнопкі,Ðпрацоўшчык,Край,ДÑкарацыÑ,kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration -Keywords[bg]=прозорец, декорациÑ, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, tqlayout, button, handle, edge, kwm, decoration +Keywords[be]=Ðкно,Кіраўнік,ÐœÑжа,Стыль,ТÑма,Вонкавы выглÑд,Кнопкі,Ðпрацоўшчык,Край,ДÑкарацыÑ,kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration +Keywords[bg]=прозорец, декорациÑ, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration Keywords[ca]=kwin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració Keywords[cs]=kwin,okno,správce,okraj,styl,motiv,vzhled,rozvrženÃ,tlaÄÃtko,úchytka,hrana,kwm,dekorace Keywords[csb]=kwin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knÄ…pa,ùchwët,raÅ„t,kwm,dekòracëjô Keywords[cy]=kwin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad -Keywords[da]=kwin,vindue,hÃ¥ndtering,kant,stil,tema,udseende,fornemmelse,tqlayout,knap,hÃ¥ndtag,kant,kwm,dekoration +Keywords[da]=kwin,vindue,hÃ¥ndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,hÃ¥ndtag,kant,kwm,dekoration Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen Keywords[el]=kwin,παÏάθυÏο,διαχειÏιστής,πεÏίγÏαμμα,στυλ,θÎμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειÏισμός,άκÏο,kwm,διακόσμηση Keywords[eo]=kwin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranÄo,butono,eÄo,kwm,ornamo @@ -181,26 +181,26 @@ Keywords[eu]=kwin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoi Keywords[fa]=kwinØŒ پنجره، مدیر، لبه، سبک، چهره، ظاهر، اØساس، طرØ‌بندی، دکمه، گرداندن، لبه، kwmØŒ تزئین Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys Keywords[fr]=kwin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration -Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,tqlayout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear +Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear Keywords[ga]=kwin,fuinneog,bainisteoir,imlÃne,stÃl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán Keywords[gl]=kwin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración -Keywords[he]=×ž× ×”×œ ×—×œ×•× ×•×ª,×—×œ×•× ×•×ª,×ž× ×”×œ,גבול,מסגרת,×¡×’× ×•×Ÿ,ערכה,ערכת × ×•×©×,מר××”,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle, edge,kwm,decoration +Keywords[he]=×ž× ×”×œ ×—×œ×•× ×•×ª,×—×œ×•× ×•×ª,×ž× ×”×œ,גבול,מסגרת,×¡×’× ×•×Ÿ,ערכה,ערכת × ×•×©×,מר××”,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration Keywords[hi]=के-विन,विंडो,पà¥à¤°à¤¬à¤‚धक,बारà¥à¤¡à¤°,शैली,पà¥à¤°à¤¸à¤‚ग,रूप,अनà¥à¤à¤µ,ले-आउट,बटन,हैंडल,किनारा,केडबलà¥à¤¯à¥‚à¤à¤®,सजावट -Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras +Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras Keywords[hu]=KWin,ablak,kezelÅ‘,szegély,stÃlus,téma,kinézet,megjelenés,elrendezés,nyomógomb,fogantyú,perem,kwm,ablakstÃlus Keywords[is]=kwin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stÃll,útlit,takki,kwm,skraut Keywords[it]=kwin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione Keywords[ja]=kwin,ウィンドウ,マãƒãƒ¼ã‚¸ãƒ£,æž ,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ãƒãƒ³ãƒ‰ãƒ«,エッジ,kwm,装飾 Keywords[km]=kwin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាបáŸáž‘្ម,ស្បែក,មុážáž„ារ,ប្លង់,ប៊ូážáž»áž„,ការ​ប្រើ,គែម,kwm,ការ​ážáž»áž”ážáŸ‚áž„ -Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,tqlayout,buttons,handle,edge,kwm,decoration,langas,tvarkyklÄ—,rÄ—melis,stilius,tema,žiÅ«rÄ—ti,jausti,iÅ¡dÄ—stymas,mygtukai,kraÅ¡tas,dekoracija +Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklÄ—,rÄ—melis,stilius,tema,žiÅ«rÄ—ti,jausti,iÅ¡dÄ—stymas,mygtukai,kraÅ¡tas,dekoracija Keywords[lv]=kwin, logs, menedžeris, rÄmis, stils, tÄ“ma, skats, gars, izkÄrtojums, poga, rokturis, stÅ«ris, kwm, dekorÄcija -Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,Ñтил,тема,изглед,чувÑтво,раÑпоред,копче,рачка,раб,декорација +Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,Ñтил,тема,изглед,чувÑтво,раÑпоред,копче,рачка,раб,декорација Keywords[mn]=KWin,Kwm,Цонх,Manager,ХүрÑÑ,Design,Ð¥ÑлбÑÑ€,Загвар, Optik,Харагдалт,Layout,Товч,Өнцөг,ЗаÑал -Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, tqlayout, tqassim, użu, button, handle, edge, kwm, decoration -Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,tqlayout,knapp,kant,kwm,pynt,dekorasjon -Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,tqlayout,Knoop,Greep,Rand,kwm,Dekoratschoon +Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration +Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon +Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon Keywords[ne]=के विन,सञà¥à¤à¥à¤¯à¤¾à¤², पà¥à¤°à¤¬à¤¨à¥à¤§à¤•, किनारा, शैली, विषयवसà¥à¤¤à¥, हेराइ, बà¥à¤à¤¾à¤‡, सजावट, बटन, हà¥à¤¯à¤¾à¤¨à¥à¤¡à¤², छेउ,kwm, सजावट -Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, tqlayout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer +Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer Keywords[nn]=kwin,vindauge,kant,bord,stil,tema,utsjÃ¥nad,bunad,knapp,handtak,kwm,dekorasjon Keywords[nso]=kwin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso Keywords[pa]=kwin,handle,edge,kwm,decoration,à¨à¨°à©‹à¨–ਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ @@ -212,9 +212,9 @@ Keywords[rw]=kwin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko Keywords[se]=kwin,láse,gieÄ‘ahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva Keywords[sk]=kwin,okno,správa,okraj,Å¡týl,téma,vzhľad,rozloženie,tlaÄidlo,hrana,kwm,dekorácia,oblasÅ¥ Keywords[sl]=kwin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,obÄutek,gumb,roÄaj,rob,kwm,okrasek -Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,Ñтил,тема,изглед,дугме,хватаљка,декорација -Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija -Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,tqlayout,knapp,hantera,kant,kwm,dekoration +Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,Ñтил,тема,изглед,дугме,хватаљка,декорација +Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija +Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration Keywords[ta]=kwin,சாளரமà¯,மேலாளரà¯,விளிமà¯à®ªà¯,பாணி,தலைபà¯à®ªà¯,பாரà¯à®µà¯ˆ,உணரà¯à®¤à®²à¯,உரà¯à®µà®°à¯ˆ,விசை,கையாளà¯,à®®à¯à®©à¯ˆ,kwm,அலஙà¯à®•à®°à®¿à®ªà¯à®ªà¯ Keywords[th]=kwin,หน้าต่าง,ตัวจัดà¸à¸²à¸£,à¸à¸£à¸à¸š,ลัà¸à¸©à¸“ะ,ชุดตà¸à¹à¸•à¹ˆà¸‡,มà¸à¸‡à¹€à¸«à¹‡à¸™,รู้สึà¸,à¸à¸²à¸£à¸ˆà¸±à¸”วาง,ปุ่ม,ที่จับ,ขà¸à¸š,kwm,à¸à¸²à¸£à¸•à¸à¹à¸•à¹ˆà¸‡ Keywords[tr]=kwin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleÅŸim,düğme,tutamaç,kenar,kwm,dekorasyon @@ -223,9 +223,9 @@ Keywords[uz]=kwin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koÊ»rinish Keywords[uz@cyrillic]=kwin,kwm,безак,ойна,бошқарувчи,уÑул,ташқи кўриниш Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza Keywords[vi]=kwin,cá»a sổ,quản lý,bá»,kiểu,sắc thái,ngoại hình,cảm nháºn,sắp xếp,nút,Ä‘iá»u khiển,cạnh,kwm,trang trà -Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,tqlayout;loukance,boton,apougnî,costé,kwm,gÃ¥liotaedje +Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gÃ¥liotaedje Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso -Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,窗å£,管ç†å™¨,边框,æ ·å¼,主题,观感,布局,按钮,处ç†,边缘,装饰 -Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,tqlayout,button,handle,edge,kwm,decoration,視窗,管ç†å“¡,邊框,é¢¨æ ¼,佈景主題,外觀,感覺,佈局,按鈕,é‚Šç·£,è£é£¾ +Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗å£,管ç†å™¨,边框,æ ·å¼,主题,观感,布局,按钮,处ç†,边缘,装饰 +Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管ç†å“¡,邊框,é¢¨æ ¼,佈景主題,外觀,感覺,佈局,按鈕,é‚Šç·£,è£é£¾ Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso Categories=Qt;KDE;X-KDE-settings-looknfeel; diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index 0993720cf..c9a0174f4 100644 --- a/kwin/kcmkwin/kwindecoration/preview.cpp +++ b/kwin/kcmkwin/kwindecoration/preview.cpp @@ -49,7 +49,7 @@ KDecorationPreview::KDecorationPreview( TQWidget* parent, const char* name ) "Most probably there\n" "was a problem loading the plugin." ), this ); - no_preview->tqsetAlignment( AlignCenter ); + no_preview->setAlignment( AlignCenter ); setMinimumSize( 100, 100 ); no_preview->resize( size()); @@ -109,7 +109,7 @@ void KDecorationPreview::positionPreviews() { int titleBarHeight, leftBorder, rightBorder, xoffset, dummy1, dummy2, dummy3; - TQRect tqgeometry; + TQRect geometry; TQSize size; no_preview->resize( this->size() ); @@ -127,15 +127,15 @@ void KDecorationPreview::positionPreviews() // Resize the active window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Active]->tqminimumSize() ); - tqgeometry = TQRect( TQPoint( 0, titleBarHeight ), size ); - deco[Active]->widget()->setGeometry( TQStyle::tqvisualRect( tqgeometry, this ) ); + .expandedTo( deco[Active]->minimumSize() ); + geometry = TQRect( TQPoint( 0, titleBarHeight ), size ); + deco[Active]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); // Resize the inactive window size = TQSize( width() - xoffset, height() - titleBarHeight ) - .expandedTo( deco[Inactive]->tqminimumSize() ); - tqgeometry = TQRect( TQPoint( xoffset, 0 ), size ); - deco[Inactive]->widget()->setGeometry( TQStyle::tqvisualRect( tqgeometry, this ) ); + .expandedTo( deco[Inactive]->minimumSize() ); + geometry = TQRect( TQPoint( xoffset, 0 ), size ); + deco[Inactive]->widget()->setGeometry( TQStyle::visualRect( geometry, this ) ); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool active ) @@ -166,13 +166,13 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode, bool act delete[] xrects; } if( active ) - tqmask = reg; // keep tqshape of the active window for unobscuredRegion() + mask = reg; // keep shape of the active window for unobscuredRegion() } TQRect KDecorationPreview::windowGeometry( bool active ) const { TQWidget *widget = active ? deco[Active]->widget() : deco[Inactive]->widget(); - return widget->tqgeometry(); + return widget->geometry(); } void KDecorationPreview::setTempBorderSize(KDecorationPlugins* plugin, KDecorationDefines::BorderSize size) @@ -214,7 +214,7 @@ TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) { // copied from KWin core's code TQRegion ret = r; - TQRegion r2 = tqmask; + TQRegion r2 = mask; if( r2.isEmpty()) r2 = TQRegion( windowGeometry( true )); r2.translate( windowGeometry( true ).x() - windowGeometry( false ).x(), @@ -356,7 +356,7 @@ bool KDecorationPreviewBridge::isPreview() const return true; } -TQRect KDecorationPreviewBridge::tqgeometry() const +TQRect KDecorationPreviewBridge::geometry() const { return preview->windowGeometry( active ); } diff --git a/kwin/kcmkwin/kwindecoration/preview.h b/kwin/kcmkwin/kwindecoration/preview.h index 002ec5de1..5604df587 100644 --- a/kwin/kcmkwin/kwindecoration/preview.h +++ b/kwin/kcmkwin/kwindecoration/preview.h @@ -57,7 +57,7 @@ class KDecorationPreview KDecorationPreviewBridge* bridge[NumWindows]; KDecoration* deco[NumWindows]; TQLabel* no_preview; - TQRegion tqmask; + TQRegion mask; }; class KDecorationPreviewBridge @@ -89,7 +89,7 @@ class KDecorationPreviewBridge virtual void performWindowOperation( WindowOperation ); virtual void setMask( const TQRegion&, int ); virtual bool isPreview() const; - virtual TQRect tqgeometry() const; + virtual TQRect geometry() const; virtual TQRect iconGeometry() const; virtual TQRegion unobscuredRegion( const TQRegion& r ) const; virtual TQWidget* workspaceWidget() const; diff --git a/kwin/kcmkwin/kwinoptions/ChangeLog b/kwin/kcmkwin/kwinoptions/ChangeLog index 612331796..0b923864c 100644 --- a/kwin/kcmkwin/kwinoptions/ChangeLog +++ b/kwin/kcmkwin/kwinoptions/ChangeLog @@ -23,7 +23,7 @@ 1998-11-06 Cristian Tibirna <ctibirna@gch.ulaval.ca> - * titlebar.[cpp,h] : added title tqalignment config + * titlebar.[cpp,h] : added title alignment config 1998-10-23 Cristian Tibirna <ctibirna@gch.ulaval.ca> @@ -37,12 +37,12 @@ 1998-10-21 Cristian Tibirna <ctibirna@gch.ulaval.ca> - * desktop.[cpp,h]: now with consistent tqlayout use + * desktop.[cpp,h]: now with consistent layout use resizeEvent() deleted 1998-10-19 Cristian Tibirna <ctibirna@gch.ulaval.ca> - * windows.[cpp,h]: now with consistent tqlayout use + * windows.[cpp,h]: now with consistent layout use resizeEvent() deleted 1998-10-18 Cristian Tibirna <ctibirna@gch.ulaval.ca> diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp index dc8273f25..ac19a5d30 100644 --- a/kwin/kcmkwin/kwinoptions/main.cpp +++ b/kwin/kcmkwin/kwinoptions/main.cpp @@ -88,37 +88,37 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name) { mConfig = new KConfig("kwinrc", false, true); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); mFocus = new KFocusConfig(false, mConfig, this, "KWin Focus Config"); - mFocus->tqlayout()->setMargin( KDialog::marginHint() ); + mFocus->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mFocus, i18n("&Focus")); connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions"); - mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() ); + mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions"); - mWindowActions->tqlayout()->setMargin( KDialog::marginHint() ); + mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mMoving = new KMovingConfig(false, mConfig, this, "KWin Moving"); - mMoving->tqlayout()->setMargin( KDialog::marginHint() ); + mMoving->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mMoving, i18n("&Moving")); connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mAdvanced = new KAdvancedConfig(false, mConfig, this, "KWin Advanced"); - mAdvanced->tqlayout()->setMargin( KDialog::marginHint() ); + mAdvanced->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mAdvanced, i18n("Ad&vanced")); connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mTranslucency = new KTranslucencyConfig(false, mConfig, this, "KWin Translucency"); - mTranslucency->tqlayout()->setMargin( KDialog::marginHint() ); + mTranslucency->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTranslucency, i18n("&Translucency")); connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); @@ -206,17 +206,17 @@ KActionsOptions::KActionsOptions(TQWidget *parent, const char *name) { mConfig = new KConfig("kwinrc", false, true); - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); - tqlayout->addWidget(tab); + layout->addWidget(tab); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "KWin TitleBar Actions"); - mTitleBarActions->tqlayout()->setMargin( KDialog::marginHint() ); + mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "KWin Window Actions"); - mWindowActions->tqlayout()->setMargin( KDialog::marginHint() ); + mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); } diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp index 07acd64cf..6adba1f89 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.cpp +++ b/kwin/kcmkwin/kwinoptions/mouse.cpp @@ -136,7 +136,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGrid *grid; TQGroupBox *box; TQLabel *label; @@ -147,10 +147,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf /** Titlebar doubleclick ************/ - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout); label = new TQLabel(i18n("&Titlebar double-click:"), this); - htqlayout->addWidget(label); + hlayout->addWidget(label); TQWhatsThis::add( label, i18n("Here you can customize mouse click behavior when double clicking on the" " titlebar of a window.") ); @@ -163,19 +163,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf combo->insertItem(i18n("Lower")); combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); - combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - htqlayout->addWidget(combo); + hlayout->addWidget(combo); coTiDbl = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar.")); label->setBuddy(combo); /** Mouse Wheel Events **************/ - TQHBoxLayout *htqlayoutW = new TQHBoxLayout(tqlayout); + TQHBoxLayout *hlayoutW = new TQHBoxLayout(layout); strMouseWheel = i18n("Titlebar wheel event:"); label = new TQLabel(strMouseWheel, this); - htqlayoutW->addWidget(label); + hlayoutW->addWidget(label); txtButton4 = i18n("Handle mouse wheel events"); TQWhatsThis::add( label, txtButton4); @@ -188,9 +188,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf comboW->insertItem(i18n("Move to Previous/Next Desktop")); comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); - comboW->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); + comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - htqlayoutW->addWidget(comboW); + hlayoutW->addWidget(comboW); coTiAct4 = comboW; TQWhatsThis::add(comboW, txtButton4); label->setBuddy(comboW); @@ -198,9 +198,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf /** Titlebar and frame **************/ box = new TQVGroupBox( i18n("Titlebar && Frame"), this, "Titlebar and Frame"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on the" " titlebar or the frame of a window.") ); @@ -219,8 +219,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(txtButton1, txtButton3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(txtButton1, txtButton3); } label = new TQLabel(strMouseButton1, grid); @@ -235,7 +235,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf label = new TQLabel(i18n("Active"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an active window.") ); @@ -256,7 +256,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf "<em>active</em> window."); // Be nice to left handed users - if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); TQWhatsThis::add(combo, txtButton1); @@ -289,10 +289,10 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf "<em>inactive</em> window."); // Be nice to left handed users - if ( leftHandedMouse ) tqSwap(txtButton1, txtButton3); + if ( leftHandedMouse ) qSwap(txtButton1, txtButton3); label = new TQLabel(i18n("Inactive"), grid); - label->tqsetAlignment(AlignCenter); + label->setAlignment(AlignCenter); TQWhatsThis::add( label, i18n("In this column you can customize mouse clicks into the titlebar" " or the frame of an inactive window.") ); @@ -327,9 +327,9 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf /** Maximize Button ******************/ box = new TQHGroupBox(i18n("Maximize Button"), this, "Maximize Button"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize behavior when clicking on the maximize button.") ); @@ -345,8 +345,8 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf if ( leftHandedMouse ) // Be nice to lefties { - tqSwap(strMouseButton[0], strMouseButton[2]); - tqSwap(txtButton[0], txtButton[2]); + qSwap(strMouseButton[0], strMouseButton[2]); + qSwap(txtButton[0], txtButton[2]); } createMaxButtonPixmaps(); @@ -356,19 +356,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, KConfig *_conf TQLabel * label = new TQLabel(strMouseButton[b], box); TQWhatsThis::add( label, txtButton[b] ); - label ->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + label ->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); coMax[b] = new ToolTipComboBox(box, tbl_Max); for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]); connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed())); TQWhatsThis::add( coMax[b], txtButton[b] ); - coMax[b]->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); + coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - tqlayout->addStretch(); + layout->addStretch(); load(); } @@ -588,7 +588,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, : KCModule(parent, "kcmkwm"), config(_config), standAlone(_standAlone) { TQString strWin1, strWin2, strWin3, strAllKey, strAll1, strAll2, strAll3, strAllW; - TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQGrid *grid; TQGroupBox *box; TQLabel *label; @@ -600,9 +600,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, /** Inactive inner window ******************/ box = new TQVGroupBox(i18n("Inactive Inner Window"), this, "Inactive Inner Window"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize mouse click behavior when clicking on an inactive" " inner window ('inner' means: not titlebar, not frame).") ); @@ -618,8 +618,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(txtButton1, txtButton3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(txtButton1, txtButton3); } strWin1 = i18n("In this row you can customize left click behavior when clicking into" @@ -629,7 +629,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, " an inactive inner window ('inner' means: not titlebar, not frame)."); // Be nice to lefties - if ( leftHandedMouse ) tqSwap(strWin1, strWin3); + if ( leftHandedMouse ) qSwap(strWin1, strWin3); label = new TQLabel(strMouseButton1, grid); TQWhatsThis::add( label, strWin1 ); @@ -670,9 +670,9 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, /** Inner window, titlebar and frame **************/ box = new TQVGroupBox(i18n("Inner Window, Titlebar && Frame"), this, "Inner Window, Titlebar and Frame"); - box->tqlayout()->setMargin(KDialog::marginHint()); - box->tqlayout()->setSpacing(KDialog::spacingHint()); - tqlayout->addWidget(box); + box->layout()->setMargin(KDialog::marginHint()); + box->layout()->setSpacing(KDialog::spacingHint()); + layout->addWidget(box); TQWhatsThis::add( box, i18n("Here you can customize KDE's behavior when clicking somewhere into" " a window while pressing a modifier key.")); @@ -696,8 +696,8 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, if ( leftHandedMouse ) { - tqSwap(strMouseButton1, strMouseButton3); - tqSwap(strAll1, strAll3); + qSwap(strMouseButton1, strMouseButton3); + qSwap(strAll1, strAll3); } label = new TQLabel(strMouseButton1, grid); @@ -764,7 +764,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, KConfig *_config, coAllW = combo; TQWhatsThis::add( combo, strAllW ); - tqlayout->addStretch(); + layout->addStretch(); load(); } diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp index d7c3893c6..cc8643af9 100644 --- a/kwin/kcmkwin/kwinoptions/windows.cpp +++ b/kwin/kcmkwin/kwinoptions/windows.cpp @@ -110,7 +110,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -124,7 +124,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren fcsBox = new TQButtonGroup(i18n("Focus"),this); fcsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->tqlayout(), + TQBoxLayout *fLay = new TQVBoxLayout(fcsBox->layout(), KDialog::spacingHint()); TQBoxLayout *cLay = new TQHBoxLayout(fLay); @@ -192,8 +192,8 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); -// fLay->addColSpacing(0,QMAX(autoRaiseOn->tqsizeHint().width(), -// clickRaiseOn->tqsizeHint().width()) + 15); +// fLay->addColSpacing(0,QMAX(autoRaiseOn->sizeHint().width(), +// clickRaiseOn->sizeHint().width()) + 15); TQWhatsThis::add( autoRaiseOn, i18n("When this option is enabled, a window in the background will automatically" " come to the front when the mouse pointer has been over it for some time.") ); @@ -236,7 +236,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, KConfig *_config, TQWidget * paren kbdBox = new TQButtonGroup(i18n("Navigation"), this); kbdBox->setColumnLayout( 0, Qt::Horizontal ); - TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->tqlayout(), KDialog::spacingHint()); + TQVBoxLayout *kLay = new TQVBoxLayout(kbdBox->layout(), KDialog::spacingHint()); altTabPopup = new TQCheckBox( i18n("Show window list while switching windows"), kbdBox ); kLay->addWidget( altTabPopup ); @@ -573,7 +573,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, KConfig *_config, TQWidget * //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -831,7 +831,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare windowsBox = new TQButtonGroup(i18n("Windows"), this); windowsBox->setColumnLayout( 0, Qt::Horizontal ); - TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->tqlayout(), KDialog::spacingHint()); + TQBoxLayout *wLay = new TQVBoxLayout (windowsBox->layout(), KDialog::spacingHint()); TQBoxLayout *bLay = new TQVBoxLayout; wLay->addLayout(bLay); @@ -848,9 +848,9 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare " while resizing it, instead of just showing a window 'skeleton'. The result may not be satisfying" " on slow machines.") ); - tqgeometryTipOn = new TQCheckBox(i18n("Display window &tqgeometry when moving or resizing"), windowsBox); - bLay->addWidget(tqgeometryTipOn); - TQWhatsThis::add(tqgeometryTipOn, i18n("Enable this option if you want a window's tqgeometry to be displayed" + geometryTipOn = new TQCheckBox(i18n("Display window &geometry when moving or resizing"), windowsBox); + bLay->addWidget(geometryTipOn); + TQWhatsThis::add(geometryTipOn, i18n("Enable this option if you want a window's geometry to be displayed" " while it is being moved or resized. The window position relative" " to the top-left corner of the screen is displayed together with" " its size.")); @@ -877,11 +877,11 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); - minimizeAnimSlowLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignLeft); + minimizeAnimSlowLabel->setAlignment(Qt::AlignTop|Qt::AlignLeft); rLay->addWidget(minimizeAnimSlowLabel,1,1); minimizeAnimFastLabel= new TQLabel(i18n("Fast"),windowsBox); - minimizeAnimFastLabel->tqsetAlignment(Qt::AlignTop|Qt::AlignRight); + minimizeAnimFastLabel->setAlignment(Qt::AlignTop|Qt::AlignRight); rLay->addWidget(minimizeAnimFastLabel,1,2); wtstr = i18n("Here you can set the speed of the animation shown when windows are" @@ -940,7 +940,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare //iTLabel = new TQLabel(i18n(" Allowed overlap:\n" // "(% of desktop space)"), // plcBox); - //iTLabel->tqsetAlignment(AlignTop|AlignHCenter); + //iTLabel->setAlignment(AlignTop|AlignHCenter); //pLay->addWidget(iTLabel,1,1); //interactiveTrigger = new TQSpinBox(0, 500, 1, plcBox); @@ -986,7 +986,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare // Any changes goes to slotChanged() connect( opaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); connect( resizeOpaqueOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( tqgeometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed())); connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); @@ -1014,12 +1014,12 @@ void KMovingConfig::setMove(int trans) void KMovingConfig::setGeometryTip(bool showGeometryTip) { - tqgeometryTipOn->setChecked(showGeometryTip); + geometryTipOn->setChecked(showGeometryTip); } bool KMovingConfig::getGeometryTip() { - return tqgeometryTipOn->isChecked(); + return geometryTipOn->isChecked(); } // placement policy --- CT 31jan98 --- diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h index 380a34809..83dc70b66 100644 --- a/kwin/kcmkwin/kwinoptions/windows.h +++ b/kwin/kcmkwin/kwinoptions/windows.h @@ -164,7 +164,7 @@ private: TQButtonGroup *windowsBox; TQCheckBox *opaque; TQCheckBox *resizeOpaqueOn; - TQCheckBox *tqgeometryTipOn; + TQCheckBox *geometryTipOn; TQCheckBox* minimizeAnimOn; TQSlider *minimizeAnimSlider; TQLabel *minimizeAnimSlowLabel, *minimizeAnimFastLabel; diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index 918951b35..1a497c8bc 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -189,7 +189,7 @@ WId DetectDialog::findWindow() { Window root; Window child; - uint tqmask; + uint mask; int rootX, rootY, x, y; Window parent = qt_xrootwin(); Atom wm_state = XInternAtom( qt_xdisplay(), "WM_STATE", False ); @@ -198,7 +198,7 @@ WId DetectDialog::findWindow() ++i ) { XQueryPointer( qt_xdisplay(), parent, &root, &child, - &rootX, &rootY, &x, &y, &tqmask ); + &rootX, &rootY, &x, &y, &mask ); if( child == None ) return 0; Atom type; diff --git a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui index 789594e97..31cae3ef3 100644 --- a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form3</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -213,6 +213,6 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui index c3a0d7ec6..3813ae589 100644 --- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui +++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>EditShortcutBase</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -66,7 +66,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -91,7 +91,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -116,7 +116,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -159,6 +159,6 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try <slot access="protected" specifier="pure virtual">editShortcut()</slot> <slot access="protected" specifier="pure virtual">clearShortcut()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp index 90c7a0cb8..19b714311 100644 --- a/kwin/kcmkwin/kwinrules/kcm.cpp +++ b/kwin/kcmkwin/kwinrules/kcm.cpp @@ -42,9 +42,9 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) : KCModule( parent, name ) , config( "kwinrulesrc" ) { - TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); - tqlayout->addWidget( widget ); + layout->addWidget( widget ); connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), diff --git a/kwin/kcmkwin/kwinrules/kwinrules.desktop b/kwin/kcmkwin/kwinrules/kwinrules.desktop index 3bd0e0c67..245994a8a 100644 --- a/kwin/kcmkwin/kwinrules/kwinrules.desktop +++ b/kwin/kcmkwin/kwinrules/kwinrules.desktop @@ -154,7 +154,7 @@ Keywords[cs]=velikost,pozice,umÃstÄ›nÃ,stav,chovánà oken,pravidla Keywords[csb]=miara,pòłożenié,stón,ùchòwanié òknół,òkna,spamiãtanié nastôwów,zapamiãtanié nastôwów,regle Keywords[cy]=maint,lleoliad,cyflwr,ffenestr,ymddygiad,ffenestri,penodol,ffyrdd osgoi,cofio,rheolau Keywords[da]=størrelse,position,tilstand,vinduesopførsel,vinduer,specifik, omgÃ¥else,husk,regler -Keywords[de]=Größe,Position,tqStatus,Fensterverhalten,Fenster,Regeln +Keywords[de]=Größe,Position,Status,Fensterverhalten,Fenster,Regeln Keywords[el]=μÎγεθος,θÎση,κατάσταση,συμπεÏιφοÏά παÏαθÏÏου,παÏάθυÏα,ειδικÎÏ‚,λÏσεις,αποθήκευση,κανόνων Keywords[en_GB]=size,position,state,window behaviour,windows,specific,workarounds,remember,rules Keywords[eo]=grandeco,pozicio,stato,fenestra konduto,fenestroj,reguloj @@ -180,7 +180,7 @@ Keywords[lv]=izmÄ“rs,novietojums,statuss,loga izturÄ“Å¡anÄs,logi,specifisks,apj Keywords[mk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,големина,позиција,ÑоÑтојба,однеÑување на прозорец,Ñпецифично,заобиколни Keywords[mt]=size,position,state,window behavior,windows,specific,workarounds,remember,rules,daqs Keywords[nb]=størrelse,posisjon,status,vindusoppførsel,vinduer,spesifikk,jukseløsninger,husk,regler -Keywords[nds]=Grött,Positschoon,tqStatus,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround +Keywords[nds]=Grött,Positschoon,Status,Finsterbedregen,Finstern,enkel,enkelte,Regeln,behollen,workaround Keywords[ne]=साइज, सà¥à¤¥à¤¿à¤¤à¤¿, अवसà¥à¤¥à¤¾, सञà¥à¤à¥à¤¯à¤¾à¤² वà¥à¤¯à¤µà¤¹à¤¾à¤°, सञà¥à¤à¥à¤¯à¤¾à¤²à¤¹à¤°à¥‚, निरà¥à¤¦à¤¿à¤·à¥à¤Ÿ, कारà¥à¤¯à¤•à¥à¤·à¥‡à¤¤à¥à¤°, याद गरà¥à¤¨à¥à¤¹à¥‹à¤¸à¥, नियम Keywords[nl]=grootte,positie,venstergedrag,vensters,specifiek,alternatieven,onthouden,regels Keywords[nn]=storleik,plassering,tilstand,vindaugsÃ¥tferd,vindauge,spesifikk,jukseløysingar,hugs,reglar diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index af25412f8..b58c96239 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -179,7 +179,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who if( type == NET::Unknown ) ret->types = NET::NormalMask; else - ret->types = 1 << type; // convert type to its tqmask + ret->types = 1 << type; // convert type to its mask ret->title = title; // set, but make unimportant ret->titlematch = Rules::UnimportantMatch; ret->clientmachine = machine; // set, but make unimportant diff --git a/kwin/kcmkwin/kwinrules/ruleslistbase.ui b/kwin/kcmkwin/kwinrules/ruleslistbase.ui index b36a1987f..c2abdaa9d 100644 --- a/kwin/kcmkwin/kwinrules/ruleslistbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleslistbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form1</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>294</height> @@ -86,6 +86,6 @@ </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp index ea426e7f1..2525644d9 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp @@ -78,7 +78,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name ) " until it is hidden (this action will be deleted after the window is hidden).</li>" "</ul>" ); // window tabs have enable signals done in designer - // tqgeometry tab + // geometry tab SETUP( position, set ); SETUP( size, set ); SETUP( desktop, set ); @@ -106,7 +106,7 @@ RulesWidget::RulesWidget( TQWidget* parent, const char* name ) SETUP( ignoreposition, force ); SETUP( minsize, force ); SETUP( maxsize, force ); - SETUP( stricttqgeometry, force ); + SETUP( strictgeometry, force ); SETUP( disableglobalshortcuts, force ); KWinModule module; int i; @@ -126,7 +126,7 @@ void RulesWidget::updateEnable##var() \ var->setEnabled( enable_##var->isChecked() && rule_##var->currentItem() != 0 ); \ } -// tqgeometry tab +// geometry tab UPDATE_ENABLE_SLOT( position ) UPDATE_ENABLE_SLOT( size ) UPDATE_ENABLE_SLOT( desktop ) @@ -158,7 +158,7 @@ UPDATE_ENABLE_SLOT( type ) UPDATE_ENABLE_SLOT( ignoreposition ) UPDATE_ENABLE_SLOT( minsize ) UPDATE_ENABLE_SLOT( maxsize ) -UPDATE_ENABLE_SLOT( stricttqgeometry ) +UPDATE_ENABLE_SLOT( strictgeometry ) UPDATE_ENABLE_SLOT( disableglobalshortcuts ) #undef UPDATE_ENABLE_SLOT @@ -428,7 +428,7 @@ void RulesWidget::setRules( Rules* rules ) CHECKBOX_FORCE_RULE( ignoreposition, ); LINEEDIT_FORCE_RULE( minsize, sizeToStr ); LINEEDIT_FORCE_RULE( maxsize, sizeToStr ); - CHECKBOX_FORCE_RULE( stricttqgeometry, ); + CHECKBOX_FORCE_RULE( strictgeometry, ); CHECKBOX_FORCE_RULE( disableglobalshortcuts, ); } @@ -518,7 +518,7 @@ Rules* RulesWidget::rules() const CHECKBOX_FORCE_RULE( ignoreposition, ); LINEEDIT_FORCE_RULE( minsize, strToSize ); LINEEDIT_FORCE_RULE( maxsize, strToSize ); - CHECKBOX_FORCE_RULE( stricttqgeometry, ); + CHECKBOX_FORCE_RULE( strictgeometry, ); CHECKBOX_FORCE_RULE( disableglobalshortcuts, ); return rules; } @@ -621,7 +621,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info ) CHECKBOX_PREFILL( above,, info.state() & NET::KeepAbove ); CHECKBOX_PREFILL( below,, info.state() & NET::KeepBelow ); // noborder is only internal KWin information, so let's guess - CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.tqgeometry() ); + CHECKBOX_PREFILL( noborder,, info.frameGeometry() == info.geometry() ); CHECKBOX_PREFILL( skiptaskbar,, info.state() & NET::SkipTaskbar ); CHECKBOX_PREFILL( skippager,, info.state() & NET::SkipPager ); //CHECKBOX_PREFILL( acceptfocus, ); @@ -635,7 +635,7 @@ void RulesWidget::prefillUnusedValues( const KWin::WindowInfo& info ) //CHECKBOX_PREFILL( ignoreposition, ); LINEEDIT_PREFILL( minsize, sizeToStr, info.frameGeometry().size() ); LINEEDIT_PREFILL( maxsize, sizeToStr, info.frameGeometry().size() ); - //CHECKBOX_PREFILL( stricttqgeometry, ); + //CHECKBOX_PREFILL( strictgeometry, ); //CHECKBOX_PREFILL( disableglobalshortcuts, ); } @@ -661,7 +661,7 @@ bool RulesWidget::finalCheck() all_types = false; if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types ) { - if( KMessageBox::warningContinueCancel( tqtopLevelWidget(), + if( KMessageBox::warningContinueCancel( topLevelWidget(), i18n( "You have specified the window class as unimportant.\n" "This means the settings will possibly apply to windows from all applications. " "If you really want to create a generic setting, it is recommended you at least " @@ -673,14 +673,14 @@ bool RulesWidget::finalCheck() void RulesWidget::prepareWindowSpecific( WId window ) { - tabs->setCurrentPage( 2 ); // tqgeometry tab, skip tabs for window identification + tabs->setCurrentPage( 2 ); // geometry tab, skip tabs for window identification KWin::WindowInfo info( window, -1U, -1U ); // read everything prefillUnusedValues( info ); } void RulesWidget::shortcutEditClicked() { - EditShortcutDialog dlg( tqtopLevelWidget()); + EditShortcutDialog dlg( topLevelWidget()); dlg.setShortcut( shortcut->text()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut()); @@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name ) void EditShortcut::editShortcut() { - ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget()); + ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h index ec38818ff..b47ad88ab 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.h +++ b/kwin/kcmkwin/kwinrules/ruleswidget.h @@ -54,7 +54,7 @@ class RulesWidget virtual void machineMatchChanged(); virtual void shortcutEditClicked(); private slots: - // tqgeometry tab + // geometry tab void updateEnableposition(); void updateEnablesize(); void updateEnabledesktop(); @@ -81,7 +81,7 @@ class RulesWidget void updateEnableignoreposition(); void updateEnableminsize(); void updateEnablemaxsize(); - void updateEnablestricttqgeometry(); + void updateEnablestrictgeometry(); void updateEnableshortcut(); void updateEnabledisableglobalshortcuts(); // internal diff --git a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui index 0b23f2ed2..01c1b9918 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>Form2</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>212</width> <height>20</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>20</height> @@ -199,7 +199,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>212</width> <height>20</height> @@ -230,7 +230,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>20</height> @@ -271,7 +271,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>270</width> <height>20</height> @@ -296,7 +296,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>269</width> <height>20</height> @@ -470,7 +470,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -501,7 +501,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -543,7 +543,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -574,7 +574,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -616,7 +616,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -647,7 +647,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>199</width> <height>20</height> @@ -1181,7 +1181,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -1347,7 +1347,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>171</width> <height>20</height> @@ -1364,7 +1364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1381,7 +1381,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1398,7 +1398,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1415,7 +1415,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1432,7 +1432,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1449,7 +1449,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1466,7 +1466,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>290</width> <height>20</height> @@ -1796,7 +1796,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -1847,7 +1847,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>181</width> <height>20</height> @@ -2231,7 +2231,7 @@ <cstring>enable_ignoreposition</cstring> </property> <property name="text"> - <string>Ignore requested &tqgeometry</string> + <string>Ignore requested &geometry</string> </property> </widget> <widget class="KComboBox" row="3" column="1"> @@ -2278,7 +2278,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>160</height> @@ -2287,10 +2287,10 @@ </spacer> <widget class="QCheckBox" row="6" column="0"> <property name="name"> - <cstring>enable_stricttqgeometry</cstring> + <cstring>enable_strictgeometry</cstring> </property> <property name="text"> - <string>Strictly obey tqgeometry</string> + <string>Strictly obey geometry</string> </property> <property name="accel"> <string></string> @@ -2313,7 +2313,7 @@ </property> </item> <property name="name"> - <cstring>rule_stricttqgeometry</cstring> + <cstring>rule_strictgeometry</cstring> </property> <property name="enabled"> <bool>false</bool> @@ -2321,7 +2321,7 @@ </widget> <widget class="QCheckBox" row="6" column="3"> <property name="name"> - <cstring>stricttqgeometry</cstring> + <cstring>strictgeometry</cstring> </property> <property name="enabled"> <bool>false</bool> @@ -2523,9 +2523,9 @@ <tabstop>enable_maxsize</tabstop> <tabstop>rule_maxsize</tabstop> <tabstop>maxsize</tabstop> - <tabstop>enable_stricttqgeometry</tabstop> - <tabstop>rule_stricttqgeometry</tabstop> - <tabstop>stricttqgeometry</tabstop> + <tabstop>enable_strictgeometry</tabstop> + <tabstop>rule_strictgeometry</tabstop> + <tabstop>strictgeometry</tabstop> <tabstop>enable_disableglobalshortcuts</tabstop> <tabstop>rule_disableglobalshortcuts</tabstop> <tabstop>disableglobalshortcuts</tabstop> @@ -2539,8 +2539,8 @@ <slot access="protected" specifier="pure virtual">machineMatchChanged()</slot> <slot access="protected" specifier="pure virtual">shortcutEditClicked()</slot> </slots> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index 36f6fa072..ae31fc3e0 100644 --- a/kwin/killer/killer.cpp +++ b/kwin/killer/killer.cpp @@ -55,7 +55,7 @@ int main( int argc, char* argv[] ) bool pid_ok = false; pid_t pid = args->getOption( "pid" ).toULong( &pid_ok ); TQString caption = TQString::fromUtf8( args->getOption( "windowname" )); - TQString appname = TQString::tqfromLatin1( args->getOption( "applicationname" )); + TQString appname = TQString::fromLatin1( args->getOption( "applicationname" )); bool id_ok = false; Window id = args->getOption( "wid" ).toULong( &id_ok ); bool time_ok = false; diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c index f65586be4..713752ee1 100644 --- a/kwin/kompmgr/kompmgr.c +++ b/kwin/kompmgr/kompmgr.c @@ -99,7 +99,7 @@ typedef struct _win { unsigned int shadowSize; Atom windowType; unsigned long damage_sequence; /* sequence when damage was created */ - Bool shapable; /* this will allow window managers to exclude windows if just the deco is tqshaped*/ + Bool shapable; /* this will allow window managers to exclude windows if just the deco is shaped*/ unsigned int decoHash; Picture dimPicture; @@ -151,7 +151,7 @@ Bool synchronize; int composite_opcode; Bool disable_argb = False; -int tqshapeEvent; +int shapeEvent; /* find these once and be done with it */ Atom opacityAtom; @@ -1679,10 +1679,10 @@ get_opacity_percent(Display *dpy, win *w, double def) } #if 0 static void -damage_tqshape(Display *dpy, win *w, XRectangle *tqshape_damage) +damage_shape(Display *dpy, win *w, XRectangle *shape_damage) { set_ignore (dpy, NextRequest (dpy)); - XserverRegion region = XFixesCreateRegion (dpy, tqshape_damage, 1); + XserverRegion region = XFixesCreateRegion (dpy, shape_damage, 1); set_ignore (dpy, NextRequest (dpy)); XserverRegion tmpRegion; add_damage(dpy, region); @@ -2707,7 +2707,7 @@ main (int argc, char **argv) VisibilityChangeMask); /*shaping stuff*/ - XShapeQueryExtension(dpy, &tqshapeEvent, &dummy); + XShapeQueryExtension(dpy, &shapeEvent, &dummy); XQueryTree (dpy, root, &root_return, &parent_return, &children, &nchildren); for (i = 0; i < nchildren; i++) @@ -2947,7 +2947,7 @@ main (int argc, char **argv) /* printf("damaging win: %u\n",ev.xany.window);*/ damage_win (dpy, (XDamageNotifyEvent *) &ev); } - else if (ev.type == tqshapeEvent) + else if (ev.type == shapeEvent) { win * w = find_win(dpy, ev.xany.window); #if 1 @@ -2963,7 +2963,7 @@ main (int argc, char **argv) rect.y = ((XShapeEvent*)&ev)->y; rect.width = ((XShapeEvent*)&ev)->width; rect.height = ((XShapeEvent*)&ev)->height; - damage_tqshape(dpy, w, &rect); + damage_shape(dpy, w, &rect); #endif #if 0 if (w->shadowSize != 0) @@ -2978,7 +2978,7 @@ main (int argc, char **argv) } #endif /*this is hardly efficient, but a current workaraound - shaping support isn't that good so far (e.g. we lack tqshaped shadows) + shaping support isn't that good so far (e.g. we lack shaped shadows) IDEA: use XRender to scale/shift a copy of the window and then blurr it*/ #if 1 if (w->picture) diff --git a/kwin/layers.cpp b/kwin/layers.cpp index a5b11d438..fcb6d8383 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to stacking order and layers. + This file contains things relevant to stacking order and layers. Design: @@ -89,7 +89,7 @@ void Workspace::updateClientLayer( Client* c ) if( c->layer() == c->belongsToLayer()) return; StackingUpdatesBlocker blocker( this ); - c->tqinvalidateLayer(); // tqinvalidate, will be updated when doing restacking + c->invalidateLayer(); // invalidate, will be updated when doing restacking for( ClientList::ConstIterator it = c->transients().begin(); it != c->transients().end(); ++it ) @@ -306,7 +306,7 @@ void Workspace::raiseOrLowerClient( Client *c) if (!c) return; Client* topmost = NULL; // TODO Q_ASSERT( block_stacking_updates == 0 ); - if ( most_recently_raised && stacking_order.tqcontains( most_recently_raised ) && + if ( most_recently_raised && stacking_order.contains( most_recently_raised ) && most_recently_raised->isShown( true ) && c->isOnCurrentDesktop()) topmost = most_recently_raised; else @@ -471,7 +471,7 @@ void Workspace::restackClientUnderActive( Client* c ) return; } - assert( unconstrained_stacking_order.tqcontains( active_client )); + assert( unconstrained_stacking_order.contains( active_client )); if( Client::belongToSameApplication( active_client, c )) { // put it below the active window if it's the same app unconstrained_stacking_order.remove( c ); @@ -494,12 +494,12 @@ void Workspace::restackClientUnderActive( Client* c ) } } } - assert( unconstrained_stacking_order.tqcontains( c )); + assert( unconstrained_stacking_order.contains( c )); for( int desktop = 1; desktop <= numberOfDesktops(); ++desktop ) { // do for every virtual desktop to handle the case of onalldesktop windows - if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].tqcontains( active_client )) + if( c->wantsTabFocus() && c->isOnDesktop( desktop ) && focus_chain[ desktop ].contains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { // put it after the active window if it's the same app @@ -523,7 +523,7 @@ void Workspace::restackClientUnderActive( Client* c ) } } // the same for global_focus_chain - if( c->wantsTabFocus() && global_focus_chain.tqcontains( active_client )) + if( c->wantsTabFocus() && global_focus_chain.contains( active_client )) { if( Client::belongToSameApplication( active_client, c )) { @@ -583,7 +583,7 @@ ClientList Workspace::constrainedStackingOrder() // If a window is raised above some other window in the same window group // which is in the ActiveLayer (i.e. it's fulscreened), make sure it stays // above that window (see #95731). - if( minimum_layer.tqcontains( (*it)->group()) + if( minimum_layer.contains( (*it)->group()) && minimum_layer[ (*it)->group() ] == ActiveLayer && ( l == NormalLayer || l == AboveLayer )) { diff --git a/kwin/lib/kcommondecoration.cpp b/kwin/lib/kcommondecoration.cpp index a950a7ecb..87541ad60 100644 --- a/kwin/lib/kcommondecoration.cpp +++ b/kwin/lib/kcommondecoration.cpp @@ -73,7 +73,7 @@ bool KCommonDecoration::decorationBehaviour(DecorationBehaviour behaviour) const return false; } -int KCommonDecoration::tqlayoutMetric(LayoutMetric lm, bool, const KCommonDecorationButton *) const +int KCommonDecoration::layoutMetric(LayoutMetric lm, bool, const KCommonDecorationButton *) const { switch (lm) { case LM_BorderLeft: @@ -145,12 +145,12 @@ void KCommonDecoration::updateCaption() void KCommonDecoration::borders( int& left, int& right, int& top, int& bottom ) const { - left = tqlayoutMetric(LM_BorderLeft); - right = tqlayoutMetric(LM_BorderRight); - bottom = tqlayoutMetric(LM_BorderBottom); - top = tqlayoutMetric(LM_TitleHeight) + - tqlayoutMetric(LM_TitleEdgeTop) + - tqlayoutMetric(LM_TitleEdgeBottom); + left = layoutMetric(LM_BorderLeft); + right = layoutMetric(LM_BorderRight); + bottom = layoutMetric(LM_BorderBottom); + top = layoutMetric(LM_TitleHeight) + + layoutMetric(LM_TitleEdgeTop) + + layoutMetric(LM_TitleEdgeBottom); updateLayout(); // TODO!! don't call everytime we are in ::borders } @@ -161,14 +161,14 @@ void KCommonDecoration::updateLayout() const int r_x, r_y, r_x2, r_y2; r.coords(&r_x, &r_y, &r_x2, &r_y2); - // tqlayout preview widget + // layout preview widget if (m_previewWidget) { - const int borderLeft = tqlayoutMetric(LM_BorderLeft); - const int borderRight = tqlayoutMetric(LM_BorderRight); - const int borderBottom = tqlayoutMetric(LM_BorderBottom); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); + const int borderLeft = layoutMetric(LM_BorderLeft); + const int borderRight = layoutMetric(LM_BorderRight); + const int borderBottom = layoutMetric(LM_BorderBottom); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); int left = r_x+borderLeft; int top = r_y+titleEdgeTop+titleHeight+titleEdgeBottom; @@ -182,28 +182,28 @@ void KCommonDecoration::updateLayout() const // resize buttons... for (int n=0; n<NumButtons; n++) { if (m_button[n]) { - TQSize newSize = TQSize(tqlayoutMetric(LM_ButtonWidth, true, m_button[n]), - tqlayoutMetric(LM_ButtonHeight, true, m_button[n]) ); + TQSize newSize = TQSize(layoutMetric(LM_ButtonWidth, true, m_button[n]), + layoutMetric(LM_ButtonHeight, true, m_button[n]) ); if (newSize != m_button[n]->size() ) m_button[n]->setSize(newSize); } } - // tqlayout buttons - int y = r_y + tqlayoutMetric(LM_TitleEdgeTop) + tqlayoutMetric(LM_ButtonMarginTop); + // layout buttons + int y = r_y + layoutMetric(LM_TitleEdgeTop) + layoutMetric(LM_ButtonMarginTop); if (m_buttonsLeft.count() > 0) { - const int buttonSpacing = tqlayoutMetric(LM_ButtonSpacing); - int x = r_x + tqlayoutMetric(LM_TitleEdgeLeft); + const int buttonSpacing = layoutMetric(LM_ButtonSpacing); + int x = r_x + layoutMetric(LM_TitleEdgeLeft); for (ButtonContainer::const_iterator it = m_buttonsLeft.begin(); it != m_buttonsLeft.end(); ++it) { bool elementLayouted = false; if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += tqlayoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) ); + x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) ); elementLayouted = true; } } else { - x+= tqlayoutMetric(LM_ExplicitButtonSpacer); + x+= layoutMetric(LM_ExplicitButtonSpacer); elementLayouted = true; } if (elementLayouted && it != m_buttonsLeft.end() ) @@ -212,20 +212,20 @@ void KCommonDecoration::updateLayout() const } if (m_buttonsRight.count() > 0) { - const int titleEdgeRightLeft = r_x2-tqlayoutMetric(LM_TitleEdgeRight)+1; + const int titleEdgeRightLeft = r_x2-layoutMetric(LM_TitleEdgeRight)+1; - const int buttonSpacing = tqlayoutMetric(LM_ButtonSpacing); + const int buttonSpacing = layoutMetric(LM_ButtonSpacing); int x = titleEdgeRightLeft - buttonContainerWidth(m_buttonsRight); for (ButtonContainer::const_iterator it = m_buttonsRight.begin(); it != m_buttonsRight.end(); ++it) { bool elementLayouted = false; if (*it) { if (!(*it)->isHidden() ) { moveWidget(x,y, *it); - x += tqlayoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) );; + x += layoutMetric(LM_ButtonWidth, true, ::qt_cast<KCommonDecorationButton*>(*it) );; elementLayouted = true; } } else { - x += tqlayoutMetric(LM_ExplicitButtonSpacer); + x += layoutMetric(LM_ExplicitButtonSpacer); elementLayouted = true; } if (elementLayouted && it != m_buttonsRight.end() ) @@ -277,8 +277,8 @@ void KCommonDecoration::resetLayout() const int minTitleBarWidth = 35; btnHideMinWidth = buttonContainerWidth(m_buttonsLeft,true) + buttonContainerWidth(m_buttonsRight,true) + - tqlayoutMetric(LM_TitleEdgeLeft,false) + tqlayoutMetric(LM_TitleEdgeRight,false) + - tqlayoutMetric(LM_TitleBorderLeft,false) + tqlayoutMetric(LM_TitleBorderRight,false) + + layoutMetric(LM_TitleEdgeLeft,false) + layoutMetric(LM_TitleEdgeRight,false) + + layoutMetric(LM_TitleBorderLeft,false) + layoutMetric(LM_TitleBorderRight,false) + minTitleBarWidth; btnHideLastWidth = 0; } @@ -295,7 +295,7 @@ int KCommonDecoration::buttonsRightWidth() const int KCommonDecoration::buttonContainerWidth(const ButtonContainer &btnContainer, bool countHidden) const { - int explicitSpacer = tqlayoutMetric(LM_ExplicitButtonSpacer); + int explicitSpacer = layoutMetric(LM_ExplicitButtonSpacer); int shownElementsCount = 0; @@ -311,7 +311,7 @@ int KCommonDecoration::buttonContainerWidth(const ButtonContainer &btnContainer, ++shownElementsCount; } } - w += tqlayoutMetric(LM_ButtonSpacing)*(shownElementsCount-1); + w += layoutMetric(LM_ButtonSpacing)*(shownElementsCount-1); return w; } @@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString if (btn) { btn->setLeft(isLeft); - btn->setSize(TQSize(tqlayoutMetric(LM_ButtonWidth, true, btn),tqlayoutMetric(LM_ButtonHeight, true, btn)) ); + btn->setSize(TQSize(layoutMetric(LM_ButtonWidth, true, btn),layoutMetric(LM_ButtonHeight, true, btn)) ); btn->show(); btnContainer.append(btn); } @@ -497,15 +497,15 @@ void KCommonDecoration::resize( const TQSize& s ) widget()->resize( s ); } -TQSize KCommonDecoration::tqminimumSize() const +TQSize KCommonDecoration::minimumSize() const { - const int minWidth = QMAX(tqlayoutMetric(LM_TitleEdgeLeft), tqlayoutMetric(LM_BorderLeft)) - +QMAX(tqlayoutMetric(LM_TitleEdgeRight), tqlayoutMetric(LM_BorderRight)) - +tqlayoutMetric(LM_TitleBorderLeft)+tqlayoutMetric(LM_TitleBorderRight); + const int minWidth = QMAX(layoutMetric(LM_TitleEdgeLeft), layoutMetric(LM_BorderLeft)) + +QMAX(layoutMetric(LM_TitleEdgeRight), layoutMetric(LM_BorderRight)) + +layoutMetric(LM_TitleBorderLeft)+layoutMetric(LM_TitleBorderRight); return TQSize(minWidth, - tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight) - +tqlayoutMetric(LM_TitleEdgeBottom) - +tqlayoutMetric(LM_BorderBottom) ); + layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight) + +layoutMetric(LM_TitleEdgeBottom) + +layoutMetric(LM_BorderBottom) ); } void KCommonDecoration::maximizeChange() @@ -659,7 +659,7 @@ void KCommonDecoration::resizeEvent(TQResizeEvent */*e*/) updateWindowShape(); // FIXME: don't update() here! this would result in two paintEvent()s - // because there is already "something" else triggering the tqrepaint... + // because there is already "something" else triggering the repaint... // widget()->update(); } @@ -688,7 +688,7 @@ void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e) if( e->button() != LeftButton ) return; - int tb = tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeBottom); + int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); // when shaded, react on double clicks everywhere to make it easier to unshade. otherwise // react only on double clicks in the title bar region... if (isSetShade() || e->pos().y() <= tb ) @@ -697,14 +697,14 @@ void KCommonDecoration::mouseDoubleClickEvent(TQMouseEvent *e) void KCommonDecoration::wheelEvent(TQWheelEvent *e) { - int tb = tqlayoutMetric(LM_TitleEdgeTop)+tqlayoutMetric(LM_TitleHeight)+tqlayoutMetric(LM_TitleEdgeBottom); + int tb = layoutMetric(LM_TitleEdgeTop)+layoutMetric(LM_TitleHeight)+layoutMetric(LM_TitleEdgeBottom); if (isSetShade() || e->pos().y() <= tb ) titlebarMouseWheelOperation( e->delta()); } KCommonDecoration::Position KCommonDecoration::mousePosition(const TQPoint &point) const { - const int corner = 18+3*tqlayoutMetric(LM_BorderBottom, false)/2; + const int corner = 18+3*layoutMetric(LM_BorderBottom, false)/2; Position pos = PositionCenter; TQRect r = widget()->rect(); @@ -712,14 +712,14 @@ KCommonDecoration::Position KCommonDecoration::mousePosition(const TQPoint &poin r.coords(&r_x, &r_y, &r_x2, &r_y2); int p_x = point.x(); int p_y = point.y(); - const int borderLeft = tqlayoutMetric(LM_BorderLeft); -// const int borderRight = tqlayoutMetric(LM_BorderRight); - const int borderBottom = tqlayoutMetric(LM_BorderBottom); - const int titleHeight = tqlayoutMetric(LM_TitleHeight); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); + const int borderLeft = layoutMetric(LM_BorderLeft); +// const int borderRight = layoutMetric(LM_BorderRight); + const int borderBottom = layoutMetric(LM_BorderBottom); + const int titleHeight = layoutMetric(LM_TitleHeight); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); const int borderBottomTop = r_y2-borderBottom+1; const int borderLeftRight = r_x+borderLeft-1; @@ -769,7 +769,7 @@ KCommonDecoration::Position KCommonDecoration::mousePosition(const TQPoint &poin void KCommonDecoration::updateWindowShape() { - // don't tqmask the widget... + // don't mask the widget... if (!decorationBehaviour(DB_WindowMask) ) return; @@ -783,7 +783,7 @@ void KCommonDecoration::updateWindowShape() for(int screen=0; screen < desktop->numScreens(); ++screen) { TQRect fullscreen(desktop->screenGeometry(screen)); - TQRect window = tqgeometry(); + TQRect window = geometry(); if(window.topLeft() == fullscreen.topLeft() ) tl = false; if(window.topRight() == fullscreen.topRight() ) tr = false; @@ -791,30 +791,30 @@ void KCommonDecoration::updateWindowShape() if(window.bottomRight()== fullscreen.bottomRight() ) br = false; } - TQRegion tqmask(0, 0, w, h); + TQRegion mask(0, 0, w, h); // Remove top-left corner. if(tl) { - tqmask -= cornerShape(WC_TopLeft); + mask -= cornerShape(WC_TopLeft); } // Remove top-right corner. if(tr) { - tqmask -= cornerShape(WC_TopRight); + mask -= cornerShape(WC_TopRight); } // Remove top-left corner. if(bl) { - tqmask -= cornerShape(WC_BottomLeft); + mask -= cornerShape(WC_BottomLeft); } // Remove top-right corner. if(br) { - tqmask -= cornerShape(WC_BottomRight); + mask -= cornerShape(WC_BottomRight); } - setMask( tqmask ); + setMask( mask ); } bool KCommonDecoration::eventFilter( TQObject* o, TQEvent* e ) @@ -857,13 +857,13 @@ TQRect KCommonDecoration::titleRect() const { int r_x, r_y, r_x2, r_y2; widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2); - const int titleEdgeLeft = tqlayoutMetric(LM_TitleEdgeLeft); - const int titleEdgeTop = tqlayoutMetric(LM_TitleEdgeTop); - const int titleEdgeRight = tqlayoutMetric(LM_TitleEdgeRight); - const int titleEdgeBottom = tqlayoutMetric(LM_TitleEdgeBottom); - const int titleBorderLeft = tqlayoutMetric(LM_TitleBorderLeft); - const int titleBorderRight = tqlayoutMetric(LM_TitleBorderRight); - const int ttlHeight = tqlayoutMetric(LM_TitleHeight); + const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft); + const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop); + const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight); + const int titleEdgeBottom = layoutMetric(LM_TitleEdgeBottom); + const int titleBorderLeft = layoutMetric(LM_TitleBorderLeft); + const int titleBorderRight = layoutMetric(LM_TitleBorderRight); + const int ttlHeight = layoutMetric(LM_TitleHeight); const int titleEdgeBottomBottom = r_y+titleEdgeTop+ttlHeight+titleEdgeBottom-1; return TQRect(r_x+titleEdgeLeft+buttonsLeftWidth()+titleBorderLeft, r_y+titleEdgeTop, r_x2-titleEdgeRight-buttonsRightWidth()-titleBorderRight-(r_x+titleEdgeLeft+buttonsLeftWidth()+titleBorderLeft), @@ -921,7 +921,7 @@ void KCommonDecorationButton::setSize(const TQSize &s) } } -TQSize KCommonDecorationButton::tqsizeHint() const +TQSize KCommonDecorationButton::sizeHint() const { return m_size; } diff --git a/kwin/lib/kcommondecoration.h b/kwin/lib/kcommondecoration.h index 64e852e77..f515a7da7 100644 --- a/kwin/lib/kcommondecoration.h +++ b/kwin/lib/kcommondecoration.h @@ -54,7 +54,7 @@ class KCommonDecorationPrivate; /** * This class eases development of decorations by implementing parts of KDecoration * which are error prone and common for most decorations. - * It takes care of the window tqlayout, button/action handling, and window tqmask creation. + * It takes care of the window layout, button/action handling, and window mask creation. */ class KWIN_EXPORT KCommonDecoration : public KDecoration { @@ -65,7 +65,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual ~KCommonDecoration(); /** - * Used to calculate the decoration tqlayout. The basic tqlayout looks like this: + * Used to calculate the decoration layout. The basic layout looks like this: * * Window: * _______________________________________________________________ @@ -95,7 +95,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration * | button | spacing | button | spacing | explicit spacer | spacing | ... | spacing | button | * |________|_________|________|_________|_________________|_________|________|_________|________| * - * @see tqlayoutMetric() + * @see layoutMetric() */ enum LayoutMetric { @@ -119,7 +119,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration enum DecorationBehaviour { DB_MenuClose, ///< Close window on double clicking the menu - DB_WindowMask, ///< Set a tqmask on the window + DB_WindowMask, ///< Set a mask on the window DB_ButtonHide ///< Hide buttons when there is not enough space in the titlebar }; @@ -155,13 +155,13 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual bool decorationBehaviour(DecorationBehaviour behaviour) const; /** - * This controls the tqlayout of the decoration in various ways. It is - * possible to have a different tqlayout for different window states. - * @param lm The tqlayout element. + * This controls the layout of the decoration in various ways. It is + * possible to have a different layout for different window states. + * @param lm The layout element. * @param respectWindowState Whether window states should be taken into account or a "default" state should be assumed. * @param button For LM_ButtonWidth and LM_ButtonHeight, the button. */ - virtual int tqlayoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton *button = 0) const; + virtual int layoutMetric(LayoutMetric lm, bool respectWindowState = true, const KCommonDecorationButton *button = 0) const; /** * Create a new title bar button. KCommonDecoration takes care of memory management. @@ -170,14 +170,14 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual KCommonDecorationButton *createButton(ButtonType type) = 0; /** - * @return the tqmask for the specific window corner. + * @return the mask for the specific window corner. */ virtual TQRegion cornerShape(WindowCorner corner); /** - * This updates the window tqmask using the information provided by + * This updates the window mask using the information provided by * cornerShape(). Edges which are aligned to screen corners are not - * tqshaped for better usability (remember to paint these areas in paintEvent(), too). + * shaped for better usability (remember to paint these areas in paintEvent(), too). * You normally don't want/need to reimplement updateWindowShape(). * @see cornerShape() */ @@ -202,7 +202,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration */ void updateLayout() const; /** - * Makes sure all buttons are tqrepainted. + * Makes sure all buttons are repainted. */ void updateButtons() const; /** @@ -223,7 +223,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration public: /** - * Handles widget and tqlayout creation, call the base implementation when subclassing this member. + * Handles widget and layout creation, call the base implementation when subclassing this member. */ virtual void init(); /** @@ -233,7 +233,7 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration virtual void borders( int& left, int& right, int& top, int& bottom ) const; virtual void show(); virtual void resize(const TQSize& s); - virtual TQSize tqminimumSize() const; + virtual TQSize minimumSize() const; virtual void maximizeChange(); virtual void desktopChange(); virtual void shadeChange(); @@ -343,7 +343,7 @@ class KWIN_EXPORT KCommonDecorationButton : public QButton */ ButtonState lastMousePress() const { return m_lastMouse; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void setToggleButton(bool toggle); diff --git a/kwin/lib/kdecoration.cpp b/kwin/lib/kdecoration.cpp index 22b3cd75c..97c8965e9 100644 --- a/kwin/lib/kdecoration.cpp +++ b/kwin/lib/kdecoration.cpp @@ -68,7 +68,7 @@ void KDecoration::setMainWidget( TQWidget* w ) assert( w_ == NULL ); w_ = w; w->setMouseTracking( true ); - widget()->resize( tqgeometry().size()); + widget()->resize( geometry().size()); } TQWidget* KDecoration::initialParentWidget() const @@ -206,9 +206,9 @@ bool KDecoration::isPreview() const return bridge_->isPreview(); } -TQRect KDecoration::tqgeometry() const +TQRect KDecoration::geometry() const { - return bridge_->tqgeometry(); + return bridge_->geometry(); } TQRect KDecoration::iconGeometry() const @@ -388,7 +388,7 @@ const TQFont& KDecorationOptions::font(bool active, bool small) const return(active ? d->activeFont : d->inactiveFont); } -const TQColorGroup& KDecorationOptions::tqcolorGroup(ColorType type, bool active) const +const TQColorGroup& KDecorationOptions::colorGroup(ColorType type, bool active) const { int idx = type + (active ? 0 : NUM_COLORS); if(d->cg[idx]) diff --git a/kwin/lib/kdecoration.h b/kwin/lib/kdecoration.h index 89cdf95a5..f41f19041 100644 --- a/kwin/lib/kdecoration.h +++ b/kwin/lib/kdecoration.h @@ -127,7 +127,7 @@ public: SettingDecoration = 1 << 0, ///< The decoration was changed SettingColors = 1 << 1, ///< The color palette was changed SettingFont = 1 << 2, ///< The titlebar font was changed - SettingButtons = 1 << 3, ///< The button tqlayout was changed + SettingButtons = 1 << 3, ///< The button layout was changed SettingTooltips = 1 << 4, ///< The tooltip setting was changed SettingBorder = 1 << 5 ///< The border size setting was changed }; @@ -205,7 +205,7 @@ public: * @param type The requested color type. * @param active Whether to return the color for active or inactive windows. */ - const TQColorGroup& tqcolorGroup(ColorType type, bool active=true) const; + const TQColorGroup& colorGroup(ColorType type, bool active=true) const; /** * Returns the active or inactive decoration font. * The changed flags for this setting is SettingFont. @@ -291,7 +291,7 @@ public: /** * @internal */ - virtual unsigned long updateSettings() = 0; // returns SettingXYZ tqmask + virtual unsigned long updateSettings() = 0; // returns SettingXYZ mask protected: /** @@ -412,7 +412,7 @@ class KWIN_EXPORT KDecoration bool isResizable() const; /** * This function returns the window type of the decorated window. - * The argument to this function is a tqmask of all window types + * The argument to this function is a mask of all window types * the decoration knows about (as the list of valid window types * is extended over time, and fallback types are specified in order * to support older code). For a description of all window types, @@ -451,7 +451,7 @@ class KWIN_EXPORT KDecoration * * \note Decorations that enable a double-click operation for the menu * button must ensure to call \a showWindowMenu() with the \a pos - * rectangle set to the menu button tqgeometry. + * rectangle set to the menu button geometry. * IMPORTANT: As a result of this function, the decoration object that * called it may be destroyed after the function returns. This means * that the decoration object must either return immediately after @@ -481,15 +481,15 @@ class KWIN_EXPORT KDecoration void performWindowOperation( WindowOperation op ); /** * If the decoration is non-rectangular, this function needs to be called - * to set the tqshape of the decoration. + * to set the shape of the decoration. * - * @param reg The tqshape of the decoration. + * @param reg The shape of the decoration. * @param mode The X11 values Unsorted, YSorted, YXSorted and YXBanded that specify * the sorting of the rectangles, default value is Unsorted. */ void setMask( const TQRegion& reg, int mode = 0 ); /** - * This convenience function resets the tqshape tqmask. + * This convenience function resets the shape mask. */ void clearMask(); // convenience /** @@ -499,13 +499,13 @@ class KWIN_EXPORT KDecoration */ bool isPreview() const; /** - * Returns the tqgeometry of the decoration. + * Returns the geometry of the decoration. */ - TQRect tqgeometry() const; + TQRect geometry() const; /** - * Returns the icon tqgeometry for the window, i.e. the tqgeometry of the taskbar + * Returns the icon geometry for the window, i.e. the geometry of the taskbar * entry. This is used mainly for window minimize animations. Note that - * the tqgeometry may be null. + * the geometry may be null. */ TQRect iconGeometry() const; /** @@ -573,13 +573,13 @@ class KWIN_EXPORT KDecoration * whether it's shaded. Decorations often turn off their bottom border when the * window is shaded, and turn off their left/right/bottom borders when * the window is maximized and moving and resizing of maximized windows is disabled. - * This function mustn't do any tqrepaints or resizes. Also, if the sizes returned + * This function mustn't do any repaints or resizes. Also, if the sizes returned * by this function don't match the real values, this may result in drawing errors * or other problems. * * @see KDecorationOptions::moveResizeMaximizedWindows() */ - // mustn't do any tqrepaints, resizes or anything like that + // mustn't do any repaints, resizes or anything like that virtual void borders( int& left, int& right, int& top, int& bottom ) const = 0; /** * This method is called by kwin when the style should resize the decoration window. @@ -594,7 +594,7 @@ class KWIN_EXPORT KDecoration * Note that the returned size shouldn't be too large, because it will be * used to keep the decorated window at least as large. */ - virtual TQSize tqminimumSize() const = 0; + virtual TQSize minimumSize() const = 0; /** * This function is called whenever the window either becomes or stops being active. * Use isActive() to find out the current state. @@ -647,10 +647,10 @@ class KWIN_EXPORT KDecoration * you should compensate for the 2 pixels that would make the window * look larger. * - * @param geom The tqgeometry at this the bound should be drawn + * @param geom The geometry at this the bound should be drawn * @param clear @a true if the bound should be cleared * - * @see workspaceWidget() and tqgeometry(). + * @see workspaceWidget() and geometry(). */ virtual bool drawbound( const TQRect& geom, bool clear ); /** @@ -661,7 +661,7 @@ class KWIN_EXPORT KDecoration * @a False should be returned if the default implementation should be used. * Note that you should not use this function to force disabling of the animation. * - * @see workspaceWidget(), tqgeometry() and helperShowHide(). + * @see workspaceWidget(), geometry() and helperShowHide(). */ virtual bool animateMinimize( bool minimize ); /** @@ -673,7 +673,7 @@ class KWIN_EXPORT KDecoration * This function is called to reset the decoration on settings changes. * It is usually invoked by calling KDecorationFactory::resetDecorations(). * - * @param changed Specifies which settings were changed, given by the SettingXXX tqmasks + * @param changed Specifies which settings were changed, given by the SettingXXX masks */ virtual void reset( unsigned long changed ); @@ -877,12 +877,12 @@ inline bool KDecoration::isOnAllDesktops() const inline int KDecoration::width() const { - return tqgeometry().width(); + return geometry().width(); } inline int KDecoration::height() const { - return tqgeometry().height(); + return geometry().height(); } #endif diff --git a/kwin/lib/kdecoration_p.h b/kwin/lib/kdecoration_p.h index c3797831e..58f386c9b 100644 --- a/kwin/lib/kdecoration_p.h +++ b/kwin/lib/kdecoration_p.h @@ -85,7 +85,7 @@ class KDecorationBridge : public KDecorationDefines virtual void performWindowOperation( WindowOperation ) = 0; virtual void setMask( const TQRegion&, int ) = 0; virtual bool isPreview() const = 0; - virtual TQRect tqgeometry() const = 0; + virtual TQRect geometry() const = 0; virtual TQRect iconGeometry() const = 0; virtual TQRegion unobscuredRegion( const TQRegion& r ) const = 0; virtual TQWidget* workspaceWidget() const = 0; diff --git a/kwin/lib/kdecoration_plugins_p.cpp b/kwin/lib/kdecoration_plugins_p.cpp index 2e870eaf4..0490e4755 100644 --- a/kwin/lib/kdecoration_plugins_p.cpp +++ b/kwin/lib/kdecoration_plugins_p.cpp @@ -167,7 +167,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) // For clients in kdeartwork TQString catalogue = nameStr; - catalogue.tqreplace( "kwin3_", "kwin_" ); + catalogue.replace( "kwin3_", "kwin_" ); KGlobal::locale()->insertCatalogue( catalogue ); // For KCommonDecoration based clients KGlobal::locale()->insertCatalogue( "kwin_lib" ); diff --git a/kwin/lib/kdecorationfactory.cpp b/kwin/lib/kdecorationfactory.cpp index 65fde37bc..7ad1aefbe 100644 --- a/kwin/lib/kdecorationfactory.cpp +++ b/kwin/lib/kdecorationfactory.cpp @@ -58,7 +58,7 @@ TQValueList< KDecorationDefines::BorderSize > KDecorationFactory::borderSizes() bool KDecorationFactory::exists( const KDecoration* deco ) const { - return _decorations.tqcontains( const_cast< KDecoration* >( deco )); + return _decorations.contains( const_cast< KDecoration* >( deco )); } void KDecorationFactory::addDecoration( KDecoration* deco ) diff --git a/kwin/lib/kdecorationfactory.h b/kwin/lib/kdecorationfactory.h index 467a24f17..7396ad987 100644 --- a/kwin/lib/kdecorationfactory.h +++ b/kwin/lib/kdecorationfactory.h @@ -53,10 +53,10 @@ class KWIN_EXPORT KDecorationFactory virtual KDecoration* createDecoration( KDecorationBridge* bridge ) = 0; /** * This function is called when the configuration settings changed. - * The argument specifies what has changed, using the SettingXXX tqmasks. + * The argument specifies what has changed, using the SettingXXX masks. * It should be determined whether the decorations need to be completely * remade, in which case true should be returned, or whether only e.g. - * a tqrepaint will be sufficient, in which case false should be returned, + * a repaint will be sufficient, in which case false should be returned, * and resetDecorations() can be called to reset all decoration objects. * Note that true should be returned only when really necessary. */ diff --git a/kwin/main.cpp b/kwin/main.cpp index b24e86712..edceeb6bf 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -96,9 +96,9 @@ Application::Application( ) if (screen_number == -1) screen_number = DefaultScreen(qt_xdisplay()); - if( !owner.claim( args->isSet( "tqreplace" ), true )) + if( !owner.claim( args->isSet( "replace" ), true )) { - fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --tqreplace)\n").local8Bit(), stderr); + fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); @@ -142,7 +142,7 @@ Application::Application( ) Application::~Application() { delete Workspace::self(); - if( owner.ownerWindow() != None ) // if there was no --tqreplace (no new WM) + if( owner.ownerWindow() != None ) // if there was no --replace (no new WM) { XSetInputFocus( qt_xdisplay(), PointerRoot, RevertToPointerRoot, qt_x_time ); DCOPRef ref( "kded", "kded" ); @@ -184,7 +184,7 @@ static const char description[] = I18N_NOOP( "KDE window manager" ); static KCmdLineOptions args[] = { { "lock", I18N_NOOP("Disable configuration options"), 0 }, - { "tqreplace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, + { "replace", I18N_NOOP("Replace already-running ICCCM2.0-compliant window manager"), 0 }, KCmdLineLastOption }; diff --git a/kwin/manage.cpp b/kwin/manage.cpp index 06fbb0511..df385867a 100644 --- a/kwin/manage.cpp +++ b/kwin/manage.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to handling incoming events. + This file contains things relevant to handling incoming events. */ @@ -32,7 +32,7 @@ namespace KWinInternal /*! Manages the clients. This means handling the very first maprequest: - reparenting, initial tqgeometry, initial state, placement, etc. + reparenting, initial geometry, initial state, placement, etc. Returns false if KWin is not going to manage this window. */ bool Client::manage( Window w, bool isMapped ) @@ -44,8 +44,8 @@ bool Client::manage( Window w, bool isMapped ) grabXServer(); // from this place on, manage() mustn't return false - postpone_tqgeometry_updates = 1; - pending_tqgeometry_update = true; // force update when finishing with tqgeometry changes + postpone_geometry_updates = 1; + pending_geometry_update = true; // force update when finishing with geometry changes embedClient( w, attr ); @@ -195,7 +195,7 @@ bool Client::manage( Window w, bool isMapped ) bool placementDone = FALSE; if ( session ) - geom = session->tqgeometry; + geom = session->geometry; TQRect area; bool partial_keep_in_area = isMapped || session; @@ -234,7 +234,7 @@ bool Client::manage( Window w, bool isMapped ) bool usePosition = false; if ( isMapped || session || placementDone ) - placementDone = true; // use tqgeometry + placementDone = true; // use geometry else if( isTransient() && !isUtility() && !isDialog() && !isSplash()) usePosition = true; else if( isTransient() && !hasNETSupport()) @@ -266,7 +266,7 @@ bool Client::manage( Window w, bool isMapped ) usePosition = true; if( !rules()->checkIgnoreGeometry( !usePosition )) { - bool ignorePPosition = ( options->ignorePositionClasses.tqcontains(TQString::tqfromLatin1(resourceClass()))); + bool ignorePPosition = ( options->ignorePositionClasses.contains(TQString::fromLatin1(resourceClass()))); if ( ( (xSizeHint.flags & PPosition) && !ignorePPosition ) || (xSizeHint.flags & USPosition) ) @@ -321,7 +321,7 @@ bool Client::manage( Window w, bool isMapped ) keepInArea( area, partial_keep_in_area ); XShapeSelectInput( qt_xdisplay(), window(), ShapeNotifyMask ); - is_tqshape = Shape::hasShape( window()); + is_shape = Shape::hasShape( window()); updateShape(); //CT extra check for stupid jdk 1.3.1. But should make sense in general @@ -357,7 +357,7 @@ bool Client::manage( Window w, bool isMapped ) minimize( true ); // no animation // SELI this seems to be mainly for kstart and ksystraycmd - // probably should be tqreplaced by something better + // probably should be replaced by something better bool doNotShow = false; if ( workspace()->isNotManaged( caption() ) ) doNotShow = TRUE; @@ -388,7 +388,7 @@ bool Client::manage( Window w, bool isMapped ) } else { - geom_restore = tqgeometry(); // remember restore tqgeometry + geom_restore = geometry(); // remember restore geometry if ( isMaximizable() && ( width() >= area.width() || height() >= area.height() ) ) { @@ -416,7 +416,7 @@ bool Client::manage( Window w, bool isMapped ) } // window may want to be maximized // done after checking that the window isn't larger than the workarea, so that - // the restore tqgeometry from the checks above takes precedence, and window + // the restore geometry from the checks above takes precedence, and window // isn't restored larger than the workarea MaximizeMode maxmode = static_cast< MaximizeMode > ((( info->state() & NET::MaxVert ) ? MaximizeVertical : 0 ) diff --git a/kwin/options.cpp b/kwin/options.cpp index 3abc7ffc2..cab703051 100644 --- a/kwin/options.cpp +++ b/kwin/options.cpp @@ -53,7 +53,7 @@ unsigned long Options::updateSettings() config->setGroup( "Windows" ); moveMode = stringToMoveResizeMode( config->readEntry("MoveMode", "Opaque" )); resizeMode = stringToMoveResizeMode( config->readEntry("ResizeMode", "Opaque" )); - show_tqgeometry_tip = config->readBoolEntry("GeometryTip", false); + show_geometry_tip = config->readBoolEntry("GeometryTip", false); tabboxOutline = config->readBoolEntry("TabboxOutline", true); TQString val; @@ -95,7 +95,7 @@ unsigned long Options::updateSettings() placement = Placement::policyFromString( config->readEntry("Placement"), true ); xineramaPlacementScreen = KCLAMP( config->readNumEntry( "XineramaPlacementScreen", -1 ), - -1, tqApp->desktop()->numScreens() - 1 ); + -1, qApp->desktop()->numScreens() - 1 ); animateShade = config->readBoolEntry("AnimateShade", TRUE ); animateMinimize = config->readBoolEntry("AnimateMinimize", TRUE ); @@ -301,7 +301,7 @@ Options::MouseWheelCommand Options::mouseWheelCommand(const TQString &name) bool Options::showGeometryTip() { - return show_tqgeometry_tip; + return show_geometry_tip; } TQColor &Options::shadowColour(bool active) @@ -379,7 +379,7 @@ int Options::electricBorderDelay() bool Options::checkIgnoreFocusStealing( const Client* c ) { - return ignoreFocusStealingClasses.tqcontains(TQString::tqfromLatin1(c->resourceClass())); + return ignoreFocusStealingClasses.contains(TQString::fromLatin1(c->resourceClass())); } Options::MouseCommand Options::wheelToMouseCommand( MouseWheelCommand com, int delta ) diff --git a/kwin/options.h b/kwin/options.h index 7200f3257..dbaa8855f 100644 --- a/kwin/options.h +++ b/kwin/options.h @@ -372,7 +372,7 @@ class Options : public KDecorationOptions int electric_borders; int electric_border_delay; - bool show_tqgeometry_tip; + bool show_geometry_tip; bool topmenus; bool desktop_topmenu; TQColor shadow_colour; diff --git a/kwin/placement.cpp b/kwin/placement.cpp index 4911d7256..a9862ce27 100644 --- a/kwin/placement.cpp +++ b/kwin/placement.cpp @@ -35,7 +35,7 @@ Placement::Placement(Workspace* w) } /*! - Places the client \a c according to the workspace's tqlayout policy + Places the client \a c according to the workspace's layout policy */ void Placement::place(Client* c, TQRect& area ) { @@ -452,7 +452,7 @@ void Placement::placeDialog(Client* c, TQRect& area, Policy nextPlacement ) void Placement::placeUnderMouse(Client* c, TQRect& area, Policy /*next*/ ) { area = checkArea( c, area ); - TQRect geom = c->tqgeometry(); + TQRect geom = c->geometry(); geom.moveCenter( TQCursor::pos()); c->move( geom.topLeft()); c->keepInArea( area ); // make sure it's kept inside workarea @@ -507,8 +507,8 @@ void Placement::placeOnMainWindow(Client* c, TQRect& area, Policy nextPlacement place( c, area, Centered ); return; } - TQRect geom = c->tqgeometry(); - geom.moveCenter( place_on->tqgeometry().center()); + TQRect geom = c->geometry(); + geom.moveCenter( place_on->geometry().center()); c->move( geom.topLeft()); // get area again, because the mainwindow may be on different xinerama screen area = checkArea( c, TQRect()); @@ -523,7 +523,7 @@ void Placement::placeMaximizing(Client* c, TQRect& area, Policy nextPlacement ) { if( m_WorkspacePtr->clientArea( MaximizeArea, c ) == area ) c->maximize( Client::MaximizeFull ); - else // if the tqgeometry doesn't match default maximize area (xinerama case?), + else // if the geometry doesn't match default maximize area (xinerama case?), { // it's probably better to use the given area c->setGeometry( area ); } @@ -538,7 +538,7 @@ void Placement::placeMaximizing(Client* c, TQRect& area, Policy nextPlacement ) TQRect Placement::checkArea( const Client* c, const TQRect& area ) { if( area.isNull()) - return m_WorkspacePtr->clientArea( PlacementArea, c->tqgeometry().center(), c->desktop()); + return m_WorkspacePtr->clientArea( PlacementArea, c->geometry().center(), c->desktop()); return area; } @@ -591,7 +591,7 @@ const char* Placement::policyToString( Policy policy ) void Workspace::slotWindowPackLeft() { if( active_client && active_client->isMovable()) - active_client->move( packPositionLeft( active_client, active_client->tqgeometry().left(), true ), + active_client->move( packPositionLeft( active_client, active_client->geometry().left(), true ), active_client->y()); } @@ -599,7 +599,7 @@ void Workspace::slotWindowPackRight() { if( active_client && active_client->isMovable()) active_client->move( - packPositionRight( active_client, active_client->tqgeometry().right(), true ) + packPositionRight( active_client, active_client->geometry().right(), true ) - active_client->width() + 1, active_client->y()); } @@ -607,14 +607,14 @@ void Workspace::slotWindowPackUp() { if( active_client && active_client->isMovable()) active_client->move( active_client->x(), - packPositionUp( active_client, active_client->tqgeometry().top(), true )); + packPositionUp( active_client, active_client->geometry().top(), true )); } void Workspace::slotWindowPackDown() { if( active_client && active_client->isMovable()) active_client->move( active_client->x(), - packPositionDown( active_client, active_client->tqgeometry().bottom(), true ) - active_client->height() + 1 ); + packPositionDown( active_client, active_client->geometry().bottom(), true ) - active_client->height() + 1 ); } void Workspace::slotWindowGrowHorizontal() @@ -627,16 +627,16 @@ void Client::growHorizontal() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setRight( workspace()->packPositionRight( this, geom.right(), true )); TQSize adjsize = adjustedSize( geom.size(), SizemodeFixedW ); - if( tqgeometry().size() == adjsize && geom.size() != adjsize && xSizeHint.width_inc > 1 ) // take care of size increments + if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.width_inc > 1 ) // take care of size increments { int newright = workspace()->packPositionRight( this, geom.right() + xSizeHint.width_inc - 1, true ); // check that it hasn't grown outside of the area, due to size increments // TODO this may be wrong? if( workspace()->clientArea( MovementArea, - TQPoint(( x() + newright ) / 2, tqgeometry().center().y()), desktop()).right() >= newright ) + TQPoint(( x() + newright ) / 2, geometry().center().y()), desktop()).right() >= newright ) geom.setRight( newright ); } geom.setSize( adjustedSize( geom.size(), SizemodeFixedW )); @@ -653,7 +653,7 @@ void Client::shrinkHorizontal() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setRight( workspace()->packPositionLeft( this, geom.right(), false )); if( geom.width() <= 1 ) return; @@ -672,15 +672,15 @@ void Client::growVertical() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setBottom( workspace()->packPositionDown( this, geom.bottom(), true )); TQSize adjsize = adjustedSize( geom.size(), SizemodeFixedH ); - if( tqgeometry().size() == adjsize && geom.size() != adjsize && xSizeHint.height_inc > 1 ) // take care of size increments + if( geometry().size() == adjsize && geom.size() != adjsize && xSizeHint.height_inc > 1 ) // take care of size increments { int newbottom = workspace()->packPositionDown( this, geom.bottom() + xSizeHint.height_inc - 1, true ); // check that it hasn't grown outside of the area, due to size increments if( workspace()->clientArea( MovementArea, - TQPoint( tqgeometry().center().x(), ( y() + newbottom ) / 2 ), desktop()).bottom() >= newbottom ) + TQPoint( geometry().center().x(), ( y() + newbottom ) / 2 ), desktop()).bottom() >= newbottom ) geom.setBottom( newbottom ); } geom.setSize( adjustedSize( geom.size(), SizemodeFixedH )); @@ -698,7 +698,7 @@ void Client::shrinkVertical() { if( !isResizable() || isShade()) return; - TQRect geom = tqgeometry(); + TQRect geom = geometry(); geom.setBottom( workspace()->packPositionUp( this, geom.bottom(), false )); if( geom.height() <= 1 ) return; @@ -712,7 +712,7 @@ int Workspace::packPositionLeft( const Client* cl, int oldx, bool left_edge ) co int newx = clientArea( MovementArea, cl ).left(); if( oldx <= newx ) // try another Xinerama screen newx = clientArea( MovementArea, - TQPoint( cl->tqgeometry().left() - 1, cl->tqgeometry().center().y()), cl->desktop()).left(); + TQPoint( cl->geometry().left() - 1, cl->geometry().center().y()), cl->desktop()).left(); if( oldx <= newx ) return oldx; for( ClientList::ConstIterator it = clients.begin(); @@ -721,10 +721,10 @@ int Workspace::packPositionLeft( const Client* cl, int oldx, bool left_edge ) co { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( active_client->desktop())) continue; - int x = left_edge ? (*it)->tqgeometry().right() + 1 : (*it)->tqgeometry().left() - 1; + int x = left_edge ? (*it)->geometry().right() + 1 : (*it)->geometry().left() - 1; if( x > newx && x < oldx - && !( cl->tqgeometry().top() > (*it)->tqgeometry().bottom() // they overlap in Y direction - || cl->tqgeometry().bottom() < (*it)->tqgeometry().top())) + && !( cl->geometry().top() > (*it)->geometry().bottom() // they overlap in Y direction + || cl->geometry().bottom() < (*it)->geometry().top())) newx = x; } return newx; @@ -735,7 +735,7 @@ int Workspace::packPositionRight( const Client* cl, int oldx, bool right_edge ) int newx = clientArea( MovementArea, cl ).right(); if( oldx >= newx ) // try another Xinerama screen newx = clientArea( MovementArea, - TQPoint( cl->tqgeometry().right() + 1, cl->tqgeometry().center().y()), cl->desktop()).right(); + TQPoint( cl->geometry().right() + 1, cl->geometry().center().y()), cl->desktop()).right(); if( oldx >= newx ) return oldx; for( ClientList::ConstIterator it = clients.begin(); @@ -744,10 +744,10 @@ int Workspace::packPositionRight( const Client* cl, int oldx, bool right_edge ) { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( cl->desktop())) continue; - int x = right_edge ? (*it)->tqgeometry().left() - 1 : (*it)->tqgeometry().right() + 1; + int x = right_edge ? (*it)->geometry().left() - 1 : (*it)->geometry().right() + 1; if( x < newx && x > oldx - && !( cl->tqgeometry().top() > (*it)->tqgeometry().bottom() - || cl->tqgeometry().bottom() < (*it)->tqgeometry().top())) + && !( cl->geometry().top() > (*it)->geometry().bottom() + || cl->geometry().bottom() < (*it)->geometry().top())) newx = x; } return newx; @@ -758,7 +758,7 @@ int Workspace::packPositionUp( const Client* cl, int oldy, bool top_edge ) const int newy = clientArea( MovementArea, cl ).top(); if( oldy <= newy ) // try another Xinerama screen newy = clientArea( MovementArea, - TQPoint( cl->tqgeometry().center().x(), cl->tqgeometry().top() - 1 ), cl->desktop()).top(); + TQPoint( cl->geometry().center().x(), cl->geometry().top() - 1 ), cl->desktop()).top(); if( oldy <= newy ) return oldy; for( ClientList::ConstIterator it = clients.begin(); @@ -767,10 +767,10 @@ int Workspace::packPositionUp( const Client* cl, int oldy, bool top_edge ) const { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( cl->desktop())) continue; - int y = top_edge ? (*it)->tqgeometry().bottom() + 1 : (*it)->tqgeometry().top() - 1; + int y = top_edge ? (*it)->geometry().bottom() + 1 : (*it)->geometry().top() - 1; if( y > newy && y < oldy - && !( cl->tqgeometry().left() > (*it)->tqgeometry().right() // they overlap in X direction - || cl->tqgeometry().right() < (*it)->tqgeometry().left())) + && !( cl->geometry().left() > (*it)->geometry().right() // they overlap in X direction + || cl->geometry().right() < (*it)->geometry().left())) newy = y; } return newy; @@ -781,7 +781,7 @@ int Workspace::packPositionDown( const Client* cl, int oldy, bool bottom_edge ) int newy = clientArea( MovementArea, cl ).bottom(); if( oldy >= newy ) // try another Xinerama screen newy = clientArea( MovementArea, - TQPoint( cl->tqgeometry().center().x(), cl->tqgeometry().bottom() + 1 ), cl->desktop()).bottom(); + TQPoint( cl->geometry().center().x(), cl->geometry().bottom() + 1 ), cl->desktop()).bottom(); if( oldy >= newy ) return oldy; for( ClientList::ConstIterator it = clients.begin(); @@ -790,10 +790,10 @@ int Workspace::packPositionDown( const Client* cl, int oldy, bool bottom_edge ) { if( !(*it)->isShown( false ) || !(*it)->isOnDesktop( cl->desktop())) continue; - int y = bottom_edge ? (*it)->tqgeometry().top() - 1 : (*it)->tqgeometry().bottom() + 1; + int y = bottom_edge ? (*it)->geometry().top() - 1 : (*it)->geometry().bottom() + 1; if( y < newy && y > oldy - && !( cl->tqgeometry().left() > (*it)->tqgeometry().right() - || cl->tqgeometry().right() < (*it)->tqgeometry().left())) + && !( cl->geometry().left() > (*it)->geometry().right() + || cl->geometry().right() < (*it)->geometry().left())) newy = y; } return newy; diff --git a/kwin/popupinfo.cpp b/kwin/popupinfo.cpp index d07e7262c..f0e80640a 100644 --- a/kwin/popupinfo.cpp +++ b/kwin/popupinfo.cpp @@ -76,7 +76,7 @@ void PopupInfo::paintEvent( TQPaintEvent* ) { TQPainter p( this ); style().drawPrimitive( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), - tqcolorGroup(), TQStyle::Style_Default ); + colorGroup(), TQStyle::Style_Default ); paintContents(); } @@ -90,7 +90,7 @@ void PopupInfo::paintContents() TQPainter p( this ); TQRect r( 6, 6, width()-12, height()-12 ); - p.fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) ); + p.fillRect( r, colorGroup().brush( TQColorGroup::Background ) ); /* p.setPen(Qt::white); diff --git a/kwin/rules.cpp b/kwin/rules.cpp index e0631d53c..cfcf4bc43 100644 --- a/kwin/rules.cpp +++ b/kwin/rules.cpp @@ -58,7 +58,7 @@ Rules::Rules() , acceptfocusrule( UnusedForceRule ) , moveresizemoderule( UnusedForceRule ) , closeablerule( UnusedForceRule ) - , stricttqgeometryrule( UnusedForceRule ) + , strictgeometryrule( UnusedForceRule ) , shortcutrule( UnusedSetRule ) , disableglobalshortcutsrule( UnusedForceRule ) { @@ -162,7 +162,7 @@ void Rules::readFromCfg( KConfig& cfg ) READ_FORCE_RULE( acceptfocus, Bool, ); READ_FORCE_RULE( moveresizemode, , Options::stringToMoveResizeMode ); READ_FORCE_RULE( closeable, Bool, ); - READ_FORCE_RULE( stricttqgeometry, Bool, ); + READ_FORCE_RULE( strictgeometry, Bool, ); READ_SET_RULE( shortcut, , ); READ_FORCE_RULE( disableglobalshortcuts, Bool, ); } @@ -251,7 +251,7 @@ void Rules::write( KConfig& cfg ) const WRITE_FORCE_RULE( acceptfocus, ); WRITE_FORCE_RULE( moveresizemode, Options::moveResizeModeToString ); WRITE_FORCE_RULE( closeable, ); - WRITE_FORCE_RULE( stricttqgeometry, ); + WRITE_FORCE_RULE( strictgeometry, ); WRITE_SET_RULE( shortcut, ); WRITE_FORCE_RULE( disableglobalshortcuts, ); } @@ -288,7 +288,7 @@ bool Rules::isEmpty() const && acceptfocusrule == UnusedForceRule && moveresizemoderule == UnusedForceRule && closeablerule == UnusedForceRule - && stricttqgeometryrule == UnusedForceRule + && strictgeometryrule == UnusedForceRule && shortcutrule == UnusedSetRule && disableglobalshortcutsrule == UnusedForceRule ); } @@ -339,7 +339,7 @@ bool Rules::matchWMClass( const TQCString& match_class, const TQCString& match_n return false; if( wmclassmatch == ExactMatch && wmclass != cwmclass ) return false; - if( wmclassmatch == SubstringMatch && !cwmclass.tqcontains( wmclass )) + if( wmclassmatch == SubstringMatch && !cwmclass.contains( wmclass )) return false; } return true; @@ -353,7 +353,7 @@ bool Rules::matchRole( const TQCString& match_role ) const return false; if( windowrolematch == ExactMatch && windowrole != match_role ) return false; - if( windowrolematch == SubstringMatch && !match_role.tqcontains( windowrole )) + if( windowrolematch == SubstringMatch && !match_role.contains( windowrole )) return false; } return true; @@ -367,7 +367,7 @@ bool Rules::matchTitle( const TQString& match_title ) const return false; if( titlematch == ExactMatch && title != match_title ) return false; - if( titlematch == SubstringMatch && !match_title.tqcontains( title )) + if( titlematch == SubstringMatch && !match_title.contains( title )) return false; } return true; @@ -388,7 +388,7 @@ bool Rules::matchClientMachine( const TQCString& match_machine ) const && clientmachine != match_machine ) return false; if( clientmachinematch == SubstringMatch - && !match_machine.tqcontains( clientmachine )) + && !match_machine.contains( clientmachine )) return false; } return true; @@ -614,7 +614,7 @@ APPLY_FORCE_RULE( fsplevel, FSP, int ) APPLY_FORCE_RULE( acceptfocus, AcceptFocus, bool ) APPLY_FORCE_RULE( moveresizemode, MoveResizeMode, Options::MoveResizeMode ) APPLY_FORCE_RULE( closeable, Closeable, bool ) -APPLY_FORCE_RULE( stricttqgeometry, StrictGeometry, bool ) +APPLY_FORCE_RULE( strictgeometry, StrictGeometry, bool ) APPLY_RULE( shortcut, Shortcut, TQString ) APPLY_FORCE_RULE( disableglobalshortcuts, DisableGlobalShortcuts, bool ) @@ -676,7 +676,7 @@ void Rules::discardUsed( bool withdrawn ) DISCARD_USED_FORCE_RULE( acceptfocus ); DISCARD_USED_FORCE_RULE( moveresizemode ); DISCARD_USED_FORCE_RULE( closeable ); - DISCARD_USED_FORCE_RULE( stricttqgeometry ); + DISCARD_USED_FORCE_RULE( strictgeometry ); DISCARD_USED_SET_RULE( shortcut ); DISCARD_USED_FORCE_RULE( disableglobalshortcuts ); } @@ -1038,7 +1038,7 @@ void Workspace::discardUsedWindowRules( Client* c, bool withdrawn ) it != rules.end(); ) { - if( c->rules()->tqcontains( *it )) + if( c->rules()->contains( *it )) { updated = true; (*it)->discardUsed( withdrawn ); diff --git a/kwin/rules.h b/kwin/rules.h index 08a563762..584e6a952 100644 --- a/kwin/rules.h +++ b/kwin/rules.h @@ -40,7 +40,7 @@ class WindowRules WindowRules(); void update( Client* ); void discardTemporary(); - bool tqcontains( const Rules* rule ) const; + bool contains( const Rules* rule ) const; void remove( Rules* rule ); Placement::Policy checkPlacement( Placement::Policy placement ) const; TQRect checkGeometry( TQRect rect, bool init = false ) const; @@ -232,8 +232,8 @@ class Rules ForceRule moveresizemoderule; bool closeable; ForceRule closeablerule; - bool stricttqgeometry; - ForceRule stricttqgeometryrule; + bool strictgeometry; + ForceRule strictgeometryrule; TQString shortcut; SetRule shortcutrule; bool disableglobalshortcuts; @@ -284,15 +284,15 @@ WindowRules::WindowRules() } inline -bool WindowRules::tqcontains( const Rules* rule ) const +bool WindowRules::contains( const Rules* rule ) const { - return tqFind( rules.begin(), rules.end(), rule ) != rules.end(); + return qFind( rules.begin(), rules.end(), rule ) != rules.end(); } inline void WindowRules::remove( Rules* rule ) { - TQValueVector< Rules* >::Iterator pos = tqFind( rules.begin(), rules.end(), rule ); + TQValueVector< Rules* >::Iterator pos = qFind( rules.begin(), rules.end(), rule ); if( pos != rules.end()) rules.erase( pos ); } diff --git a/kwin/sm.cpp b/kwin/sm.cpp index 9628a8c19..31cada7e0 100644 --- a/kwin/sm.cpp +++ b/kwin/sm.cpp @@ -94,9 +94,9 @@ void Workspace::storeSession( KConfig* config, SMSavePhase phase ) config->writeEntry( TQString("wmClientMachine")+n, c->wmClientMachine( true ).data() ); config->writeEntry( TQString("resourceName")+n, c->resourceName().data() ); config->writeEntry( TQString("resourceClass")+n, c->resourceClass().data() ); - config->writeEntry( TQString("tqgeometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME - config->writeEntry( TQString("restore")+n, c->tqgeometryRestore() ); - config->writeEntry( TQString("fsrestore")+n, c->tqgeometryFSRestore() ); + config->writeEntry( TQString("geometry")+n, TQRect( c->calculateGravitation(TRUE), c->clientSize() ) ); // FRAME + config->writeEntry( TQString("restore")+n, c->geometryRestore() ); + config->writeEntry( TQString("fsrestore")+n, c->geometryFSRestore() ); config->writeEntry( TQString("maximize")+n, (int) c->maximizeMode() ); config->writeEntry( TQString("fullscreen")+n, (int) c->fullScreenMode() ); config->writeEntry( TQString("desktop")+n, c->desktop() ); @@ -164,7 +164,7 @@ void Workspace::loadSessionInfo() info->wmClientMachine = config->readEntry( TQString("wmClientMachine")+n ).latin1(); info->resourceName = config->readEntry( TQString("resourceName")+n ).latin1(); info->resourceClass = config->readEntry( TQString("resourceClass")+n ).lower().latin1(); - info->tqgeometry = config->readRectEntry( TQString("tqgeometry")+n ); + info->geometry = config->readRectEntry( TQString("geometry")+n ); info->restore = config->readRectEntry( TQString("restore")+n ); info->fsrestore = config->readRectEntry( TQString("fsrestore")+n ); info->maximized = config->readNumEntry( TQString("maximize")+n, 0 ); @@ -265,7 +265,7 @@ bool Workspace::windowRoleMatch( const TQCString& role1, const TQCString& role2 if( pos1 < 0 || pos2 < 0 || pos1 != pos2 ) ret = role1 == role2; else - ret = tqstrncmp( role1, role2, pos1 ) == 0; + ret = qstrncmp( role1, role2, pos1 ) == 0; kdDebug() << "WR:" << role1 << ":" << pos1 << ":" << role2 << ":" << pos2 << ":::" << ret << endl; return ret; } @@ -402,7 +402,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() props[ 2 ].num_vals = 1; props[ 2 ].vals = &propvalue[ 2 ]; propvalue[ 3 ].length = 0; - propvalue[ 3 ].value = tqApp->argv()[ 0 ]; + propvalue[ 3 ].value = qApp->argv()[ 0 ]; props[ 3 ].name = const_cast< char* >( SmProgram ); props[ 3 ].type = const_cast< char* >( SmARRAY8 ); props[ 3 ].num_vals = 1; @@ -30,7 +30,7 @@ struct SessionInfo TQCString resourceName; TQCString resourceClass; - TQRect tqgeometry; + TQRect geometry; TQRect restore; TQRect fsrestore; int maximized; diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp index e96d0c24b..a79c10233 100644 --- a/kwin/tabbox.cpp +++ b/kwin/tabbox.cpp @@ -116,7 +116,7 @@ void TabBox::createClientList(ClientList &list, int desktop /*-1 = all*/, Client Client* modal = c->findModal(); if( modal == NULL || modal == c ) add = c; - else if( !list.tqcontains( modal )) + else if( !list.contains( modal )) add = modal; else { @@ -273,7 +273,7 @@ void TabBox::nextPrev( bool next) client = 0; break; } - } while ( client && !clients.tqcontains( client )); + } while ( client && !clients.contains( client )); setCurrentClient( client ); } else if( mode() == DesktopMode ) @@ -402,7 +402,7 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( (*it) == current_client ) - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); // draw icon TQPixmap icon; @@ -439,11 +439,11 @@ void TabBox::drawContents( TQPainter * ) // draw text if ( (*it) == current_client ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else if( (*it)->isMinimized()) { - TQColor c1 = tqcolorGroup().text(); - TQColor c2 = tqcolorGroup().background(); + TQColor c1 = colorGroup().text(); + TQColor c2 = colorGroup().background(); // from kicker's TaskContainer::blendColors() int r1, g1, b1; int r2, g2, b2; @@ -458,7 +458,7 @@ void TabBox::drawContents( TQPainter * ) p.setPen(TQColor( r1, g1, b1 )); } else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, s); @@ -496,13 +496,13 @@ void TabBox::drawContents( TQPainter * ) { // draw highlight background if ( iDesktop == desk ) // current desktop - p.fillRect(x, y, r.width(), lineHeight, tqcolorGroup().highlight()); + p.fillRect(x, y, r.width(), lineHeight, colorGroup().highlight()); p.save(); // draw "icon" (here: number of desktop) - p.fillRect(x+5, y+2, iconWidth, iconHeight, tqcolorGroup().base()); - p.setPen(tqcolorGroup().text()); + p.fillRect(x+5, y+2, iconWidth, iconHeight, colorGroup().base()); + p.setPen(colorGroup().text()); p.drawRect(x+5, y+2, iconWidth, iconHeight); // draw desktop-number @@ -514,9 +514,9 @@ void TabBox::drawContents( TQPainter * ) // draw desktop name text if ( iDesktop == desk ) - p.setPen(tqcolorGroup().highlightedText()); + p.setPen(colorGroup().highlightedText()); else - p.setPen(tqcolorGroup().text()); + p.setPen(colorGroup().text()); p.drawText(x+5 + iconWidth + 8, y, r.width() - 5 - iconWidth - 8, lineHeight, Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine, @@ -698,7 +698,7 @@ void TabBox::handleMouseEvent( XEvent* e ) if( e->type != ButtonPress ) return; TQPoint pos( e->xbutton.x_root, e->xbutton.y_root ); - if( !tqgeometry().tqcontains( pos )) + if( !geometry().contains( pos )) { workspace()->closeTabBox(); // click outside closes tab return; @@ -766,10 +766,10 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms ) uint keySymX = keySyms[ iKeySym ]; uchar keyCodeX = XKeysymToKeycode( qt_xdisplay(), keySymX ); int i = keyCodeX / 8; - char tqmask = 1 << (keyCodeX - (i * 8)); + char mask = 1 << (keyCodeX - (i * 8)); kdDebug(125) << iKeySym << ": keySymX=0x" << TQString::number( keySymX, 16 ) - << " i=" << i << " tqmask=0x" << TQString::number( tqmask, 16 ) + << " i=" << i << " mask=0x" << TQString::number( mask, 16 ) << " keymap[i]=0x" << TQString::number( keymap[i], 16 ) << endl; // Abort if bad index value, @@ -779,13 +779,13 @@ bool areKeySymXsDepressed( bool bAll, const uint keySyms[], int nKeySyms ) // If ALL keys passed need to be depressed, if( bAll ) { - if( (keymap[i] & tqmask) == 0 ) + if( (keymap[i] & mask) == 0 ) return false; } else { // If we are looking for ANY key press, and this key is depressed, - if( keymap[i] & tqmask ) + if( keymap[i] & mask ) return true; } } @@ -1117,8 +1117,8 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX ) if (tab_grab) { - forward = cutWalkThroughWindows.tqcontains( keyX ); - backward = cutWalkThroughWindowsReverse.tqcontains( keyX ); + forward = cutWalkThroughWindows.contains( keyX ); + backward = cutWalkThroughWindowsReverse.contains( keyX ); if (forward || backward) { kdDebug(125) << "== " << cutWalkThroughWindows.toStringInternal() @@ -1128,10 +1128,10 @@ void Workspace::tabBoxKeyPress( const KKeyNative& keyX ) } else if (control_grab) { - forward = cutWalkThroughDesktops.tqcontains( keyX ) || - cutWalkThroughDesktopList.tqcontains( keyX ); - backward = cutWalkThroughDesktopsReverse.tqcontains( keyX ) || - cutWalkThroughDesktopListReverse.tqcontains( keyX ); + forward = cutWalkThroughDesktops.contains( keyX ) || + cutWalkThroughDesktopList.contains( keyX ); + backward = cutWalkThroughDesktopsReverse.contains( keyX ) || + cutWalkThroughDesktopListReverse.contains( keyX ); if (forward || backward) walkThroughDesktops(forward); } diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp index ca3ce11d2..d0d165005 100644 --- a/kwin/tools/decobenchmark/main.cpp +++ b/kwin/tools/decobenchmark/main.cpp @@ -40,7 +40,7 @@ static KCmdLineOptions options[] = { { "+decoration", "Decoration library to use, such as kwin3_plastik.", 0 }, - { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 }, + { "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 }, { "+repetitions", "Number of test repetitions.", 0 }, { 0, 0, 0 } }; @@ -117,7 +117,7 @@ int main(int argc, char** argv) Tests test; if (t == "all") test = AllTests; - else if (t == "tqrepaint") + else if (t == "repaint") test = RepaintTest; else if (t == "caption") test = CaptionTest; diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp index 69c85c140..3cbcdcb5f 100644 --- a/kwin/tools/decobenchmark/preview.cpp +++ b/kwin/tools/decobenchmark/preview.cpp @@ -61,12 +61,12 @@ KDecorationPreview::~KDecorationPreview() void KDecorationPreview::performRepaintTest(int n) { - kdDebug() << "start " << n << " tqrepaints..." << endl; + kdDebug() << "start " << n << " repaints..." << endl; bridge->setCaption("Deco Benchmark"); deco->captionChange(); positionPreviews(0); for (int i = 0; i < n; ++i) { - deco->widget()->tqrepaint(); + deco->widget()->repaint(); kapp->processEvents(); } } @@ -79,7 +79,7 @@ void KDecorationPreview::performCaptionTest(int n) for (int i = 0; i < n; ++i) { bridge->setCaption(caption.arg(i) ); deco->captionChange(); - deco->widget()->tqrepaint(); + deco->widget()->repaint(); kapp->processEvents(); } } @@ -127,10 +127,10 @@ void KDecorationPreview::positionPreviews(int shrink) if ( !deco ) return; - TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/; + TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/; - TQRect tqgeometry(TQPoint(10, 10), size); - deco->widget()->setGeometry(tqgeometry); + TQRect geometry(TQPoint(10, 10), size); + deco->widget()->setGeometry(geometry); } void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode ) @@ -165,7 +165,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode ) TQRect KDecorationPreview::windowGeometry( bool active ) const { TQWidget *widget = deco->widget(); - return widget->tqgeometry(); + return widget->geometry(); } TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) const @@ -309,7 +309,7 @@ bool KDecorationPreviewBridge::isPreview() const return false; } -TQRect KDecorationPreviewBridge::tqgeometry() const +TQRect KDecorationPreviewBridge::geometry() const { return preview->windowGeometry( active ); } diff --git a/kwin/tools/decobenchmark/preview.h b/kwin/tools/decobenchmark/preview.h index aea4fe7ea..9f2445036 100644 --- a/kwin/tools/decobenchmark/preview.h +++ b/kwin/tools/decobenchmark/preview.h @@ -85,7 +85,7 @@ class KDecorationPreviewBridge virtual void performWindowOperation( WindowOperation ); virtual void setMask( const TQRegion&, int ); virtual bool isPreview() const; - virtual TQRect tqgeometry() const; + virtual TQRect geometry() const; virtual TQRect iconGeometry() const; virtual TQRegion unobscuredRegion( const TQRegion& r ) const; virtual TQWidget* workspaceWidget() const; diff --git a/kwin/tools/xreply/xreply.c b/kwin/tools/xreply/xreply.c index 648961b80..ecdf6ebc3 100644 --- a/kwin/tools/xreply/xreply.c +++ b/kwin/tools/xreply/xreply.c @@ -33,7 +33,7 @@ __attribute((weak)) int ___xreply_reply_enabled = 1; extern long ___xreply_reply_count; extern int ___xreply_reply_enabled; -typedef tqStatus (*xreply_ptr_t)(Display*,xReply*,int,Bool); +typedef Status (*xreply_ptr_t)(Display*,xReply*,int,Bool); static xreply_ptr_t xreply_ptr = NULL; static int xreply_backtrace_set = 0; @@ -163,7 +163,7 @@ static void xreply_backtrace() free (strings); } -tqStatus +Status _XReply (dpy, rep, extra, discard) register Display *dpy; register xReply *rep; diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp index 6ad2bf041..e825ac846 100644 --- a/kwin/useractions.cpp +++ b/kwin/useractions.cpp @@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms. /* - This file tqcontains things relevant to direct user actions, such as + This file contains things relevant to direct user actions, such as responses to global keyboard shortcuts, or selecting actions from the window operations menu. @@ -229,7 +229,7 @@ void Workspace::desktopPopupAboutToShow() id = desk_popup->insertItem( basic_name .arg(i) - .arg( desktopName(i).tqreplace( '&', "&&" )), + .arg( desktopName(i).replace( '&', "&&" )), i ); if ( active_popup_client && !active_popup_client->isOnAllDesktops() && active_popup_client->desktop() == i ) @@ -293,7 +293,7 @@ void Workspace::setupWindowShortcut( Client* c ) client_keys_client = c; connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool ))); TQRect r = clientArea( ScreenArea, c ); - TQSize size = client_keys_dialog->tqsizeHint(); + TQSize size = client_keys_dialog->sizeHint(); TQPoint pos = c->pos() + c->clientPos(); if( pos.x() + size.width() >= r.right()) pos.setX( r.right() - size.width()); @@ -364,9 +364,9 @@ void Workspace::performWindowOperation( Client* c, Options::WindowOperation op ) return; if (op == Options::MoveOp || op == Options::UnrestrictedMoveOp ) - TQCursor::setPos( c->tqgeometry().center() ); + TQCursor::setPos( c->geometry().center() ); if (op == Options::ResizeOp || op == Options::UnrestrictedResizeOp ) - TQCursor::setPos( c->tqgeometry().bottomRight()); + TQCursor::setPos( c->geometry().bottomRight()); switch ( op ) { case Options::MoveOp: @@ -1044,8 +1044,8 @@ void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) else { TQRect area = clientArea(ScreenArea, TQPoint(x, y), currentDesktop()); - clientPopupAboutToShow(); // needed for tqsizeHint() to be correct :-/ - int popupHeight = p->tqsizeHint().height(); + clientPopupAboutToShow(); // needed for sizeHint() to be correct :-/ + int popupHeight = p->sizeHint().height(); if (y + popupHeight < area.height()) p->exec( TQPoint( x, y ) ); else @@ -1093,7 +1093,7 @@ void Client::setShortcut( const TQString& _cut ) // Format: // base+(abcdef)<space>base+(abcdef) // E.g. Alt+Ctrl+(ABCDEF) Win+X,Win+(ABCDEF) - if( !cut.tqcontains( '(' ) && !cut.tqcontains( ')' ) && !cut.tqcontains( ' ' )) + if( !cut.contains( '(' ) && !cut.contains( ')' ) && !cut.contains( ' ' )) { if( workspace()->shortcutAvailable( KShortcut( cut ), this )) setShortcutInternal( KShortcut( cut )); diff --git a/kwin/utils.cpp b/kwin/utils.cpp index cfbf3e994..33bdd6299 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -43,11 +43,11 @@ namespace KWinInternal // used to store the return values of // XShapeQueryExtension. -// Necessary since tqshaped window are an extension to X -int Shape::kwin_tqshape_version = 0; -int Shape::kwin_tqshape_event = 0; +// Necessary since shaped window are an extension to X +int Shape::kwin_shape_version = 0; +int Shape::kwin_shape_event = 0; -// does the window w need a tqshape combine tqmask around it? +// does the window w need a shape combine mask around it? bool Shape::hasShape( WId w) { int xws, yws, xbs, ybs; @@ -61,21 +61,21 @@ bool Shape::hasShape( WId w) return boundingShaped != 0; } -int Shape::tqshapeEvent() +int Shape::shapeEvent() { - return kwin_tqshape_event; + return kwin_shape_event; } void Shape::init() { - kwin_tqshape_version = 0; + kwin_shape_version = 0; int dummy; - if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) + if( !XShapeQueryExtension(qt_xdisplay(), &kwin_shape_event, &dummy)) return; int major, minor; if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) return; - kwin_tqshape_version = major * 0x10 + minor; + kwin_shape_version = major * 0x10 + minor; } void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, diff --git a/kwin/utils.h b/kwin/utils.h index c1c0fd38c..b1b2b2e2c 100644 --- a/kwin/utils.h +++ b/kwin/utils.h @@ -89,9 +89,9 @@ enum ForceGeometry_t { NormalGeometrySet, ForceGeometrySet }; // Areas, mostly related to Xinerama enum clientAreaOption { - PlacementArea, // tqgeometry where a window will be initially placed after being mapped + PlacementArea, // geometry where a window will be initially placed after being mapped MovementArea, // ??? window movement snapping area? ignore struts - MaximizeArea, // tqgeometry to which a window will be maximized + MaximizeArea, // geometry to which a window will be maximized MaximizeFullArea, // like MaximizeArea, but ignore struts - used e.g. for topmenu FullScreenArea, // area for fullscreen windows // these below don't depend on xinerama settings @@ -111,14 +111,14 @@ enum ShadeMode class Shape { public: - static bool available() { return kwin_tqshape_version > 0; } - static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits + static bool available() { return kwin_shape_version > 0; } + static int version() { return kwin_shape_version; } // as 16*major+minor, i.e. two hex digits static bool hasShape( WId w); - static int tqshapeEvent(); + static int shapeEvent(); static void init(); private: - static int kwin_tqshape_version; - static int kwin_tqshape_event; + static int kwin_shape_version; + static int kwin_shape_event; }; // compile with XShape older than 1.0 diff --git a/kwin/wm-spec/index.html b/kwin/wm-spec/index.html index a8b0ac57c..187fe7d72 100644 --- a/kwin/wm-spec/index.html +++ b/kwin/wm-spec/index.html @@ -146,7 +146,7 @@ on the ICCCM [2], which defines WM (window manager) interactions at a lower level. The ICCCM does not provide ways to implement many features that modern desktop users expect. The GNOME and KDE desktop projects originally developed their own extensions to the ICCCM to -support these features; this spec tqreplaces those custom extensions +support these features; this spec replaces those custom extensions with a standardized set of ICCCM additions that any desktop environment can adopt. </P diff --git a/kwin/wm-spec/x107.html b/kwin/wm-spec/x107.html index 94c718ee9..d165e1fbc 100644 --- a/kwin/wm-spec/x107.html +++ b/kwin/wm-spec/x107.html @@ -84,7 +84,7 @@ a SendEvent request with the following arguments: CLASS="PROGRAMLISTING" >destination root propagate False -event-tqmask (SubstructureNotify|SubstructureRedirect) +event-mask (SubstructureNotify|SubstructureRedirect) event the specified ClientMessage</PRE > </P @@ -174,7 +174,7 @@ CLASS="PROGRAMLISTING" This property SHOULD be set by the Window Manager. </P ><P ->A Pager can request a change in the desktop tqgeometry by sending a _NET_DESKTOP_GEOMETRY client +>A Pager can request a change in the desktop geometry by sending a _NET_DESKTOP_GEOMETRY client message to the root window: </P ><PRE @@ -310,7 +310,7 @@ CLASS="PROGRAMLISTING" </PRE ><P >This property MUST be set by WM upon calculating the work area for -each desktop. Contains a tqgeometry for each desktop. These geometries are +each desktop. Contains a geometry for each desktop. These geometries are specified relative to the viewport on each desktop and specify an area that is completely contained within the viewport. Work area SHOULD be used by desktop applications to place desktop icons appropriately. @@ -407,17 +407,17 @@ CLASS="LITERAL" >n</TT > is the screen number. The purpose of this property is to allow the Window Manager to know the desktop - tqlayout displayed by the Pager. + layout displayed by the Pager. </P ><P > <TT CLASS="LITERAL" >_NET_DESKTOP_LAYOUT</TT -> describes the tqlayout of virtual - desktops relative to each other. More specifically, it describes the tqlayout +> describes the layout of virtual + desktops relative to each other. More specifically, it describes the layout used by the owner of the manager selection. The Window Manager may use - this tqlayout information or may choose to ignore it. - The property tqcontains four values: the Pager orientation, the number of + this layout information or may choose to ignore it. + The property contains four values: the Pager orientation, the number of desktops in the X direction, the number in the Y direction, and the starting corner of the Pager. </P @@ -454,7 +454,7 @@ CLASS="LITERAL" >_NET_WM_ORIENTATION_HORZ</TT > the desktops are layed out in rows, with the first desktop in the - specified starting corner. So a tqlayout with X=4 and Y=3 starting in + specified starting corner. So a layout with X=4 and Y=3 starting in the <TT CLASS="LITERAL" >_NET_WM_TOPLEFT</TT @@ -491,7 +491,7 @@ CLASS="PROGRAMLISTING" CLASS="LITERAL" >_NET_WM_ORIENTATION_VERT</TT > - the tqlayout for X=4 and Y=3 starting in the <TT + the layout for X=4 and Y=3 starting in the <TT CLASS="LITERAL" >_NET_WM_TOPLEFT</TT > diff --git a/kwin/wm-spec/x225.html b/kwin/wm-spec/x225.html index 93f45d980..7a31fb1b7 100644 --- a/kwin/wm-spec/x225.html +++ b/kwin/wm-spec/x225.html @@ -209,7 +209,7 @@ list of types, whilst providing default behaviour for window managers that do not recognise the extensions. </P ><P ->Rationale: This hint is intend to tqreplace the MOTIF hints. One of the +>Rationale: This hint is intend to replace the MOTIF hints. One of the objections to the MOTIF hints is that they are a purely visual description of the window decoration. By describing the function of the window, the window manager can apply consistent decoration and behaviour to windows of the same @@ -509,7 +509,7 @@ CLASS="PROGRAMLISTING" >_NET_WM_STRUT, left, right, top, bottom, CARDINAL[4]/32</PRE ><P >This property MUST be set by the Client if the window is to reserve space at -the edge of the screen. The property tqcontains a 4 cardinals specifying the +the edge of the screen. The property contains a 4 cardinals specifying the width of the reserved area at each border of the screen. The order of the borders is left, right, top, bottom. The client MAY change this property anytime, therefore the Window Manager MUST @@ -545,7 +545,7 @@ CLASS="PROGRAMLISTING" >_NET_WM_ICON_GEOMETRY, x, y, width, height, CARDINAL[4]/32</PRE ><P >This optional property MAY be set by standalone tools like a taskbar or an -iconbox. It specifies the tqgeometry of a possible icon in case the window is iconified. +iconbox. It specifies the geometry of a possible icon in case the window is iconified. </P ><P >Rationale: This makes it possible for a window manager to display a nice diff --git a/kwin/wm-spec/x24.html b/kwin/wm-spec/x24.html index bff756d52..47b406d0b 100644 --- a/kwin/wm-spec/x24.html +++ b/kwin/wm-spec/x24.html @@ -102,13 +102,13 @@ NAME="AEN30" in early ICCCM drafts. Maximizing a window should give it as much of the screen area as possible (this may not be the full screen area, but only a smaller 'workarea', since the Window Manager may have reserved certain areas for other -windows). A Window Manager is expected to remember the tqgeometry of a maximized window +windows). A Window Manager is expected to remember the geometry of a maximized window and restore it upon de-maximization. Modern Window Managers typically allow separate horizontal and vertical maximization.</P ><P >With the introduction of the Xinerama extension in X11 R6.4, maximization has become more involved. Xinerama allows a screen to span multiple -monitors in a freely configurable tqgeometry. In such a setting, maximizing +monitors in a freely configurable geometry. In such a setting, maximizing a window would ideally not grow it to fill the whole screen, but only the monitor it is shown on. There are of course borderline cases for windows crossing monitor boundaries, and 'real' maximization to the full screen may @@ -335,7 +335,7 @@ NAME="AEN76" ><P >Window-in-window MDI is a multiple document interface known from MS Windows platforms. Programs employing it have a single top-level window -which tqcontains a workspace which tqcontains the subwindows for the open +which contains a workspace which contains the subwindows for the open documents. These subwindows are decorated with Window Manager frames and can be manipulated within their parent window just like ordinary top-level windows on the root window.</P diff --git a/kwin/wm-spec/x351.html b/kwin/wm-spec/x351.html index 2e827fbc1..882f63fbf 100644 --- a/kwin/wm-spec/x351.html +++ b/kwin/wm-spec/x351.html @@ -97,10 +97,10 @@ NAME="AEN356" ></H2 ><P >This spec suggests implementing the file manager desktop by mapping a -desktop-sized window (no tqshape) to all desktops, with +desktop-sized window (no shape) to all desktops, with _NET_WM_WINDOW_TYPE_DESKTOP. This makes the desktop focusable and greatly simplifies implementation of the file manager. It is also faster than -managing lots of small tqshaped windows. The file manager draws the background +managing lots of small shaped windows. The file manager draws the background on this window. There should be a root property with a window handle for use in applications that want to draw the background (xearth). </P diff --git a/kwin/wm-spec/x512.html b/kwin/wm-spec/x512.html index a89e6ac1d..73a6ca4fb 100644 --- a/kwin/wm-spec/x512.html +++ b/kwin/wm-spec/x512.html @@ -124,7 +124,7 @@ NAME="AEN514" ></LI ><LI ><P -> Added _NET_DESKTOP_LAYOUT to allow a Pager to specify inter-desktop tqgeometry. +> Added _NET_DESKTOP_LAYOUT to allow a Pager to specify inter-desktop geometry. </P ></LI ><LI diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 18aa2a662..2d4eea005 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -124,9 +124,9 @@ Workspace::Workspace( bool restore ) electric_bottom_border(None), electric_left_border(None), electric_right_border(None), - tqlayoutOrientation(Qt::Vertical), - tqlayoutX(-1), - tqlayoutY(2), + layoutOrientation(Qt::Vertical), + layoutX(-1), + layoutY(2), workarea(NULL), screenarea(NULL), managing_topmenus( false ), @@ -170,7 +170,7 @@ Workspace::Workspace( bool restore ) Qt::WType_Desktop | Qt::WPaintUnclipped ); - kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventtqmask on root window later + kapp->setGlobalMouseTracking( true ); // so that this doesn't mess eventmask on root window later // call this before XSelectInput() on the root window startup = new KStartupInfo( KStartupInfo::DisableKWinModule | KStartupInfo::AnnounceSilenceChanges, this ); @@ -412,11 +412,11 @@ void Workspace::init() NETPoint* viewports = new NETPoint[ number_of_desktops ]; rootInfo->setDesktopViewport( number_of_desktops, *viewports ); delete[] viewports; - TQRect geom = TQApplication::desktop()->tqgeometry(); - NETSize desktop_tqgeometry; - desktop_tqgeometry.width = geom.width(); - desktop_tqgeometry.height = geom.height(); - rootInfo->setDesktopGeometry( -1, desktop_tqgeometry ); + TQRect geom = TQApplication::desktop()->geometry(); + NETSize desktop_geometry; + desktop_geometry.width = geom.width(); + desktop_geometry.height = geom.height(); + rootInfo->setDesktopGeometry( -1, desktop_geometry ); setShowingDesktop( false ); } // end updates blocker block @@ -450,7 +450,7 @@ Workspace::~Workspace() delete kompmgr; blockStackingUpdates( true ); // TODO grabXServer(); - // use stacking_order, so that kwin --tqreplace keeps stacking order + // use stacking_order, so that kwin --replace keeps stacking order for( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it ) @@ -539,9 +539,9 @@ void Workspace::addClient( Client* c, allowed_t ) updateFocusChains( c, FocusChainUpdate ); // add to focus chain if not already there clients.append( c ); } - if( !unconstrained_stacking_order.tqcontains( c )) + if( !unconstrained_stacking_order.contains( c )) unconstrained_stacking_order.append( c ); - if( !stacking_order.tqcontains( c )) // it'll be updated later, and updateToolWindows() requires + if( !stacking_order.contains( c )) // it'll be updated later, and updateToolWindows() requires stacking_order.append( c ); // c to be in stacking_order if( c->isTopMenu()) addTopMenu( c ); @@ -580,7 +580,7 @@ void Workspace::removeClient( Client* c, allowed_t ) if( c->isNormalWindow()) Notify::raise( Notify::Delete ); - Q_ASSERT( clients.tqcontains( c ) || desktops.tqcontains( c )); + Q_ASSERT( clients.contains( c ) || desktops.contains( c )); clients.remove( c ); desktops.remove( c ); unconstrained_stacking_order.remove( c ); @@ -612,7 +612,7 @@ void Workspace::removeClient( Client* c, allowed_t ) updateStackingOrder( true ); if (tab_grab) - tab_box->tqrepaint(); + tab_box->repaint(); updateClientArea(); } @@ -641,7 +641,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) else focus_chain[ i ].prepend( c ); } - else if( !focus_chain[ i ].tqcontains( c )) + else if( !focus_chain[ i ].contains( c )) { // add it after the active one if( active_client != NULL && active_client != c && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client ) @@ -667,7 +667,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) focus_chain[ i ].remove( c ); focus_chain[ i ].prepend( c ); } - else if( !focus_chain[ i ].tqcontains( c )) + else if( !focus_chain[ i ].contains( c )) { if( active_client != NULL && active_client != c && !focus_chain[ i ].isEmpty() && focus_chain[ i ].last() == active_client ) @@ -690,7 +690,7 @@ void Workspace::updateFocusChains( Client* c, FocusChainChange change ) global_focus_chain.remove( c ); global_focus_chain.prepend( c ); } - else if( !global_focus_chain.tqcontains( c )) + else if( !global_focus_chain.contains( c )) { if( active_client != NULL && active_client != c && !global_focus_chain.isEmpty() && global_focus_chain.last() == active_client ) @@ -970,7 +970,7 @@ void Workspace::slotReconfigure() #if 0 // This actually seems to make things worse now TQWidget curtain; curtain.setBackgroundMode( NoBackground ); - curtain.setGeometry( TQApplication::desktop()->tqgeometry() ); + curtain.setGeometry( TQApplication::desktop()->geometry() ); curtain.show(); #endif for( ClientList::ConstIterator it = clients.begin(); @@ -1000,7 +1000,7 @@ void Workspace::slotReconfigure() topmenu_selection->release(); lostTopMenuSelection(); } - topmenu_height = 0; // tqinvalidate used menu height + topmenu_height = 0; // invalidate used menu height if( managingTopMenus()) { updateTopMenuGeometry(); @@ -1136,7 +1136,7 @@ bool Workspace::isNotManaged( const TQString& title ) void Workspace::refresh() { TQWidget w; - w.setGeometry( TQApplication::desktop()->tqgeometry() ); + w.setGeometry( TQApplication::desktop()->geometry() ); w.show(); w.hide(); TQApplication::flushX(); @@ -1147,7 +1147,7 @@ void Workspace::refresh() going to be hidden are first obscured by new windows with no background ( i.e. transparent ) placed right below the windows. These invisible windows are removed after the switch is complete. - Reduces desktop ( wallpaper ) tqrepaints during desktop switching + Reduces desktop ( wallpaper ) repaints during desktop switching */ class ObscuringWindows { @@ -1169,7 +1169,7 @@ void ObscuringWindows::create( Client* c ) cached = new TQValueList<Window>; Window obs_win; XWindowChanges chngs; - int tqmask = CWSibling | CWStackMode; + int mask = CWSibling | CWStackMode; if( cached->count() > 0 ) { cached->remove( obs_win = cached->first()); @@ -1177,7 +1177,7 @@ void ObscuringWindows::create( Client* c ) chngs.y = c->y(); chngs.width = c->width(); chngs.height = c->height(); - tqmask |= CWX | CWY | CWWidth | CWHeight; + mask |= CWX | CWY | CWWidth | CWHeight; } else { @@ -1190,7 +1190,7 @@ void ObscuringWindows::create( Client* c ) } chngs.sibling = c->frameId(); chngs.stack_mode = Below; - XConfigureWindow( qt_xdisplay(), obs_win, tqmask, &chngs ); + XConfigureWindow( qt_xdisplay(), obs_win, mask, &chngs ); XMapWindow( qt_xdisplay(), obs_win ); obscuring_windows.append( obs_win ); } @@ -1271,7 +1271,7 @@ bool Workspace::setCurrentDesktop( int new_desktop ) { // Search in focus chain if ( movingClient != NULL && active_client == movingClient - && focus_chain[currentDesktop()].tqcontains( active_client ) + && focus_chain[currentDesktop()].contains( active_client ) && active_client->isShown( true ) && active_client->isOnCurrentDesktop()) { c = active_client; // the requestFocus below will fail, as the client is already active @@ -1348,7 +1348,7 @@ int Workspace::desktopToRight( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Vertical) + if (layoutOrientation == Qt::Vertical) { dt += y; if ( dt >= numberOfDesktops() ) @@ -1379,7 +1379,7 @@ int Workspace::desktopToLeft( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Vertical) + if (layoutOrientation == Qt::Vertical) { dt -= y; if ( dt < 0 ) @@ -1410,7 +1410,7 @@ int Workspace::desktopUp( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Horizontal) + if (layoutOrientation == Qt::Horizontal) { dt -= x; if ( dt < 0 ) @@ -1441,7 +1441,7 @@ int Workspace::desktopDown( int desktop ) const int x,y; calcDesktopLayout(x,y); int dt = desktop-1; - if (tqlayoutOrientation == Qt::Horizontal) + if (layoutOrientation == Qt::Horizontal) { dt += x; if ( dt >= numberOfDesktops() ) @@ -1562,7 +1562,7 @@ int Workspace::numScreens() const { if( !options->xineramaEnabled ) return 0; - return tqApp->desktop()->numScreens(); + return qApp->desktop()->numScreens(); } int Workspace::activeScreen() const @@ -1572,10 +1572,10 @@ int Workspace::activeScreen() const if( !options->activeMouseScreen ) { if( activeClient() != NULL && !activeClient()->isOnScreen( active_screen )) - return tqApp->desktop()->screenNumber( activeClient()->tqgeometry().center()); + return qApp->desktop()->screenNumber( activeClient()->geometry().center()); return active_screen; } - return tqApp->desktop()->screenNumber( TQCursor::pos()); + return qApp->desktop()->screenNumber( TQCursor::pos()); } // check whether a client moved completely out of what's considered the active screen, @@ -1596,21 +1596,21 @@ void Workspace::setActiveScreenMouse( TQPoint mousepos ) { if( !options->xineramaEnabled ) return; - active_screen = tqApp->desktop()->screenNumber( mousepos ); + active_screen = qApp->desktop()->screenNumber( mousepos ); } TQRect Workspace::screenGeometry( int screen ) const { if (( !options->xineramaEnabled ) || (kapp->desktop()->numScreens() < 2)) - return tqApp->desktop()->tqgeometry(); - return tqApp->desktop()->screenGeometry( screen ); + return qApp->desktop()->geometry(); + return qApp->desktop()->screenGeometry( screen ); } int Workspace::screenNumber( TQPoint pos ) const { if( !options->xineramaEnabled ) return 0; - return tqApp->desktop()->screenNumber( pos ); + return qApp->desktop()->screenNumber( pos ); } void Workspace::sendClientToScreen( Client* c, int screen ) @@ -1640,18 +1640,18 @@ void Workspace::setDesktopLayout( int, int, int ) void Workspace::updateDesktopLayout() { // rootInfo->desktopLayoutCorner(); // I don't find this worth bothering, feel free to - tqlayoutOrientation = ( rootInfo->desktopLayoutOrientation() == NET::OrientationHorizontal + layoutOrientation = ( rootInfo->desktopLayoutOrientation() == NET::OrientationHorizontal ? Qt::Horizontal : Qt::Vertical ); - tqlayoutX = rootInfo->desktopLayoutColumnsRows().width(); - tqlayoutY = rootInfo->desktopLayoutColumnsRows().height(); - if( tqlayoutX == 0 && tqlayoutY == 0 ) // not given, set default tqlayout - tqlayoutY = 2; + layoutX = rootInfo->desktopLayoutColumnsRows().width(); + layoutY = rootInfo->desktopLayoutColumnsRows().height(); + if( layoutX == 0 && layoutY == 0 ) // not given, set default layout + layoutY = 2; } void Workspace::calcDesktopLayout(int &x, int &y) const { - x = tqlayoutX; // <= 0 means compute it from the other and total number of desktops - y = tqlayoutY; + x = layoutX; // <= 0 means compute it from the other and total number of desktops + y = layoutY; if((x <= 0) && (y > 0)) x = (numberOfDesktops()+y-1) / y; else if((y <=0) && (x > 0)) @@ -1669,7 +1669,7 @@ void Workspace::calcDesktopLayout(int &x, int &y) const */ bool Workspace::addSystemTrayWin( WId w ) { - if ( systemTrayWins.tqcontains( w ) ) + if ( systemTrayWins.contains( w ) ) return TRUE; NETWinInfo ni( qt_xdisplay(), w, root, NET::WMKDESystemTrayWinFor ); @@ -1691,7 +1691,7 @@ bool Workspace::addSystemTrayWin( WId w ) */ bool Workspace::removeSystemTrayWin( WId w, bool check ) { - if ( !systemTrayWins.tqcontains( w ) ) + if ( !systemTrayWins.contains( w ) ) return FALSE; if( check ) { @@ -1794,17 +1794,17 @@ void Workspace::slotGrabWindow() //No XShape - no work. if( Shape::available()) { - //As the first step, get the tqmask from XShape. + //As the first step, get the mask from XShape. int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), active_client->frameId(), ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost tqshape of the window; + //The ShapeBounding region is the outermost shape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region if (rects) { - //Create a TQRegion from the rectangles describing the bounding tqmask. + //Create a TQRegion from the rectangles describing the bounding mask. TQRegion contents; for (int pos = 0; pos < count; pos++) contents += TQRegion(rects[pos].x, rects[pos].y, @@ -1814,18 +1814,18 @@ void Workspace::slotGrabWindow() //Create the bounding box. TQRegion bbox(0, 0, snapshot.width(), snapshot.height()); - //Get the tqmasked away area. - TQRegion tqmaskedAway = bbox - contents; - TQMemArray<TQRect> tqmaskedAwayRects = tqmaskedAway.rects(); + //Get the masked away area. + TQRegion maskedAway = bbox - contents; + TQMemArray<TQRect> maskedAwayRects = maskedAway.rects(); - //Construct a bitmap tqmask from the rectangles - TQBitmap tqmask( snapshot.width(), snapshot.height()); - TQPainter p(&tqmask); - p.fillRect(0, 0, tqmask.width(), tqmask.height(), Qt::color1); - for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++) - p.fillRect(tqmaskedAwayRects[pos], Qt::color0); + //Construct a bitmap mask from the rectangles + TQBitmap mask( snapshot.width(), snapshot.height()); + TQPainter p(&mask); + p.fillRect(0, 0, mask.width(), mask.height(), Qt::color1); + for (uint pos = 0; pos < maskedAwayRects.count(); pos++) + p.fillRect(maskedAwayRects[pos], Qt::color0); p.end(); - snapshot.setMask(tqmask); + snapshot.setMask(mask); } } @@ -2121,7 +2121,7 @@ void Workspace::checkElectricBorders( bool force ) electric_current_border = 0; - TQRect r = TQApplication::desktop()->tqgeometry(); + TQRect r = TQApplication::desktop()->geometry(); electricTop = r.top(); electricBottom = r.bottom(); electricLeft = r.left(); @@ -2140,12 +2140,12 @@ void Workspace::createBorderWindows() electric_have_borders = true; - TQRect r = TQApplication::desktop()->tqgeometry(); + TQRect r = TQApplication::desktop()->geometry(); XSetWindowAttributes attributes; - unsigned long valuetqmask; + unsigned long valuemask; attributes.override_redirect = True; attributes.event_mask = ( EnterWindowMask | LeaveWindowMask ); - valuetqmask= (CWOverrideRedirect | CWEventMask | CWCursor ); + valuemask= (CWOverrideRedirect | CWEventMask | CWCursor ); attributes.cursor = XCreateFontCursor(qt_xdisplay(), XC_sb_up_arrow); electric_top_border = XCreateWindow (qt_xdisplay(), qt_xrootwin(), @@ -2154,7 +2154,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_top_border); attributes.cursor = XCreateFontCursor(qt_xdisplay(), @@ -2165,7 +2165,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_bottom_border); attributes.cursor = XCreateFontCursor(qt_xdisplay(), @@ -2176,7 +2176,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_left_border); attributes.cursor = XCreateFontCursor(qt_xdisplay(), @@ -2187,7 +2187,7 @@ void Workspace::createBorderWindows() 0, CopyFromParent, InputOnly, CopyFromParent, - valuetqmask, &attributes); + valuemask, &attributes); XMapWindow(qt_xdisplay(), electric_right_border); // Set XdndAware on the windows, so that DND enter events are received (#86998) Atom version = 4; // XDND version @@ -2264,7 +2264,7 @@ void Workspace::clientMoved(const TQPoint &pos, Time now) { electric_current_border = 0; - TQRect r = TQApplication::desktop()->tqgeometry(); + TQRect r = TQApplication::desktop()->geometry(); int offset; int desk_before = currentDesktop(); @@ -2381,7 +2381,7 @@ void Workspace::raiseElectricBorders() void Workspace::addTopMenu( Client* c ) { assert( c->isTopMenu()); - assert( !topmenus.tqcontains( c )); + assert( !topmenus.contains( c )); topmenus.append( c ); if( managingTopMenus()) { @@ -2402,7 +2402,7 @@ void Workspace::removeTopMenu( Client* c ) // if( c->isTopMenu()) // kdDebug() << "REMOVE TOPMENU:" << c << endl; assert( c->isTopMenu()); - assert( topmenus.tqcontains( c )); + assert( topmenus.contains( c )); topmenus.remove( c ); updateCurrentTopMenu(); // TODO reduce topMenuHeight() if possible? @@ -2466,7 +2466,7 @@ int Workspace::topMenuHeight() const { // simply create a dummy menubar and use its preffered height as the menu height KMenuBar tmpmenu; tmpmenu.insertItem( "dummy" ); - topmenu_height = tmpmenu.tqsizeHint().height(); + topmenu_height = tmpmenu.sizeHint().height(); } return topmenu_height; } @@ -2650,20 +2650,20 @@ void Workspace::handleKompmgrOutput( KProcess* , char *buffer, int buflen) { TQString message; TQString output = TQString::fromLocal8Bit( buffer, buflen ); - if (output.tqcontains("Started",false)) + if (output.contains("Started",false)) ; // don't do anything, just pass to the connection release - else if (output.tqcontains("Can't open display",false)) + else if (output.contains("Can't open display",false)) message = i18n("<qt><b>kompmgr failed to open the display</b><br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"); - else if (output.tqcontains("No render extension",false)) + else if (output.contains("No render extension",false)) message = i18n("<qt><b>kompmgr cannot find the Xrender extension</b><br>You are using either an outdated or a crippled version of XOrg.<br>Get XOrg ≥ 6.8 from www.freedesktop.org.<br></qt>"); - else if (output.tqcontains("No composite extension",false)) + else if (output.contains("No composite extension",false)) message = i18n("<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.<br>Additionally, you need to add a new section to your X config file:<br>" "<i>Section \"Extensions\"<br>" "Option \"Composite\" \"Enable\"<br>" "EndSection</i></qt>"); - else if (output.tqcontains("No damage extension",false)) + else if (output.contains("No damage extension",false)) message = i18n("<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.</qt>"); - else if (output.tqcontains("No XFixes extension",false)) + else if (output.contains("No XFixes extension",false)) message = i18n("<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg ≥ 6.8 for translucency and shadows to work.</qt>"); else return; //skip others // kompmgr startup failed or succeeded, release connection diff --git a/kwin/workspace.h b/kwin/workspace.h index e60bc5e88..55043276e 100644 --- a/kwin/workspace.h +++ b/kwin/workspace.h @@ -619,9 +619,9 @@ class Workspace : public TQObject, public KWinInterface, public KDecorationDefin Time electric_time_last; TQPoint electric_push_point; - Qt::Orientation tqlayoutOrientation; - int tqlayoutX; - int tqlayoutY; + Qt::Orientation layoutOrientation; + int layoutX; + int layoutY; Placement *initPositioning; @@ -1,13 +1,13 @@ -- setting up own tqlayout if you're not root - using xkbcomp +- setting up own layout if you're not root - using xkbcomp - allowing other latin base groups instead of "us" (e.g. "dvorak") -- checking each tqlayout in kxkb.cpp if it's ok for single group -- checking each tqlayout in kcmtqlayout.cpp whether it's latin and don't need latin group +- checking each layout in kxkb.cpp if it's ok for single group +- checking each layout in kcmlayout.cpp whether it's latin and don't need latin group -- check the problem with gnome apps, first switch of tqlayout with keyboard shortcut locks input +- check the problem with gnome apps, first switch of layout with keyboard shortcut locks input -- kdesktop_lock: tqlayouts menu, flag icons, better error handling +- kdesktop_lock: layouts menu, flag icons, better error handling - parse xfree86.xml instead of xfree86.lst for XFree86 4.3.0 and higher diff --git a/kxkb/extension.cpp b/kxkb/extension.cpp index 12b9b9bbe..3817a8c4c 100644 --- a/kxkb/extension.cpp +++ b/kxkb/extension.cpp @@ -24,14 +24,14 @@ TQMap<TQString, FILE*> XKBExtension::fileCache; //TODO: move to class? -static TQString getLayoutKey(const TQString& tqlayout, const TQString& variant) +static TQString getLayoutKey(const TQString& layout, const TQString& variant) { - return tqlayout + "." + variant; + return layout + "." + variant; } -TQString XKBExtension::getPrecompiledLayoutFilename(const TQString& tqlayoutKey) +TQString XKBExtension::getPrecompiledLayoutFilename(const TQString& layoutKey) { - TQString compiledLayoutFileName = m_tempDir + tqlayoutKey + ".xkm"; + TQString compiledLayoutFileName = m_tempDir + layoutKey + ".xkm"; return compiledLayoutFileName; } @@ -115,28 +115,28 @@ bool XKBExtension::setXkbOptions(const TQString& options, bool resetOld) } bool XKBExtension::setLayout(const TQString& model, - const TQString& tqlayout, const TQString& variant, + const TQString& layout, const TQString& variant, const TQString& includeGroup, bool useCompiledLayouts) { if( useCompiledLayouts == false ) { - return setLayoutInternal( model, tqlayout, variant, includeGroup ); + return setLayoutInternal( model, layout, variant, includeGroup ); } - const TQString tqlayoutKey = getLayoutKey(tqlayout, variant); + const TQString layoutKey = getLayoutKey(layout, variant); bool res; - if( fileCache.tqcontains(tqlayoutKey) ) { - res = setCompiledLayout( tqlayoutKey ); - kdDebug() << "setCompiledLayout " << tqlayoutKey << ": " << res << endl; + if( fileCache.contains(layoutKey) ) { + res = setCompiledLayout( layoutKey ); + kdDebug() << "setCompiledLayout " << layoutKey << ": " << res << endl; if( res ) return res; } // else { - res = setLayoutInternal( model, tqlayout, variant, includeGroup ); - kdDebug() << "setRawLayout " << tqlayoutKey << ": " << res << endl; + res = setLayoutInternal( model, layout, variant, includeGroup ); + kdDebug() << "setRawLayout " << layoutKey << ": " << res << endl; if( res ) - compileCurrentLayout( tqlayoutKey ); + compileCurrentLayout( layoutKey ); // } return res; @@ -144,10 +144,10 @@ bool XKBExtension::setLayout(const TQString& model, // private bool XKBExtension::setLayoutInternal(const TQString& model, - const TQString& tqlayout, const TQString& variant, + const TQString& layout, const TQString& variant, const TQString& includeGroup) { - if ( tqlayout.isEmpty() ) + if ( layout.isEmpty() ) return false; TQString exe = KGlobal::dirs()->findExe("setxkbmap"); @@ -156,12 +156,12 @@ bool XKBExtension::setLayoutInternal(const TQString& model, return false; } - TQString fullLayout = tqlayout; + TQString fullLayout = layout; TQString fullVariant = variant; if( includeGroup.isEmpty() == false ) { fullLayout = includeGroup; fullLayout += ","; - fullLayout += tqlayout; + fullLayout += layout; // fullVariant = baseVar; fullVariant = ","; @@ -173,7 +173,7 @@ bool XKBExtension::setLayoutInternal(const TQString& model, // p << "-rules" << rule; if( model.isEmpty() == false ) p << "-model" << model; - p << "-tqlayout" << fullLayout; + p << "-layout" << fullLayout; if( !fullVariant.isNull() && !fullVariant.isEmpty() ) p << "-variant" << fullVariant; @@ -209,25 +209,25 @@ unsigned int XKBExtension::getGroup() const } /** - * @brief Gets the current tqlayout in its binary compiled form + * @brief Gets the current layout in its binary compiled form * and write it to the file specified by 'fileName' - * @param[in] fileName file to store compiled tqlayout to + * @param[in] fileName file to store compiled layout to * @return true if no problem, false otherwise */ -bool XKBExtension::compileCurrentLayout(const TQString &tqlayoutKey) +bool XKBExtension::compileCurrentLayout(const TQString &layoutKey) { XkbFileInfo result; memset(&result, 0, sizeof(result)); result.type = XkmKeymapFile; XkbReadFromServer(m_dpy, XkbAllMapComponentsMask, XkbAllMapComponentsMask, &result); - const TQString fileName = getPrecompiledLayoutFilename(tqlayoutKey); + const TQString fileName = getPrecompiledLayoutFilename(layoutKey); - kdDebug() << "compiling tqlayout " << this << " cache size: " << fileCache.count() << endl; - if( fileCache.tqcontains(tqlayoutKey) ) { - kdDebug() << "trashing old compiled tqlayout for " << fileName << endl; - if( fileCache[ tqlayoutKey ] != NULL ) - fclose( fileCache[ tqlayoutKey ] ); // recompiling - trash the old file + kdDebug() << "compiling layout " << this << " cache size: " << fileCache.count() << endl; + if( fileCache.contains(layoutKey) ) { + kdDebug() << "trashing old compiled layout for " << fileName << endl; + if( fileCache[ layoutKey ] != NULL ) + fclose( fileCache[ layoutKey ] ); // recompiling - trash the old file fileCache.remove(fileName); } @@ -241,41 +241,41 @@ bool XKBExtension::compileCurrentLayout(const TQString &tqlayoutKey) } if( !XkbWriteXKMFile(output, &result) ) { - kdWarning() << "Could not write compiled tqlayout to " << fileName << endl; + kdWarning() << "Could not write compiled layout to " << fileName << endl; fclose(output); return false; } fclose(output); // TODO: can we change mode w/out reopening? FILE *input = fopen(TQFile::encodeName(fileName), "r"); - fileCache[ tqlayoutKey ] = input; + fileCache[ layoutKey ] = input; XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); return true; } /** - * @brief takes tqlayout from its compiled binary snapshot in file + * @brief takes layout from its compiled binary snapshot in file * and sets it as current - * TODO: cache tqlayout in memory rather than in file + * TODO: cache layout in memory rather than in file */ -bool XKBExtension::setCompiledLayout(const TQString &tqlayoutKey) +bool XKBExtension::setCompiledLayout(const TQString &layoutKey) { FILE *input = NULL; - if( fileCache.tqcontains(tqlayoutKey) ) { - input = fileCache[ tqlayoutKey ]; + if( fileCache.contains(layoutKey) ) { + input = fileCache[ layoutKey ]; } if( input == NULL ) { kdWarning() << "setCompiledLayout trying to reopen xkb file" << endl; // should never happen - const TQString fileName = getPrecompiledLayoutFilename(tqlayoutKey); + const TQString fileName = getPrecompiledLayoutFilename(layoutKey); input = fopen(TQFile::encodeName(fileName), "r"); // FILE *input = fopen(TQFile::encodeName(fileName), "r"); if ( input == NULL ) { kdDebug() << "Unable to open " << fileName << ": " << strerror(errno) << endl; - fileCache.remove(tqlayoutKey); + fileCache.remove(layoutKey); return false; } } @@ -288,7 +288,7 @@ bool XKBExtension::setCompiledLayout(const TQString &tqlayoutKey) if ((result.xkb = XkbAllocKeyboard())==NULL) { kdWarning() << "Unable to allocate memory for keyboard description" << endl; // fclose(input); -// fileCache.remove(tqlayoutKey); +// fileCache.remove(layoutKey); return false; } @@ -299,7 +299,7 @@ bool XKBExtension::setCompiledLayout(const TQString &tqlayoutKey) kdWarning() << "Unable to load map from file" << endl; XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); fclose(input); - fileCache.remove(tqlayoutKey); + fileCache.remove(layoutKey); return false; } @@ -309,14 +309,14 @@ bool XKBExtension::setCompiledLayout(const TQString &tqlayoutKey) { if (!XkbWriteToServer(&result)) { - kdWarning() << "Unable to write the keyboard tqlayout to X display" << endl; + kdWarning() << "Unable to write the keyboard layout to X display" << endl; XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); return false; } } else { - kdWarning() << "Unable prepare the keyboard tqlayout for X display" << endl; + kdWarning() << "Unable prepare the keyboard layout for X display" << endl; } XkbFreeKeyboard(result.xkb, XkbAllControlsMask, True); @@ -324,7 +324,7 @@ bool XKBExtension::setCompiledLayout(const TQString &tqlayoutKey) } -// Deletes the precompiled tqlayouts stored in temporary files +// Deletes the precompiled layouts stored in temporary files // void XKBExtension::deletePrecompiledLayouts() // { // TQMapConstIterator<LayoutUnit, TQString> it, end; diff --git a/kxkb/extension.h b/kxkb/extension.h index 82ea9231b..bf4293d2b 100644 --- a/kxkb/extension.h +++ b/kxkb/extension.h @@ -14,7 +14,7 @@ public: static bool setXkbOptions(const TQString& options, bool resetOldOptions); bool setLayout(const TQString& model, - const TQString& tqlayout, const TQString& variant, + const TQString& layout, const TQString& variant, const TQString& includeGroup, bool useCompiledLayouts=true); bool setGroup(unsigned int group); unsigned int getGroup() const; @@ -25,12 +25,12 @@ private: static TQMap<TQString, FILE*> fileCache; bool setLayoutInternal(const TQString& model, - const TQString& tqlayout, const TQString& variant, + const TQString& layout, const TQString& variant, const TQString& includeGroup); - bool compileCurrentLayout(const TQString& tqlayoutKey); - bool setCompiledLayout(const TQString& tqlayoutKey); + bool compileCurrentLayout(const TQString& layoutKey); + bool setCompiledLayout(const TQString& layoutKey); - TQString getPrecompiledLayoutFilename(const TQString& tqlayoutKey); + TQString getPrecompiledLayoutFilename(const TQString& layoutKey); // void deletePrecompiledLayouts(); }; diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index ef0cc168f..7af7ae691 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -116,7 +116,7 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(variantChanged())); connect( widget->listLayoutsDst, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(tqlayoutSelChanged(TQListViewItem *))); + this, TQT_SLOT(layoutSelChanged(TQListViewItem *))); connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(displayNameChanged(const TQString&))); @@ -185,23 +185,23 @@ void LayoutConfig::initUI() { widget->comboModel->setCurrentText(i18n(modelName)); - TQValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_tqlayouts; + TQValueList<LayoutUnit> otherLayouts = m_kxkbConfig.m_layouts; widget->listLayoutsDst->clear(); // to optimize we should have gone from it.end to it.begin TQValueList<LayoutUnit>::ConstIterator it; for (it = otherLayouts.begin(); it != otherLayouts.end(); ++it ) { TQListViewItemIterator src_it( widget->listLayoutsSrc ); - LayoutUnit tqlayoutUnit = *it; + LayoutUnit layoutUnit = *it; for ( ; src_it.current(); ++src_it ) { TQListViewItem* srcItem = src_it.current(); - if ( tqlayoutUnit.tqlayout == src_it.current()->text(LAYOUT_COLUMN_MAP) ) { // check if current config knows about this tqlayout + if ( layoutUnit.layout == src_it.current()->text(LAYOUT_COLUMN_MAP) ) { // check if current config knows about this layout TQListViewItem* newItem = copyLVI(srcItem, widget->listLayoutsDst); - newItem->setText(LAYOUT_COLUMN_VARIANT, tqlayoutUnit.variant); - newItem->setText(LAYOUT_COLUMN_INCLUDE, tqlayoutUnit.includeGroup); - newItem->setText(LAYOUT_COLUMN_DISPLAY_NAME, tqlayoutUnit.displayName); + newItem->setText(LAYOUT_COLUMN_VARIANT, layoutUnit.variant); + newItem->setText(LAYOUT_COLUMN_INCLUDE, layoutUnit.includeGroup); + newItem->setText(LAYOUT_COLUMN_DISPLAY_NAME, layoutUnit.displayName); widget->listLayoutsDst->insertItem(newItem); newItem->moveItem(widget->listLayoutsDst->lastItem()); @@ -277,27 +277,27 @@ void LayoutConfig::save() m_kxkbConfig.m_options = createOptionString(); TQListViewItem *item = widget->listLayoutsDst->firstChild(); - TQValueList<LayoutUnit> tqlayouts; + TQValueList<LayoutUnit> layouts; while (item) { - TQString tqlayout = item->text(LAYOUT_COLUMN_MAP); + TQString layout = item->text(LAYOUT_COLUMN_MAP); TQString variant = item->text(LAYOUT_COLUMN_VARIANT); TQString includes = item->text(LAYOUT_COLUMN_INCLUDE); TQString displayName = item->text(LAYOUT_COLUMN_DISPLAY_NAME); - LayoutUnit tqlayoutUnit(tqlayout, variant); - tqlayoutUnit.includeGroup = includes; - tqlayoutUnit.displayName = displayName; - tqlayouts.append( tqlayoutUnit ); + LayoutUnit layoutUnit(layout, variant); + layoutUnit.includeGroup = includes; + layoutUnit.displayName = displayName; + layouts.append( layoutUnit ); item = item->nextSibling(); - kdDebug() << "To save: tqlayout " << tqlayoutUnit.toPair() - << ", inc: " << tqlayoutUnit.includeGroup - << ", disp: " << tqlayoutUnit.displayName << endl; + kdDebug() << "To save: layout " << layoutUnit.toPair() + << ", inc: " << layoutUnit.includeGroup + << ", disp: " << layoutUnit.displayName << endl; } - m_kxkbConfig.m_tqlayouts = tqlayouts; + m_kxkbConfig.m_layouts = layouts; - if( m_kxkbConfig.m_tqlayouts.count() == 0 ) { - m_kxkbConfig.m_tqlayouts.append(LayoutUnit(DEFAULT_LAYOUT_UNIT)); + if( m_kxkbConfig.m_layouts.count() == 0 ) { + m_kxkbConfig.m_layouts.append(LayoutUnit(DEFAULT_LAYOUT_UNIT)); widget->chkEnable->setChecked(false); } @@ -331,8 +331,8 @@ void LayoutConfig::save() void LayoutConfig::updateStickyLimit() { - int tqlayoutsCnt = widget->listLayoutsDst->childCount(); - int maxDepth = tqlayoutsCnt - 1; + int layoutsCnt = widget->listLayoutsDst->childCount(); + int maxDepth = layoutsCnt - 1; if( maxDepth < 2 ) { maxDepth = 2; @@ -349,11 +349,11 @@ void LayoutConfig::add() if( sel == 0 ) return; - // Create a copy of the sel widget, as one might add the same tqlayout more + // Create a copy of the sel widget, as one might add the same layout more // than one time, with different variants. TQListViewItem* toadd = copyLVI(sel, widget->listLayoutsDst); - // Turn on "Include Latin tqlayout" for new language by default (bnc:204402) + // Turn on "Include Latin layout" for new language by default (bnc:204402) toadd->setText(LAYOUT_COLUMN_INCLUDE, "us"); widget->listLayoutsDst->insertItem(toadd); @@ -361,7 +361,7 @@ void LayoutConfig::add() toadd->moveItem(widget->listLayoutsDst->lastItem()); // disabling temporary: does not work reliable in Qt :( // widget->listLayoutsDst->setSelected(sel, true); -// tqlayoutSelChanged(sel); +// layoutSelChanged(sel); updateStickyLimit(); changed(); @@ -384,7 +384,7 @@ void LayoutConfig::remove() delete sel; if( newSel ) widget->listLayoutsSrc->setSelected(newSel, true); - tqlayoutSelChanged(newSel); + layoutSelChanged(newSel); updateStickyLimit(); changed(); @@ -443,23 +443,23 @@ void LayoutConfig::displayNameChanged(const TQString& newDisplayName) if( selLayout == NULL ) return; - const LayoutUnit tqlayoutUnitKey = getLayoutUnitKey( selLayout ); - LayoutUnit& tqlayoutUnit = *m_kxkbConfig.m_tqlayouts.find(tqlayoutUnitKey); + const LayoutUnit layoutUnitKey = getLayoutUnitKey( selLayout ); + LayoutUnit& layoutUnit = *m_kxkbConfig.m_layouts.find(layoutUnitKey); TQString oldName = selLayout->text(LAYOUT_COLUMN_DISPLAY_NAME); if( oldName.isEmpty() ) - oldName = KxkbConfig::getDefaultDisplayName( tqlayoutUnit ); + oldName = KxkbConfig::getDefaultDisplayName( layoutUnit ); if( oldName != newDisplayName ) { - kdDebug() << "setting label for " << tqlayoutUnit.toPair() << " : " << newDisplayName << endl; + kdDebug() << "setting label for " << layoutUnit.toPair() << " : " << newDisplayName << endl; selLayout->setText(LAYOUT_COLUMN_DISPLAY_NAME, newDisplayName); updateIndicator(selLayout); emit changed(); } } -/** will update flag with label if tqlayout label has been edited +/** will update flag with label if layout label has been edited */ void LayoutConfig::updateIndicator(TQListViewItem* selLayout) { @@ -482,11 +482,11 @@ void LayoutConfig::latinChanged() include = ""; selLayout->setText(LAYOUT_COLUMN_INCLUDE, include); - LayoutUnit tqlayoutUnitKey = getLayoutUnitKey(selLayout); - kdDebug() << "tqlayout " << tqlayoutUnitKey.toPair() << ", inc: " << include << endl; + LayoutUnit layoutUnitKey = getLayoutUnitKey(selLayout); + kdDebug() << "layout " << layoutUnitKey.toPair() << ", inc: " << include << endl; } -void LayoutConfig::tqlayoutSelChanged(TQListViewItem *sel) +void LayoutConfig::layoutSelChanged(TQListViewItem *sel) { widget->comboVariant->clear(); widget->comboVariant->setEnabled( sel != NULL ); @@ -499,8 +499,8 @@ void LayoutConfig::tqlayoutSelChanged(TQListViewItem *sel) } - LayoutUnit tqlayoutUnitKey = getLayoutUnitKey(sel); - TQString kbdLayout = tqlayoutUnitKey.tqlayout; + LayoutUnit layoutUnitKey = getLayoutUnitKey(sel); + TQString kbdLayout = layoutUnitKey.layout; // TODO: need better algorithm here for determining if needs us group if ( ! m_rules->isSingleGroup(kbdLayout) @@ -518,7 +518,7 @@ void LayoutConfig::tqlayoutSelChanged(TQListViewItem *sel) } TQStringList vars = m_rules->getAvailableVariants(kbdLayout); - kdDebug() << "tqlayout " << kbdLayout << " has " << vars.count() << " variants" << endl; + kdDebug() << "layout " << kbdLayout << " has " << vars.count() << " variants" << endl; if( vars.count() > 0 ) { vars.prepend(DEFAULT_VARIANT_NAME); @@ -557,7 +557,7 @@ TQWidget* LayoutConfig::makeOptionsTab() OptionListItem *parent; for (; it.current(); ++it) { - if (!it.currentKey().tqcontains(':')) + if (!it.currentKey().contains(':')) { if( it.currentKey() == "ctrl" || it.currentKey() == "caps" || it.currentKey() == "altwin" ) { @@ -589,7 +589,7 @@ TQWidget* LayoutConfig::makeOptionsTab() if (parent != NULL) { // workaroung for mistake in rules file for xkb options in XFree 4.2.0 TQString text(it.current()); - text = text.tqreplace( "Cap$", "Caps." ); + text = text.replace( "Cap$", "Caps." ); if( parent->type() == TQCheckListItem::RadioButtonController ) new OptionListItem(parent, i18n(text.utf8()), TQCheckListItem::RadioButton, key); @@ -622,7 +622,7 @@ void LayoutConfig::updateOptionsCommand() void LayoutConfig::updateLayoutCommand() { TQString setxkbmap; - TQString tqlayoutDisplayName; + TQString layoutDisplayName; TQListViewItem* sel = widget->listLayoutsDst->selectedItem(); if( sel != NULL ) { @@ -633,27 +633,27 @@ void LayoutConfig::updateLayoutCommand() setxkbmap = "setxkbmap"; //-rules " + m_rule setxkbmap += " -model " + lookupLocalized(m_rules->models(), widget->comboModel->currentText()) - + " -tqlayout "; + + " -layout "; setxkbmap += kbdLayout; if( widget->chkLatin->isChecked() ) setxkbmap += ",us"; -/* LayoutUnit tqlayoutUnitKey = getLayoutUnitKey(sel); - tqlayoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_tqlayouts.find(tqlayoutUnitKey) );*/ - tqlayoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME); - if( tqlayoutDisplayName.isEmpty() ) { +/* LayoutUnit layoutUnitKey = getLayoutUnitKey(sel); + layoutDisplayName = m_kxkbConfig.getLayoutDisplayName( *m_kxkbConfig.m_layouts.find(layoutUnitKey) );*/ + layoutDisplayName = sel->text(LAYOUT_COLUMN_DISPLAY_NAME); + if( layoutDisplayName.isEmpty() ) { int count = 0; TQListViewItem *item = widget->listLayoutsDst->firstChild(); while (item) { - TQString tqlayout_ = item->text(LAYOUT_COLUMN_MAP); - if( tqlayout_ == kbdLayout ) + TQString layout_ = item->text(LAYOUT_COLUMN_MAP); + if( layout_ == kbdLayout ) ++count; item = item->nextSibling(); } bool single = count < 2; - tqlayoutDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(kbdLayout, variant), single); + layoutDisplayName = m_kxkbConfig.getDefaultDisplayName(LayoutUnit(kbdLayout, variant), single); } - kdDebug() << "disp: '" << tqlayoutDisplayName << "'" << endl; + kdDebug() << "disp: '" << layoutDisplayName << "'" << endl; if( !variant.isEmpty() ) { setxkbmap += " -variant "; @@ -666,7 +666,7 @@ void LayoutConfig::updateLayoutCommand() widget->editCmdLine->setText(setxkbmap); widget->editDisplayName->setEnabled( sel != NULL ); - widget->editDisplayName->setText(tqlayoutDisplayName); + widget->editDisplayName->setText(layoutDisplayName); } void LayoutConfig::changed() @@ -695,20 +695,20 @@ void LayoutConfig::loadRules() widget->comboModel->insertStringList(modelsList); widget->comboModel->setCurrentItem(0); - // fill in the additional tqlayouts + // fill in the additional layouts widget->listLayoutsSrc->clear(); widget->listLayoutsDst->clear(); - TQDictIterator<char> it2(m_rules->tqlayouts()); + TQDictIterator<char> it2(m_rules->layouts()); while (it2.current()) { - TQString tqlayout = it2.currentKey(); - TQString tqlayoutName = it2.current(); + TQString layout = it2.currentKey(); + TQString layoutName = it2.current(); TQListViewItem *item = new TQListViewItem(widget->listLayoutsSrc); - item->setPixmap(LAYOUT_COLUMN_FLAG, LayoutIcon::getInstance().findPixmap(tqlayout, true)); - item->setText(LAYOUT_COLUMN_NAME, i18n(tqlayoutName.latin1())); - item->setText(LAYOUT_COLUMN_MAP, tqlayout); + item->setPixmap(LAYOUT_COLUMN_FLAG, LayoutIcon::getInstance().findPixmap(layout, true)); + item->setText(LAYOUT_COLUMN_NAME, i18n(layoutName.latin1())); + item->setText(LAYOUT_COLUMN_MAP, layout); ++it2; } widget->listLayoutsSrc->setSorting(LAYOUT_COLUMN_NAME); // from Qt3 TQListView sorts by language @@ -724,7 +724,7 @@ TQString LayoutConfig::createOptionString() { TQString option(it.currentKey()); - if (option.tqcontains(':')) { + if (option.contains(':')) { TQString optionKey = option.mid(0, option.find(':')); OptionListItem *item = m_optionGroups[optionKey]; @@ -795,14 +795,14 @@ OptionListItem * OptionListItem::findChildItem( const TQString& optionName ) extern "C" { - KDE_EXPORT KCModule *create_keyboard_tqlayout(TQWidget *parent, const char *) + KDE_EXPORT KCModule *create_keyboard_layout(TQWidget *parent, const char *) { - return new LayoutConfig(parent, "kcmtqlayout"); + return new LayoutConfig(parent, "kcmlayout"); } KDE_EXPORT KCModule *create_keyboard(TQWidget *parent, const char *) { - return new KeyboardConfig(parent, "kcmtqlayout"); + return new KeyboardConfig(parent, "kcmlayout"); } KDE_EXPORT void init_keyboard() @@ -816,7 +816,7 @@ extern "C" kapp->startServiceByDesktopName("kxkb"); } else { - // Even if the tqlayouts have been disabled we still want to set Xkb options + // Even if the layouts have been disabled we still want to set Xkb options // user can always switch them off now in the "Options" tab if( m_kxkbConfig.m_enableXkbOptions ) { if( !XKBExtension::setXkbOptions(m_kxkbConfig.m_options, m_kxkbConfig.m_resetOldOptions) ) { diff --git a/kxkb/kcmlayout.h b/kxkb/kcmlayout.h index 5ff153fcf..6f61e9e06 100644 --- a/kxkb/kcmlayout.h +++ b/kxkb/kcmlayout.h @@ -37,7 +37,7 @@ protected slots: void variantChanged(); void displayNameChanged(const TQString& name); void latinChanged(); - void tqlayoutSelChanged(TQListViewItem *); + void layoutSelChanged(TQListViewItem *); void loadRules(); void updateLayoutCommand(); void updateOptionsCommand(); diff --git a/kxkb/kcmlayoutwidget.ui b/kxkb/kcmlayoutwidget.ui index 8e9f9d79e..82c866009 100644 --- a/kxkb/kcmlayoutwidget.ui +++ b/kxkb/kcmlayoutwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>LayoutConfigWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>600</width> <height>510</height> @@ -34,7 +34,7 @@ <property name="name"> <cstring>tabWidget</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>600</width> <height>500</height> @@ -56,7 +56,7 @@ <cstring>chkEnable</cstring> </property> <property name="text"> - <string>&Enable keyboard tqlayouts</string> + <string>&Enable keyboard layouts</string> </property> <property name="checked"> <bool>true</bool> @@ -70,7 +70,7 @@ <string></string> </property> <property name="whatsThis" stdset="0"> - <string><h1>Keyboard Layout</h1> Here you can choose your keyboard tqlayout and model. The 'model' refers to the type of keyboard that is connected to your computer, while the keyboard tqlayout defines "which key does what" and may be different for different countries.</string> + <string><h1>Keyboard Layout</h1> Here you can choose your keyboard layout and model. The 'model' refers to the type of keyboard that is connected to your computer, while the keyboard layout defines "which key does what" and may be different for different countries.</string> </property> <grid> <property name="name"> @@ -81,7 +81,7 @@ <cstring>textLabel1_4</cstring> </property> <property name="text"> - <string>Available tqlayouts:</string> + <string>Available layouts:</string> </property> </widget> <widget class="QLabel" row="2" column="2" rowspan="1" colspan="3"> @@ -89,7 +89,7 @@ <cstring>textLabel1_4_2</cstring> </property> <property name="text"> - <string>Active tqlayouts:</string> + <string>Active layouts:</string> </property> </widget> <widget class="QLabel" row="0" column="2" rowspan="1" colspan="3"> @@ -116,7 +116,7 @@ </sizepolicy> </property> <property name="whatsThis" stdset="0"> - <string>Here you can choose a keyboard model. This setting is independent of your keyboard tqlayout and refers to the "hardware" model, i.e. the way your keyboard is manufactured. Modern keyboards that come with your computer usually have two extra keys and are referred to as "104-key" models, which is probably what you want if you do not know what kind of keyboard you have. + <string>Here you can choose a keyboard model. This setting is independent of your keyboard layout and refers to the "hardware" model, i.e. the way your keyboard is manufactured. Modern keyboards that come with your computer usually have two extra keys and are referred to as "104-key" models, which is probably what you want if you do not know what kind of keyboard you have. </string> </property> </widget> @@ -194,12 +194,12 @@ <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string>If more than one tqlayout is present in this list, the KDE panel will offer a docked flag. By clicking on this flag you can easily switch between tqlayouts. The first tqlayout will be default one.</string> + <string>If more than one layout is present in this list, the KDE panel will offer a docked flag. By clicking on this flag you can easily switch between layouts. The first layout will be default one.</string> </property> </widget> <widget class="QLayoutWidget" row="4" column="2" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -303,7 +303,7 @@ <property name="name"> <cstring>listLayoutsSrc</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>260</width> <height>0</height> @@ -313,7 +313,7 @@ <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string>This is the list of available keyboard tqlayouts in your system. You can add tqlayout to the active list by selecting it and pressing "Add" button.</string> + <string>This is the list of available keyboard layouts in your system. You can add layout to the active list by selecting it and pressing "Add" button.</string> </property> </widget> <widget class="QLineEdit" row="8" column="1" rowspan="1" colspan="4"> @@ -324,7 +324,7 @@ <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string>This is the command which is executed when switching to the selected tqlayout. It may help you if you want to debug tqlayout switching, or if you want to switch tqlayouts without the help of KDE.</string> + <string>This is the command which is executed when switching to the selected layout. It may help you if you want to debug layout switching, or if you want to switch layouts without the help of KDE.</string> </property> </widget> <widget class="QCheckBox" row="7" column="2" rowspan="1" colspan="3"> @@ -335,10 +335,10 @@ <bool>false</bool> </property> <property name="text"> - <string>Include latin tqlayout</string> + <string>Include latin layout</string> </property> <property name="whatsThis" stdset="0"> - <string>If after you switch to this tqlayout some keyboard shortcuts based on latin keys do not work try to enable this option.</string> + <string>If after you switch to this layout some keyboard shortcuts based on latin keys do not work try to enable this option.</string> </property> </widget> <widget class="QLabel" row="6" column="2"> @@ -379,7 +379,7 @@ <cstring>comboVariant</cstring> </property> <property name="whatsThis" stdset="0"> - <string>Here you can choose a variant of selected keyboard tqlayout. Layout variants usually represent different key maps for the same language. For example, Ukrainian tqlayout might have four variants: basic, winkeys (as in Windows), typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on a transliterated latin one). + <string>Here you can choose a variant of selected keyboard layout. Layout variants usually represent different key maps for the same language. For example, Ukrainian layout might have four variants: basic, winkeys (as in Windows), typewriter (as in typewriters) and phonetic (each Ukrainian letter is placed on a transliterated latin one). </string> </property> </widget> @@ -393,7 +393,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -410,7 +410,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>210</width> <height>20</height> @@ -442,7 +442,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -477,7 +477,7 @@ <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string>If you select "Application" or "Window" switching policy, changing the keyboard tqlayout will only affect the current application or window.</string> + <string>If you select "Application" or "Window" switching policy, changing the keyboard layout will only affect the current application or window.</string> </property> <vbox> <property name="name"> @@ -523,7 +523,7 @@ <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string>Shows country flag on background of tqlayout name in tray icon</string> + <string>Shows country flag on background of layout name in tray icon</string> </property> </widget> <widget class="QGroupBox" row="2" column="1"> @@ -545,7 +545,7 @@ <string>Enable sticky switching</string> </property> <property name="whatsThis" stdset="0"> - <string>If you have more than two tqlayouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few tqlayouts. You can specify the number of tqlayouts to rotate below. You can still access all tqlayouts by right-clicking on the kxkb indicator.</string> + <string>If you have more than two layouts and turn this option on, switching with the keyboard shortcut or clicking on the kxkb indicator will only cycle through the last few layouts. You can specify the number of layouts to rotate below. You can still access all layouts by right-clicking on the kxkb indicator.</string> </property> </widget> <widget class="QLabel" row="1" column="0"> @@ -556,7 +556,7 @@ <bool>false</bool> </property> <property name="text"> - <string>Number of tqlayouts to rotate:</string> + <string>Number of layouts to rotate:</string> </property> <property name="buddy" stdset="0"> <cstring>spinBox1</cstring> @@ -583,7 +583,7 @@ <cstring>chkShowSingle</cstring> </property> <property name="text"> - <string>Show indicator for single tqlayout</string> + <string>Show indicator for single layout</string> </property> </widget> </grid> @@ -710,6 +710,6 @@ <include location="local" impldecl="in implementation">kdialogbase.h</include> </includes> <pixmapfunction>SmallIcon</pixmapfunction> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index 901b6bbe3..f66ea587c 100644 --- a/kxkb/kcmmisc.cpp +++ b/kxkb/kcmmisc.cpp @@ -51,7 +51,7 @@ #include <X11/Xlib.h> KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *) - : KCModule (parent, "kcmtqlayout") + : KCModule (parent, "kcmlayout") { TQString wtstr; TQBoxLayout* lay = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -286,7 +286,7 @@ int xkb_init() &xkb_lmaj, &xkb_lmin ); } -unsigned int xkb_tqmask_modifier( XkbDescPtr xkb, const char *name ) +unsigned int xkb_mask_modifier( XkbDescPtr xkb, const char *name ) { int i; if( !xkb || !xkb->names ) @@ -298,47 +298,47 @@ unsigned int xkb_tqmask_modifier( XkbDescPtr xkb, const char *name ) char* modStr = XGetAtomName( xkb->dpy, xkb->names->vmods[i] ); if( modStr != NULL && strcmp(name, modStr) == 0 ) { - unsigned int tqmask; - XkbVirtualModsToReal( xkb, 1 << i, &tqmask ); - return tqmask; + unsigned int mask; + XkbVirtualModsToReal( xkb, 1 << i, &mask ); + return mask; } } return 0; } -unsigned int xkb_numlock_tqmask() +unsigned int xkb_numlock_mask() { XkbDescPtr xkb; if(( xkb = XkbGetKeyboard( qt_xdisplay(), XkbAllComponentsMask, XkbUseCoreKbd )) != NULL ) { - unsigned int tqmask = xkb_tqmask_modifier( xkb, "NumLock" ); + unsigned int mask = xkb_mask_modifier( xkb, "NumLock" ); XkbFreeKeyboard( xkb, 0, True ); - return tqmask; + return mask; } return 0; } int xkb_set_on() { - unsigned int tqmask; + unsigned int mask; if( !xkb_init()) return 0; - tqmask = xkb_numlock_tqmask(); - if( tqmask == 0 ) + mask = xkb_numlock_mask(); + if( mask == 0 ) return 0; - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, tqmask, tqmask); + XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, mask, mask); return 1; } int xkb_set_off() { - unsigned int tqmask; + unsigned int mask; if( !xkb_init()) return 0; - tqmask = xkb_numlock_tqmask(); - if( tqmask == 0 ) + mask = xkb_numlock_mask(); + if( mask == 0 ) return 0; - XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, tqmask, 0); + XkbLockModifiers ( qt_xdisplay(), XkbUseCoreKbd, mask, 0); return 1; } #endif @@ -347,10 +347,10 @@ int xkb_set_off() int xtest_get_numlock_state() { int i; - int numlock_tqmask = 0; + int numlock_mask = 0; Window dummy1, dummy2; int dummy3, dummy4, dummy5, dummy6; - unsigned int tqmask; + unsigned int mask; KeyCode numlock_keycode = XKeysymToKeycode( qt_xdisplay(), XK_Num_Lock ); if( numlock_keycode == NoSymbol ) return 0; @@ -360,12 +360,12 @@ int xtest_get_numlock_state() ++i ) { if( map->modifiermap[ map->max_keypermod * i ] == numlock_keycode ) - numlock_tqmask = 1 << i; + numlock_mask = 1 << i; } XQueryPointer( qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, - &dummy3, &dummy4, &dummy5, &dummy6, &tqmask ); + &dummy3, &dummy4, &dummy5, &dummy6, &mask ); XFreeModifiermap( map ); - return tqmask & numlock_tqmask; + return mask & numlock_mask; } void xtest_change_numlock() diff --git a/kxkb/kcmmiscwidget.ui b/kxkb/kcmmiscwidget.ui index ac0f3ca13..479188293 100644 --- a/kxkb/kcmmiscwidget.ui +++ b/kxkb/kcmmiscwidget.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KeyboardConfigWidget</cstring> </property> - <property name="tqgeometry"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -339,6 +339,6 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">knuminput.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/kxkb/keyboard.desktop b/kxkb/keyboard.desktop index 5840d629f..893d92d36 100644 --- a/kxkb/keyboard.desktop +++ b/kxkb/keyboard.desktop @@ -198,7 +198,7 @@ Keywords[hr]=Keyboard,Keyboard repeat,Click volume,Input Devices,repeat,volme,Ti Keywords[hu]=billentyűzet,billentyűismétlés,leütési hang,beviteli eszközök,ismétlés,hangerÅ‘ Keywords[id]=Keyboard,Pengulangan keyboard,Volume klik,Divais Input,repeat,volume Keywords[is]=Lyklaborð,inntakstæki,endurtekning,útlit,alþjóðlegt -Keywords[it]=tastiera,ripetizione dei tasti,volume del clic,dispositivi di input,tqlayout,volume +Keywords[it]=tastiera,ripetizione dei tasti,volume del clic,dispositivi di input,layout,volume Keywords[ja]=ã‚ーボード,ã‚ーボードリピート,クリック音é‡,入力デãƒã‚¤ã‚¹,リピート,éŸ³é‡ Keywords[km]=ក្ដារចុច,ធ្វើ​ក្ដារចុច​ម្ដង​ទៀáž,សំឡáŸáž„​ចុច,ឧបករណáŸâ€‹áž–áŸážáŸŒáž˜áž¶áž“​បញ្ចូល,ធ្វើ​ម្ដង​ទៀáž,សំឡáŸáž„ Keywords[lo]=à»àº›à»‰àº™àºžàº´àº¡ ,àºàº²àº™àºˆàº±àº”ວາງà»àº›à»‰àº™àºžàº´àº¡,àºàº¸àº›àº°àºàºàº™àº‚à»à»‰àº¡àº¹àº™à»€àº‚ົ້າ diff --git a/kxkb/keyboard_layout.desktop b/kxkb/keyboard_layout.desktop index 0d60fe66e..2ba997aa0 100644 --- a/kxkb/keyboard_layout.desktop +++ b/kxkb/keyboard_layout.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Exec=kcmshell keyboard_tqlayout +Exec=kcmshell keyboard_layout Icon=keyboard Type=Application DocPath=kxkb/index.html X-KDE-ModuleType=Library X-KDE-Library=keyboard -X-KDE-FactoryName=keyboard_tqlayout +X-KDE-FactoryName=keyboard_layout X-KDE-ParentApp=kcontrol Name=Keyboard Layout @@ -22,8 +22,8 @@ Name[ca]=Disposició del teclat Name[cs]=Rozvrženà klávesnice Name[csb]=Ùstôw klawiaturë Name[cy]=Cynllun Bysellfwrdd -Name[da]=Tastaturtqlayout -Name[de]=Tastaturtqlayout +Name[da]=Tastaturlayout +Name[de]=Tastaturlayout Name[el]=Διάταξη πληκτÏολογίου Name[eo]=KlavararanÄo Name[es]=Disposición del teclado @@ -72,7 +72,7 @@ Name[sk]=Rozloženie klávesnice Name[sl]=Razpored tipk Name[sr]=РаÑпоред таÑтера Name[sr@Latn]=Raspored tastera -Name[sv]=Tangentbordstqlayout +Name[sv]=Tangentbordslayout Name[ta]=விசைபà¯à®ªà®²à®•à¯ˆ உரà¯à®µà®°à¯ˆ Name[te]=కీబోరà±à°¡à± కూరà±à°ªà± Name[tg]=Тарҳбандии забонак @@ -102,7 +102,7 @@ Comment[ca]=Disposició del teclat Comment[cs]=Rozvrženà klávesnice Comment[csb]=Ùstôw klawiaturë Comment[cy]=Haenlun Bysellfwrdd -Comment[da]=Tastaturtqlayout +Comment[da]=Tastaturlayout Comment[de]=Tastaturbelegung Comment[el]=Διάταξη πληκτÏολογίου Comment[eo]=KlavararanÄo @@ -150,7 +150,7 @@ Comment[sk]=Rozloženie klávesnice Comment[sl]=Razpored tipk Comment[sr]=РаÑпоред таÑтера Comment[sr@Latn]=Raspored tastera -Comment[sv]=Anpassa tangentbordets tqlayout +Comment[sv]=Anpassa tangentbordets layout Comment[ta]=விசைபà¯à®ªà®²à®•à¯ˆ உரà¯à®µà®°à¯ˆ Comment[te]=కీబోరà±à°¡à± కూరà±à°ªà± Comment[tg]=Тарҳбандии забонак @@ -186,12 +186,12 @@ Keywords[eu]=Teklatua,Diseinua,Nazio artekoa Keywords[fa]=صÙØÙ‡ کلید، طرØ‌بندی، بین‌المللی Keywords[fi]=Näppäimistö,Näppäimistön järjestys,Kansainvälinen Keywords[fr]=clavier,disposition du clavier,périphériques d'entrée,International -Keywords[fy]=keyboard,toetsenbord,toetseboerd,keyboard tqlayout,toetseboerdyndieling,toetsenbordindeling,input devices,invoerapparaten,ynfierapparaten,randapparaten +Keywords[fy]=keyboard,toetsenbord,toetseboerd,keyboard layout,toetseboerdyndieling,toetsenbordindeling,input devices,invoerapparaten,ynfierapparaten,randapparaten Keywords[ga]=Méarchlár,Leagan Amach,Idirnáisiúnta Keywords[gl]=Teclado,Tipo de teclado,Internacional Keywords[he]=מקלדת,פריסה,×‘×™× ×œ×ומי, Keyboard,Layout,International Keywords[hi]=कà¥à¤‚जीपट,ख़ाका,अंतरà¥à¤°à¤¾à¤·à¥à¤Ÿà¥à¤°à¥€à¤¯ -Keywords[hr]=Keyboard,Keyboard tqlayout,Input Devices,Tipkovnica,Raspored tipkovnice,MeÄ‘unarodno +Keywords[hr]=Keyboard,Keyboard layout,Input Devices,Tipkovnica,Raspored tipkovnice,MeÄ‘unarodno Keywords[hu]=billentyűzet,kiosztás,nemzetközi Keywords[is]=Lyklaborð,inntakstæki,alþjóðlegt Keywords[it]=tastiera,mappatura,internazionale @@ -206,7 +206,7 @@ Keywords[mt]=Tastiera,Keyboard,Tqassim tal-keyboard,Input Devices Keywords[nb]=tastatur,tasteoppsett,oppsett,sprÃ¥k,internasjonal Keywords[nds]=Tastatuur,Tasttoornen,Layout,Internatschonaal Keywords[ne]=कà¥à¤žà¥à¤œà¥€à¤ªà¤¾à¤Ÿà¥€, सजावट, अनà¥à¤¤à¤°à¤°à¤¾à¤·à¥à¤Ÿà¥à¤°à¤¿à¤¯ -Keywords[nl]=keyboard,toetsenbord,keyboard tqlayout,toetsenbordindeling,input devices,invoerapparaten,randapparaten +Keywords[nl]=keyboard,toetsenbord,keyboard layout,toetsenbordindeling,input devices,invoerapparaten,randapparaten Keywords[nn]=tastatur,tasteoppsett,oppsett,sprÃ¥k,internasjonal Keywords[nso]=Keyboard,Peakanyo,Boditshabatshaba Keywords[pa]=ਕੀ-ਬੋਰਡ,ਖਾਕਾ,ਅੰਤਰਰਾਸ਼ਟਰੀ diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 576ddf4a0..43e9f8046 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -72,12 +72,12 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) ::exit(1); } - // keep in sync with kcmtqlayout.cpp + // keep in sync with kcmlayout.cpp keys = new KGlobalAccel(this); #include "kxkbbindings.cpp" keys->updateConnections(); - m_tqlayoutOwnerMap = new LayoutMap(kxkbConfig); + m_layoutOwnerMap = new LayoutMap(kxkbConfig); connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) ); addKipcEventMask( KIPC::SettingsChanged ); @@ -92,7 +92,7 @@ KXKBApp::~KXKBApp() delete m_tray; delete m_rules; delete m_extension; - delete m_tqlayoutOwnerMap; + delete m_layoutOwnerMap; delete kWinModule; } @@ -101,7 +101,7 @@ int KXKBApp::newInstance() m_extension->reset(); if( settingsRead() ) - tqlayoutApply(); + layoutApply(); return 0; } @@ -143,29 +143,29 @@ bool KXKBApp::settingsRead() kdDebug() << "Active window " << m_prevWinId << endl; } - m_tqlayoutOwnerMap->reset(); - m_tqlayoutOwnerMap->setCurrentWindow( m_prevWinId ); + m_layoutOwnerMap->reset(); + m_layoutOwnerMap->setCurrentWindow( m_prevWinId ); if( m_rules == NULL ) m_rules = new XkbRules(false); - for(int ii=0; ii<(int)kxkbConfig.m_tqlayouts.count(); ii++) { - LayoutUnit& tqlayoutUnit = kxkbConfig.m_tqlayouts[ii]; - tqlayoutUnit.defaultGroup = m_rules->getDefaultGroup(tqlayoutUnit.tqlayout, tqlayoutUnit.includeGroup); - kdDebug() << "default group for " << tqlayoutUnit.toPair() << " is " << tqlayoutUnit.defaultGroup << endl; + for(int ii=0; ii<(int)kxkbConfig.m_layouts.count(); ii++) { + LayoutUnit& layoutUnit = kxkbConfig.m_layouts[ii]; + layoutUnit.defaultGroup = m_rules->getDefaultGroup(layoutUnit.layout, layoutUnit.includeGroup); + kdDebug() << "default group for " << layoutUnit.toPair() << " is " << layoutUnit.defaultGroup << endl; } m_currentLayout = kxkbConfig.getDefaultLayout(); - if( kxkbConfig.m_tqlayouts.count() == 1 ) { - TQString tqlayoutName = m_currentLayout.tqlayout; + if( kxkbConfig.m_layouts.count() == 1 ) { + TQString layoutName = m_currentLayout.layout; TQString variantName = m_currentLayout.variant; TQString includeName = m_currentLayout.includeGroup; int group = m_currentLayout.defaultGroup; - if( !m_extension->setLayout(kxkbConfig.m_model, tqlayoutName, variantName, includeName, false) + if( !m_extension->setLayout(kxkbConfig.m_model, layoutName, variantName, includeName, false) || !m_extension->setGroup( group ) ) { - kdDebug() << "Error switching to single tqlayout " << m_currentLayout.toPair() << endl; + kdDebug() << "Error switching to single layout " << m_currentLayout.toPair() << endl; // TODO: alert user } @@ -201,51 +201,51 @@ void KXKBApp::initTray() } m_tray->setShowFlag(kxkbConfig.m_showFlag); - m_tray->initLayoutList(kxkbConfig.m_tqlayouts, *m_rules); + m_tray->initLayoutList(kxkbConfig.m_layouts, *m_rules); m_tray->setCurrentLayout(m_currentLayout); m_tray->show(); } -// This function activates the keyboard tqlayout specified by the +// This function activates the keyboard layout specified by the // configuration members (m_currentLayout) -void KXKBApp::tqlayoutApply() +void KXKBApp::layoutApply() { setLayout(m_currentLayout); } // kdcop -bool KXKBApp::setLayout(const TQString& tqlayoutPair) +bool KXKBApp::setLayout(const TQString& layoutPair) { - const LayoutUnit tqlayoutUnitKey(tqlayoutPair); - if( kxkbConfig.m_tqlayouts.tqcontains(tqlayoutUnitKey) ) { - return setLayout( *kxkbConfig.m_tqlayouts.find(tqlayoutUnitKey) ); + const LayoutUnit layoutUnitKey(layoutPair); + if( kxkbConfig.m_layouts.contains(layoutUnitKey) ) { + return setLayout( *kxkbConfig.m_layouts.find(layoutUnitKey) ); } return false; } -// Activates the keyboard tqlayout specified by 'tqlayoutUnit' -bool KXKBApp::setLayout(const LayoutUnit& tqlayoutUnit, int group) +// Activates the keyboard layout specified by 'layoutUnit' +bool KXKBApp::setLayout(const LayoutUnit& layoutUnit, int group) { bool res = false; if( group == -1 ) - group = tqlayoutUnit.defaultGroup; + group = layoutUnit.defaultGroup; res = m_extension->setLayout(kxkbConfig.m_model, - tqlayoutUnit.tqlayout, tqlayoutUnit.variant, - tqlayoutUnit.includeGroup); + layoutUnit.layout, layoutUnit.variant, + layoutUnit.includeGroup); if( res ) m_extension->setGroup(group); // not checking for ret - not important if( res ) - m_currentLayout = tqlayoutUnit; + m_currentLayout = layoutUnit; if (m_tray) { if( res ) - m_tray->setCurrentLayout(tqlayoutUnit); + m_tray->setCurrentLayout(layoutUnit); else - m_tray->setError(tqlayoutUnit.toPair()); + m_tray->setError(layoutUnit.toPair()); } return res; @@ -253,23 +253,23 @@ bool KXKBApp::setLayout(const LayoutUnit& tqlayoutUnit, int group) void KXKBApp::toggled() { - const LayoutUnit& tqlayout = m_tqlayoutOwnerMap->getNextLayout().tqlayoutUnit; - setLayout(tqlayout); + const LayoutUnit& layout = m_layoutOwnerMap->getNextLayout().layoutUnit; + setLayout(layout); } void KXKBApp::menuActivated(int id) { if( KxkbLabelController::START_MENU_ID <= id - && id < KxkbLabelController::START_MENU_ID + (int)kxkbConfig.m_tqlayouts.count() ) + && id < KxkbLabelController::START_MENU_ID + (int)kxkbConfig.m_layouts.count() ) { - const LayoutUnit& tqlayout = kxkbConfig.m_tqlayouts[id - KxkbLabelController::START_MENU_ID]; - m_tqlayoutOwnerMap->setCurrentLayout( tqlayout ); - setLayout( tqlayout ); + const LayoutUnit& layout = kxkbConfig.m_layouts[id - KxkbLabelController::START_MENU_ID]; + m_layoutOwnerMap->setCurrentLayout( layout ); + setLayout( layout ); } else if (id == KxkbLabelController::CONFIG_MENU_ID) { KProcess p; - p << "kcmshell" << "keyboard_tqlayout"; + p << "kcmshell" << "keyboard_layout"; p.start(KProcess::DontCare); } else if (id == KxkbLabelController::HELP_MENU_ID) @@ -295,25 +295,25 @@ void KXKBApp::windowChanged(WId winId) kdDebug() << "old WinId: " << m_prevWinId << ", new WinId: " << winId << endl; - if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) { // saving tqlayout/group from previous window + if( m_prevWinId != X11Helper::UNKNOWN_WINDOW_ID ) { // saving layout/group from previous window // kdDebug() << "storing " << m_currentLayout.toPair() << ":" << group << " for " << m_prevWinId << endl; -// m_tqlayoutOwnerMap->setCurrentWindow(m_prevWinId); - m_tqlayoutOwnerMap->setCurrentLayout(m_currentLayout); - m_tqlayoutOwnerMap->setCurrentGroup(group); +// m_layoutOwnerMap->setCurrentWindow(m_prevWinId); + m_layoutOwnerMap->setCurrentLayout(m_currentLayout); + m_layoutOwnerMap->setCurrentGroup(group); } m_prevWinId = winId; if( winId != X11Helper::UNKNOWN_WINDOW_ID ) { - m_tqlayoutOwnerMap->setCurrentWindow(winId); - const LayoutState& tqlayoutState = m_tqlayoutOwnerMap->getCurrentLayout(); + m_layoutOwnerMap->setCurrentWindow(winId); + const LayoutState& layoutState = m_layoutOwnerMap->getCurrentLayout(); - if( tqlayoutState.tqlayoutUnit != m_currentLayout ) { - kdDebug() << "switching to " << tqlayoutState.tqlayoutUnit.toPair() << ":" << group << " for " << winId << endl; - setLayout( tqlayoutState.tqlayoutUnit, tqlayoutState.group ); + if( layoutState.layoutUnit != m_currentLayout ) { + kdDebug() << "switching to " << layoutState.layoutUnit.toPair() << ":" << group << " for " << winId << endl; + setLayout( layoutState.layoutUnit, layoutState.group ); } - else if( tqlayoutState.group != group ) { // we need to change only the group - m_extension->setGroup(tqlayoutState.group); + else if( layoutState.group != group ) { // we need to change only the group + m_extension->setGroup(layoutState.group); } } } @@ -331,18 +331,18 @@ void KXKBApp::slotSettingsChanged(int category) /* Viki (onscreen keyboard) has problems determining some modifiers states - when kxkb uses precompiled tqlayouts instead of setxkbmap. Probably a bug - in the xkb functions used for the precompiled tqlayouts *shrug*. + when kxkb uses precompiled layouts instead of setxkbmap. Probably a bug + in the xkb functions used for the precompiled layouts *shrug*. */ void KXKBApp::forceSetXKBMap( bool set ) { if( m_forceSetXKBMap == set ) return; m_forceSetXKBMap = set; - tqlayoutApply(); + layoutApply(); } -/*Precompiles the keyboard tqlayouts for faster activation later. +/*Precompiles the keyboard layouts for faster activation later. This is done by loading each one of them and then dumping the compiled map from the X server into our local buffer.*/ // void KXKBApp::initPrecompiledLayouts() @@ -350,20 +350,20 @@ map from the X server into our local buffer.*/ // TQStringList dirs = KGlobal::dirs()->findDirs ( "tmp", "" ); // TQString tempDir = dirs.count() == 0 ? "/tmp/" : dirs[0]; // -// TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_tqlayouts.end(); +// TQValueList<LayoutUnit>::ConstIterator end = kxkbConfig.m_layouts.end(); // -// for (TQValueList<LayoutUnit>::ConstIterator it = kxkbConfig.m_tqlayouts.begin(); it != end; ++it) +// for (TQValueList<LayoutUnit>::ConstIterator it = kxkbConfig.m_layouts.begin(); it != end; ++it) // { -// LayoutUnit tqlayoutUnit(*it); -// // const char* baseGr = m_includes[tqlayout]; -// // int group = m_rules->getGroup(tqlayout, baseGr); -// // if( m_extension->setLayout(m_model, tqlayout, m_variants[tqlayout], group, baseGr) ) { -// TQString compiledLayoutFileName = tempDir + tqlayoutUnit.tqlayout + "." + tqlayoutUnit.variant + ".xkm"; +// LayoutUnit layoutUnit(*it); +// // const char* baseGr = m_includes[layout]; +// // int group = m_rules->getGroup(layout, baseGr); +// // if( m_extension->setLayout(m_model, layout, m_variants[layout], group, baseGr) ) { +// TQString compiledLayoutFileName = tempDir + layoutUnit.layout + "." + layoutUnit.variant + ".xkm"; // // if( m_extension->getCompiledLayout(compiledLayoutFileName) ) -// m_compiledLayoutFileNames[tqlayoutUnit.toPair()] = compiledLayoutFileName; +// m_compiledLayoutFileNames[layoutUnit.toPair()] = compiledLayoutFileName; // // } // // else { -// // kdDebug() << "Error precompiling tqlayout " << tqlayout << endl; +// // kdDebug() << "Error precompiling layout " << layout << endl; // // } // } // } diff --git a/kxkb/kxkb.desktop b/kxkb/kxkb.desktop index a68d98d0d..283e0a663 100644 --- a/kxkb/kxkb.desktop +++ b/kxkb/kxkb.desktop @@ -13,7 +13,7 @@ Name[cs]=Nástroj k nastavenà klávesnice Name[csb]=Nôrzãdze mapòwaniô klawiaturë Name[cy]=Erfyn Map Bysellfwrdd Name[da]=Tastaturkortværktøj -Name[de]=Dienstprogramm zum Tastaturtqlayout +Name[de]=Dienstprogramm zum Tastaturlayout Name[el]=ΕÏγαλείο χάÏτη πληκτÏολογίου Name[eo]=KlavararanÄilo Name[es]=Redefinición del teclado @@ -62,7 +62,7 @@ Name[sk]=Nástroj pre rozloženie kláves Name[sl]=Razpored tipk Name[sr]=Ðлат за мапирање таÑтатуре Name[sr@Latn]=Alat za mapiranje tastature -Name[sv]=Verktyg för tangentbordstqlayout +Name[sv]=Verktyg för tangentbordslayout Name[ta]=விசைபà¯à®ªà®²à®•à¯ˆ கà¯à®±à¯à®•à¯à®•à¯à®µà®´à®¿ கரà¯à®µà®¿ Name[tg]=Обзори нақшаи Ñафҳаи калид Name[th]=เครื่à¸à¸‡à¸¡à¸·à¸à¸ˆà¸±à¸”ตารางปุ่มพิมพ์ diff --git a/kxkb/kxkb.h b/kxkb/kxkb.h index fafb26eb3..fc05c620a 100644 --- a/kxkb/kxkb.h +++ b/kxkb/kxkb.h @@ -44,7 +44,7 @@ class KWinModule; class LayoutMap; /* This is the main Kxkb class responsible for reading options - and switching tqlayouts + and switching layouts */ class KXKBApp : public KUniqueApplication @@ -58,9 +58,9 @@ public: virtual int newInstance(); - bool setLayout(const LayoutUnit& tqlayoutUnit, int group=-1); + bool setLayout(const LayoutUnit& layoutUnit, int group=-1); k_dcop: - bool setLayout(const TQString& tqlayoutPair); + bool setLayout(const TQString& layoutPair); TQString getCurrentLayout() { return m_currentLayout.toPair(); } TQStringList getLayoutsList() { return kxkbConfig.getLayoutStringList(); } void forceSetXKBMap( bool set ); @@ -75,7 +75,7 @@ protected slots: protected: // Read settings, and apply them. bool settingsRead(); - void tqlayoutApply(); + void layoutApply(); private: void initTray(); @@ -84,7 +84,7 @@ private: KxkbConfig kxkbConfig; WId m_prevWinId; // for tricky part of saving xkb group - LayoutMap* m_tqlayoutOwnerMap; + LayoutMap* m_layoutOwnerMap; LayoutUnit m_currentLayout; diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp index 0b285b869..0e62fbc21 100644 --- a/kxkb/kxkbconfig.cpp +++ b/kxkb/kxkbconfig.cpp @@ -32,10 +32,10 @@ const char* DEFAULT_MODEL = "pc104"; LayoutUnit KxkbConfig::getDefaultLayout() { - if( m_tqlayouts.size() == 0 ) + if( m_layouts.size() == 0 ) return DEFAULT_LAYOUT_UNIT; - return m_tqlayouts[0]; + return m_layouts[0]; } bool KxkbConfig::load(int loadMode) @@ -43,7 +43,7 @@ bool KxkbConfig::load(int loadMode) KConfig *config = new KConfig("kxkbrc", true, false); config->setGroup("Layout"); -// Even if the tqlayouts have been disabled we still want to set Xkb options +// Even if the layouts have been disabled we still want to set Xkb options // user can always switch them off now in the "Options" tab m_enableXkbOptions = config->readBoolEntry("EnableXkbOptions", false); @@ -63,33 +63,33 @@ bool KxkbConfig::load(int loadMode) m_model = config->readEntry("Model", DEFAULT_MODEL); kdDebug() << "Model: " << m_model << endl; - TQStringList tqlayoutList; + TQStringList layoutList; if( config->hasKey("LayoutList") ) { - tqlayoutList = config->readListEntry("LayoutList"); + layoutList = config->readListEntry("LayoutList"); } else { // old config TQString mainLayout = config->readEntry("Layout", DEFAULT_LAYOUT_UNIT.toPair()); - tqlayoutList = config->readListEntry("Additional"); - tqlayoutList.prepend(mainLayout); + layoutList = config->readListEntry("Additional"); + layoutList.prepend(mainLayout); } - if( tqlayoutList.count() == 0 ) - tqlayoutList.append("us"); + if( layoutList.count() == 0 ) + layoutList.append("us"); - m_tqlayouts.clear(); - for(TQStringList::ConstIterator it = tqlayoutList.begin(); it != tqlayoutList.end() ; ++it) { - m_tqlayouts.append( LayoutUnit(*it) ); - kdDebug() << " tqlayout " << LayoutUnit(*it).toPair() << " in list: " << m_tqlayouts.tqcontains( LayoutUnit(*it) ) << endl; + m_layouts.clear(); + for(TQStringList::ConstIterator it = layoutList.begin(); it != layoutList.end() ; ++it) { + m_layouts.append( LayoutUnit(*it) ); + kdDebug() << " layout " << LayoutUnit(*it).toPair() << " in list: " << m_layouts.contains( LayoutUnit(*it) ) << endl; } - kdDebug() << "Found " << m_tqlayouts.count() << " tqlayouts, default is " << getDefaultLayout().toPair() << endl; + kdDebug() << "Found " << m_layouts.count() << " layouts, default is " << getDefaultLayout().toPair() << endl; TQStringList displayNamesList = config->readListEntry("DisplayNames", ','); for(TQStringList::ConstIterator it = displayNamesList.begin(); it != displayNamesList.end() ; ++it) { TQStringList displayNamePair = TQStringList::split(':', *it ); if( displayNamePair.count() == 2 ) { - LayoutUnit tqlayoutUnit( displayNamePair[0] ); - if( m_tqlayouts.tqcontains( tqlayoutUnit ) ) { - m_tqlayouts[m_tqlayouts.findIndex(tqlayoutUnit)].displayName = displayNamePair[1].left(3); + LayoutUnit layoutUnit( displayNamePair[0] ); + if( m_layouts.contains( layoutUnit ) ) { + m_layouts[m_layouts.findIndex(layoutUnit)].displayName = displayNamePair[1].left(3); } } } @@ -101,9 +101,9 @@ bool KxkbConfig::load(int loadMode) for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) { TQStringList includePair = TQStringList::split(':', *it ); if( includePair.count() == 2 ) { - LayoutUnit tqlayoutUnit( includePair[0] ); - if( m_tqlayouts.tqcontains( tqlayoutUnit ) ) { - m_tqlayouts[m_tqlayouts.findIndex(tqlayoutUnit)].includeGroup = includePair[1]; + LayoutUnit layoutUnit( includePair[0] ); + if( m_layouts.contains( layoutUnit ) ) { + m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = includePair[1]; kdDebug() << "Got inc group: " << includePair[0] << ": " << includePair[1] << endl; } } @@ -113,13 +113,13 @@ bool KxkbConfig::load(int loadMode) kdDebug() << "Old includes..." << endl; TQStringList includeList = config->readListEntry("Includes"); for(TQStringList::ConstIterator it = includeList.begin(); it != includeList.end() ; ++it) { - TQString tqlayoutName = LayoutUnit::parseLayout( *it ); - LayoutUnit tqlayoutUnit( tqlayoutName, "" ); - kdDebug() << "old tqlayout for inc: " << tqlayoutUnit.toPair() << " included " << m_tqlayouts.tqcontains( tqlayoutUnit ) << endl; - if( m_tqlayouts.tqcontains( tqlayoutUnit ) ) { + TQString layoutName = LayoutUnit::parseLayout( *it ); + LayoutUnit layoutUnit( layoutName, "" ); + kdDebug() << "old layout for inc: " << layoutUnit.toPair() << " included " << m_layouts.contains( layoutUnit ) << endl; + if( m_layouts.contains( layoutUnit ) ) { TQString variantName = LayoutUnit::parseVariant(*it); - m_tqlayouts[m_tqlayouts.findIndex(tqlayoutUnit)].includeGroup = variantName; - kdDebug() << "Got inc group: " << tqlayoutUnit.toPair() << ": " << variantName << endl; + m_layouts[m_layouts.findIndex(layoutUnit)].includeGroup = variantName; + kdDebug() << "Got inc group: " << layoutUnit.toPair() << ": " << variantName << endl; } } } @@ -128,24 +128,24 @@ bool KxkbConfig::load(int loadMode) m_showSingle = config->readBoolEntry("ShowSingle", false); m_showFlag = config->readBoolEntry("ShowFlag", true); - TQString tqlayoutOwner = config->readEntry("SwitchMode", "Global"); + TQString layoutOwner = config->readEntry("SwitchMode", "Global"); - if( tqlayoutOwner == "WinClass" ) { + if( layoutOwner == "WinClass" ) { m_switchingPolicy = SWITCH_POLICY_WIN_CLASS; } - else if( tqlayoutOwner == "Window" ) { + else if( layoutOwner == "Window" ) { m_switchingPolicy = SWITCH_POLICY_WINDOW; } - else /*if( tqlayoutOwner == "Global" )*/ { + else /*if( layoutOwner == "Global" )*/ { m_switchingPolicy = SWITCH_POLICY_GLOBAL; } - if( m_tqlayouts.count() < 2 && m_switchingPolicy != SWITCH_POLICY_GLOBAL ) { + if( m_layouts.count() < 2 && m_switchingPolicy != SWITCH_POLICY_GLOBAL ) { kdWarning() << "Layout count is less than 2, using Global switching policy" << endl; m_switchingPolicy = SWITCH_POLICY_GLOBAL; } - kdDebug() << "Layout owner mode " << tqlayoutOwner << endl; + kdDebug() << "Layout owner mode " << layoutOwner << endl; m_stickySwitching = config->readBoolEntry("StickySwitching", false); m_stickySwitchingDepth = config->readEntry("StickySwitchingDepth", "2").toInt(); @@ -153,14 +153,14 @@ bool KxkbConfig::load(int loadMode) m_stickySwitchingDepth = 2; if( m_stickySwitching == true ) { - if( m_tqlayouts.count() < 3 ) { + if( m_layouts.count() < 3 ) { kdWarning() << "Layout count is less than 3, sticky switching will be off" << endl; m_stickySwitching = false; } else - if( (int)m_tqlayouts.count() - 1 < m_stickySwitchingDepth ) { - kdWarning() << "Sticky switching depth is more than tqlayout count -1, adjusting..." << endl; - m_stickySwitchingDepth = m_tqlayouts.count() - 1; + if( (int)m_layouts.count() - 1 < m_stickySwitchingDepth ) { + kdWarning() << "Sticky switching depth is more than layout count -1, adjusting..." << endl; + m_stickySwitchingDepth = m_layouts.count() - 1; } } @@ -180,31 +180,31 @@ void KxkbConfig::save() config->writeEntry("ResetOldOptions", m_resetOldOptions); config->writeEntry("Options", m_options ); - TQStringList tqlayoutList; + TQStringList layoutList; TQStringList includeList; TQStringList displayNamesList; TQValueList<LayoutUnit>::ConstIterator it; - for(it = m_tqlayouts.begin(); it != m_tqlayouts.end(); ++it) { - const LayoutUnit& tqlayoutUnit = *it; + for(it = m_layouts.begin(); it != m_layouts.end(); ++it) { + const LayoutUnit& layoutUnit = *it; - tqlayoutList.append( tqlayoutUnit.toPair() ); + layoutList.append( layoutUnit.toPair() ); - if( tqlayoutUnit.includeGroup.isEmpty() == false ) { - TQString incGroupUnit = TQString("%1:%2").arg(tqlayoutUnit.toPair(), tqlayoutUnit.includeGroup); + if( layoutUnit.includeGroup.isEmpty() == false ) { + TQString incGroupUnit = TQString("%1:%2").arg(layoutUnit.toPair(), layoutUnit.includeGroup); includeList.append( incGroupUnit ); } - TQString displayName( tqlayoutUnit.displayName ); - kdDebug() << " displayName " << tqlayoutUnit.toPair() << " : " << displayName << endl; - if( displayName.isEmpty() == false && displayName != tqlayoutUnit.tqlayout ) { - displayName = TQString("%1:%2").arg(tqlayoutUnit.toPair(), displayName); + TQString displayName( layoutUnit.displayName ); + kdDebug() << " displayName " << layoutUnit.toPair() << " : " << displayName << endl; + if( displayName.isEmpty() == false && displayName != layoutUnit.layout ) { + displayName = TQString("%1:%2").arg(layoutUnit.toPair(), displayName); displayNamesList.append( displayName ); } } - config->writeEntry("LayoutList", tqlayoutList); - kdDebug() << "Saving Layouts: " << tqlayoutList << endl; + config->writeEntry("LayoutList", layoutList); + kdDebug() << "Saving Layouts: " << layoutList << endl; config->writeEntry("IncludeGroups", includeList); kdDebug() << "Saving includeGroups: " << includeList << endl; @@ -244,8 +244,8 @@ void KxkbConfig::setDefaults() m_resetOldOptions = false; m_options = ""; - m_tqlayouts.clear(); - m_tqlayouts.append( DEFAULT_LAYOUT_UNIT ); + m_layouts.clear(); + m_layouts.append( DEFAULT_LAYOUT_UNIT ); m_useKxkb = false; m_showSingle = false; @@ -259,12 +259,12 @@ void KxkbConfig::setDefaults() TQStringList KxkbConfig::getLayoutStringList(/*bool compact*/) { - TQStringList tqlayoutList; - for(TQValueList<LayoutUnit>::ConstIterator it = m_tqlayouts.begin(); it != m_tqlayouts.end(); ++it) { - const LayoutUnit& tqlayoutUnit = *it; - tqlayoutList.append( tqlayoutUnit.toPair() ); + TQStringList layoutList; + for(TQValueList<LayoutUnit>::ConstIterator it = m_layouts.begin(); it != m_layouts.end(); ++it) { + const LayoutUnit& layoutUnit = *it; + layoutList.append( layoutUnit.toPair() ); } - return tqlayoutList; + return layoutList; } @@ -291,21 +291,21 @@ TQString KxkbConfig::getDefaultDisplayName(const TQString& code_) return displayName; } -TQString KxkbConfig::getDefaultDisplayName(const LayoutUnit& tqlayoutUnit, bool single) +TQString KxkbConfig::getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single) { - if( tqlayoutUnit.variant == "" ) - return getDefaultDisplayName( tqlayoutUnit.tqlayout ); + if( layoutUnit.variant == "" ) + return getDefaultDisplayName( layoutUnit.layout ); - TQString displayName = tqlayoutUnit.tqlayout.left(2); + TQString displayName = layoutUnit.layout.left(2); if( single == false ) - displayName += tqlayoutUnit.variant.left(1); + displayName += layoutUnit.variant.left(1); return displayName; } /** - * @brief Gets the single tqlayout part of a tqlayout(variant) string - * @param[in] layvar String in form tqlayout(variant) to parse - * @return The tqlayout found in the string + * @brief Gets the single layout part of a layout(variant) string + * @param[in] layvar String in form layout(variant) to parse + * @return The layout found in the string */ const TQString LayoutUnit::parseLayout(const TQString &layvar) { @@ -322,8 +322,8 @@ const TQString LayoutUnit::parseLayout(const TQString &layvar) } /** - * @brief Gets the single variant part of a tqlayout(variant) string - * @param[in] layvar String in form tqlayout(variant) to parse + * @brief Gets the single variant part of a layout(variant) string + * @param[in] layvar String in form layout(variant) to parse * @return The variant found in the string, no check is performed */ const TQString LayoutUnit::parseVariant(const TQString &layvar) diff --git a/kxkb/kxkbconfig.h b/kxkb/kxkbconfig.h index 9668a33db..82fe610c9 100644 --- a/kxkb/kxkbconfig.h +++ b/kxkb/kxkbconfig.h @@ -18,7 +18,7 @@ #include <tqmap.h> -/* Utility classes for per-window/per-application tqlayout implementation +/* Utility classes for per-window/per-application layout implementation */ enum SwitchingPolicy { SWITCH_POLICY_GLOBAL = 0, @@ -37,7 +37,7 @@ inline TQString createPair(TQString key, TQString value) } struct LayoutUnit { - TQString tqlayout; + TQString layout; TQString variant; TQString includeGroup; TQString displayName; @@ -45,8 +45,8 @@ struct LayoutUnit { LayoutUnit() {} - LayoutUnit(TQString tqlayout_, TQString variant_): - tqlayout(tqlayout_), + LayoutUnit(TQString layout_, TQString variant_): + layout(layout_), variant(variant_) {} @@ -55,26 +55,26 @@ struct LayoutUnit { } void setFromPair(const TQString& pair) { - tqlayout = parseLayout(pair); + layout = parseLayout(pair); variant = parseVariant(pair); } TQString toPair() const { - return createPair(tqlayout, variant); + return createPair(layout, variant); } bool operator<(const LayoutUnit& lu) const { - return tqlayout<lu.tqlayout || - (tqlayout==lu.tqlayout && variant<lu.variant); + return layout<lu.layout || + (layout==lu.layout && variant<lu.variant); } bool operator!=(const LayoutUnit& lu) const { - return tqlayout!=lu.tqlayout || variant!=lu.variant; + return layout!=lu.layout || variant!=lu.variant; } bool operator==(const LayoutUnit& lu) const { -// kdDebug() << tqlayout << "==" << lu.tqlayout << "&&" << variant << "==" << lu.variant << endl; - return tqlayout==lu.tqlayout && variant==lu.variant; +// kdDebug() << layout << "==" << lu.layout << "&&" << variant << "==" << lu.variant << endl; + return layout==lu.layout && variant==lu.variant; } //private: @@ -102,7 +102,7 @@ public: TQString m_model; TQString m_options; - TQValueList<LayoutUnit> m_tqlayouts; + TQValueList<LayoutUnit> m_layouts; LayoutUnit getDefaultLayout(); @@ -112,7 +112,7 @@ public: TQStringList getLayoutStringList(/*bool compact*/); static TQString getDefaultDisplayName(const TQString& code_); - static TQString getDefaultDisplayName(const LayoutUnit& tqlayoutUnit, bool single=false); + static TQString getDefaultDisplayName(const LayoutUnit& layoutUnit, bool single=false); private: static const TQMap<TQString, TQString> parseIncludesMap(const TQStringList& pairList); diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index 38cc57231..749ef4353 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -48,23 +48,23 @@ void KxkbLabelController::setPixmap(const TQPixmap& pixmap) } -void KxkbLabelController::setCurrentLayout(const LayoutUnit& tqlayoutUnit) +void KxkbLabelController::setCurrentLayout(const LayoutUnit& layoutUnit) { - setToolTip(m_descriptionMap[tqlayoutUnit.toPair()]); - setPixmap( LayoutIcon::getInstance().findPixmap(tqlayoutUnit.tqlayout, m_showFlag, tqlayoutUnit.displayName) ); + setToolTip(m_descriptionMap[layoutUnit.toPair()]); + setPixmap( LayoutIcon::getInstance().findPixmap(layoutUnit.layout, m_showFlag, layoutUnit.displayName) ); } -void KxkbLabelController::setError(const TQString& tqlayoutInfo) +void KxkbLabelController::setError(const TQString& layoutInfo) { - TQString msg = i18n("Error changing keyboard tqlayout to '%1'").arg(tqlayoutInfo); + TQString msg = i18n("Error changing keyboard layout to '%1'").arg(layoutInfo); setToolTip(msg); label->setPixmap(LayoutIcon::getInstance().findPixmap("error", m_showFlag)); } -void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& tqlayouts, const XkbRules& rules) +void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rules) { // KPopupMenu* menu = contextMenu(); TQPopupMenu* menu = contextMenu; @@ -85,15 +85,15 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& tqlayout int cnt = 0; TQValueList<LayoutUnit>::ConstIterator it; - for (it=tqlayouts.begin(); it != tqlayouts.end(); ++it) + for (it=layouts.begin(); it != layouts.end(); ++it) { - const TQString tqlayoutName = (*it).tqlayout; + const TQString layoutName = (*it).layout; const TQString variantName = (*it).variant; - const TQPixmap& tqlayoutPixmap = LayoutIcon::getInstance().findPixmap(tqlayoutName, m_showFlag, (*it).displayName); - const TQPixmap pix = iconeffect.apply(tqlayoutPixmap, KIcon::Small, KIcon::DefaultState); + const TQPixmap& layoutPixmap = LayoutIcon::getInstance().findPixmap(layoutName, m_showFlag, (*it).displayName); + const TQPixmap pix = iconeffect.apply(layoutPixmap, KIcon::Small, KIcon::DefaultState); - TQString fullName = i18n((rules.tqlayouts()[tqlayoutName])); + TQString fullName = i18n((rules.layouts()[layoutName])); if( variantName.isEmpty() == false ) fullName += " (" + variantName + ")"; contextMenu->insertItem(pix, fullName, START_MENU_ID + cnt, m_menuStartIndex + cnt); diff --git a/kxkb/kxkbtraywindow.h b/kxkb/kxkbtraywindow.h index 66d1c7220..089a7906b 100644 --- a/kxkb/kxkbtraywindow.h +++ b/kxkb/kxkbtraywindow.h @@ -24,7 +24,7 @@ class TQLabel; class TQPopupMenu; class XkbRules; -/* This class is responsible for displaying flag/label for the tqlayout, +/* This class is responsible for displaying flag/label for the layout, catching keyboard/mouse events and displaying menu when selected */ @@ -37,10 +37,10 @@ public: KxkbLabelController(TQLabel *label, TQPopupMenu* contextMenu); - void initLayoutList(const TQValueList<LayoutUnit>& tqlayouts, const XkbRules& rule); - void setCurrentLayout(const LayoutUnit& tqlayout); -// void setCurrentLayout(const TQString& tqlayout, const TQString &variant); - void setError(const TQString& tqlayoutInfo=""); + void initLayoutList(const TQValueList<LayoutUnit>& layouts, const XkbRules& rule); + void setCurrentLayout(const LayoutUnit& layout); +// void setCurrentLayout(const TQString& layout, const TQString &variant); + void setError(const TQString& layoutInfo=""); void setShowFlag(bool showFlag) { m_showFlag = showFlag; } void show() { label->show(); } diff --git a/kxkb/layoutmap.cpp b/kxkb/layoutmap.cpp index 93641d850..9c13fc49b 100644 --- a/kxkb/layoutmap.cpp +++ b/kxkb/layoutmap.cpp @@ -1,5 +1,5 @@ // -// C++ Implementation: tqlayoutmap +// C++ Implementation: layoutmap // // Description: // @@ -69,13 +69,13 @@ TQPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueueInternal(WId winId) //LayoutQueue& TQPtrQueue<LayoutState>& LayoutMap::getCurrentLayoutQueue(WId winId) { - TQPtrQueue<LayoutState>& tqlayoutQueue = getCurrentLayoutQueueInternal(winId); - if( tqlayoutQueue.count() == 0 ) { - initLayoutQueue(tqlayoutQueue); - kdDebug() << "map: Created queue for " << winId << " size: " << tqlayoutQueue.count() << endl; + TQPtrQueue<LayoutState>& layoutQueue = getCurrentLayoutQueueInternal(winId); + if( layoutQueue.count() == 0 ) { + initLayoutQueue(layoutQueue); + kdDebug() << "map: Created queue for " << winId << " size: " << layoutQueue.count() << endl; } - return tqlayoutQueue; + return layoutQueue; } LayoutState& LayoutMap::getCurrentLayout() { @@ -83,50 +83,50 @@ LayoutState& LayoutMap::getCurrentLayout() { } LayoutState& LayoutMap::getNextLayout() { - LayoutQueue& tqlayoutQueue = getCurrentLayoutQueue(m_currentWinId); - LayoutState* tqlayoutState = tqlayoutQueue.dequeue(); - tqlayoutQueue.enqueue(tqlayoutState); + LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId); + LayoutState* layoutState = layoutQueue.dequeue(); + layoutQueue.enqueue(layoutState); - kdDebug() << "map: Next tqlayout: " << tqlayoutQueue.head()->tqlayoutUnit.toPair() - << " group: " << tqlayoutQueue.head()->tqlayoutUnit.defaultGroup << " for " << m_currentWinId << endl; + kdDebug() << "map: Next layout: " << layoutQueue.head()->layoutUnit.toPair() + << " group: " << layoutQueue.head()->layoutUnit.defaultGroup << " for " << m_currentWinId << endl; - return *tqlayoutQueue.head(); + return *layoutQueue.head(); } void LayoutMap::setCurrentGroup(int group) { getCurrentLayout().group = group; } -void LayoutMap::setCurrentLayout(const LayoutUnit& tqlayoutUnit) { - LayoutQueue& tqlayoutQueue = getCurrentLayoutQueue(m_currentWinId); - kdDebug() << "map: Storing tqlayout: " << tqlayoutUnit.toPair() - << " group: " << tqlayoutUnit.defaultGroup << " for " << m_currentWinId << endl; +void LayoutMap::setCurrentLayout(const LayoutUnit& layoutUnit) { + LayoutQueue& layoutQueue = getCurrentLayoutQueue(m_currentWinId); + kdDebug() << "map: Storing layout: " << layoutUnit.toPair() + << " group: " << layoutUnit.defaultGroup << " for " << m_currentWinId << endl; - int queueSize = (int)tqlayoutQueue.count(); + int queueSize = (int)layoutQueue.count(); for(int ii=0; ii<queueSize; ii++) { - if( tqlayoutQueue.head()->tqlayoutUnit == tqlayoutUnit ) + if( layoutQueue.head()->layoutUnit == layoutUnit ) return; // if present return when it's in head - LayoutState* tqlayoutState = tqlayoutQueue.dequeue(); + LayoutState* layoutState = layoutQueue.dequeue(); if( ii < queueSize - 1 ) { - tqlayoutQueue.enqueue(tqlayoutState); + layoutQueue.enqueue(layoutState); } else { - delete tqlayoutState; - tqlayoutQueue.enqueue(new LayoutState(tqlayoutUnit)); + delete layoutState; + layoutQueue.enqueue(new LayoutState(layoutUnit)); } } for(int ii=0; ii<queueSize - 1; ii++) { - LayoutState* tqlayoutState = tqlayoutQueue.dequeue(); - tqlayoutQueue.enqueue(tqlayoutState); + LayoutState* layoutState = layoutQueue.dequeue(); + layoutQueue.enqueue(layoutState); } } // private -void LayoutMap::initLayoutQueue(LayoutQueue& tqlayoutQueue) { +void LayoutMap::initLayoutQueue(LayoutQueue& layoutQueue) { int queueSize = ( m_kxkbConfig.m_stickySwitching ) - ? m_kxkbConfig.m_stickySwitchingDepth : m_kxkbConfig.m_tqlayouts.count(); + ? m_kxkbConfig.m_stickySwitchingDepth : m_kxkbConfig.m_layouts.count(); for(int ii=0; ii<queueSize; ii++) { - tqlayoutQueue.enqueue( new LayoutState(m_kxkbConfig.m_tqlayouts[ii]) ); + layoutQueue.enqueue( new LayoutState(m_kxkbConfig.m_layouts[ii]) ); } } diff --git a/kxkb/layoutmap.h b/kxkb/layoutmap.h index 3a7197965..4be4cdfb2 100644 --- a/kxkb/layoutmap.h +++ b/kxkb/layoutmap.h @@ -1,5 +1,5 @@ // -// C++ Interface: tqlayoutmap +// C++ Interface: layoutmap // // Description: // @@ -26,14 +26,14 @@ // LayoutInfo is used for sticky switching and per-window/application switching policy struct LayoutState { - const LayoutUnit& tqlayoutUnit; + const LayoutUnit& layoutUnit; int group; - LayoutState(const LayoutUnit& tqlayoutUnit_): - tqlayoutUnit(tqlayoutUnit_), - group(tqlayoutUnit_.defaultGroup) + LayoutState(const LayoutUnit& layoutUnit_): + layoutUnit(layoutUnit_), + group(layoutUnit_.defaultGroup) { -// kdDebug() << "new LayoutState " << tqlayoutUnit.toPair() << " group: " << group << endl; +// kdDebug() << "new LayoutState " << layoutUnit.toPair() << " group: " << group << endl; } }; @@ -48,7 +48,7 @@ public: LayoutMap(const KxkbConfig& kxkbConfig); // void setConfig(const KxkbConfig& kxkbConfig); - void setCurrentLayout(const LayoutUnit& tqlayoutUnit); + void setCurrentLayout(const LayoutUnit& layoutUnit); void setCurrentGroup(int group); LayoutState& getNextLayout(); LayoutState& getCurrentLayout(); @@ -66,7 +66,7 @@ private: WId m_currentWinId; TQString m_currentWinClass; // only for SWITCH_POLICY_WIN_CLASS - void initLayoutQueue(LayoutQueue& tqlayoutQueue); + void initLayoutQueue(LayoutQueue& layoutQueue); LayoutQueue& getCurrentLayoutQueue(WId winId); LayoutQueue& getCurrentLayoutQueueInternal(WId winId); void clearMaps(); diff --git a/kxkb/pixmap.cpp b/kxkb/pixmap.cpp index a059e954f..0ca1500e3 100644 --- a/kxkb/pixmap.cpp +++ b/kxkb/pixmap.cpp @@ -83,10 +83,10 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis if( pm->height() < FLAG_MAX_HEIGHT ) { TQPixmap* pix = new TQPixmap(FLAG_MAX_WIDTH, FLAG_MAX_HEIGHT); pix->fill( Qt::lightGray ); -// pix->fill( TQColor(tqRgba(127,127,127,255)) ); -// TQBitmap tqmask; -// tqmask.fill(1); -// pix->setMask(tqmask); +// pix->fill( TQColor(qRgba(127,127,127,255)) ); +// TQBitmap mask; +// mask.fill(1); +// pix->setMask(mask); int dy = (pix->height() - pm->height()) / 2; copyBlt( pix, 0, dy, pm, 0, 0, -1, -1 ); @@ -112,83 +112,83 @@ LayoutIcon::findPixmap(const TQString& code_, bool showFlag, const TQString& dis } /** -@brief Try to get country code from tqlayout name in xkb before xorg 6.9.0 +@brief Try to get country code from layout name in xkb before xorg 6.9.0 */ -TQString LayoutIcon::getCountryFromLayoutName(const TQString& tqlayoutName) +TQString LayoutIcon::getCountryFromLayoutName(const TQString& layoutName) { TQString flag; if( X11Helper::areLayoutsClean() ) { // >= Xorg 6.9.0 - if( tqlayoutName == "mkd" ) + if( layoutName == "mkd" ) flag = "mk"; else - if( tqlayoutName == "srp" ) { + if( layoutName == "srp" ) { TQString csFlagFile = locate("locale", flagTemplate.arg("cs")); flag = csFlagFile.isEmpty() ? "yu" : "cs"; } else - if( tqlayoutName.endsWith("/jp") ) + if( layoutName.endsWith("/jp") ) flag = "jp"; else - if( tqlayoutName == "trq" || tqlayoutName == "trf" || tqlayoutName == "tralt" ) + if( layoutName == "trq" || layoutName == "trf" || layoutName == "tralt" ) flag = "tr"; else - if( tqlayoutName.length() > 2 ) + if( layoutName.length() > 2 ) flag = ""; else - flag = tqlayoutName; + flag = layoutName; } else { - if( tqlayoutName == "ar" ) // Arabic - not argentina + if( layoutName == "ar" ) // Arabic - not argentina ; else - if( tqlayoutName == "sr" || tqlayoutName == "cs") // Serbian language - Yugoslavia + if( layoutName == "sr" || layoutName == "cs") // Serbian language - Yugoslavia flag = "yu"; else - if( tqlayoutName == "bs" ) // Bosnian language - Bosnia + if( layoutName == "bs" ) // Bosnian language - Bosnia flag = "ba"; else - if( tqlayoutName == "la" ) // Latin America + if( layoutName == "la" ) // Latin America ; else - if( tqlayoutName == "lo" ) // Lao + if( layoutName == "lo" ) // Lao flag = "la"; else - if( tqlayoutName == "pl2" ) // Poland + if( layoutName == "pl2" ) // Poland flag = "pl"; else - if( tqlayoutName == "iu" ) // Inuktitut - Canada + if( layoutName == "iu" ) // Inuktitut - Canada flag = "ca"; else - if( tqlayoutName == "syr" ) // Syriac + if( layoutName == "syr" ) // Syriac flag = "sy"; else - if( tqlayoutName == "dz" ) // Dzongka/Tibetian - Buthan + if( layoutName == "dz" ) // Dzongka/Tibetian - Buthan flag = "bt"; else - if( tqlayoutName == "ogham" ) // Ogham - Ireland + if( layoutName == "ogham" ) // Ogham - Ireland flag = "ie"; else - if( tqlayoutName == "ge_la" || tqlayoutName == "ge_ru" ) + if( layoutName == "ge_la" || layoutName == "ge_ru" ) flag = "ge"; else - if( tqlayoutName == "el" ) + if( layoutName == "el" ) flag = "gr"; else - if( tqlayoutName.endsWith("/jp") ) + if( layoutName.endsWith("/jp") ) flag = "jp"; else - if( tqlayoutName == "ml" || tqlayoutName == "dev" || tqlayoutName == "gur" - || tqlayoutName == "guj" || tqlayoutName == "kan" || tqlayoutName == "ori" - || tqlayoutName == "tel" || tqlayoutName == "tml" || tqlayoutName == "ben" ) // some Indian languages + if( layoutName == "ml" || layoutName == "dev" || layoutName == "gur" + || layoutName == "guj" || layoutName == "kan" || layoutName == "ori" + || layoutName == "tel" || layoutName == "tml" || layoutName == "ben" ) // some Indian languages flag = "in"; else { - int sepPos = tqlayoutName.find(TQRegExp("[-_]")); - TQString leftCode = tqlayoutName.mid(0, sepPos); + int sepPos = layoutName.find(TQRegExp("[-_]")); + TQString leftCode = layoutName.mid(0, sepPos); TQString rightCode; if( sepPos != -1 ) - rightCode = tqlayoutName.mid(sepPos+1); -// kdDebug() << "tqlayout name breakup: " << leftCode << ":" << rightCode << endl; + rightCode = layoutName.mid(sepPos+1); +// kdDebug() << "layout name breakup: " << leftCode << ":" << rightCode << endl; if( rightCode.length() == 2 && TQRegExp("[A-Z][A-Z]").exactMatch(rightCode) ) { @@ -211,7 +211,7 @@ void LayoutIcon::dimPixmap(TQPixmap& pm) for(int x=0; x<image.width(); x++) { QRgb rgb = image.pixel(x,y); - QRgb dimRgb(tqRgb(tqRed(rgb)*3/4, tqGreen(rgb)*3/4, tqBlue(rgb)*3/4)); + QRgb dimRgb(qRgb(qRed(rgb)*3/4, qGreen(rgb)*3/4, qBlue(rgb)*3/4)); image.setPixel(x, y, dimRgb); } pm.convertFromImage(image); @@ -313,7 +313,7 @@ TQPixmap* LayoutIcon::createErrorPixmap() // I18N_NOOP("Iranian"); // should be not Iranian but Farsi I18N_NOOP("Latin America"); I18N_NOOP("Maltese"); - I18N_NOOP("Maltese (US tqlayout)"); + I18N_NOOP("Maltese (US layout)"); I18N_NOOP("Northern Saami (Finland)"); I18N_NOOP("Northern Saami (Norway)"); I18N_NOOP("Northern Saami (Sweden)"); diff --git a/kxkb/pixmap.h b/kxkb/pixmap.h index 661e74eff..7070d91b2 100644 --- a/kxkb/pixmap.h +++ b/kxkb/pixmap.h @@ -19,7 +19,7 @@ private: LayoutIcon(); TQPixmap* createErrorPixmap(); void dimPixmap(TQPixmap& pixmap); - TQString getCountryFromLayoutName(const TQString& tqlayoutName); + TQString getCountryFromLayoutName(const TQString& layoutName); public: static const TQString& ERROR_CODE; diff --git a/kxkb/rules.cpp b/kxkb/rules.cpp index 940b2db35..dbf5b823d 100644 --- a/kxkb/rules.cpp +++ b/kxkb/rules.cpp @@ -15,8 +15,8 @@ #include "rules.h" -XkbRules::XkbRules(bool tqlayoutsOnly): - m_tqlayouts(90) +XkbRules::XkbRules(bool layoutsOnly): + m_layouts(90) { X11_DIR = X11Helper::findX11Dir(); @@ -34,23 +34,23 @@ XkbRules::XkbRules(bool tqlayoutsOnly): return; } - loadRules(rulesFile, tqlayoutsOnly); + loadRules(rulesFile, layoutsOnly); loadOldLayouts(rulesFile); loadGroups(::locate("config", "kxkb_groups")); } -void XkbRules::loadRules(TQString file, bool tqlayoutsOnly) +void XkbRules::loadRules(TQString file, bool layoutsOnly) { - RulesInfo* rules = X11Helper::loadRules(file, tqlayoutsOnly); + RulesInfo* rules = X11Helper::loadRules(file, layoutsOnly); if (rules == NULL) { kdDebug() << "Unable to load rules" << endl; return; } - m_tqlayouts= rules->tqlayouts; - if( tqlayoutsOnly == false ) { + m_layouts= rules->layouts; + if( layoutsOnly == false ) { m_models = rules->models; m_options = rules->options; } @@ -65,7 +65,7 @@ void XkbRules::loadRules(TQString file, bool tqlayoutsOnly) // // the rule file wasn't found // static struct { // const char * locale; -// const char * tqlayout; +// const char * layout; // } fixedLayouts[] = { // { "ben", "Bengali" }, // { "ar", "Arabic" }, @@ -73,21 +73,21 @@ void XkbRules::loadRules(TQString file, bool tqlayoutsOnly) // { 0, 0 } // }; // -// for(int i=0; fixedLayouts[i].tqlayout != 0; i++ ) { -// if( m_tqlayouts.find(fixedLayouts[i].locale) == 0 ) -// m_tqlayouts.insert(fixedLayouts[i].locale, fixedLayouts[i].tqlayout); +// for(int i=0; fixedLayouts[i].layout != 0; i++ ) { +// if( m_layouts.find(fixedLayouts[i].locale) == 0 ) +// m_layouts.insert(fixedLayouts[i].locale, fixedLayouts[i].layout); // } // } -bool XkbRules::isSingleGroup(const TQString& tqlayout) +bool XkbRules::isSingleGroup(const TQString& layout) { return X11Helper::areSingleGroupsSupported() - && !m_oldLayouts.tqcontains(tqlayout) - && !m_nonLatinLayouts.tqcontains(tqlayout); + && !m_oldLayouts.contains(layout) + && !m_nonLatinLayouts.contains(layout); } -// check $oldtqlayouts and $nonlatin groups for XFree 4.3 and later +// check $oldlayouts and $nonlatin groups for XFree 4.3 and later void XkbRules::loadOldLayouts(TQString rulesFile) { OldLayouts* oldLayoutsStruct = X11Helper::loadOldLayouts( rulesFile ); @@ -95,8 +95,8 @@ void XkbRules::loadOldLayouts(TQString rulesFile) m_nonLatinLayouts = oldLayoutsStruct->nonLatinLayouts; } -// for multi-group tqlayouts in XFree 4.2 and older -// or if tqlayout is present in $oldtqlayout or $nonlatin groups +// for multi-group layouts in XFree 4.2 and older +// or if layout is present in $oldlayout or $nonlatin groups void XkbRules::loadGroups(TQString file) { TQFile f(file); @@ -121,35 +121,35 @@ void XkbRules::loadGroups(TQString file) } unsigned int -XkbRules::getDefaultGroup(const TQString& tqlayout, const TQString& includeGroup) +XkbRules::getDefaultGroup(const TQString& layout, const TQString& includeGroup) { -// check for new one-group tqlayouts in XFree 4.3 and older - if( isSingleGroup(tqlayout) ) { +// check for new one-group layouts in XFree 4.3 and older + if( isSingleGroup(layout) ) { if( includeGroup.isEmpty() == false ) return 1; else return 0; } - TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(tqlayout); + TQMap<TQString, unsigned int>::iterator it = m_initialGroups.find(layout); return it == m_initialGroups.end() ? 0 : it.data(); } QStringList -XkbRules::getAvailableVariants(const TQString& tqlayout) +XkbRules::getAvailableVariants(const TQString& layout) { - if( tqlayout.isEmpty() || !tqlayouts().find(tqlayout) ) + if( layout.isEmpty() || !layouts().find(layout) ) return TQStringList(); - TQStringList* result1 = m_varLists[tqlayout]; + TQStringList* result1 = m_varLists[layout]; if( result1 ) return *result1; - bool oldLayouts = m_oldLayouts.tqcontains(tqlayout); - TQStringList* result = X11Helper::getVariants(tqlayout, X11_DIR, oldLayouts); + bool oldLayouts = m_oldLayouts.contains(layout); + TQStringList* result = X11Helper::getVariants(layout, X11_DIR, oldLayouts); - m_varLists.insert(tqlayout, result); + m_varLists.insert(layout, result); return *result; } diff --git a/kxkb/rules.h b/kxkb/rules.h index 27163a140..a4955317e 100644 --- a/kxkb/rules.h +++ b/kxkb/rules.h @@ -10,27 +10,27 @@ class XkbRules { public: - XkbRules(bool tqlayoutsOnly=false); + XkbRules(bool layoutsOnly=false); const TQDict<char> &models() const { return m_models; }; - const TQDict<char> &tqlayouts() const { return m_tqlayouts; }; + const TQDict<char> &layouts() const { return m_layouts; }; const TQDict<char> &options() const { return m_options; }; - TQStringList getAvailableVariants(const TQString& tqlayout); - unsigned int getDefaultGroup(const TQString& tqlayout, const TQString& includeGroup); + TQStringList getAvailableVariants(const TQString& layout); + unsigned int getDefaultGroup(const TQString& layout, const TQString& includeGroup); - bool isSingleGroup(const TQString& tqlayout); + bool isSingleGroup(const TQString& layout); protected: - void loadRules(TQString filename, bool tqlayoutsOnly=false); + void loadRules(TQString filename, bool layoutsOnly=false); void loadGroups(TQString filename); void loadOldLayouts(TQString filename); private: TQDict<char> m_models; - TQDict<char> m_tqlayouts; + TQDict<char> m_layouts; TQDict<char> m_options; TQMap<TQString, unsigned int> m_initialGroups; TQDict<TQStringList> m_varLists; diff --git a/kxkb/x11helper.cpp b/kxkb/x11helper.cpp index c44ba7971..e8f13f6aa 100644 --- a/kxkb/x11helper.cpp +++ b/kxkb/x11helper.cpp @@ -57,7 +57,7 @@ const TQString X11Helper::X11_WIN_CLASS_UNKNOWN = "<unknown>"; static const TQRegExp NON_CLEAN_LAYOUT_REGEXP("[^a-z]"); -bool X11Helper::m_tqlayoutsClean = true; +bool X11Helper::m_layoutsClean = true; const QString X11Helper::findX11Dir() @@ -107,7 +107,7 @@ X11Helper::findXkbRulesFile(TQString x11Dir, Display *dpy) } RulesInfo* -X11Helper::loadRules(const TQString& file, bool tqlayoutsOnly) +X11Helper::loadRules(const TQString& file, bool layoutsOnly) { XkbRF_RulesPtr xkbRules = XkbRF_Load(TQFile::encodeName(file).data(), "", true, true); @@ -119,32 +119,32 @@ X11Helper::loadRules(const TQString& file, bool tqlayoutsOnly) RulesInfo* rulesInfo = new RulesInfo(); for (int i = 0; i < xkbRules->layouts.num_desc; ++i) { - TQString tqlayoutName(xkbRules->layouts.desc[i].name); - rulesInfo->tqlayouts.tqreplace( tqlayoutName, qstrdup( xkbRules->layouts.desc[i].desc ) ); + TQString layoutName(xkbRules->layouts.desc[i].name); + rulesInfo->layouts.replace( layoutName, qstrdup( xkbRules->layouts.desc[i].desc ) ); - if( m_tqlayoutsClean == true - && tqlayoutName.find( NON_CLEAN_LAYOUT_REGEXP ) != -1 - && tqlayoutName.endsWith("/jp") == false ) { + if( m_layoutsClean == true + && layoutName.find( NON_CLEAN_LAYOUT_REGEXP ) != -1 + && layoutName.endsWith("/jp") == false ) { kdDebug() << "Layouts are not clean (Xorg < 6.9.0 or XFree86)" << endl; - m_tqlayoutsClean = false; + m_layoutsClean = false; } } - if( tqlayoutsOnly == true ) { + if( layoutsOnly == true ) { XkbRF_Free(xkbRules, true); return rulesInfo; } for (int i = 0; i < xkbRules->models.num_desc; ++i) - rulesInfo->models.tqreplace(xkbRules->models.desc[i].name, qstrdup( xkbRules->models.desc[i].desc ) ); + rulesInfo->models.replace(xkbRules->models.desc[i].name, qstrdup( xkbRules->models.desc[i].desc ) ); for (int i = 0; i < xkbRules->options.num_desc; ++i) - rulesInfo->options.tqreplace(xkbRules->options.desc[i].name, qstrdup( xkbRules->options.desc[i].desc ) ); + rulesInfo->options.replace(xkbRules->options.desc[i].name, qstrdup( xkbRules->options.desc[i].desc ) ); XkbRF_Free(xkbRules, true); // workaround for empty 'compose' options group description if( rulesInfo->options.find("compose:menu") && !rulesInfo->options.find("compose") ) { - rulesInfo->options.tqreplace("compose", "Compose Key Position"); + rulesInfo->options.replace("compose", "Compose Key Position"); } for(TQDictIterator<char> it(rulesInfo->options) ; it.current() != NULL; ++it ) { @@ -154,7 +154,7 @@ X11Helper::loadRules(const TQString& file, bool tqlayoutsOnly) if( columnPos != -1 ) { TQString group = option.mid(0, columnPos); if( rulesInfo->options.find(group) == NULL ) { - rulesInfo->options.tqreplace(group, group.latin1()); + rulesInfo->options.replace(group, group.latin1()); kdDebug() << "Added missing option group: " << group << endl; } } @@ -162,17 +162,17 @@ X11Helper::loadRules(const TQString& file, bool tqlayoutsOnly) // // workaround for empty misc options group description in XFree86 4.4.0 // if( rulesInfo->options.find("numpad:microsoft") && !rulesInfo->options.find("misc") ) { -// rulesInfo->options.tqreplace("misc", "Miscellaneous compatibility options" ); +// rulesInfo->options.replace("misc", "Miscellaneous compatibility options" ); // } return rulesInfo; } -// check $oldtqlayouts and $nonlatin groups for XFree 4.3 and later +// check $oldlayouts and $nonlatin groups for XFree 4.3 and later OldLayouts* X11Helper::loadOldLayouts(const TQString& rulesFile) { - static const char* oldLayoutsTag = "! $oldtqlayouts"; + static const char* oldLayoutsTag = "! $oldlayouts"; static const char* nonLatinLayoutsTag = "! $nonlatin"; TQStringList m_oldLayouts; TQStringList m_nonLatinLayouts; @@ -196,7 +196,7 @@ X11Helper::loadOldLayouts(const TQString& rulesFile) line = line.simplifyWhiteSpace(); m_oldLayouts = TQStringList::split(TQRegExp("\\s"), line); -// kdDebug() << "oldtqlayouts " << m_oldLayouts.join("|") << endl; +// kdDebug() << "oldlayouts " << m_oldLayouts.join("|") << endl; if( !m_nonLatinLayouts.empty() ) break; @@ -229,21 +229,21 @@ X11Helper::loadOldLayouts(const TQString& rulesFile) } -/* pretty simple algorithm - reads the tqlayout file and +/* pretty simple algorithm - reads the layout file and tries to find "xkb_symbols" - also checks whether previous line tqcontains "hidden" to skip it + also checks whether previous line contains "hidden" to skip it */ TQStringList* -X11Helper::getVariants(const TQString& tqlayout, const TQString& x11Dir, bool oldLayouts) +X11Helper::getVariants(const TQString& layout, const TQString& x11Dir, bool oldLayouts) { TQStringList* result = new TQStringList(); TQString file = x11Dir + "xkb/symbols/"; - // workaround for XFree 4.3 new directory for one-group tqlayouts + // workaround for XFree 4.3 new directory for one-group layouts if( TQDir(file+"pc").exists() && !oldLayouts ) file += "pc/"; - file += tqlayout; + file += layout; // kdDebug() << "reading variants from " << file << endl; diff --git a/kxkb/x11helper.h b/kxkb/x11helper.h index 058b34475..042fb4ce5 100644 --- a/kxkb/x11helper.h +++ b/kxkb/x11helper.h @@ -7,7 +7,7 @@ struct RulesInfo { TQDict<char> models; - TQDict<char> tqlayouts; + TQDict<char> layouts; TQDict<char> options; }; @@ -18,7 +18,7 @@ struct OldLayouts { class X11Helper { - static bool m_tqlayoutsClean; + static bool m_layoutsClean; public: static const WId UNKNOWN_WINDOW_ID = (WId) 0; @@ -30,11 +30,11 @@ public: static const TQString findX11Dir(); static const TQString findXkbRulesFile(TQString x11Dir, Display* dpy); static TQString getWindowClass(WId winId, Display* dpy); - static TQStringList* getVariants(const TQString& tqlayout, const TQString& x11Dir, bool oldLayouts=false); - static RulesInfo* loadRules(const TQString& rulesFile, bool tqlayoutsOnly=false); + static TQStringList* getVariants(const TQString& layout, const TQString& x11Dir, bool oldLayouts=false); + static RulesInfo* loadRules(const TQString& rulesFile, bool layoutsOnly=false); static OldLayouts* loadOldLayouts(const TQString& rulesFile); - static bool areLayoutsClean() { return m_tqlayoutsClean; } + static bool areLayoutsClean() { return m_layoutsClean; } static bool areSingleGroupsSupported(); }; diff --git a/l10n/README b/l10n/README index 48905afb6..f389f58f2 100644 --- a/l10n/README +++ b/l10n/README @@ -143,7 +143,7 @@ between the entry name and the value. * DateFormat[language code] This defines how a date is formated. The date string will be contructed from this string and the sequences below will be - tqreplaced. This should be marked with a language code as well for + replaced. This should be marked with a language code as well for each supported language. %Y The year with century as a decimal number. @@ -170,7 +170,7 @@ between the entry name and the value. * TimeFormat This defines how a times are formated. The date string will be contructed from this string and the sequences below will be - tqreplaced. + replaced. %H The hour as a decimal number using a 24-hour clock (range 00 to 23). diff --git a/l10n/cd/entry.desktop b/l10n/cd/entry.desktop index 1604d0a08..a92d6aec2 100644 --- a/l10n/cd/entry.desktop +++ b/l10n/cd/entry.desktop @@ -1,35 +1,35 @@ [KCM Locale] -Name=Congo, The Detqmocratic Republic of the +Name=Congo, The Democratic Republic of the Name[af]=Kongo, Demokratiese republiek van die Name[ar]=جمهورية الكونغو الديمقراطية Name[be]=ДÑÐ¼Ð°ÐºÑ€Ð°Ñ‚Ñ‹Ñ‡Ð½Ð°Ñ Ð ÑÑпубліка Конга Name[bg]=ДРКонго Name[bn]=কঙà§à¦—োর গণতানà§à¦¤à§à¦°à¦¿à¦• পà§à¦°à¦œà¦¾à¦¤à¦¨à§à¦¤à§à¦° Name[bs]=Kongo, Demokratska republika -Name[ca]=Congo, República Detqmocrà tica del +Name[ca]=Congo, República Democrà tica del Name[cs]=Kongo Name[csb]=Kòngò, Demòkraticznô Repùblika Kòngò -Name[cy]=Congo, Gweriniaeth Detqmocrataidd y +Name[cy]=Congo, Gweriniaeth Democrataidd y Name[da]=Congo, den demokratiske republik Name[de]=Kongo, Republik Name[el]=Κονγκό, ΔημοκÏατία του Name[eo]=Kongo, la Demokratia Respubliko de la -Name[es]=Congo, República detqmocrática del +Name[es]=Congo, República democrática del Name[et]=Kongo (DV) Name[eu]=Kongoko Errepublika Demokratikoa Name[fa]=جمهوری دموکراسیÙÙ Ú©Ù†Ú¯Ùˆ Name[fi]=Kongon demokraattinen tasavalta -Name[fr]=République Détqmocratique du Congo -Name[fy]=Kongo, de detqmocratische republyk van de +Name[fr]=République Démocratique du Congo +Name[fy]=Kongo, de democratische republyk van de Name[ga]=Poblacht Dhaonlathach an Chongó -Name[gl]=Congo, República Detqmocrática do +Name[gl]=Congo, República Democrática do Name[he]=×§×•× ×’×•, הרפובליקה הדמוקרטית של Name[hi]=डेमोकà¥à¤°à¥‡à¤Ÿà¤¿à¤• रिपबà¥à¤²à¤¿à¤• ऑफ कॉगो Name[hr]=Kongo, Demokratska republika Name[hu]=Kongói Demokratikus Köztársaság Name[id]=Republik Demokrasi Kongo Name[is]=Kongó, Austur -Name[it]=Congo, Repubblica Detqmocratica del +Name[it]=Congo, Repubblica Democratica del Name[ja]=コンゴ Name[ka]=კáƒáƒœáƒ’áƒ, დემáƒáƒ™áƒ áƒáƒ¢áƒ˜áƒ£áƒšáƒ˜ რესპუბლიკრName[kk]=Конго (КДР) @@ -42,13 +42,13 @@ Name[mt]=Kongo (RD) Name[nb]=Kongo Name[nds]=Kongo (De demokraatsche Republiek) Name[ne]=पà¥à¤°à¤œà¤¾à¤¤à¤¾à¤¨à¥à¤¤à¥à¤°à¤¿à¤• गणराजà¥à¤¯ कङà¥à¤—ो -Name[nl]=Congo, Detqmocratische republiek +Name[nl]=Congo, Democratische republiek Name[nn]=Kongo Name[pa]=ਕਾਂਗੋ, ਲੋਕਤੰਤਰੀ ਗਣਰਾਜ Name[pl]=Republika Demokratyczna Kongo -Name[pt]=Congo, República Detqmocrática do -Name[pt_BR]=República Detqmocrática do Congo -Name[ro]=Congo, Republica Detqmocrată +Name[pt]=Congo, República Democrática do +Name[pt_BR]=República Democrática do Congo +Name[ro]=Congo, Republica Democrată Name[ru]=ДемократичеÑÐºÐ°Ñ Ð ÐµÑпублика Конго Name[rw]=Kongo, Repubulika Iharanira Demokarasi ya Name[se]=Kongo @@ -67,7 +67,7 @@ Name[uk]=Конго, демократична реÑпубліка Name[uz]=Kongo Demokratik Respublikasi Name[uz@cyrillic]=Конго Демократик РеÑпубликаÑи Name[vi]=Cá»™ng hoà Dân chủ Congo -Name[wa]=Congo, republike detqmocratike +Name[wa]=Congo, republike democratike Name[zh_CN]=刚果民主共和国 Name[zh_TW]=剛果民主共和國 Region=centralafrica diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index 2a0723b1b..82b4aeb17 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -181,7 +181,7 @@ void FaviconsModule::downloadHostIcon(const KURL &url) void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const KURL &iconURL) { - if (d->failedDownloads.tqcontains(iconURL.url())) + if (d->failedDownloads.contains(iconURL.url())) return; KIO::Job *job = KIO::get(iconURL, false, false); @@ -222,7 +222,7 @@ void FaviconsModule::slotResult(KIO::Job *job) io.setIODevice(&buffer); io.setParameters("size=16"); // Check here too, the job might have had no error, but the downloaded - // file tqcontains just a 404 message sent with a 200 status. + // file contains just a 404 message sent with a 200 status. // microsoft.com does that... (malte) if (io.read()) { diff --git a/libkonq/kfileivi.cc b/libkonq/kfileivi.cc index 48f6d8bb6..3bc303bae 100644 --- a/libkonq/kfileivi.cc +++ b/libkonq/kfileivi.cc @@ -81,7 +81,7 @@ KFileIVI::~KFileIVI() delete d; } -void KFileIVI::tqinvalidateThumb( int state, bool redraw ) +void KFileIVI::invalidateThumb( int state, bool redraw ) { TQIconSet::Mode mode; switch( state ) diff --git a/libkonq/kfileivi.h b/libkonq/kfileivi.h index 45bcdd68b..6c16907ec 100644 --- a/libkonq/kfileivi.h +++ b/libkonq/kfileivi.h @@ -68,7 +68,7 @@ public: * Changes the icon for this item. * @param size the icon size (0 for default, otherwise size in pixels) * @param state the state of the icon (enum in KIcon) - * @param recalc whether to update the tqlayout of the icon view when setting the icon + * @param recalc whether to update the layout of the icon view when setting the icon * @param redraw whether to redraw the item after setting the icon */ virtual void setIcon( int size, @@ -80,7 +80,7 @@ public: * Bypass @ref setIcon. This is for animated icons, you should use setIcon * in all other cases. * @param pixmap the pixmap to set - it SHOULD really have the right icon size! - * @param recalc whether to update the tqlayout of the icon view when setting the icon + * @param recalc whether to update the layout of the icon view when setting the icon * @param redraw whether to redraw the item after setting the icon */ void setPixmapDirect( const TQPixmap & pixmap, @@ -88,14 +88,14 @@ public: bool redraw=false); /** - * Notifies that all icon effects on thumbs should be tqinvalidated, + * Notifies that all icon effects on thumbs should be invalidated, * e.g. because the effect settings have been changed. The thumb itself * is assumed to be still valid (use setThumbnailPixmap() instead * otherwise). * @param state the state of the icon (enum in KIcon) * @param redraw whether to redraw the item after setting the icon */ - void tqinvalidateThumb( int state, bool redraw = false ); + void invalidateThumb( int state, bool redraw = false ); /** * Our current thumbnail is not longer "current". diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc index fd201ee02..2b32129c2 100644 --- a/libkonq/kivdirectoryoverlay.cc +++ b/libkonq/kivdirectoryoverlay.cc @@ -37,7 +37,7 @@ KIVDirectoryOverlay::KIVDirectoryOverlay(KFileIVI* directory) : m_lister(0), m_foundItems(false), - m_tqcontainsFolder(false), m_popularIcons(0) + m_containsFolder(false), m_popularIcons(0) { if (!m_lister) { @@ -92,7 +92,7 @@ void KIVDirectoryOverlay::slotCompleted() // Only show folder if there's no other candidate. Most folders contain // folders. We know this. - if ( m_bestIcon.isNull() && m_tqcontainsFolder ) { + if ( m_bestIcon.isNull() && m_containsFolder ) { m_bestIcon = "folder"; } @@ -131,7 +131,7 @@ void KIVDirectoryOverlay::slotNewItems( const KFileItemList& items ) } (*iconCount)++; } else if ( file -> isDir() ) { - m_tqcontainsFolder = true; + m_containsFolder = true; } } diff --git a/libkonq/kivdirectoryoverlay.h b/libkonq/kivdirectoryoverlay.h index bcf16b914..27fba34d9 100644 --- a/libkonq/kivdirectoryoverlay.h +++ b/libkonq/kivdirectoryoverlay.h @@ -49,7 +49,7 @@ private slots: private: KDirLister* m_lister; bool m_foundItems; - bool m_tqcontainsFolder; + bool m_containsFolder; TQDict<int>* m_popularIcons; TQString m_bestIcon; KFileIVI* m_directory; diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cc index 30f140b6e..d592a0617 100644 --- a/libkonq/knewmenu.cc +++ b/libkonq/knewmenu.cc @@ -56,10 +56,10 @@ KDirWatch * KNewMenu::s_pDirWatch = 0L; class KNewMenu::KNewMenuPrivate { public: - KNewMenuPrivate() : m_tqparentWidget(0) {} + KNewMenuPrivate() : m_parentWidget(0) {} KActionCollection * m_actionCollection; TQString m_destPath; - TQWidget *m_tqparentWidget; + TQWidget *m_parentWidget; KActionMenu *m_menuDev; }; @@ -75,13 +75,13 @@ KNewMenu::KNewMenu( KActionCollection * _collec, const char *name ) : makeMenus(); } -KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name ) : +KNewMenu::KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name ) : KActionMenu( i18n( "Create New" ), "filenew", _collec, name ), menuItemsVersion( 0 ) { d = new KNewMenuPrivate; d->m_actionCollection = _collec; - d->m_tqparentWidget = tqparentWidget; + d->m_parentWidget = parentWidget; makeMenus(); } @@ -363,7 +363,7 @@ void KNewMenu::slotNewDir() if (popupFiles.isEmpty()) return; - KonqOperations::newDir(d->m_tqparentWidget, popupFiles.first()); + KonqOperations::newDir(d->m_parentWidget, popupFiles.first()); } void KNewMenu::slotNewFile() @@ -395,8 +395,8 @@ void KNewMenu::slotNewFile() if ( df.readType() == "Link" ) { m_isURLDesktopFile = true; - // entry.comment tqcontains i18n("Enter link to location (URL):"). JFYI :) - KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_tqparentWidget ); + // entry.comment contains i18n("Enter link to location (URL):"). JFYI :) + KURLDesktopFileDlg dlg( i18n("File name:"), entry.comment, d->m_parentWidget ); // TODO dlg.setCaption( i18n( ... ) ); if ( dlg.exec() ) { @@ -419,7 +419,7 @@ void KNewMenu::slotNewFile() //kdDebug(1203) << "second arg=" << (*it).url() << endl; //kdDebug(1203) << "third arg=" << entry.text << endl; TQString text = entry.text; - text.tqreplace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename + text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename KURL defaultFile( *it ); defaultFile.addPath( KIO::encodeFileName( text ) ); @@ -428,7 +428,7 @@ void KNewMenu::slotNewFile() KURL templateURL; templateURL.setPath( entry.templatePath ); - (void) new KPropertiesDialog( templateURL, *it, text, d->m_tqparentWidget ); + (void) new KPropertiesDialog( templateURL, *it, text, d->m_parentWidget ); } return; // done, exit. } @@ -439,7 +439,7 @@ void KNewMenu::slotNewFile() // Show the small dialog for getting the destination filename bool ok; TQString text = entry.text; - text.tqreplace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename + text.replace( "...", TQString::null ); // the ... is fine for the menu item but not for the default filename KURL defaultFile( *(popupFiles.begin()) ); defaultFile.addPath( KIO::encodeFileName( text ) ); @@ -447,7 +447,7 @@ void KNewMenu::slotNewFile() text = KIO::RenameDlg::suggestName( *(popupFiles.begin()), text); name = KInputDialog::getText( TQString::null, entry.comment, - text, &ok, d->m_tqparentWidget ); + text, &ok, d->m_parentWidget ); if ( !ok ) return; } @@ -545,7 +545,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin TQLabel * label = new TQLabel( textFileName, fileNameBox ); m_leFileName = new KLineEdit( fileNameBox, 0L ); - m_leFileName->setMinimumWidth(m_leFileName->tqsizeHint().width() * 3); + m_leFileName->setMinimumWidth(m_leFileName->sizeHint().width() * 3); label->setBuddy(m_leFileName); // please "scheck" style m_leFileName->setText( defaultName ); m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect @@ -559,7 +559,7 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin m_urlRequester = new KURLRequester( defaultUrl, urlBox, "urlRequester" ); m_urlRequester->setMode( KFile::File | KFile::Directory ); - m_urlRequester->setMinimumWidth( m_urlRequester->tqsizeHint().width() * 3 ); + m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 ); connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotURLTextChanged(const TQString&)) ); label->setBuddy(m_urlRequester); // please "scheck" style diff --git a/libkonq/knewmenu.h b/libkonq/knewmenu.h index 3c1b0a78b..6935ae7a4 100644 --- a/libkonq/knewmenu.h +++ b/libkonq/knewmenu.h @@ -58,7 +58,7 @@ public: * Constructor */ KNewMenu( KActionCollection * _collec, const char *name=0L ); - KNewMenu( KActionCollection * _collec, TQWidget *tqparentWidget, const char *name=0L ); + KNewMenu( KActionCollection * _collec, TQWidget *parentWidget, const char *name=0L ); virtual ~KNewMenu(); /** diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cc index 254e3f7dc..ca21c69a3 100644 --- a/libkonq/konq_bgnddlg.cc +++ b/libkonq/konq_bgnddlg.cc @@ -48,10 +48,10 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, m_buttonGroup = new TQButtonGroup( i18n("Background"), page ); m_buttonGroup->setColumnLayout( 0, Qt::Vertical ); - m_buttonGroup->tqlayout()->setMargin( KDialog::marginHint() ); - m_buttonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); - TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->tqlayout() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + m_buttonGroup->layout()->setMargin( KDialog::marginHint() ); + m_buttonGroup->layout()->setSpacing( KDialog::spacingHint() ); + TQGridLayout* groupLayout = new TQGridLayout( m_buttonGroup->layout() ); + groupLayout->setAlignment( Qt::AlignTop ); mainLayout->addWidget( m_buttonGroup ); connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ), @@ -61,7 +61,7 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup ); groupLayout->addWidget( m_radioColor, 0, 0 ); m_buttonColor = new KColorButton( theColor, defaultColor, m_buttonGroup ); - m_buttonColor->tqsetSizePolicy( TQSizePolicy::Preferred, + m_buttonColor->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ); groupLayout->addWidget( m_buttonColor, 0, 1 ); @@ -90,14 +90,14 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, TQLabel* lbl = new TQLabel( i18n("Preview"), page ); hlay->addWidget( lbl ); TQFrame* frame = new TQFrame( page ); - frame->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); + frame->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ); frame->setFrameShape( TQFrame::HLine ); frame->setFrameShadow( TQFrame::Sunken ); hlay->addWidget( frame ); // preview frame m_preview = new TQFrame( page ); - m_preview->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_preview->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_preview->setMinimumSize( 370, 180 ); m_preview->setFrameShape( TQFrame::Panel ); m_preview->setFrameShadow( TQFrame::Raised ); diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index 811e5b6a6..d64dde7ef 100644 --- a/libkonq/konq_dirpart.cc +++ b/libkonq/konq_dirpart.cc @@ -190,7 +190,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) kdDebug(1203) << "the icon theme handles the following sizes:" << avSizes << endl; if (avSizes.count() < 10) { // Use the icon sizes supplied by the theme. - // If avSizes tqcontains more than 10 entries, assume a scalable + // If avSizes contains more than 10 entries, assume a scalable // icon theme. TQValueList<int>::Iterator it; for (i=1, it=avSizes.begin(); (it!=avSizes.end()) && (i<7); it++, i++) @@ -301,7 +301,7 @@ void KonqDirPart::slotBackgroundSettings() m_pProps->setBgPixmapFile( dlg->pixmapFile() ); } m_pProps->applyColors( scrollWidget()->viewport() ); - scrollWidget()->viewport()->tqrepaint(); + scrollWidget()->viewport()->repaint(); } delete dlg; @@ -548,7 +548,7 @@ void KonqDirPart::slotIconSizeToggled( bool toggleOn ) // This slot is called when an iconsize action is checked or by calling // action->setChecked(false) (previously true). So we must filter out - // the 'untoggled' case to prevent odd results here (tqrepaints/loops!) + // the 'untoggled' case to prevent odd results here (repaints/loops!) if ( !toggleOn ) return; diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cc index 07a3e8bda..0fdca5722 100644 --- a/libkonq/konq_drag.cc +++ b/libkonq/konq_drag.cc @@ -47,12 +47,12 @@ const char* KonqIconDrag::format( int i ) const else return 0; } -TQByteArray KonqIconDrag::tqencodedData( const char* mime ) const +TQByteArray KonqIconDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); if ( mimetype == "application/x-qiconlist" ) - a = TQIconDrag::tqencodedData( mime ); + a = TQIconDrag::encodedData( mime ); else if ( mimetype == "text/uri-list" ) { TQCString s = urls.join( "\r\n" ).latin1(); if( urls.count() > 0 ) @@ -145,7 +145,7 @@ const char* KonqIconDrag2::format( int i ) const return KonqIconDrag::format( i ); } -TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const +TQByteArray KonqIconDrag2::encodedData( const char* mime ) const { TQCString mimetype( mime ); if ( mimetype == "application/x-kde-urilist" ) @@ -164,7 +164,7 @@ TQByteArray KonqIconDrag2::tqencodedData( const char* mime ) const a[c] = 0; return a; } - return KonqIconDrag::tqencodedData( mime ); + return KonqIconDrag::encodedData( mime ); } // @@ -223,7 +223,7 @@ const char* KonqDrag::format( int i ) const else return 0; } -TQByteArray KonqDrag::tqencodedData( const char* mime ) const +TQByteArray KonqDrag::encodedData( const char* mime ) const { TQByteArray a; TQCString mimetype( mime ); @@ -232,7 +232,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const // Code taken from TQUriDrag::setUris int c=0; for (TQStrListIterator it(m_urls); *it; ++it) { - int l = tqstrlen(*it); + int l = qstrlen(*it); a.resize(c+l+2); memcpy(a.data()+c,*it,l); memcpy(a.data()+c+l,"\r\n",2); @@ -243,7 +243,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const } else if ( mimetype == "application/x-kde-urilist" ) { - return TQUriDrag::tqencodedData( "text/uri-list" ); + return TQUriDrag::encodedData( "text/uri-list" ); } else if ( mimetype == "application/x-kde-cutselection" ) { @@ -271,7 +271,7 @@ TQByteArray KonqDrag::tqencodedData( const char* mime ) const bool KonqDrag::decodeIsCutSelection( const TQMimeSource *e ) { - TQByteArray a = e->tqencodedData( "application/x-kde-cutselection" ); + TQByteArray a = e->encodedData( "application/x-kde-cutselection" ); if ( a.isEmpty() ) return false; else diff --git a/libkonq/konq_drag.h b/libkonq/konq_drag.h index 685569db9..e5e49a837 100644 --- a/libkonq/konq_drag.h +++ b/libkonq/konq_drag.h @@ -44,7 +44,7 @@ public: virtual ~KonqIconDrag() {} const char* format( int i ) const; - TQByteArray tqencodedData( const char* mime ) const; + TQByteArray encodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url ); @@ -72,7 +72,7 @@ public: virtual ~KonqIconDrag2() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; void append( const TQIconDragItem &item, const TQRect &pr, const TQRect &tr, const TQString &url, const KURL &mostLocalURL ); @@ -107,7 +107,7 @@ public: virtual ~KonqDrag() {} virtual const char* format( int i ) const; - virtual TQByteArray tqencodedData( const char* mime ) const; + virtual TQByteArray encodedData( const char* mime ) const; void setMoveSelection( bool move ) { m_bCutSelection = move; } diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc index b6aac84e3..81262ae99 100644 --- a/libkonq/konq_filetip.cc +++ b/libkonq/konq_filetip.cc @@ -49,12 +49,12 @@ KonqFileTip::KonqFileTip( TQScrollView* parent ) { m_iconLabel = new TQLabel(this); m_textLabel = new TQLabel(this); - m_textLabel->tqsetAlignment(Qt::AlignAuto | Qt::AlignTop); + m_textLabel->setAlignment(Qt::AlignAuto | Qt::AlignTop); - TQGridLayout* tqlayout = new TQGridLayout(this, 1, 2, 8, 0); - tqlayout->addWidget(m_iconLabel, 0, 0); - tqlayout->addWidget(m_textLabel, 0, 1); - tqlayout->setResizeMode(TQLayout::Fixed); + TQGridLayout* layout = new TQGridLayout(this, 1, 2, 8, 0); + layout->addWidget(m_iconLabel, 0, 0); + layout->addWidget(m_textLabel, 0, 1); + layout->setResizeMode(TQLayout::Fixed); setPalette( TQToolTip::palette() ); setMargin( 1 ); @@ -189,7 +189,7 @@ void KonqFileTip::drawContents( TQPainter *p ) } if ( m_corners[m_corner].isNull()) - m_corners[m_corner].load( locate( "data", TQString::tqfromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); + m_corners[m_corner].load( locate( "data", TQString::fromLatin1( "konqueror/pics/%1.png" ).arg( names[m_corner] ) ) ); TQPixmap &pix = m_corners[m_corner]; diff --git a/libkonq/konq_historycomm.h b/libkonq/konq_historycomm.h index 96c3a375e..ea2a387df 100644 --- a/libkonq/konq_historycomm.h +++ b/libkonq/konq_historycomm.h @@ -37,7 +37,7 @@ public: KURL url; TQString typedURL; TQString title; - TQ_UINT32 numberOfTimesVisited; + Q_UINT32 numberOfTimesVisited; TQDateTime firstVisited; TQDateTime lastVisited; }; @@ -65,8 +65,8 @@ protected: k_dcop: virtual ASYNC notifyHistoryEntry( KonqHistoryEntry e, TQCString saveId) = 0; - virtual ASYNC notifyMaxCount( TQ_UINT32 count, TQCString saveId ) = 0; - virtual ASYNC notifyMaxAge( TQ_UINT32 days, TQCString saveId ) = 0; + virtual ASYNC notifyMaxCount( Q_UINT32 count, TQCString saveId ) = 0; + virtual ASYNC notifyMaxAge( Q_UINT32 days, TQCString saveId ) = 0; virtual ASYNC notifyClear( TQCString saveId ) = 0; virtual ASYNC notifyRemove( KURL url, TQCString saveId ) = 0; virtual ASYNC notifyRemove( KURL::List url, TQCString saveId ) = 0; diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc index 1b590fc61..b971d39b3 100644 --- a/libkonq/konq_historymgr.cc +++ b/libkonq/konq_historymgr.cc @@ -31,7 +31,7 @@ #include "konqbookmarkmanager.h" -const TQ_UINT32 KonqHistoryManager::s_historyVersion = 3; +const Q_UINT32 KonqHistoryManager::s_historyVersion = 3; KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) : KParts::HistoryProvider( parent, name ), @@ -48,7 +48,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) m_history.setAutoDelete( true ); m_filename = locateLocal( "data", - TQString::tqfromLatin1("konqueror/konq_history" )); + TQString::fromLatin1("konqueror/konq_history" )); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); @@ -102,7 +102,7 @@ bool KonqHistoryManager::loadHistory() TQDataStream crcStream( data, IO_ReadOnly ); if ( !fileStream.atEnd() ) { - TQ_UINT32 version; + Q_UINT32 version; fileStream >> version; TQDataStream *stream = &fileStream; @@ -111,7 +111,7 @@ bool KonqHistoryManager::loadHistory() bool crcOk = false; if ( version == 2 || version == 3) { - TQ_UINT32 crc; + Q_UINT32 crc; crcChecked = true; fileStream >> crc >> data; crcOk = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ) == crc; @@ -132,7 +132,7 @@ bool KonqHistoryManager::loadHistory() // binary file, this would make backups impossible (they would clear // themselves on startup, because all entries expire). // [But V1 and V2 formats did it, so we do a dummy read] - TQ_UINT32 dummy; + Q_UINT32 dummy; *stream >> dummy; *stream >> dummy; @@ -224,7 +224,7 @@ bool KonqHistoryManager::saveHistory() //For DCOP, transfer strings instead - wire compat. KonqHistoryEntry::marshalURLAsStrings = true; - TQ_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ); + Q_UINT32 crc = crc32( 0, reinterpret_cast<unsigned char *>( data.data() ), data.size() ); *fileStream << crc << data; file.close(); @@ -295,11 +295,11 @@ void KonqHistoryManager::addToHistory( bool pending, const KURL& _url, // konqueror's window caption). if ( !pending && u != title ) entry.title = title; - entry.firstVisited = TQDateTime::tqcurrentDateTime(); + entry.firstVisited = TQDateTime::currentDateTime(); entry.lastVisited = entry.firstVisited; // always remove from pending if available, otherwise the else branch leaks - // if the map already tqcontains an entry for this key. + // if the map already contains an entry for this key. TQMapIterator<TQString,KonqHistoryEntry*> it = m_pending.find( u ); if ( it != m_pending.end() ) { delete it.data(); @@ -342,7 +342,7 @@ void KonqHistoryManager::insert( const TQString& url ) // Local URL -> add to history KonqHistoryEntry entry; entry.url = u; - entry.firstVisited = TQDateTime::tqcurrentDateTime(); + entry.firstVisited = TQDateTime::currentDateTime(); entry.lastVisited = entry.firstVisited; emitAddToHistory( entry ); } @@ -419,22 +419,22 @@ void KonqHistoryManager::emitClear() "notifyClear(TQCString)", data ); } -void KonqHistoryManager::emitSetMaxCount( TQ_UINT32 count ) +void KonqHistoryManager::emitSetMaxCount( Q_UINT32 count ) { TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream << count << objId(); kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxCount(TQ_UINT32, TQCString)", data ); + "notifyMaxCount(Q_UINT32, TQCString)", data ); } -void KonqHistoryManager::emitSetMaxAge( TQ_UINT32 days ) +void KonqHistoryManager::emitSetMaxAge( Q_UINT32 days ) { TQByteArray data; TQDataStream stream( data, IO_WriteOnly ); stream << days << objId(); kapp->dcopClient()->send( "konqueror*", "KonqHistoryManager", - "notifyMaxAge(TQ_UINT32, TQCString)", data ); + "notifyMaxAge(Q_UINT32, TQCString)", data ); } /////////////////////////////////////////////////////////////////// @@ -487,7 +487,7 @@ void KonqHistoryManager::notifyHistoryEntry( KonqHistoryEntry e, emit entryAdded( entry ); } -void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString ) +void KonqHistoryManager::notifyMaxCount( Q_UINT32 count, TQCString ) { m_maxCount = count; clearPending(); @@ -503,7 +503,7 @@ void KonqHistoryManager::notifyMaxCount( TQ_UINT32 count, TQCString ) } } -void KonqHistoryManager::notifyMaxAge( TQ_UINT32 days, TQCString ) +void KonqHistoryManager::notifyMaxAge( Q_UINT32 days, TQCString ) { m_maxAgeDays = days; clearPending(); @@ -589,7 +589,7 @@ void KonqHistoryManager::notifyRemove( KURL::List urls, TQCString ) // compatibility fallback, try to load the old completion history bool KonqHistoryManager::loadFallback() { - TQString file = locateLocal( "config", TQString::tqfromLatin1("konq_history")); + TQString file = locateLocal( "config", TQString::fromLatin1("konq_history")); if ( file.isEmpty() ) return false; @@ -646,7 +646,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item) entry->url = u; entry->numberOfTimesVisited = weight; // to make it not expire immediately... - entry->lastVisited = TQDateTime::tqcurrentDateTime(); + entry->lastVisited = TQDateTime::currentDateTime(); } return entry; @@ -655,7 +655,7 @@ KonqHistoryEntry * KonqHistoryManager::createFallbackEntry(const TQString& item) KonqHistoryEntry * KonqHistoryManager::findEntry( const KURL& url ) { // small optimization (dict lookup) for items _not_ in our history - if ( !KParts::HistoryProvider::tqcontains( url.url() ) ) + if ( !KParts::HistoryProvider::contains( url.url() ) ) return 0L; return m_history.findEntry( url ); diff --git a/libkonq/konq_historymgr.h b/libkonq/konq_historymgr.h index 46c603f20..11b14603b 100644 --- a/libkonq/konq_historymgr.h +++ b/libkonq/konq_historymgr.h @@ -91,7 +91,7 @@ public: * * The history is saved after receiving the DCOP call. */ - void emitSetMaxCount( TQ_UINT32 count ); + void emitSetMaxCount( Q_UINT32 count ); /** * Sets a new maximum age of history entries and removes all entries that @@ -102,7 +102,7 @@ public: * * The history is saved after receiving the DCOP call. */ - void emitSetMaxAge( TQ_UINT32 days ); + void emitSetMaxAge( Q_UINT32 days ); /** * Removes the history entry for @p url, if existant. Tells all other @@ -123,12 +123,12 @@ public: /** * @returns the current maximum number of history entries. */ - TQ_UINT32 maxCount() const { return m_maxCount; } + Q_UINT32 maxCount() const { return m_maxCount; } /** * @returns the current maximum age (in days) of history entries. */ - TQ_UINT32 maxAge() const { return m_maxAgeDays; } + Q_UINT32 maxAge() const { return m_maxAgeDays; } /** * Adds a pending entry to the history. Pending means, that the entry is @@ -236,7 +236,7 @@ protected: */ inline bool isExpired( KonqHistoryEntry *entry ) { return (entry && m_maxAgeDays > 0 && entry->lastVisited < - TQDate::tqcurrentDate().addDays( -m_maxAgeDays )); + TQDate::currentDate().addDays( -m_maxAgeDays )); } /** @@ -259,13 +259,13 @@ protected: * Called when the configuration of the maximum count changed. * Called via DCOP by some config-module */ - virtual void notifyMaxCount( TQ_UINT32 count, TQCString saveId ); + virtual void notifyMaxCount( Q_UINT32 count, TQCString saveId ); /** * Called when the configuration of the maximum age of history-entries * changed. Called via DCOP by some config-module */ - virtual void notifyMaxAge( TQ_UINT32 days, TQCString saveId ); + virtual void notifyMaxAge( Q_UINT32 days, TQCString saveId ); /** * Clears the history completely. Called via DCOP by some config-module @@ -327,7 +327,7 @@ protected: private slots: /** * Called by the updateTimer to emit the KParts::HistoryProvider::updated() - * signal so that khtml can tqrepaint the updated links. + * signal so that khtml can repaint the updated links. */ void slotEmitUpdated(); @@ -367,8 +367,8 @@ private: */ TQMap<TQString,KonqHistoryEntry*> m_pending; - TQ_UINT32 m_maxCount; // maximum of history entries - TQ_UINT32 m_maxAgeDays; // maximum age of a history entry + Q_UINT32 m_maxCount; // maximum of history entries + Q_UINT32 m_maxAgeDays; // maximum age of a history entry KCompletion *m_pCompletion; // the completion object we sync with @@ -378,7 +378,7 @@ private: */ TQTimer *m_updateTimer; - static const TQ_UINT32 s_historyVersion; + static const Q_UINT32 s_historyVersion; }; diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 7145c009c..0ce2ca346 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -151,7 +151,7 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF m_LineupMode = LineupBoth; // emit our signals slotSelectionChanged(); - m_iconPositionGroupPrefix = TQString::tqfromLatin1( "IconPosition::" ); + m_iconPositionGroupPrefix = TQString::fromLatin1( "IconPosition::" ); KonqUndoManager::incRef(); } @@ -308,7 +308,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) if (!hasPixmap && backgroundMode() != NoBackground) d->m_movie->setBackgroundColor( viewport()->backgroundColor() ); d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) ); - d->m_movie->connecttqStatus( this, TQT_SLOT( slotMovietqStatus(int) ) ); + d->m_movie->connectStatus( this, TQT_SLOT( slotMovieStatus(int) ) ); d->movieFileName = d->pActiveItem->mouseOverAnimation(); d->pActiveItem->setAnimated( true ); } @@ -331,7 +331,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) else // No change in current item { // No effect. If we want to underline on hover, we should - // force the IVI to tqrepaint here, though! + // force the IVI to repaint here, though! d->pActiveItem = 0L; d->pFileTip->setItem( 0L ); } @@ -346,10 +346,10 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) // ## shouldn't this be disabled during rectangular selection too ? if (d->bSoundPreviews && d->pSoundPlayer && - d->pSoundPlayer->mimeTypes().tqcontains( + d->pSoundPlayer->mimeTypes().contains( item->item()->mimetype()) && KGlobalSettings::showFilePreview(item->item()->url()) - && tqtopLevelWidget() == kapp->activeWindow()) + && topLevelWidget() == kapp->activeWindow()) { d->pSoundItem = item; d->bSoundItemClicked = false; @@ -478,11 +478,11 @@ void KonqIconViewWidget::slotMovieUpdate( const TQRect& rect ) } d->pActiveItem->setPixmapDirect( frame, false, false /*no redraw*/ ); TQRect pixRect = d->pActiveItem->pixmapRect(false); - tqrepaintContents( pixRect.x() + rect.x(), pixRect.y() + rect.y(), rect.width(), rect.height(), false ); + repaintContents( pixRect.x() + rect.x(), pixRect.y() + rect.y(), rect.width(), rect.height(), false ); } } -void KonqIconViewWidget::slotMovietqStatus( int status ) +void KonqIconViewWidget::slotMovieStatus( int status ) { if ( status < 0 ) { // Error playing the MNG -> forget about it and do normal iconeffect @@ -648,9 +648,9 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie } bool stopAll = !stopImagePreviewFor.isEmpty() && stopImagePreviewFor.first() == "*"; - // Disable tqrepaints that can be triggered by ivi->setIcon(). Since icons are + // Disable repaints that can be triggered by ivi->setIcon(). Since icons are // resized in-place, if the icon size is increasing it can happens that the right - // or bottom icons exceed the size of the viewport.. here we prevent the tqrepaint + // or bottom icons exceed the size of the viewport.. here we prevent the repaint // event that will be triggered in that case. bool prevUpdatesState = viewport()->isUpdatesEnabled(); viewport()->setUpdatesEnabled( false ); @@ -669,7 +669,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie ivi->setIcon( size, ivi->state(), true, false ); } else - ivi->tqinvalidateThumb( ivi->state(), true ); + ivi->invalidateThumb( ivi->state(), true ); } // Restore viewport update to previous state @@ -677,7 +677,7 @@ void KonqIconViewWidget::setIcons( int size, const TQStringList& stopImagePrevie if ( ( sizeChanged || previewSizeChanged || oldGridX != gridX() || !stopImagePreviewFor.isEmpty() ) && autoArrange() ) - arrangeItemsInGrid( true ); // take new grid into account and tqrepaint + arrangeItemsInGrid( true ); // take new grid into account and repaint else viewport()->update(); //Repaint later.. } @@ -692,7 +692,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString return true; // Support for *mt == "image/*" TQString tmp( mimeType ); - if ( (*mt).endsWith("*") && tmp.tqreplace(TQRegExp("/.*"), "/*") == (*mt) ) + if ( (*mt).endsWith("*") && tmp.replace(TQRegExp("/.*"), "/*") == (*mt) ) return true; if ( (*mt) == "text/plain" ) { @@ -830,7 +830,7 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force ) return; } - if ((d->bSoundPreviews = d->previewSettings.tqcontains( "audio/" )) && + if ((d->bSoundPreviews = d->previewSettings.contains( "audio/" )) && !d->pSoundPlayer) { KLibFactory *factory = KLibLoader::self()->factory("konq_sound"); @@ -995,7 +995,7 @@ void KonqIconViewWidget::contentsDragEnterEvent( TQDragEnterEvent *e ) { if ( e->provides( "text/uri-list" ) ) { - TQByteArray payload = e->tqencodedData( "text/uri-list" ); + TQByteArray payload = e->encodedData( "text/uri-list" ); if ( !payload.size() ) kdError() << "Empty data !" << endl; // Cache the URLs, since we need them every time we move over a file @@ -1221,7 +1221,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) // The following call is SO expensive (the ::widgetAt call eats up to 80% // of the mouse move cpucycles!), so it's mandatory to place that function // under strict checks, such as d->pSoundPlayer->isPlaying() - if ( TQApplication::widgetAt( TQCursor::pos() ) != tqtopLevelWidget() ) + if ( TQApplication::widgetAt( TQCursor::pos() ) != topLevelWidget() ) { if (d->pSoundPlayer) d->pSoundPlayer->stop(); @@ -1249,7 +1249,7 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link) && ev->source() && ev->source() == viewport()) { - // First we need to call TQIconView though, to clear the drag tqshape + // First we need to call TQIconView though, to clear the drag shape bool bMovable = itemsMovable(); setItemsMovable(false); // hack ? call it what you want :-) KIconView::contentsDropEvent( ev ); @@ -1290,7 +1290,7 @@ void KonqIconViewWidget::doubleClickTimeout() if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath()))) brenameTrash = true; - if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == LeftButton && item->textRect( false ).tqcontains(e.pos())) + if ( url.isLocalFile() && !brenameTrash && d->renameItem && m_pSettings->renameIconDirectly() && e.button() == LeftButton && item->textRect( false ).contains(e.pos())) { if( d->pActivateDoubleClick->isActive () ) d->pActivateDoubleClick->stop(); @@ -1368,7 +1368,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e ) bool brenameTrash =false; if ( url.isLocalFile() && (url.directory(false) == KGlobalSettings::trashPath() || url.path(1).startsWith(KGlobalSettings::trashPath()))) brenameTrash = true; - if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == LeftButton && item->textRect( false ).tqcontains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0)) + if ( !brenameTrash && !KGlobalSettings::singleClick() && m_pSettings->renameIconDirectly() && e->button() == LeftButton && item->textRect( false ).contains(e->pos())&& !d->firstClick && url.isLocalFile() && (!url.protocol().find("device", 0, false)==0)) { d->firstClick = true; d->mousePos = e->pos(); @@ -1703,7 +1703,7 @@ void KonqIconViewWidget::lineupIcons() } // Perform the actual moving - TQRegion tqrepaintRegion; + TQRegion repaintRegion; TQValueList<TQIconViewItem*> movedItems; for ( i = 0; i < nx; i++ ) { @@ -1722,7 +1722,7 @@ void KonqIconViewWidget::lineupIcons() movedItems.prepend( item ); item->move( newX, newY ); if ( item->rect() != oldRect ) - tqrepaintRegion = tqrepaintRegion.unite( oldRect ); + repaintRegion = repaintRegion.unite( oldRect ); } } delete bin; @@ -1730,20 +1730,20 @@ void KonqIconViewWidget::lineupIcons() } } - // tqrepaint + // repaint if ( newItemWidth ) updateContents(); else { - // Repaint only tqrepaintRegion... - TQMemArray<TQRect> rects = tqrepaintRegion.rects(); + // Repaint only repaintRegion... + TQMemArray<TQRect> rects = repaintRegion.rects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; - tqrepaintContents( rects[l], false ); + repaintContents( rects[l], false ); } // Repaint icons that were moved while ( !movedItems.isEmpty() ) { - tqrepaintItem( movedItems.first() ); + repaintItem( movedItems.first() ); movedItems.remove( movedItems.first() ); } } @@ -1760,7 +1760,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) gridValues( &x0, &y0, &dx, &dy, &nxmax, &nymax ); int textHeight = iconTextHeight() * fontMetrics().height(); - TQRegion tqrepaintRegion; + TQRegion repaintRegion; TQValueList<TQIconViewItem*> movedItems; int nx = 0, ny = 0; @@ -1775,7 +1775,7 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) movedItems.prepend( item ); item->move( newX, newY ); if ( item->rect() != oldRect ) - tqrepaintRegion = tqrepaintRegion.unite( oldRect ); + repaintRegion = repaintRegion.unite( oldRect ); } if ( arrangement == TQIconView::LeftToRight ) { nx++; @@ -1793,16 +1793,16 @@ void KonqIconViewWidget::lineupIcons( TQIconView::Arrangement arrangement ) } } - // Repaint only tqrepaintRegion... - TQMemArray<TQRect> rects = tqrepaintRegion.rects(); + // Repaint only repaintRegion... + TQMemArray<TQRect> rects = repaintRegion.rects(); for ( uint l = 0; l < rects.count(); l++ ) { kdDebug( 1203 ) << "Repainting (" << rects[l].x() << "," << rects[l].y() << ")\n"; - tqrepaintContents( rects[l], false ); + repaintContents( rects[l], false ); } // Repaint icons that were moved while ( !movedItems.isEmpty() ) { - tqrepaintItem( movedItems.first() ); + repaintItem( movedItems.first() ); movedItems.remove( movedItems.first() ); } } @@ -1916,7 +1916,7 @@ void KonqIconViewWidget::updatePreviewMimeTypes() KTrader::OfferList::ConstIterator it; for ( it = plugins.begin(); it != plugins.end(); ++it ) { - if ( d->previewSettings.tqcontains((*it)->desktopEntryName()) ) { + if ( d->previewSettings.contains((*it)->desktopEntryName()) ) { TQStringList mimeTypes = (*it)->property("MimeTypes").toStringList(); for (TQStringList::ConstIterator mt = mimeTypes.begin(); mt != mimeTypes.end(); ++mt) d->pPreviewMimeTypes->append(*mt); diff --git a/libkonq/konq_iconviewwidget.h b/libkonq/konq_iconviewwidget.h index 16cdef63d..04db9029a 100644 --- a/libkonq/konq_iconviewwidget.h +++ b/libkonq/konq_iconviewwidget.h @@ -140,7 +140,7 @@ public: int gridXValue() const; /** - * Calculate the tqgeometry of the fixed grid that is used to line up the + * Calculate the geometry of the fixed grid that is used to line up the * icons, for example when using the lineupIcons() method. * * @param x @@ -296,7 +296,7 @@ protected slots: void slotPreviewResult(); void slotMovieUpdate( const TQRect& rect ); - void slotMovietqStatus( int status ); + void slotMovieStatus( int status ); void slotReenableAnimation(); void slotAboutToCreate(const TQPoint &pos, const TQValueList<KIO::CopyInfo> &files); diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index 7e52be950..6a1ebcdb6 100644 --- a/libkonq/konq_operations.cc +++ b/libkonq/konq_operations.cc @@ -76,7 +76,7 @@ KonqOperations::~KonqOperations() void KonqOperations::editMimeType( const TQString & mimeType ) { - TQString keditfiletype = TQString::tqfromLatin1("keditfiletype"); + TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " " + KProcess::quote(mimeType), keditfiletype, keditfiletype /*unused*/); } @@ -185,7 +185,7 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm return; } - if ( askDeleteConfirmation( selectedURLs, method, confirmation, tqparentWidget() ) ) + if ( askDeleteConfirmation( selectedURLs, method, confirmation, parentWidget() ) ) { //m_srcURLs = selectedURLs; KIO::Job *job; @@ -525,7 +525,7 @@ void KonqOperations::doFileCopy() } m_method = TRASH; - if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, tqparentWidget() ) ) + if ( askDeleteConfirmation( mlst, TRASH, DEFAULT_CONFIRMATION, parentWidget() ) ) action = TQDropEvent::Move; else { @@ -815,7 +815,7 @@ void KonqMultiRestoreJob::slotResult( KIO::Job *job ) slotStart(); } -TQWidget* KonqOperations::tqparentWidget() const +TQWidget* KonqOperations::parentWidget() const { return static_cast<TQWidget *>( parent() ); } diff --git a/libkonq/konq_operations.h b/libkonq/konq_operations.h index ec04033df..f9134bcde 100644 --- a/libkonq/konq_operations.h +++ b/libkonq/konq_operations.h @@ -173,7 +173,7 @@ protected: void setPasteInfo( KIOPasteInfo * info ) { m_pasteInfo = info; } private: - TQWidget* tqparentWidget() const; + TQWidget* parentWidget() const; protected slots: diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 9ce147b07..3cff83453 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/libkonq/konq_pixmapprovider.cc @@ -182,13 +182,13 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon int x = big.width() - small.width(); int y = 0; - if ( big.tqmask() ) { - TQBitmap tqmask = *big.tqmask(); - bitBlt( &tqmask, x, y, - small.tqmask() ? const_cast<TQBitmap *>(small.tqmask()) : &small, 0, 0, + if ( big.mask() ) { + TQBitmap mask = *big.mask(); + bitBlt( &mask, x, y, + small.mask() ? const_cast<TQBitmap *>(small.mask()) : &small, 0, 0, small.width(), small.height(), - small.tqmask() ? OrROP : SetROP ); - big.setMask( tqmask ); + small.mask() ? OrROP : SetROP ); + big.setMask( mask ); } bitBlt( &big, x, y, &small ); diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 6d1057c04..044bda9d2 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -95,12 +95,12 @@ public: class KonqPopupMenu::KonqPopupMenuPrivate { public: - KonqPopupMenuPrivate() : m_tqparentWidget( 0 ), + KonqPopupMenuPrivate() : m_parentWidget( 0 ), m_itemFlags( KParts::BrowserExtension::DefaultPopupItems ) { } TQString m_urlTitle; - TQWidget *m_tqparentWidget; + TQWidget *m_parentWidget; KParts::BrowserExtension::PopupFlags m_itemFlags; }; @@ -199,30 +199,30 @@ KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, KURL viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * tqparentWidget, + TQWidget * parentWidget, bool showProperties ) - : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) + : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) { KonqPopupFlags kpf = ( showProperties ? ShowProperties : IsLink ) | ShowNewWindow; - init(tqparentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems); + init(parentWidget, kpf, KParts::BrowserExtension::DefaultPopupItems); } KonqPopupMenu::KonqPopupMenu( KBookmarkManager *mgr, const KFileItemList &items, const KURL& viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * tqparentWidget, + TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags) - : TQPopupMenu( tqparentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) + : TQPopupMenu( parentWidget, "konq_popupmenu" ), m_actions( actions ), m_ownActions( static_cast<TQWidget *>( 0 ), "KonqPopupMenu::m_ownActions" ), m_pMenuNew( newMenu ), m_sViewURL(viewURL), m_lstItems(items), m_pManager(mgr) { - init(tqparentWidget, kpf, flags); + init(parentWidget, kpf, flags); } -void KonqPopupMenu::init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags) +void KonqPopupMenu::init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags flags) { d = new KonqPopupMenuPrivate; - d->m_tqparentWidget = tqparentWidget; + d->m_parentWidget = parentWidget; d->m_itemFlags = flags; setup(kpf); } @@ -280,7 +280,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, TQCString name; name.setNum( id ); name.prepend( isBuiltin ? "builtinservice_" : "userservice_" ); - KAction * act = new KAction( TQString((*it).m_strName).tqreplace('&',"&&"), 0, + KAction * act = new KAction( TQString((*it).m_strName).replace('&',"&&"), 0, this, TQT_SLOT( slotRunService() ), &m_ownActions, name ); @@ -354,7 +354,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) m_pluginList.setAutoDelete( true ); m_ownActions.setHighlightingEnabled( true ); - attrName = TQString::tqfromLatin1( "name" ); + attrName = TQString::fromLatin1( "name" ); prepareXMLGUIStuff(); m_builder = new KonqPopupMenuGUIBuilder( this ); @@ -584,7 +584,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { act = new KAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); KSimpleConfig trashConfig( "trashrc", true ); - trashConfig.setGroup( "tqStatus" ); + trashConfig.setGroup( "Status" ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); addAction( act ); } @@ -720,7 +720,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) TQCString object = dcopcall.section(' ', 1,-2).utf8(); TQString function = dcopcall.section(' ', -1); if(!function.endsWith("(KURL::List)")) { - kdWarning() << "Desktop file " << *eIt << " tqcontains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; + kdWarning() << "Desktop file " << *eIt << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl; continue; //Be safe. } @@ -741,7 +741,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) else if ( cfg.hasKey( "X-KDE-Protocols" ) ) { TQStringList protocols = TQStringList::split( "," , cfg.readEntry( "X-KDE-Protocols" ) ); - if ( !protocols.tqcontains( urlForServiceMenu.protocol() ) ) + if ( !protocols.contains( urlForServiceMenu.protocol() ) ) continue; } else if ( urlForServiceMenu.protocol() == "trash" || urlForServiceMenu.url().startsWith( "system:/trash" ) ) @@ -755,7 +755,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( cfg.hasKey( "X-KDE-Require" ) ) { const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" ); - if ( capabilities.tqcontains( "Write" ) && !sWriting ) + if ( capabilities.contains( "Write" ) && !sWriting ) continue; } if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-KDE-GetActionMenu") ) && cfg.hasKey( "ServiceTypes" ) ) @@ -882,20 +882,20 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) const TQString onlyShowIn = service->property("OnlyShowIn", TQVariant::String).toString(); if ( !onlyShowIn.isEmpty() ) { const TQStringList aList = TQStringList::split(';', onlyShowIn); - if (!aList.tqcontains("KDE")) + if (!aList.contains("KDE")) continue; } const TQString notShowIn = service->property("NotShowIn", TQVariant::String).toString(); if ( !notShowIn.isEmpty() ) { const TQStringList aList = TQStringList::split(';', notShowIn); - if (aList.tqcontains("KDE")) + if (aList.contains("KDE")) continue; } TQCString nam; nam.setNum( id ); - TQString actionName( (*it)->name().tqreplace("&", "&&") ); + TQString actionName( (*it)->name().replace("&", "&&") ); if ( menu == m_menuElement ) // no submenu -> prefix single offer actionName = i18n( "Open with %1" ).arg( actionName ); @@ -1034,7 +1034,7 @@ void KonqPopupMenu::slotPopupNewDir() if (m_lstPopupURLs.empty()) return; - KonqOperations::newDir(d->m_tqparentWidget, m_lstPopupURLs.first()); + KonqOperations::newDir(d->m_parentWidget, m_lstPopupURLs.first()); } void KonqPopupMenu::slotPopupEmptyTrashBin() @@ -1115,10 +1115,10 @@ KPropertiesDialog* KonqPopupMenu::showPropertiesDialog() if (item->entry().count() == 0) // this item wasn't listed by a slave { // KPropertiesDialog will use stat to get more info on the file - return new KPropertiesDialog( item->url(), d->m_tqparentWidget ); + return new KPropertiesDialog( item->url(), d->m_parentWidget ); } } - return new KPropertiesDialog( m_lstItems, d->m_tqparentWidget ); + return new KPropertiesDialog( m_lstItems, d->m_parentWidget ); } KAction *KonqPopupMenu::action( const TQDomElement &element ) const @@ -1156,7 +1156,7 @@ void KonqPopupMenu::addPlugins() //search for a plugin with the right protocol KTrader::OfferList plugin_offers; unsigned int pluginCount = 0; - plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::tqfromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); + plugin_offers = KTrader::self()->query( m_sMimeType.isNull() ? TQString::fromLatin1( "all/all" ) : m_sMimeType, "'KonqPopupMenu/Plugin' in ServiceTypes"); if ( plugin_offers.isEmpty() ) return; // no plugins installed do not bother about it @@ -1175,7 +1175,7 @@ void KonqPopupMenu::addPlugins() if ( !plugin ) continue; // This make the kuick plugin insert its stuff above "Properties" - TQString pluginClientName = TQString::tqfromLatin1( "Plugin%1" ).arg( pluginCount ); + TQString pluginClientName = TQString::fromLatin1( "Plugin%1" ).arg( pluginCount ); addMerge( pluginClientName ); plugin->domDocument().documentElement().setAttribute( "name", pluginClientName ); m_pluginList.append( plugin ); diff --git a/libkonq/konq_popupmenu.h b/libkonq/konq_popupmenu.h index f1dc5ab63..ee528bc9e 100644 --- a/libkonq/konq_popupmenu.h +++ b/libkonq/konq_popupmenu.h @@ -69,7 +69,7 @@ public: // WARNING: bitfield. Next item is 8 /** - * @deprecated lacks tqparentWidget pointer, and + * @deprecated lacks parentWidget pointer, and * uses bool instead of KonqPopupFlags enum, * might do strange things with the 'new window' action. */ @@ -89,7 +89,7 @@ public: KURL viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * tqparentWidget, + TQWidget * parentWidget, bool showPropertiesAndFileType = true ) KDE_DEPRECATED; /** @@ -99,7 +99,7 @@ public: * @param viewURL the URL shown in the view, to test for RMB click on view background * @param actions list of actions the caller wants to see in the menu * @param newMenu "New" menu, shared with the File menu, in konqueror - * @param tqparentWidget the widget we're showing this popup for. Helps destroying + * @param parentWidget the widget we're showing this popup for. Helps destroying * the popup if the widget is destroyed before the popup. * @param kpf flags from the KonqPopupFlags enum, set by the calling application * @param f flags from the BrowserExtension enum, set by the calling part @@ -117,7 +117,7 @@ public: const KURL& viewURL, KActionCollection & actions, KNewMenu * newMenu, - TQWidget * tqparentWidget, + TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags f /*= KParts::BrowserExtension::DefaultPopupItems*/); @@ -177,7 +177,7 @@ protected: KActionCollection m_ownActions; private: - void init (TQWidget * tqparentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags); + void init (TQWidget * parentWidget, KonqPopupFlags kpf, KParts::BrowserExtension::PopupFlags itemFlags); void setup(KonqPopupFlags kpf); void addPlugins( ); int insertServicesSubmenus(const TQMap<TQString, ServiceList>& list, TQDomElement& menu, bool isBuiltin); diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cc index e7096a3f8..303fe044f 100644 --- a/libkonq/konq_propsview.cc +++ b/libkonq/konq_propsview.cc @@ -103,7 +103,7 @@ KonqPropsView::KonqPropsView( KInstance * instance, KonqPropsView * defaultProps //the default-to-off bias to propagate up. if (!config->readBoolEntry("EnableSoundPreviews", false)) { - if (!m_dontPreview.tqcontains("audio/")) + if (!m_dontPreview.contains("audio/")) m_dontPreview.append("audio/"); } @@ -234,13 +234,13 @@ bool KonqPropsView::enterDir( const KURL & dir ) { if (!config->readBoolEntry("EnableSoundPreviews", false)) - if (!m_dontPreview.tqcontains("audio/")) + if (!m_dontPreview.contains("audio/")) m_dontPreview.append("audio/"); } else { - if (m_defaultProps->m_dontPreview.tqcontains("audio/")) - if (!m_dontPreview.tqcontains("audio/")) + if (m_defaultProps->m_dontPreview.contains("audio/")) + if (!m_dontPreview.contains("audio/")) m_dontPreview.append("audio/"); } } @@ -395,7 +395,7 @@ void KonqPropsView::setShowingDirectoryOverlays( bool show ) void KonqPropsView::setShowingPreview( const TQString &preview, bool show ) { - if ( m_dontPreview.tqcontains( preview ) != show ) + if ( m_dontPreview.contains( preview ) != show ) return; else if ( show ) m_dontPreview.remove( preview ); @@ -409,7 +409,7 @@ void KonqPropsView::setShowingPreview( const TQString &preview, bool show ) //Audio is special-cased, as we use a binary setting //for it to get it to follow the defaults right. - bool audioEnabled = !m_dontPreview.tqcontains("audio/"); + bool audioEnabled = !m_dontPreview.contains("audio/"); //Don't write it out into the DontPreview line if (!audioEnabled) @@ -474,7 +474,7 @@ void KonqPropsView::setBgColor( const TQColor & color ) const TQColor & KonqPropsView::bgColor( TQWidget * widget ) const { if ( !m_bgColor.isValid() ) - return widget->tqcolorGroup().base(); + return widget->colorGroup().base(); else return m_bgColor; } @@ -501,7 +501,7 @@ void KonqPropsView::setTextColor( const TQColor & color ) const TQColor & KonqPropsView::textColor( TQWidget * widget ) const { if ( !m_textColor.isValid() ) - return widget->tqcolorGroup().text(); + return widget->colorGroup().text(); else return m_textColor; } @@ -567,10 +567,10 @@ const TQStringList& KonqPropsView::previewSettings() for ( KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it ) { TQString name = (*it)->desktopEntryName(); - if ( ! m_dontPreview.tqcontains(name) ) + if ( ! m_dontPreview.contains(name) ) d->previewsToShow->append( name ); } - if ( ! m_dontPreview.tqcontains( "audio/" ) ) + if ( ! m_dontPreview.contains( "audio/" ) ) d->previewsToShow->append( "audio/" ); } } diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h index a1d397d18..c69b97966 100644 --- a/libkonq/konq_propsview.h +++ b/libkonq/konq_propsview.h @@ -107,7 +107,7 @@ public: void setShowingPreview( const TQString &preview, bool show ); void setShowingPreview( bool show ); - bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.tqcontains(preview); } + bool isShowingPreview( const TQString &preview ) const { return ! m_dontPreview.contains(preview); } bool isShowingPreview(); const TQStringList &previewSettings(); @@ -133,7 +133,7 @@ protected: TQString currentGroup() const { return isDefaultProperties() ? - TQString::tqfromLatin1("Settings") : TQString::tqfromLatin1("URL properties"); + TQString::fromLatin1("Settings") : TQString::fromLatin1("URL properties"); } private: diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc index b9cf41503..d48c7af10 100644 --- a/libkonq/konq_settings.cc +++ b/libkonq/konq_settings.cc @@ -146,10 +146,10 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const kdDebug(1203) << "KonqFMSettings::shouldEmbed : serviceTypeGroup=" << serviceTypeGroup << endl; if ( serviceTypeGroup == "inode" || serviceTypeGroup == "Browser" || serviceTypeGroup == "Konqueror" ) return true; //always embed mimetype inode/*, Browser/* and Konqueror/* - TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::tqfromLatin1("embed-")+serviceTypeGroup ); + TQMap<TQString, TQString>::ConstIterator it = m_embedMap.find( TQString::fromLatin1("embed-")+serviceTypeGroup ); if ( it != m_embedMap.end() ) { kdDebug(1203) << "KonqFMSettings::shouldEmbed: " << it.data() << endl; - return it.data() == TQString::tqfromLatin1("true"); + return it.data() == TQString::fromLatin1("true"); } // 3 - if no config found, use default. // Note: if you change those defaults, also change kcontrol/filetypes/typeslistitem.cpp ! diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc index b8858a2b2..91eece83b 100644 --- a/libkonq/konq_undo.cc +++ b/libkonq/konq_undo.cc @@ -317,7 +317,7 @@ void KonqUndoManager::undo() } else if ( (*it).m_link ) { - if ( !d->m_fileCleanupStack.tqcontains( (*it).m_dst ) ) + if ( !d->m_fileCleanupStack.contains( (*it).m_dst ) ) d->m_fileCleanupStack.prepend( (*it).m_dst ); if ( d->m_current.m_type != KonqCommand::MOVE ) @@ -339,7 +339,7 @@ void KonqUndoManager::undo() KURL::List::ConstIterator it = d->m_current.m_src.begin(); KURL::List::ConstIterator end = d->m_current.m_src.end(); for (; it != end; ++it ) - if ( !d->m_dirStack.tqcontains( *it) ) + if ( !d->m_dirStack.contains( *it) ) d->m_dirStack.push( *it ); } */ @@ -652,13 +652,13 @@ TQDataStream &operator>>( TQDataStream &stream, KonqBasicOperation &op ) TQDataStream &operator<<( TQDataStream &stream, const KonqCommand &cmd ) { - stream << cmd.m_valid << (TQ_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst; + stream << cmd.m_valid << (Q_INT8)cmd.m_type << cmd.m_opStack << cmd.m_src << cmd.m_dst; return stream; } TQDataStream &operator>>( TQDataStream &stream, KonqCommand &cmd ) { - TQ_INT8 type; + Q_INT8 type; stream >> cmd.m_valid >> type >> cmd.m_opStack >> cmd.m_src >> cmd.m_dst; cmd.m_type = static_cast<KonqCommand::Type>( type ); return stream; diff --git a/libkonq/konqbookmarkmanager.h b/libkonq/konqbookmarkmanager.h index a45878562..9774d92e9 100644 --- a/libkonq/konqbookmarkmanager.h +++ b/libkonq/konqbookmarkmanager.h @@ -11,7 +11,7 @@ public: static KBookmarkManager * self() { if ( !s_bookmarkManager ) { - TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("konqueror/bookmarks.xml")); + TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml")); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); } return s_bookmarkManager; diff --git a/nsplugins/NSPluginCallbackIface.h b/nsplugins/NSPluginCallbackIface.h index 6b23e87a9..33e9f85c3 100644 --- a/nsplugins/NSPluginCallbackIface.h +++ b/nsplugins/NSPluginCallbackIface.h @@ -37,7 +37,7 @@ k_dcop: virtual ASYNC requestURL(TQString url, TQString target) = 0; virtual ASYNC postURL(TQString url, TQString target, TQByteArray data, TQString mime) = 0; virtual ASYNC statusMessage( TQString msg ) = 0; - virtual ASYNC evalJavaScript( TQ_INT32 id, TQString script ) = 0; + virtual ASYNC evalJavaScript( Q_INT32 id, TQString script ) = 0; }; diff --git a/nsplugins/README b/nsplugins/README index da6b9fd60..5b45594ab 100644 --- a/nsplugins/README +++ b/nsplugins/README @@ -1,7 +1,7 @@ nsplugins ========= -The 'nsplugins' directory tqcontains various tools used to utilize Netscape(R) +The 'nsplugins' directory contains various tools used to utilize Netscape(R) browser plugins in KDE applications. - ./ - common headers and utilities diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 09736870c..3824334c0 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -63,12 +63,12 @@ NSPluginInstance::NSPluginInstance(TQWidget *parent) void NSPluginInstance::init(const TQCString& app, const TQCString& obj) { stub = new NSPluginInstanceIface_stub( app, obj ); - TQGridLayout *_tqlayout = new TQGridLayout(this, 1, 1); + TQGridLayout *_layout = new TQGridLayout(this, 1, 1); KConfig cfg("kcmnspluginrc", false); cfg.setGroup("Misc"); if (cfg.readBoolEntry("demandLoad", false)) { _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this)); - _tqlayout->addWidget(_button, 0, 0); + _layout->addWidget(_button, 0, 0); connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin())); show(); } else { @@ -130,7 +130,7 @@ void NSPluginInstance::windowChanged(WId w) setBackgroundMode(w == 0 ? TQWidget::PaletteBackground : TQWidget::NoBackground); if (w == 0) { // FIXME: Put a notice here to tell the user that it crashed. - tqrepaint(); + repaint(); } } @@ -174,13 +174,13 @@ void NSPluginInstance::focusOutEvent( TQFocusEvent* event ) void NSPluginInstance::displayPlugin() { - tqApp->syncX(); // process pending X commands + qApp->syncX(); // process pending X commands stub->displayPlugin(); } void NSPluginInstance::resizePlugin( int w, int h ) { - tqApp->syncX(); + qApp->syncX(); stub->resizePlugin( w, h ); } diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h index 8561c6df2..1748bb504 100644 --- a/nsplugins/nspluginloader.h +++ b/nsplugins/nspluginloader.h @@ -69,7 +69,7 @@ protected: bool inited; int resize_count; TQPushButton *_button; - TQGridLayout *_tqlayout; + TQGridLayout *_layout; NSPluginInstanceIface_stub* stub; private: // wrappers void displayPlugin(); diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 0996725ea..e7580db93 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -90,7 +90,7 @@ TQString PluginLiveConnectExtension::evalJavaScript( const TQString & script ) kdDebug(1432) << "PLUGIN:LiveConnect::evalJavaScript " << script << endl; ArgList args; TQString jscode; - jscode.sprintf("this.__nsplugin=eval(\"%s\")", TQString(script).tqreplace('\\', "\\\\").tqreplace('"', "\\\"").latin1()); + jscode.sprintf("this.__nsplugin=eval(\"%s\")", TQString(script).replace('\\', "\\\\").replace('"', "\\\"").latin1()); //kdDebug(1432) << "String is [" << jscode << "]" << endl; args.push_back(qMakePair(KParts::LiveConnectExtension::TypeString, jscode)); TQString nsplugin("Undefined"); @@ -171,13 +171,13 @@ PluginFactory::~PluginFactory() s_instance = 0; } -KParts::Part * PluginFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName, +KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args) { Q_UNUSED(classname) kdDebug(1432) << "PluginFactory::create" << endl; - KParts::Part *obj = new PluginPart(tqparentWidget, widgetName, parent, name, args); + KParts::Part *obj = new PluginPart(parentWidget, widgetName, parent, name, args); return obj; } @@ -201,7 +201,7 @@ KAboutData *PluginFactory::aboutData() /**************************************************************************/ -PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, +PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args) : KParts::ReadOnlyPart(parent, name), _widget(0), _args(args), _destructed(0L) @@ -226,7 +226,7 @@ PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObjec _callback = new NSPluginCallback(this); // create a canvas to insert our widget - _canvas = new PluginCanvasWidget( tqparentWidget, widgetName ); + _canvas = new PluginCanvasWidget( parentWidget, widgetName ); //_canvas->setFocusPolicy( TQWidget::ClickFocus ); _canvas->setFocusPolicy( TQWidget::WheelFocus ); _canvas->setBackgroundMode( TQWidget::NoBackground ); @@ -307,7 +307,7 @@ bool PluginPart::openURL(const KURL &url) _widget = inst; } else { TQLabel *label = new TQLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas ); - label->tqsetAlignment( AlignCenter | WordBreak ); + label->setAlignment( AlignCenter | WordBreak ); _widget = label; } diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h index cd17d1431..012d5443f 100644 --- a/nsplugins/plugin_part.h +++ b/nsplugins/plugin_part.h @@ -67,7 +67,7 @@ public: PluginFactory(); virtual ~PluginFactory(); - virtual KParts::Part * createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0, + virtual KParts::Part * createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); @@ -102,7 +102,7 @@ class PluginPart: public KParts::ReadOnlyPart { Q_OBJECT public: - PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, + PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args = TQStringList()); virtual ~PluginPart(); diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index fbe5f8da3..6914deb93 100644 --- a/nsplugins/pluginscan.cpp +++ b/nsplugins/pluginscan.cpp @@ -130,7 +130,7 @@ void deletePluginMimeTypes() } for ( unsigned int i=0; i<dirs.count(); i++ ) { - if ( !dirs[i].tqcontains(".") ) { + if ( !dirs[i].contains(".") ) { // check all mime types for X-KDE-nsplugin flag kdDebug(1433) << " - Looking in " << dirs[i] << endl; @@ -251,14 +251,14 @@ int tryCheck(int write_fd, const TQString &absFile) NPError err = func_GetValue( 0, NPPVpluginNameString, (void*)&buf ); if ( err==NPERR_NO_ERROR ) - name = TQString::tqfromLatin1( buf ); + name = TQString::fromLatin1( buf ); kdDebug() << "name = " << name << endl; // get name NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString, (void*)&buf ); if ( nperr==NPERR_NO_ERROR ) - description = TQString::tqfromLatin1( buf ); + description = TQString::fromLatin1( buf ); kdDebug() << "description = " << description << endl; } else @@ -283,7 +283,7 @@ int tryCheck(int write_fd, const TQString &absFile) // remove version info, as it is not used at the moment TQRegExp versionRegExp(";version=[^:]*:"); - mimeInfo.tqreplace( versionRegExp, ":"); + mimeInfo.replace( versionRegExp, ":"); // unload plugin lib kdDebug(1433) << " - unloading plugin" << endl; @@ -404,10 +404,10 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, for ( type=types.begin(); type!=types.end(); ++type ) { kdDebug(1433) << " - type=" << *type << endl; - name = name.tqreplace( ':', "%3A" ); + name = name.replace( ':', "%3A" ); TQString entry = name + ":" + *type; - if ( !mimeInfoList.tqcontains( entry ) ) { + if ( !mimeInfoList.contains( entry ) ) { if (!actuallyUsing) { // note the plugin name cache << "[" << absFile << "]" << endl; @@ -444,7 +444,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList, static int depth = 0; // avoid recursion because of symlink circles depth++; for ( unsigned int i=0; i<dirs.count(); i++ ) { - if ( depth<8 && !dirs[i].tqcontains(".") ) + if ( depth<8 && !dirs[i].contains(".") ) scanDirectory( dirs.absFilePath(dirs[i]), mimeInfoList, cache ); } depth--; @@ -620,7 +620,7 @@ int main( int argc, char **argv ) TQString desc = info[3]; // append to global mime type list - if ( !mimeTypes.tqcontains(type) ) { + if ( !mimeTypes.contains(type) ) { kdDebug(1433) << " - mimeType=" << type << endl; mimeTypes.append( type ); diff --git a/nsplugins/sdk/jni.h b/nsplugins/sdk/jni.h index d77820edc..863075afa 100644 --- a/nsplugins/sdk/jni.h +++ b/nsplugins/sdk/jni.h @@ -27,7 +27,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. @@ -40,7 +40,7 @@ #include <stdio.h> #include <stdarg.h> -/* jni_md.h tqcontains the machine-dependent typedefs for jbyte, jint +/* jni_md.h contains the machine-dependent typedefs for jbyte, jint and jlong */ #include "jni_md.h" @@ -580,7 +580,7 @@ struct JNINativeInterface_ { (JNIEnv *env, jclass clazz, jfieldID fieldID, jdouble value); jstring (JNICALL *NewString) - (JNIEnv *env, const jchar *tqunicode, jsize len); + (JNIEnv *env, const jchar *unicode, jsize len); jsize (JNICALL *GetStringLength) (JNIEnv *env, jstring str); const jchar *(JNICALL *GetStringChars) @@ -1508,8 +1508,8 @@ struct JNIEnv_ { functions->SetStaticDoubleField(this,clazz,fieldID,value); } - jstring NewString(const jchar *tqunicode, jsize len) { - return functions->NewString(this,tqunicode,len); + jstring NewString(const jchar *unicode, jsize len) { + return functions->NewString(this,unicode,len); } jsize GetStringLength(jstring str) { return functions->GetStringLength(this,str); diff --git a/nsplugins/sdk/jni_md.h b/nsplugins/sdk/jni_md.h index 40517d20a..c0aa11159 100644 --- a/nsplugins/sdk/jni_md.h +++ b/nsplugins/sdk/jni_md.h @@ -29,7 +29,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. diff --git a/nsplugins/sdk/jri.h b/nsplugins/sdk/jri.h index 8327a7dce..f29945b94 100644 --- a/nsplugins/sdk/jri.h +++ b/nsplugins/sdk/jri.h @@ -28,7 +28,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the NPL, the GPL or the LGPL. @@ -341,8 +341,8 @@ typedef const JRIEnvInterface* JRIEnv; #define JRI_SetStaticFieldDouble(env, clazz, fieldID, value) \ (((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value)) -#define JRI_NewString(env, tqunicode, len) \ - (((*(env))->NewString)(env, JRI_NewString_op, tqunicode, len)) +#define JRI_NewString(env, unicode, len) \ + (((*(env))->NewString)(env, JRI_NewString_op, unicode, len)) #define JRI_GetStringLength(env, string) \ (((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string)) diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h index 12111871b..5ae741ed3 100644 --- a/nsplugins/sdk/jri_md.h +++ b/nsplugins/sdk/jri_md.h @@ -28,7 +28,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the NPL, the GPL or the LGPL. @@ -202,7 +202,7 @@ typedef long jint; ******************************************************************************/ /* -** Bit tqmasking macros. (n must be <= 31 to be portable) +** Bit masking macros. (n must be <= 31 to be portable) */ #define JRI_BIT(n) ((juint)1 << (n)) #define JRI_BITMASK(n) (JRI_BIT(n) - 1) diff --git a/nsplugins/sdk/jritypes.h b/nsplugins/sdk/jritypes.h index e578c33ed..ddeb6331c 100644 --- a/nsplugins/sdk/jritypes.h +++ b/nsplugins/sdk/jritypes.h @@ -28,7 +28,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the NPL, the GPL or the LGPL. diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h index 0f3b292a6..67b91b680 100644 --- a/nsplugins/sdk/npapi.h +++ b/nsplugins/sdk/npapi.h @@ -29,7 +29,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the NPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the NPL, the GPL or the LGPL. @@ -329,14 +329,14 @@ typedef struct /* - * The following tqmasks are applied on certain platforms to NPNV and + * The following masks are applied on certain platforms to NPNV and * NPPV selectors that pass around pointers to COM interfaces. Newer * compilers on some platforms may generate vtables that are not * compatible with older compilers. To prevent older plugins from - * not understanding a new browser's ABI, these tqmasks change the + * not understanding a new browser's ABI, these masks change the * values of those selectors on those platforms. To remain backwards * compatible with differenet versions of the browser, plugins can - * use these tqmasks to dynamically determine and use the correct C++ + * use these masks to dynamically determine and use the correct C++ * ABI that the browser is expecting. This does not apply to Windows * as Microsoft's COM ABI will likely not change. */ @@ -677,7 +677,7 @@ NPError NP_LOADDS NPN_NewStream(NPP instance, NPMIMEType type, const char* target, NPStream** stream); int32 NP_LOADDS NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer); NPError NP_LOADDS NPN_DestroyStream(NPP instance, NPStream* stream, NPReason reason); -void NP_LOADDS NPN_tqStatus(NPP instance, const char* message); +void NP_LOADDS NPN_Status(NPP instance, const char* message); const char* NP_LOADDS NPN_UserAgent(NPP instance); void* NP_LOADDS NPN_MemAlloc(uint32 size); void NP_LOADDS NPN_MemFree(void* ptr); diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h index 06a8e1ee6..5a8423390 100644 --- a/nsplugins/sdk/npruntime.h +++ b/nsplugins/sdk/npruntime.h @@ -66,7 +66,7 @@ #define _NP_RUNTIME_H_ #include <tqglobal.h> -typedef TQ_UINT32 uint32_t; +typedef Q_UINT32 uint32_t; #ifdef __cplusplus extern "C" { @@ -306,7 +306,7 @@ typedef bool (*NPRemovePropertyFunctionPtr)(NPObject *npobj, NPInvalidateFunctionPtr is called by the scripting environment when the native code is shutdown. Any attempt to message a - NPObject instance after the tqinvalidate callback has been + NPObject instance after the invalidate callback has been called will result in undefined behavior, even if the native code is still retaining those NPObject instances. (The runtime will typically return immediately, with 0 or NULL, from an attempt @@ -318,7 +318,7 @@ struct NPClass uint32_t structVersion; NPAllocateFunctionPtr allocate; NPDeallocateFunctionPtr deallocate; - NPInvalidateFunctionPtr tqinvalidate; + NPInvalidateFunctionPtr invalidate; NPHasMethodFunctionPtr hasMethod; NPInvokeFunctionPtr invoke; NPInvokeDefaultFunctionPtr invokeDefault; diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h index 01aef8ee9..dff545d9f 100644 --- a/nsplugins/sdk/npupp.h +++ b/nsplugins/sdk/npupp.h @@ -28,7 +28,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. @@ -770,28 +770,28 @@ typedef NPError (* NP_LOADDS NPN_DestroyStreamUPP)(NPP instance, NPStream* strea #endif -/* NPN_tqStatus */ +/* NPN_Status */ #if _NPUPP_USE_UPP_ -typedef UniversalProcPtr NPN_tqStatusUPP; +typedef UniversalProcPtr NPN_StatusUPP; enum { - uppNPN_tqStatusProcInfo = kThinkCStackBased + uppNPN_StatusProcInfo = kThinkCStackBased | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP))) | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *))) }; -#define NewNPN_tqStatusProc(FUNC) \ - (NPN_tqStatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_tqStatusProcInfo, GetCurrentArchitecture()) -#define CallNPN_tqStatusProc(FUNC, npp, msg) \ - (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_tqStatusProcInfo, (npp), (msg)) +#define NewNPN_StatusProc(FUNC) \ + (NPN_StatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_StatusProcInfo, GetCurrentArchitecture()) +#define CallNPN_StatusProc(FUNC, npp, msg) \ + (void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg)) #else -typedef void (* NP_LOADDS NPN_tqStatusUPP)(NPP instance, const char* message); -#define NewNPN_tqStatusProc(FUNC) \ - ((NPN_tqStatusUPP) (FUNC)) -#define CallNPN_tqStatusProc(FUNC, npp, msg) \ +typedef void (* NP_LOADDS NPN_StatusUPP)(NPP instance, const char* message); +#define NewNPN_StatusProc(FUNC) \ + ((NPN_StatusUPP) (FUNC)) +#define CallNPN_StatusProc(FUNC, npp, msg) \ (*(FUNC))((npp), (msg)) #endif @@ -1678,7 +1678,7 @@ typedef struct _NPNetscapeFuncs { NPN_NewStreamUPP newstream; NPN_WriteUPP write; NPN_DestroyStreamUPP destroystream; - NPN_tqStatusUPP status; + NPN_StatusUPP status; NPN_UserAgentUPP uagent; NPN_MemAllocUPP memalloc; NPN_MemFreeUPP memfree; @@ -1690,8 +1690,8 @@ typedef struct _NPNetscapeFuncs { NPN_PostURLNotifyUPP posturlnotify; NPN_GetValueUPP getvalue; NPN_SetValueUPP setvalue; - NPN_InvalidateRectUPP tqinvalidaterect; - NPN_InvalidateRegionUPP tqinvalidateregion; + NPN_InvalidateRectUPP invalidaterect; + NPN_InvalidateRegionUPP invalidateregion; NPN_ForceRedrawUPP forceredraw; NPN_GetStringIdentifierUPP getstringidentifier; NPN_GetStringIdentifiersUPP getstringidentifiers; diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h index 0d4c27705..e96cfcf67 100644 --- a/nsplugins/sdk/obsolete/protypes.h +++ b/nsplugins/sdk/obsolete/protypes.h @@ -26,7 +26,7 @@ * version of this file only under the terms of the GPL and not to * allow others to use your version of this file under the MPL, * indicate your decision by deleting the provisions above and - * tqreplace them with the notice and other provisions required by + * replace them with the notice and other provisions required by * the GPL. If you do not delete the provisions above, a recipient * may use your version of this file under either the MPL or the * GPL. diff --git a/nsplugins/sdk/prcpucfg.h b/nsplugins/sdk/prcpucfg.h index b3b41df79..b2d1cebdb 100644 --- a/nsplugins/sdk/prcpucfg.h +++ b/nsplugins/sdk/prcpucfg.h @@ -28,7 +28,7 @@ * of those above. If you wish to allow use of your version of this file only * under the terms of either the GPL or the LGPL, and not to allow others to * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and tqreplace them with the notice + * decision by deleting the provisions above and replace them with the notice * and other provisions required by the GPL or the LGPL. If you do not delete * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. diff --git a/nsplugins/sdk/prtypes.h b/nsplugins/sdk/prtypes.h index 28944cd54..b68361082 100644 --- a/nsplugins/sdk/prtypes.h +++ b/nsplugins/sdk/prtypes.h @@ -26,7 +26,7 @@ * version of this file only under the terms of the GPL and not to * allow others to use your version of this file under the MPL, * indicate your decision by deleting the provisions above and - * tqreplace them with the notice and other provisions required by + * replace them with the notice and other provisions required by * the GPL. If you do not delete the provisions above, a recipient * may use your version of this file under either the MPL or the * GPL. @@ -231,7 +231,7 @@ ** MACROS: PR_BIT ** PR_BITMASK ** DESCRIPTION: -** Bit tqmasking macros. XXX n must be <= 31 to be portable +** Bit masking macros. XXX n must be <= 31 to be portable ***********************************************************************/ #define PR_BIT(n) ((PRUint32)1 << (n)) #define PR_BITMASK(n) (PR_BIT(n) - 1) @@ -459,10 +459,10 @@ typedef PRIntn PRBool; typedef PRUint8 PRPackedBool; /* -** tqStatus code used by some routines that have a single point of failure or +** Status code used by some routines that have a single point of failure or ** special status return. */ -typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRtqStatus; +typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus; #ifdef MOZ_UNICODE /* diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp index 5c3e1bb3d..0d9eadf29 100644 --- a/nsplugins/test/testnsplugin.cpp +++ b/nsplugins/test/testnsplugin.cpp @@ -41,7 +41,7 @@ TestNSPlugin::TestNSPlugin() m_client = new TQWidget( this, "m_client" ); setCentralWidget( m_client ); m_client->show(); - m_tqlayout = new TQHBoxLayout( m_client ); + m_layout = new TQHBoxLayout( m_client ); // file menu KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection()); @@ -90,7 +90,7 @@ void TestNSPlugin::newView() m_plugins.append( win ); connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)), this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) ); - m_tqlayout->addWidget( win ); + m_layout->addWidget( win ); win->show(); } else { diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h index 944235996..949de2986 100644 --- a/nsplugins/test/testnsplugin.h +++ b/nsplugins/test/testnsplugin.h @@ -49,7 +49,7 @@ protected: NSPluginLoader *m_loader; TQPtrList<TQWidget> m_plugins; TQWidget *m_client; - TQBoxLayout *m_tqlayout; + TQBoxLayout *m_layout; }; diff --git a/nsplugins/viewer/NSPluginClassIface.h b/nsplugins/viewer/NSPluginClassIface.h index c9051821d..7eb71f27d 100644 --- a/nsplugins/viewer/NSPluginClassIface.h +++ b/nsplugins/viewer/NSPluginClassIface.h @@ -47,10 +47,10 @@ class NSPluginClassIface : virtual public DCOPObject k_dcop: - virtual DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed, + virtual DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed, TQStringList argn, TQStringList argv, - TQString appId, TQString callbackId, TQ_INT8 reload, - TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed) = 0; + TQString appId, TQString callbackId, Q_INT8 reload, + Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed) = 0; virtual TQString getMIMEDescription() = 0; }; @@ -66,11 +66,11 @@ k_dcop: virtual int winId() = 0; - virtual int setWindow(TQ_INT8 remove=0) = 0; + virtual int setWindow(Q_INT8 remove=0) = 0; - virtual void resizePlugin(TQ_INT32 w, TQ_INT32 h) = 0; + virtual void resizePlugin(Q_INT32 w, Q_INT32 h) = 0; - virtual void javascriptResult(TQ_INT32 id, TQString result) = 0; + virtual void javascriptResult(Q_INT32 id, TQString result) = 0; virtual void displayPlugin() = 0; diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp index 2443ce739..9f5f43d51 100644 --- a/nsplugins/viewer/kxt.cpp +++ b/nsplugins/viewer/kxt.cpp @@ -159,11 +159,11 @@ void reparentChildrenOf(TQWidget* parent) void qwidget_realize( Widget widget, - XtValueMask* tqmask, + XtValueMask* mask, XSetWindowAttributes* attributes ) { - widgetClassRec.core_class.realize(widget, tqmask, attributes); + widgetClassRec.core_class.realize(widget, mask, attributes); KXtWidget* qxtw = ((QWidgetRec*)widget)->qwidget.qxtwidget; if (XtWindow(widget) != qxtw->winId()) { qxtw->create(XtWindow(widget), FALSE, FALSE); @@ -205,7 +205,7 @@ QWidgetClassRec qwidgetClassRec = { /* version */ XtVersion, /* callback_private */ 0, /* tm_table */ XtInheritTranslations, - /* query_tqgeometry */ XtInheritQueryGeometry, + /* query_geometry */ XtInheritQueryGeometry, /* display_accelerator */ XtInheritDisplayAccelerator, /* extension */ 0 }, @@ -255,7 +255,7 @@ static void np_event_proc( XEvent* e ) { Widget xtw = XtWindowToWidget( e->xany.display, e->xany.window ); - if ( xtw && tqApp->loopLevel() > 0 ) { + if ( xtw && qApp->loopLevel() > 0 ) { // Allow Xt to process the event qt_np_cascade_event_handler[e->type]( e ); } @@ -442,7 +442,7 @@ void KXtWidget::init(const char* name, WidgetClass widget_class, Use this constructor to utilize Qt widgets in an Xt/Motif application. The KXtWidget is a TQWidget, so you can create - subwidgets, tqlayouts, etc. using Qt functionality. + subwidgets, layouts, etc. using Qt functionality. */ KXtWidget::KXtWidget(const char* name, Widget parent, bool managed) : TQWidget( 0, name, WResizeNoErase ) @@ -505,7 +505,7 @@ KXtWidget::~KXtWidget() if ( need_reroot ) { hide(); - XReparentWindow(qt_xdisplay(), winId(), tqApp->desktop()->winId(), + XReparentWindow(qt_xdisplay(), winId(), qApp->desktop()->winId(), x(), y()); } @@ -567,7 +567,7 @@ bool KXtWidget::isActiveWindow() const TQWidget *w = find( (WId)win ); if ( w ) { // We know that window - return w->tqtopLevelWidget() == tqtopLevelWidget(); + return w->topLevelWidget() == topLevelWidget(); } else { // Window still may be a parent (if top-level is foreign window) Window root, parent; diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h index 89b168069..44f05db19 100644 --- a/nsplugins/viewer/kxt.h +++ b/nsplugins/viewer/kxt.h @@ -75,7 +75,7 @@ class KXtWidget : public TQWidget { Widget parent, TQWidget* qparent, ArgList args, Cardinal num_args, bool managed); - friend void qwidget_realize( Widget widget, XtValueMask* tqmask, + friend void qwidget_realize( Widget widget, XtValueMask* mask, XSetWindowAttributes* attributes ); public: diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index a32653039..be313b52b 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -138,7 +138,7 @@ void g_NPN_ForceRedraw(NPP /*instance*/) } -// tqinvalidate rect +// invalidate rect void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api7.html#999503 @@ -147,7 +147,7 @@ void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/) } -// tqinvalidate region +// invalidate region void g_NPN_InvalidateRegion(NPP /*instance*/, NPRegion /*invalidRegion*/) { // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api8.html#999528 @@ -252,8 +252,8 @@ NPError g_NPN_GetURL(NPP instance, const char *url, const char *target) NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); if (inst) { - inst->requestURL( TQString::tqfromLatin1(url), TQString::null, - TQString::tqfromLatin1(target), 0 ); + inst->requestURL( TQString::fromLatin1(url), TQString::null, + TQString::fromLatin1(target), 0 ); } return NPERR_NO_ERROR; @@ -267,8 +267,8 @@ NPError g_NPN_GetURLNotify(NPP instance, const char *url, const char *target, NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); if (inst) { kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl; - inst->requestURL( TQString::tqfromLatin1(url), TQString::null, - TQString::tqfromLatin1(target), notifyData, true ); + inst->requestURL( TQString::fromLatin1(url), TQString::null, + TQString::fromLatin1(target), notifyData, true ); } return NPERR_NO_ERROR; @@ -318,7 +318,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -360,9 +360,9 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); - if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { - inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), - TQString::tqfromLatin1(target), notifyData, args, true ); + if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { + inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), + TQString::fromLatin1(target), notifyData, args, true ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -415,7 +415,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, break; } - TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); + TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace(); previousStart = &buf[l]; previousCR = true; @@ -457,9 +457,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, } NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata); - if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) { - inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(), - TQString::tqfromLatin1(target), 0L, args, false ); + if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) { + inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(), + TQString::fromLatin1(target), 0L, args, false ); } else { // Unsupported / insecure return NPERR_INVALID_URL; @@ -470,9 +470,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target, // display status message -void g_NPN_tqStatus(NPP instance, const char *message) +void g_NPN_Status(NPP instance, const char *message) { - kdDebug(1431) << "g_NPN_tqStatus(): " << message << endl; + kdDebug(1431) << "g_NPN_Status(): " << message << endl; if (!instance) return; @@ -480,7 +480,7 @@ void g_NPN_tqStatus(NPP instance, const char *message) // turn into an instance signal NSPluginInstance *inst = (NSPluginInstance*) instance->ndata; - inst->emittqStatus(message); + inst->emitStatus(message); } @@ -816,11 +816,11 @@ void NSPluginInstance::timer() kdDebug() << "posting to " << url << endl; - emittqStatus( i18n("Submitting data to %1").arg(url) ); + emitStatus( i18n("Submitting data to %1").arg(url) ); s->post( url, req.data, req.mime, req.notify, req.args ); } else if (url.lower().startsWith("javascript:")){ if (_callback) { - static TQ_INT32 _jsrequestid = 0; + static Q_INT32 _jsrequestid = 0; _jsrequests.insert(_jsrequestid, new Request(req)); _callback->evalJavaScript(_jsrequestid++, url.mid(11)); } else { @@ -835,7 +835,7 @@ void NSPluginInstance::timer() kdDebug() << "getting " << url << endl; - emittqStatus( i18n("Requesting %1").arg(url) ); + emitStatus( i18n("Requesting %1").arg(url) ); s->get( url, req.mime, req.notify, req.reload ); } @@ -897,7 +897,7 @@ void NSPluginInstance::postURL( const TQString &url, const TQByteArray& data, } -void NSPluginInstance::emittqStatus(const TQString &message) +void NSPluginInstance::emitStatus(const TQString &message) { if( _callback ) _callback->statusMessage( message ); @@ -907,7 +907,7 @@ void NSPluginInstance::emittqStatus(const TQString &message) void NSPluginInstance::streamFinished( NSPluginStreamBase* strm ) { kdDebug(1431) << "-> NSPluginInstance::streamFinished" << endl; - emittqStatus( TQString::null ); + emitStatus( TQString::null ); _streams.setAutoDelete(false); // Don't delete it yet!! we get called from // its slot! _streams.remove(strm); @@ -916,7 +916,7 @@ void NSPluginInstance::streamFinished( NSPluginStreamBase* strm ) _timer->start( 100, true ); } -int NSPluginInstance::setWindow(TQ_INT8 remove) +int NSPluginInstance::setWindow(Q_INT8 remove) { if (remove) { @@ -980,7 +980,7 @@ static void resizeWidgets(Window w, int width, int height) { } -void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h) +void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h) { if (w == _width && h == _height) return; @@ -1021,7 +1021,7 @@ void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h) } -void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) { +void NSPluginInstance::javascriptResult(Q_INT32 id, TQString result) { TQMap<int, Request*>::iterator i = _jsrequests.find( id ); if (i != _jsrequests.end()) { Request *req = i.data(); @@ -1295,7 +1295,7 @@ void NSPluginViewer::shutdown() #if QT_VERSION < 0x030100 quitXt(); #else - tqApp->quit(); + qApp->quit(); #endif } @@ -1422,7 +1422,7 @@ int NSPluginClass::initialize() _nsFuncs.newstream = g_NPN_NewStream; _nsFuncs.write = g_NPN_Write; _nsFuncs.destroystream = g_NPN_DestroyStream; - _nsFuncs.status = g_NPN_tqStatus; + _nsFuncs.status = g_NPN_Status; _nsFuncs.uagent = g_NPN_UserAgent; _nsFuncs.memalloc = g_NPN_MemAlloc; _nsFuncs.memfree = g_NPN_MemFree; @@ -1434,8 +1434,8 @@ int NSPluginClass::initialize() _nsFuncs.posturlnotify = g_NPN_PostURLNotify; _nsFuncs.getvalue = g_NPN_GetValue; _nsFuncs.setvalue = g_NPN_SetValue; - _nsFuncs.tqinvalidaterect = g_NPN_InvalidateRect; - _nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion; + _nsFuncs.invalidaterect = g_NPN_InvalidateRect; + _nsFuncs.invalidateregion = g_NPN_InvalidateRegion; _nsFuncs.forceredraw = g_NPN_ForceRedraw; // initialize plugin @@ -1458,10 +1458,10 @@ void NSPluginClass::shutdown() } -DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 embed, +DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, Q_INT8 embed, TQStringList argn, TQStringList argv, TQString appId, TQString callbackId, - TQ_INT8 reload, TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed ) + Q_INT8 reload, Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed ) { kdDebug(1431) << "-> NSPluginClass::NewInstance" << endl; diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h index 893b1c292..da92edd76 100644 --- a/nsplugins/viewer/nsplugin.h +++ b/nsplugins/viewer/nsplugin.h @@ -172,9 +172,9 @@ public: // DCOP functions void shutdown(); int winId() { return _form != 0 ? XtWindow(_form) : 0; } - int setWindow(TQ_INT8 remove=0); - void resizePlugin(TQ_INT32 w, TQ_INT32 h); - void javascriptResult(TQ_INT32 id, TQString result); + int setWindow(Q_INT8 remove=0); + void resizePlugin(Q_INT32 w, Q_INT32 h); + void javascriptResult(Q_INT32 id, TQString result); void displayPlugin(); void gotFocusIn(); void gotFocusOut(); @@ -200,7 +200,7 @@ public: uint16 HandleEvent(void *event); // signal emitters - void emittqStatus( const TQString &message); + void emitStatus( const TQString &message); void requestURL( const TQString &url, const TQString &mime, const TQString &target, void *notify, bool forceNotify = false, bool reload = false ); void postURL( const TQString &url, const TQByteArray& data, const TQString &mime, @@ -281,10 +281,10 @@ public: ~NSPluginClass(); TQString getMIMEDescription(); - DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed, + DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed, TQStringList argn, TQStringList argv, - TQString appId, TQString callbackId, TQ_INT8 reload, TQ_INT8 post, - TQByteArray postData, TQ_UINT32 xembed ); + TQString appId, TQString callbackId, Q_INT8 reload, Q_INT8 post, + TQByteArray postData, Q_UINT32 xembed ); void destroyInstance( NSPluginInstance* inst ); bool error() { return _error; } diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp index b6eac9a4c..b34c1e03c 100644 --- a/nsplugins/viewer/qxteventloop.cpp +++ b/nsplugins/viewer/qxteventloop.cpp @@ -174,7 +174,7 @@ Boolean qmotif_event_dispatcher( XEvent *event ) } last_xevent = event; - bool delivered = ( tqApp->x11ProcessEvent( event ) != -1 ); + bool delivered = ( qApp->x11ProcessEvent( event ) != -1 ); last_xevent = 0; if ( qMotif ) { switch ( event->type ) { @@ -309,15 +309,15 @@ XtAppContext QXtEventLoop::applicationContext() const void QXtEventLoop::appStartingUp() { - int argc = tqApp->argc(); + int argc = qApp->argc(); XtDisplayInitialize( d->appContext, TQPaintDevice::x11AppDisplay(), - tqApp->name(), + qApp->name(), d->applicationClass, d->options, d->numOptions, &argc, - tqApp->argv() ); + qApp->argv() ); d->hookMeUp(); } @@ -362,18 +362,18 @@ void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id ) */ void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier ) { - XtInputMask tqmask; + XtInputMask mask; switch ( notifier->type() ) { case TQSocketNotifier::Read: - tqmask = XtInputReadMask; + mask = XtInputReadMask; break; case TQSocketNotifier::Write: - tqmask = XtInputWriteMask; + mask = XtInputWriteMask; break; case TQSocketNotifier::Exception: - tqmask = XtInputExceptMask; + mask = XtInputExceptMask; break; default: @@ -382,7 +382,7 @@ void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier ) } XtInputId id = XtAppAddInput( d->appContext, - notifier->socket(), (XtPointer) tqmask, + notifier->socket(), (XtPointer) mask, qmotif_socknot_handler, this ); d->socknotDict.insert( id, notifier ); @@ -420,7 +420,7 @@ void qmotif_timeout_handler( XtPointer, XtIntervalId * ) */ bool QXtEventLoop::processEvents( ProcessEventsFlags flags ) { - // Qt uses posted events to do lots of delayed operations, like tqrepaints... these + // Qt uses posted events to do lots of delayed operations, like repaints... these // need to be delivered before we go to sleep TQApplication::sendPostedEvents(); @@ -436,23 +436,23 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags ) qmotif_timeout_handler, 0 ); } - // get the pending event tqmask from Xt and process the next event - XtInputMask pendingtqmask = XtAppPending( d->appContext ); - XtInputMask tqmask = pendingtqmask; - if ( pendingtqmask & XtIMTimer ) { - tqmask &= ~XtIMTimer; + // get the pending event mask from Xt and process the next event + XtInputMask pendingmask = XtAppPending( d->appContext ); + XtInputMask mask = pendingmask; + if ( pendingmask & XtIMTimer ) { + mask &= ~XtIMTimer; // zero timers will starve the Xt X event dispatcher... so process // something *instead* of a timer first... - if ( tqmask != 0 ) - XtAppProcessEvent( d->appContext, tqmask ); + if ( mask != 0 ) + XtAppProcessEvent( d->appContext, mask ); // and process a timer afterwards - tqmask = pendingtqmask & XtIMTimer; + mask = pendingmask & XtIMTimer; } if ( ( flags & WaitForMore ) ) XtAppProcessEvent( d->appContext, XtIMAll ); else - XtAppProcessEvent( d->appContext, tqmask ); + XtAppProcessEvent( d->appContext, mask ); int nevents = 0; if ( ! ( flags & ExcludeSocketNotifiers ) ) @@ -463,7 +463,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags ) } d->activate_timers = FALSE; - return ( (flags & WaitForMore) || ( pendingtqmask != 0 ) || nevents > 0 ); + return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 ); } #include "qxteventloop.moc" diff --git a/nsplugins/wrapper/wrapper.c b/nsplugins/wrapper/wrapper.c index 734219413..965868426 100644 --- a/nsplugins/wrapper/wrapper.c +++ b/nsplugins/wrapper/wrapper.c @@ -439,11 +439,11 @@ NPError MyNPN_DestroyStream(NPP instance, NPStream* stream, } static -void MyNPN_tqStatus(NPP instance, const char* message) +void MyNPN_Status(NPP instance, const char* message) { - DEB(ef, "-> NPN_tqStatus( %x, %s )\n", instance, message); + DEB(ef, "-> NPN_Status( %x, %s )\n", instance, message); gNetscapeFuncs.status( instance, message ); - DEB(ef, "<- NPN_tqStatus\n"); + DEB(ef, "<- NPN_Status\n"); } static @@ -544,7 +544,7 @@ static void MyNPN_InvalidateRect(NPP instance, NPRect *invalidRect) { DEB(ef, "-> NPN_InvalidateRect( %x, 0x%x )\n", instance, invalidRect); - gNetscapeFuncs.tqinvalidaterect( instance, invalidRect ); + gNetscapeFuncs.invalidaterect( instance, invalidRect ); DEB(ef, "<- NPN_InvalidateRect\n"); } @@ -552,7 +552,7 @@ static void MyNPN_InvalidateRegion(NPP instance, NPRegion invalidRegion) { DEB(ef, "-> NPN_InvalidateRegion( %x, 0x%x )\n", instance, invalidRegion); - gNetscapeFuncs.tqinvalidateregion( instance, invalidRegion ); + gNetscapeFuncs.invalidateregion( instance, invalidRegion ); DEB(ef, "<- NPN_InvalidateRegion\n"); } @@ -605,8 +605,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) DEB(ef, "nsTable->posturlnotify = 0x%x\n", nsTable->posturlnotify); DEB(ef, "nsTable->getvalue = 0x%x\n", nsTable->getvalue); DEB(ef, "nsTable->setvalue = 0x%x\n", nsTable->setvalue); - DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", nsTable->tqinvalidaterect); - DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", nsTable->tqinvalidateregion); + DEB(ef, "nsTable->invalidaterect = 0x%x\n", nsTable->invalidaterect); + DEB(ef, "nsTable->invalidateregion = 0x%x\n", nsTable->invalidateregion); DEB(ef, "nsTable->forceredraw = 0x%x\n", nsTable->forceredraw); DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size); @@ -647,7 +647,7 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) gExtNetscapeFuncs.newstream = MyNPN_NewStream; gExtNetscapeFuncs.write = MyNPN_Write; gExtNetscapeFuncs.destroystream = MyNPN_DestroyStream; - gExtNetscapeFuncs.status = MyNPN_tqStatus; + gExtNetscapeFuncs.status = MyNPN_Status; gExtNetscapeFuncs.uagent = MyNPN_UserAgent; /*gExtNetscapeFuncs.memalloc = MyNPN_MemAlloc; gExtNetscapeFuncs.memfree = MyNPN_MemFree; @@ -659,8 +659,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) gExtNetscapeFuncs.posturlnotify = MyNPN_PostURLNotify; gExtNetscapeFuncs.getvalue = MyNPN_GetValue; gExtNetscapeFuncs.setvalue = MyNPN_SetValue; - gExtNetscapeFuncs.tqinvalidaterect = MyNPN_InvalidateRect; - gExtNetscapeFuncs.tqinvalidateregion = MyNPN_InvalidateRegion; + gExtNetscapeFuncs.invalidaterect = MyNPN_InvalidateRect; + gExtNetscapeFuncs.invalidateregion = MyNPN_InvalidateRegion; gExtNetscapeFuncs.forceredraw = MyNPN_ForceRedraw; gPluginFuncs.size = sizeof( gPluginFuncs ); @@ -709,8 +709,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) DEB(ef, "nsTable->posturlnotify = 0x%x\n", gExtNetscapeFuncs.posturlnotify); DEB(ef, "nsTable->getvalue = 0x%x\n", gExtNetscapeFuncs.getvalue); DEB(ef, "nsTable->setvalue = 0x%x\n", gExtNetscapeFuncs.setvalue); - DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", gExtNetscapeFuncs.tqinvalidaterect); - DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", gExtNetscapeFuncs.tqinvalidateregion); + DEB(ef, "nsTable->invalidaterect = 0x%x\n", gExtNetscapeFuncs.invalidaterect); + DEB(ef, "nsTable->invalidateregion = 0x%x\n", gExtNetscapeFuncs.invalidateregion); DEB(ef, "nsTable->forceredraw = 0x%x\n", gExtNetscapeFuncs.forceredraw); DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size); |
