summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ark/ace.cpp2
-rw-r--r--ark/addition.ui2
-rw-r--r--ark/arch.cpp2
-rw-r--r--ark/ark_part.cpp6
-rw-r--r--ark/arkviewer.cpp4
-rw-r--r--ark/arkwidget.cpp2
-rw-r--r--ark/compressedfile.cpp2
-rw-r--r--ark/extraction.ui2
-rw-r--r--ark/extractiondialog.cpp6
-rw-r--r--ark/general.ui4
-rw-r--r--ark/mainwindow.cpp4
-rw-r--r--ark/sevenzip.cpp2
-rw-r--r--ark/tar.cpp4
-rw-r--r--ark/tarlistingthread.h8
-rw-r--r--charselectapplet/charselectapplet.cpp8
-rw-r--r--kcalc/colors.ui6
-rw-r--r--kcalc/constants.ui26
-rw-r--r--kcalc/general.ui6
-rw-r--r--kcalc/kcalc.cpp26
-rw-r--r--kcalc/kcalc_button.cpp2
-rw-r--r--kcalc/kcalcdisplay.cpp10
-rw-r--r--kcalc/kcalcdisplay.h2
-rw-r--r--kcharselect/kcharselectdia.cc18
-rw-r--r--kdelirc/kcmlirc/addactionbase.ui44
-rw-r--r--kdelirc/kcmlirc/editactionbase.ui26
-rw-r--r--kdelirc/kcmlirc/editmodebase.ui8
-rw-r--r--kdelirc/kcmlirc/kcmlirc.cpp14
-rw-r--r--kdelirc/kcmlirc/kcmlirc.h4
-rw-r--r--kdelirc/kcmlirc/kcmlircbase.ui4
-rw-r--r--kdelirc/kcmlirc/newmode.ui2
-rw-r--r--kdelirc/kcmlirc/selectprofile.ui2
-rw-r--r--kdessh/kdessh.cpp6
-rw-r--r--kdessh/sshdlg.cpp4
-rw-r--r--kdf/disklist.cpp2
-rw-r--r--kdf/disks.cpp14
-rw-r--r--kdf/kdf.cpp4
-rw-r--r--kdf/listview.cpp12
-rw-r--r--kdf/listview.h2
-rw-r--r--kdf/mntconfig.cpp2
-rw-r--r--kedit/color.ui2
-rw-r--r--kedit/kedit.cpp6
-rw-r--r--kedit/ktextfiledlg.cpp4
-rw-r--r--kedit/misc.ui2
-rw-r--r--kfloppy/floppy.cpp6
-rw-r--r--kfloppy/floppy.h2
-rw-r--r--kfloppy/format.cpp16
-rw-r--r--kfloppy/zip.cpp4
-rw-r--r--kgpg/conf_decryption.ui2
-rw-r--r--kgpg/conf_encryption.ui4
-rw-r--r--kgpg/conf_gpg.ui4
-rw-r--r--kgpg/conf_misc.ui10
-rw-r--r--kgpg/conf_ui2.ui4
-rw-r--r--kgpg/detailedconsole.cpp2
-rw-r--r--kgpg/groupedit.ui2
-rw-r--r--kgpg/keyexport.ui4
-rw-r--r--kgpg/keygener.cpp8
-rw-r--r--kgpg/keyinfowidget.cpp8
-rw-r--r--kgpg/keyproperties.ui4
-rw-r--r--kgpg/keyserver.ui12
-rw-r--r--kgpg/keyservers.cpp4
-rw-r--r--kgpg/kgpgeditor.cpp4
-rw-r--r--kgpg/kgpginterface.cpp6
-rw-r--r--kgpg/kgpgview.cpp2
-rw-r--r--kgpg/kgpgwizard.ui8
-rw-r--r--kgpg/listkeys.cpp14
-rw-r--r--kgpg/sourceselect.ui4
-rw-r--r--khexedit/bitswapwidget.cc6
-rw-r--r--khexedit/bitswapwidget.h2
-rw-r--r--khexedit/chartabledialog.cc2
-rw-r--r--khexedit/dialog.cc10
-rw-r--r--khexedit/exportdialog.cc12
-rw-r--r--khexedit/hexbuffer.cc18
-rw-r--r--khexedit/hexbuffer.h2
-rw-r--r--khexedit/hexdrag.cc6
-rw-r--r--khexedit/hexdrag.h2
-rw-r--r--khexedit/hexeditorwidget.cc106
-rw-r--r--khexedit/hexmanagerwidget.cc10
-rw-r--r--khexedit/hextoolwidget.cc22
-rw-r--r--khexedit/hexviewwidget.cc4
-rw-r--r--khexedit/lib/codecs/kebcdic1047charcodec.cpp2
-rw-r--r--khexedit/lib/codecs/ktextcharcodec.cpp10
-rw-r--r--khexedit/lib/kbordercolumn.cpp8
-rw-r--r--khexedit/lib/kbuffercolumn.cpp8
-rw-r--r--khexedit/lib/kbufferdrag.cpp6
-rw-r--r--khexedit/lib/kbufferdrag.h2
-rw-r--r--khexedit/lib/khexedit.cpp14
-rw-r--r--khexedit/lib/khexedit.h4
-rw-r--r--khexedit/lib/koffsetcolumn.cpp4
-rw-r--r--khexedit/lib/kvaluecolumn.cpp2
-rw-r--r--khexedit/listview.cc10
-rw-r--r--khexedit/listview.h2
-rw-r--r--khexedit/optiondialog.cc2
-rw-r--r--khexedit/printdialogpage.cc22
-rw-r--r--khexedit/searchbar.cc2
-rw-r--r--khexedit/statusbarprogress.cc2
-rw-r--r--khexedit/statusbarprogress.h2
-rw-r--r--khexedit/toplevel.cc4
-rw-r--r--kjots/KJotsMain.cpp10
-rw-r--r--kjots/confpagemisc.ui6
-rw-r--r--klaptopdaemon/acpi.cpp8
-rw-r--r--klaptopdaemon/apm.cpp12
-rw-r--r--klaptopdaemon/buttons.cpp2
-rw-r--r--klaptopdaemon/daemondock.cpp2
-rw-r--r--klaptopdaemon/kpcmciainfo.cpp36
-rw-r--r--klaptopdaemon/kpcmciainfo.h4
-rw-r--r--klaptopdaemon/krichtextlabel.cpp10
-rw-r--r--klaptopdaemon/krichtextlabel.h4
-rw-r--r--klaptopdaemon/laptop_daemon.cpp2
-rw-r--r--klaptopdaemon/pcmcia.cpp2
-rw-r--r--klaptopdaemon/power.cpp4
-rw-r--r--klaptopdaemon/profile.cpp4
-rw-r--r--klaptopdaemon/warning.cpp10
-rw-r--r--klaptopdaemon/xautolock.cc2
-rw-r--r--klaptopdaemon/xautolock_engine.c8
-rw-r--r--kmilo/kmilo_kvaio/kcmkvaio/main.cpp2
-rw-r--r--kmilo/kmilo_kvaio/kvaio.cpp26
-rw-r--r--kmilo/kmilo_kvaio/kvaio.h4
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.cpp2
-rw-r--r--kmilo/kmilo_kvaio/kvaiodriverinterface.h2
-rw-r--r--kmilo/kmilod/defaultskin.cpp4
-rw-r--r--kregexpeditor/KMultiFormListBox/indexWindow.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp6
-rw-r--r--kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h2
-rw-r--r--kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp66
-rw-r--r--kregexpeditor/altnwidget.cpp8
-rw-r--r--kregexpeditor/altnwidget.h2
-rw-r--r--kregexpeditor/auxbuttons.cpp14
-rw-r--r--kregexpeditor/characterswidget.cpp10
-rw-r--r--kregexpeditor/characterswidget.h2
-rw-r--r--kregexpeditor/charselector.cpp14
-rw-r--r--kregexpeditor/compoundwidget.cpp14
-rw-r--r--kregexpeditor/compoundwidget.h2
-rw-r--r--kregexpeditor/concwidget.cpp14
-rw-r--r--kregexpeditor/concwidget.h2
-rw-r--r--kregexpeditor/drag.cpp4
-rw-r--r--kregexpeditor/drag.h2
-rw-r--r--kregexpeditor/dragaccepter.cpp6
-rw-r--r--kregexpeditor/dragaccepter.h2
-rw-r--r--kregexpeditor/editorwindow.cpp8
-rw-r--r--kregexpeditor/editorwindow.h2
-rw-r--r--kregexpeditor/emacsregexpconverter.cpp42
-rw-r--r--kregexpeditor/errormap.cpp6
-rw-r--r--kregexpeditor/gen_qregexpparser.cc4
-rw-r--r--kregexpeditor/infopage.cpp6
-rw-r--r--kregexpeditor/kregexpeditorgui.cpp8
-rw-r--r--kregexpeditor/kregexpeditorprivate.cpp6
-rw-r--r--kregexpeditor/limitedcharlineedit.cpp2
-rw-r--r--kregexpeditor/lookaheadwidget.cpp8
-rw-r--r--kregexpeditor/lookaheadwidget.h2
-rw-r--r--kregexpeditor/main.cpp2
-rw-r--r--kregexpeditor/multicontainerwidget.cpp2
-rw-r--r--kregexpeditor/myfontmetrics.cpp2
-rw-r--r--kregexpeditor/qregexpparser.y4
-rw-r--r--kregexpeditor/qtregexpconverter.cpp58
-rw-r--r--kregexpeditor/regexp.cpp2
-rw-r--r--kregexpeditor/regexpbuttons.cpp8
-rw-r--r--kregexpeditor/regexpconverter.cpp2
-rw-r--r--kregexpeditor/regexpwidget.cpp6
-rw-r--r--kregexpeditor/regexpwidget.h2
-rw-r--r--kregexpeditor/repeatregexp.cpp4
-rw-r--r--kregexpeditor/repeatwidget.cpp12
-rw-r--r--kregexpeditor/repeatwidget.h2
-rw-r--r--kregexpeditor/scrollededitorwindow.cpp2
-rw-r--r--kregexpeditor/selectablelineedit.cpp4
-rw-r--r--kregexpeditor/selectablelineedit.h2
-rw-r--r--kregexpeditor/singlecontainerwidget.cpp2
-rw-r--r--kregexpeditor/test-without-dl/main.cpp4
-rw-r--r--kregexpeditor/textregexp.cpp2
-rw-r--r--kregexpeditor/textwidget.cpp4
-rw-r--r--kregexpeditor/textwidget.h2
-rw-r--r--kregexpeditor/userdefinedregexps.cpp6
-rw-r--r--kregexpeditor/util.cpp2
-rw-r--r--kregexpeditor/verifier.cpp2
-rw-r--r--kregexpeditor/verifybuttons.cpp16
-rw-r--r--kregexpeditor/widgetfactory.cpp4
-rw-r--r--kregexpeditor/zerowidgets.cpp4
-rw-r--r--kregexpeditor/zerowidgets.h2
-rw-r--r--ksim/generalprefs.cpp16
-rw-r--r--ksim/ksim.cpp4
-rw-r--r--ksim/ksim.h2
-rw-r--r--ksim/ksimsysinfo.cpp2
-rw-r--r--ksim/ksimview.cpp16
-rw-r--r--ksim/ksimview.h2
-rw-r--r--ksim/library/chart.cpp16
-rw-r--r--ksim/library/chart.h4
-rw-r--r--ksim/library/label.cpp22
-rw-r--r--ksim/library/label.h4
-rw-r--r--ksim/library/led.cpp4
-rw-r--r--ksim/library/led.h2
-rw-r--r--ksim/library/progress.cpp6
-rw-r--r--ksim/library/progress.h2
-rw-r--r--ksim/library/themeloader.cpp18
-rw-r--r--ksim/library/themetypes.h2
-rw-r--r--ksim/monitors/cpu/ksimcpu.cpp2
-rw-r--r--ksim/monitors/disk/ksimdisk.cpp10
-rw-r--r--ksim/monitors/filesystem/filesystemstats.cpp2
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.cpp4
-rw-r--r--ksim/monitors/filesystem/fsystemconfig.cpp4
-rw-r--r--ksim/monitors/lm_sensors/sensorbase.cpp10
-rw-r--r--ksim/monitors/lm_sensors/sensorsconfig.cpp4
-rw-r--r--ksim/monitors/net/netdialog.cpp4
-rw-r--r--ksim/monitors/snmp/browsedialogbase.ui4
-rw-r--r--ksim/monitors/snmp/configwidget.ui4
-rw-r--r--ksim/monitors/snmp/hostdialogbase.ui14
-rw-r--r--ksim/monitors/snmp/monitorconfig.cpp4
-rw-r--r--ksim/monitors/snmp/monitordialogbase.ui12
-rw-r--r--ksim/monitors/snmp/proberesultdialogbase.ui2
-rw-r--r--ksim/monitors/snmp/snmp.cpp10
-rw-r--r--ksim/monitors/snmp/value.cpp6
-rw-r--r--ksim/themeprefs.cpp18
-rw-r--r--ktimer/ktimer.cpp4
-rw-r--r--ktimer/prefwidget.ui4
-rw-r--r--kwallet/allyourbase.cpp12
-rw-r--r--kwallet/kbetterthankdialogbase.ui4
-rw-r--r--kwallet/konfigurator/walletconfigwidget.ui10
-rw-r--r--kwallet/kwmapeditor.cpp2
-rw-r--r--kwallet/walletwidget.ui16
-rw-r--r--superkaramba/src/datesensor.cpp6
-rw-r--r--superkaramba/src/input.cpp6
-rw-r--r--superkaramba/src/input_python.cpp2
-rw-r--r--superkaramba/src/karamba.cpp4
-rw-r--r--superkaramba/src/karambaapp.cpp2
-rw-r--r--superkaramba/src/karambainterface.cpp4
-rw-r--r--superkaramba/src/karambasessionmanaged.cpp2
-rw-r--r--superkaramba/src/richtextlabel.cpp4
-rw-r--r--superkaramba/src/textfield.cpp10
-rw-r--r--superkaramba/src/textfield.h4
-rw-r--r--superkaramba/src/textlabel.cpp2
-rw-r--r--superkaramba/src/textlabel.h2
-rw-r--r--superkaramba/src/textlabel_python.cpp2
-rw-r--r--superkaramba/src/themes_layout.ui8
-rw-r--r--superkaramba/src/themesdlg.cpp12
-rw-r--r--superkaramba/src/themesdlg.h2
-rw-r--r--superkaramba/src/themewidget_layout.ui4
234 files changed, 860 insertions, 860 deletions
diff --git a/ark/ace.cpp b/ark/ace.cpp
index 4ce0709..6ad5cd0 100644
--- a/ark/ace.cpp
+++ b/ark/ace.cpp
@@ -174,7 +174,7 @@ void AceArch::unarchFileInternal( )
void AceArch::catchMeIfYouCan( KProcess*, char *buffer, int buflen )
{
- TQString myBuf = TQString::tqfromLatin1( buffer, buflen );
+ TQString myBuf = TQString::fromLatin1( buffer, buflen );
kdDebug(1601) << " Wololo!: " << myBuf << endl;
}
diff --git a/ark/addition.ui b/ark/addition.ui
index ac12593..401c146 100644
--- a/ark/addition.ui
+++ b/ark/addition.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
diff --git a/ark/arch.cpp b/ark/arch.cpp
index 5ff9a61..29bdf63 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -367,7 +367,7 @@ bool Arch::processLine( const TQCString &line )
TQString( "%1" )
.tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
: columns[ m_fixMonth ];
- TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+ TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
.tqarg( year )
.tqarg( month )
.tqarg( columns[ m_fixDay ] )
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 20ac169..8834e61 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -411,12 +411,12 @@ void ArkStatusBarExtension::setupStatusBar()
m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" );
m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame );
- m_pStatusLabelTotal->tqsetAlignment( AlignRight );
+ m_pStatusLabelTotal->setAlignment( AlignRight );
m_pStatusLabelTotal->setText( i18n( "Total: 0 files" ) );
m_pStatusLabelSelect = new TQLabel( statusBar(), "StatusLabelSelect" );
m_pStatusLabelSelect->setFrameStyle( TQFrame::NoFrame );
- m_pStatusLabelSelect->tqsetAlignment( AlignLeft );
+ m_pStatusLabelSelect->setAlignment( AlignLeft );
m_pStatusLabelSelect->setText(i18n( "0 files selected" ) );
m_cancelButton = new KPushButton( SmallIcon( "cancel" ), TQString(), statusBar(), "CancelButton" );
@@ -454,7 +454,7 @@ void ArkStatusBarExtension::slotSetBusy( const TQString & text, bool showCancelB
{
m_pBusyText = new TQLabel( statusBar() );
- m_pBusyText->tqsetAlignment( AlignLeft );
+ m_pBusyText->setAlignment( AlignLeft );
m_pBusyText->setFrameStyle( TQFrame::Panel | TQFrame::Raised );
}
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index b2ae335..ce0c18c 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -76,7 +76,7 @@ bool ArkViewer::view( const KURL& filename )
TQLabel *iconLabel = new TQLabel( header );
iconLabel->setPixmap( mimetype->pixmap( KIcon::Desktop ) );
- iconLabel->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+ iconLabel->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
TQVBox *headerRight = new TQVBox( header );
new TQLabel( TQString( "<qt><b>%1</b></qt>" )
@@ -84,7 +84,7 @@ bool ArkViewer::view( const KURL& filename )
);
new TQLabel( mimetype->comment(), headerRight );
- header->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
+ header->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Maximum );
m_part = KParts::ComponentFactory::createPartInstanceFromQuery<KParts::ReadOnlyPart>( mimetype->name(), TQString(), m_widget, 0, TQT_TQOBJECT(this) );
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index a83cb14..5091bb3 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -354,7 +354,7 @@ ArkWidget::convertSlotCreateDone( bool success )
// addFile( const TQString & baseDir, //
// const TQStringList & filesToAdd ) //
//////////////////////////////////////////////////////
- *it = TQString::tqfromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
+ *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it;
}
bool bOldRecVal = ArkSettings::rarRecurseSubdirs();
connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) );
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index f935eac..862d357 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -60,7 +60,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, con
m_openAsMimeType = _openAsMimeType;
kdDebug(1601) << "CompressedFile constructor" << endl;
m_tempDirectory = new KTempDir( _gui->tmpDir()
- + TQString::tqfromLatin1( "compressed_file_temp" ) );
+ + TQString::fromLatin1( "compressed_file_temp" ) );
m_tempDirectory->setAutoDelete( true );
m_tmpdir = m_tempDirectory->name();
initData();
diff --git a/ark/extraction.ui b/ark/extraction.ui
index b51ebee..1ac60b8 100644
--- a/ark/extraction.ui
+++ b/ark/extraction.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index 923f108..905cfcb 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -73,7 +73,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
TQLabel *icon = new TQLabel( header );
icon->setPixmap( DesktopIcon( "ark_extract" ) );
- icon->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+ icon->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
if ( enableSelected )
{
@@ -96,7 +96,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
TQHBox *destDirBox = new TQHBox( vbox );
TQLabel *destFolderLabel = new TQLabel( i18n( "Destination folder: " ), destDirBox );
- destFolderLabel->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
+ destFolderLabel->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
KHistoryCombo *combobox = new KHistoryCombo( true, destDirBox );
combobox->setPixmapProvider( new KURLPixmapProvider );
@@ -111,7 +111,7 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
combobox->setInsertionPolicy( TQComboBox::AtTop );
m_urlRequester = new KURLRequester( combobox, destDirBox );
- m_urlRequester->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
+ m_urlRequester->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed );
m_urlRequester->setMode( KFile::Directory );
if (!defaultExtractionDir.prettyURL().isEmpty() )
diff --git a/ark/general.ui b/ark/general.ui
index 150e1e4..d849cfc 100644
--- a/ark/general.ui
+++ b/ark/general.ui
@@ -53,7 +53,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>15</width>
<height>31</height>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 8541e1a..005aa92 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -177,7 +177,7 @@ MainWindow::file_reload()
void
MainWindow::editToolbars()
{
- saveMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
+ saveMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
KEditToolbar dlg( factory(), this );
connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ));
dlg.exec();
@@ -187,7 +187,7 @@ void
MainWindow::slotNewToolbarConfig()
{
createGUI( m_part );
- applyMainWindowSettings( KGlobal::config(), TQString::tqfromLatin1("MainWindow") );
+ applyMainWindowSettings( KGlobal::config(), TQString::fromLatin1("MainWindow") );
}
void
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index 0673f6c..a85d127 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -285,7 +285,7 @@ bool SevenZipArch::processLine( const TQCString& _line )
TQString( "%1" )
.tqarg( ArkUtils::getMonth( columns[ m_repairMonth ].ascii() ) )
: columns[ m_fixMonth ];
- TQString timestamp = TQString::tqfromLatin1( "%1-%2-%3 %4" )
+ TQString timestamp = TQString::fromLatin1( "%1-%2-%3 %4" )
.tqarg( year )
.tqarg( month )
.tqarg( columns[ m_fixDay ] )
diff --git a/ark/tar.cpp b/ark/tar.cpp
index e91f5ca..0a87d4e 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -106,12 +106,12 @@ TarArch::TarArch( ArkWidget *_gui,
{
compressed = true;
m_tmpDir = new KTempDir( _gui->tmpDir()
- + TQString::tqfromLatin1( "temp_tar" ) );
+ + TQString::fromLatin1( "temp_tar" ) );
m_tmpDir->setAutoDelete( true );
m_tmpDir->qDir()->cd( m_tmpDir->name() );
// build the temp file name
KTempFile *pTempFile = new KTempFile( m_tmpDir->name(),
- TQString::tqfromLatin1(".tar") );
+ TQString::fromLatin1(".tar") );
tmpfile = pTempFile->name();
delete pTempFile;
diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h
index 6dcdbe5..070b483 100644
--- a/ark/tarlistingthread.h
+++ b/ark/tarlistingthread.h
@@ -32,16 +32,16 @@ class KArchive;
class ListingEvent: public TQCustomEvent
{
public:
- enum tqStatus { Normal, Error, ListingFinished };
- ListingEvent( const TQStringList& data, tqStatus st = Normal )
+ enum Status { Normal, Error, ListingFinished };
+ ListingEvent( const TQStringList& data, Status st = Normal )
: TQCustomEvent( 65442 ), m_data( data ), m_status( st ) {}
const TQStringList& columns() const { return m_data; }
- tqStatus status() const { return m_status; }
+ Status status() const { return m_status; }
private:
TQStringList m_data;
- tqStatus m_status;
+ Status m_status;
};
class TarListingThread: public TQThread
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 4f41c90..2b2929e 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -251,16 +251,16 @@ void CharTable::paintCell(TQPainter* p, int row, int col)
// draw background
if (active) {
- p->setBrush(TQBrush(tqcolorGroup().highlight()));
+ p->setBrush(TQBrush(colorGroup().highlight()));
p->setPen(NoPen);
p->drawRect(0, 0, w, h);
- p->setPen(tqcolorGroup().highlightedText());
+ p->setPen(colorGroup().highlightedText());
}
else {
- p->setBrush(TQBrush(tqcolorGroup().base()));
+ p->setBrush(TQBrush(colorGroup().base()));
p->setPen(NoPen);
p->drawRect(0, 0, w, h);
- p->setPen(tqcolorGroup().text());
+ p->setPen(colorGroup().text());
}
// set font
diff --git a/kcalc/colors.ui b/kcalc/colors.ui
index 6aae3bc..af64057 100644
--- a/kcalc/colors.ui
+++ b/kcalc/colors.ui
@@ -62,7 +62,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>20</height>
@@ -179,7 +179,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -255,7 +255,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
diff --git a/kcalc/constants.ui b/kcalc/constants.ui
index efe888c..8bebd01 100644
--- a/kcalc/constants.ui
+++ b/kcalc/constants.ui
@@ -59,7 +59,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -155,7 +155,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -201,7 +201,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -226,7 +226,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -272,7 +272,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -297,7 +297,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -343,7 +343,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -368,7 +368,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -414,7 +414,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>70</width>
<height>21</height>
@@ -439,7 +439,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>80</width>
<height>21</height>
@@ -468,7 +468,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/kcalc/general.ui b/kcalc/general.ui
index 3b922b8..bd04b29 100644
--- a/kcalc/general.ui
+++ b/kcalc/general.ui
@@ -73,7 +73,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -101,7 +101,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>20</height>
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 34f4fb3..e6c2ef2 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -106,7 +106,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
// Create Button to select BaseMode
BaseChooseGroup = new TQHButtonGroup(i18n("Base"), central);
connect(BaseChooseGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotBaseSelected(int)));
- BaseChooseGroup->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+ BaseChooseGroup->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
pbBaseChoose[0] = new TQRadioButton(i18n("He&x"), BaseChooseGroup,
@@ -381,7 +381,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
updateGeometry();
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
UpdateDisplay(true);
@@ -457,7 +457,7 @@ actionCollection());
void KCalculator::setupStatusbar(void)
{
- // tqStatus bar contents
+ // Status bar contents
statusBar()->insertFixedItem(" NORM ", 0, true);
statusBar()->setItemAlignment(0, AlignCenter);
@@ -1050,7 +1050,7 @@ void KCalculator::updateGeometry(void)
{
TQWidget *tmp_widget = dynamic_cast<TQWidget *>(o);
margin = TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
+ pixelMetric(TQStyle::PM_ButtonMargin, (tmp_widget))*2;
tmp_widget->setFixedSize(s.width()+margin, s.height()+margin);
//tmp_widget->setMinimumSize(s.width()+margin, s.height()+margin);
tmp_widget->installEventFilter( this );
@@ -1060,11 +1060,11 @@ void KCalculator::updateGeometry(void)
l = mLargePage->childrenListObject();
- int h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
+ int h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
int h2 = static_cast<int>( (static_cast<float>(h1) + 4.0) / 5.0 );
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l.count(); i++)
@@ -1087,11 +1087,11 @@ void KCalculator::updateGeometry(void)
l = mNumericPage->childrenListObject(); // silence please
- h1 = (NumButtonGroup->find(0x0F))->tqminimumSize().height();
+ h1 = (NumButtonGroup->find(0x0F))->minimumSize().height();
h2 = (int)((((float)h1 + 4.0) / 5.0));
s.setWidth(mLargePage->fontMetrics().width("MMM") +
TQApplication::tqstyle().
- tqpixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
+ pixelMetric(TQStyle::PM_ButtonMargin, NumButtonGroup->find(0x0F))*2);
s.setHeight(h1 + h2);
for(uint i = 0; i < l.count(); i++)
@@ -1950,7 +1950,7 @@ void KCalculator::slotStatshow(bool toggled)
pbStat["ClearData"]->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowStat(toggled);
}
@@ -1985,7 +1985,7 @@ void KCalculator::slotScientificshow(bool toggled)
calc_display->setStatusText(2, TQString());
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowScientific(toggled);
}
@@ -2026,7 +2026,7 @@ void KCalculator::slotLogicshow(bool toggled)
(NumButtonGroup->find(i))->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowLogic(toggled);
}
@@ -2052,7 +2052,7 @@ void KCalculator::slotConstantsShow(bool toggled)
pbConstant[5]->hide();
}
adjustSize();
- setFixedSize(tqsizeHint());
+ setFixedSize(sizeHint());
KCalcSettings::setShowConstants(toggled);
}
@@ -2108,7 +2108,7 @@ void KCalculator::updateSettings()
calc_display->changeSettings();
updateGeometry();
- resize(tqminimumSize());
+ resize(minimumSize());
//
// 1999-10-31 Espen Sand: Don't ask me why ;)
diff --git a/kcalc/kcalc_button.cpp b/kcalc/kcalc_button.cpp
index 277e5bd..dd62821 100644
--- a/kcalc/kcalc_button.cpp
+++ b/kcalc/kcalc_button.cpp
@@ -118,7 +118,7 @@ void KCalcButton::paintLabel(TQPainter *paint)
{
if (_mode[_mode_flags].is_label_richtext) {
TQSimpleRichText _text(_label, font());
- _text.draw(paint, width()/2-_text.width()/2, 0, tqchildrenRegion(), tqcolorGroup());
+ _text.draw(paint, width()/2-_text.width()/2, 0, childrenRegion(), colorGroup());
} else {
KPushButton::drawButtonLabel(paint);
}
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index 83e0924..a875106 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -46,10 +46,10 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name)
selection_timer(new TQTimer)
{
setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
- tqsetAlignment(AlignRight | AlignVCenter);
+ setAlignment(AlignRight | AlignVCenter);
setFocus();
setFocusPolicy(TQ_StrongFocus);
- tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
+ setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false);
connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected()));
@@ -123,7 +123,7 @@ void KCalcDisplay::slotPaste(bool bClipboard)
tmp_str = tmp_str.stripWhiteSpace();
- if (tmp_str.tqstartsWith("0x", false))
+ if (tmp_str.startsWith("0x", false))
tmp_num_base = NB_HEX;
if (tmp_num_base != NB_DECIMAL)
@@ -598,11 +598,11 @@ void KCalcDisplay::drawContents(TQPainter *p)
// Return the TQLabel's normal size hint vertically expanded
// by half the font height to make room for the status texts
-TQSize KCalcDisplay::tqsizeHint() const
+TQSize KCalcDisplay::sizeHint() const
{
TQFont f(font());
f.setPointSize(TQMAX((f.pointSize() / 2), 7));
TQFontMetrics fm(f);
- return TQLabel::tqsizeHint() + TQSize(0, fm.height());
+ return TQLabel::sizeHint() + TQSize(0, fm.height());
}
diff --git a/kcalc/kcalcdisplay.h b/kcalc/kcalcdisplay.h
index d12ba2f..338e721 100644
--- a/kcalc/kcalcdisplay.h
+++ b/kcalc/kcalcdisplay.h
@@ -110,7 +110,7 @@ public:
TQString text() const;
bool updateDisplay(void);
void setStatusText(uint i, const TQString& text);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
private:
bool _beep;
bool _groupdigits;
diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index 1e2f23d..8741eaf 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -35,7 +35,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Add character selection widget from library tdeui
charSelect = new KCharSelect(mainWidget,"",vFont,vChr,_tableNum);
- charSelect->resize(charSelect->tqsizeHint());
+ charSelect->resize(charSelect->sizeHint());
connect(charSelect,TQT_SIGNAL(highlighted(const TQChar &)),
TQT_SLOT(charChanged(const TQChar &)));
connect(charSelect,TQT_SIGNAL(activated(const TQChar &)),
@@ -46,7 +46,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Build line editor
lined = new TQLineEdit(mainWidget);
- lined->resize(lined->tqsizeHint());
+ lined->resize(lined->sizeHint());
TQFont font = lined->font();
font.setFamily( vFont );
@@ -59,7 +59,7 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
// Build some buttons
bHelp = new KPushButton( KStdGuiItem::help(), mainWidget );
connect(bHelp,TQT_SIGNAL(clicked()),this,TQT_SLOT(help()));
- bHelp->setFixedSize( bHelp->tqsizeHint() );
+ bHelp->setFixedSize( bHelp->sizeHint() );
grid->addWidget( bHelp, 2, 0 );
TQSpacerItem *space = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding );
@@ -67,12 +67,12 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
bClear = new KPushButton( KStdGuiItem::clear(), mainWidget );
connect(bClear,TQT_SIGNAL(clicked()),this,TQT_SLOT(clear()));
- bClear->setFixedSize( bClear->tqsizeHint() );
+ bClear->setFixedSize( bClear->sizeHint() );
grid->addWidget( bClear, 2, 2 );
bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ),
"editcopy" ), mainWidget );
- bClip->setFixedSize( bClip->tqsizeHint() );
+ bClip->setFixedSize( bClip->sizeHint() );
connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip()));
grid->addWidget( bClip, 2, 3 );
@@ -104,9 +104,9 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name,
entryDirection = direction;
if( entryDirection )
- lined->tqsetAlignment( TQt::AlignRight );
+ lined->setAlignment( TQt::AlignRight );
else
- lined->tqsetAlignment( TQt::AlignLeft );
+ lined->setAlignment( TQt::AlignLeft );
setupGUI(Keys|StatusBar|Save|Create);
}
@@ -244,9 +244,9 @@ void KCharSelectDia::toggleEntryDirection()
{
entryDirection ^= 1;
if( entryDirection )
- lined->tqsetAlignment( TQt::AlignRight );
+ lined->setAlignment( TQt::AlignRight );
else
- lined->tqsetAlignment( TQt::AlignLeft );
+ lined->setAlignment( TQt::AlignLeft );
}
//==================================================================
diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui
index c9a4559..e4ed1f0 100644
--- a/kdelirc/kcmlirc/addactionbase.ui
+++ b/kdelirc/kcmlirc/addactionbase.ui
@@ -81,7 +81,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>81</width>
<height>31</height>
@@ -125,7 +125,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>101</width>
<height>31</height>
@@ -144,7 +144,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>311</width>
<height>20</height>
@@ -169,7 +169,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>321</width>
<height>21</height>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -245,7 +245,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>41</height>
@@ -289,7 +289,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>31</height>
@@ -528,7 +528,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
@@ -604,7 +604,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>81</height>
@@ -701,7 +701,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>111</height>
@@ -739,7 +739,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>146</width>
<height>21</height>
@@ -785,7 +785,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>61</height>
@@ -826,7 +826,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>61</height>
@@ -870,7 +870,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>61</height>
@@ -908,7 +908,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>51</height>
@@ -957,7 +957,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>147</width>
<height>21</height>
@@ -1035,7 +1035,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>670</width>
<height>20</height>
@@ -1171,7 +1171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>170</height>
@@ -1234,7 +1234,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>31</height>
@@ -1278,7 +1278,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>31</height>
@@ -1308,7 +1308,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>551</width>
<height>20</height>
@@ -1366,7 +1366,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui
index d94cfc2..acd9f94 100644
--- a/kdelirc/kcmlirc/editactionbase.ui
+++ b/kdelirc/kcmlirc/editactionbase.ui
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>91</height>
@@ -339,7 +339,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>101</height>
@@ -377,7 +377,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>101</height>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>101</height>
@@ -467,7 +467,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>111</height>
@@ -486,7 +486,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>106</width>
<height>0</height>
@@ -503,7 +503,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>101</height>
@@ -533,7 +533,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>481</width>
<height>20</height>
@@ -584,7 +584,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>30</height>
@@ -654,7 +654,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>491</width>
<height>20</height>
@@ -718,7 +718,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>670</width>
<height>20</height>
@@ -854,7 +854,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
@@ -902,7 +902,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui
index 829a35d..2f991ac 100644
--- a/kdelirc/kcmlirc/editmodebase.ui
+++ b/kdelirc/kcmlirc/editmodebase.ui
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>21</height>
@@ -145,7 +145,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>410</width>
<height>20</height>
@@ -192,7 +192,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>90</height>
@@ -231,7 +231,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>231</width>
<height>20</height>
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index 8ec4fff..8d4de53 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -74,8 +74,8 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC
(new TQHBoxLayout(this))->setAutoAdd(true);
theKCMLircBase = new KCMLircBase(this);
connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateActions() ));
- connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModestqStatus(TQListViewItem *) ));
- connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionstqStatus(TQListViewItem *) ));
+ connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModesStatus(TQListViewItem *) ));
+ connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) ));
connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() ));
connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) ));
connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)));
@@ -94,7 +94,7 @@ KCMLirc::~KCMLirc()
{
}
-void KCMLirc::updateModestqStatus(TQListViewItem *item)
+void KCMLirc::updateModesStatus(TQListViewItem *item)
{
theKCMLircBase->theModes->setItemsRenameable(item && item->parent());
theKCMLircBase->theAddActions->setEnabled(ProfileServer::profileServer()->profiles().count() && theKCMLircBase->theModes->selectedItem() && RemoteServer::remoteServer()->remotes()[modeMap[theKCMLircBase->theModes->selectedItem()].remote()]);
@@ -104,7 +104,7 @@ void KCMLirc::updateModestqStatus(TQListViewItem *item)
theKCMLircBase->theEditMode->setEnabled(item);
}
-void KCMLirc::updateActionstqStatus(TQListViewItem *item)
+void KCMLirc::updateActionsStatus(TQListViewItem *item)
{
theKCMLircBase->theRemoveAction->setEnabled(item);
theKCMLircBase->theEditAction->setEnabled(item);
@@ -374,7 +374,7 @@ void KCMLirc::updateActions()
theKCMLircBase->theActions->clear();
actionMap.clear();
- if(!theKCMLircBase->theModes->selectedItem()) { updateActionstqStatus(0); return; }
+ if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(0); return; }
Mode m = modeMap[theKCMLircBase->theModes->selectedItem()];
theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions <i>always</i> available") : i18n("Actions available only in mode <b>%1</b>").tqarg(m.name())));
@@ -387,7 +387,7 @@ void KCMLirc::updateActions()
if(theKCMLircBase->theActions->currentItem())
theKCMLircBase->theActions->currentItem()->setSelected(true);
- updateActionstqStatus(theKCMLircBase->theActions->currentItem());
+ updateActionsStatus(theKCMLircBase->theActions->currentItem());
}
void KCMLirc::gotButton(TQString remote, TQString button)
@@ -429,7 +429,7 @@ void KCMLirc::updateModes()
}
if(theKCMLircBase->theModes->currentItem())
theKCMLircBase->theModes->currentItem()->setSelected(true);
- updateModestqStatus(theKCMLircBase->theModes->currentItem());
+ updateModesStatus(theKCMLircBase->theModes->currentItem());
updateActions();
}
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h
index b4ea329..6d65fe8 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/kdelirc/kcmlirc/kcmlirc.h
@@ -46,8 +46,8 @@ private:
public slots:
void updateActions();
- void updateModestqStatus(TQListViewItem *);
- void updateActionstqStatus(TQListViewItem *);
+ void updateModesStatus(TQListViewItem *);
+ void updateActionsStatus(TQListViewItem *);
void updateModes();
void updateExtensions();
void updateInformation();
diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui
index 625b3a0..dfd2897 100644
--- a/kdelirc/kcmlirc/kcmlircbase.ui
+++ b/kdelirc/kcmlirc/kcmlircbase.ui
@@ -158,7 +158,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>17</width>
<height>20</height>
@@ -316,7 +316,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>240</width>
<height>21</height>
diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui
index 5726eba..571863b 100644
--- a/kdelirc/kcmlirc/newmode.ui
+++ b/kdelirc/kcmlirc/newmode.ui
@@ -93,7 +93,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui
index 5e15af9..7da2f25 100644
--- a/kdelirc/kcmlirc/selectprofile.ui
+++ b/kdelirc/kcmlirc/selectprofile.ui
@@ -70,7 +70,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index a3d5003..6e6a48d 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
KCmdLineArgs::usage(i18n("No command or host specified."));
// Check if ssh is available
- if (KStandardDirs::findExe(TQString::tqfromLatin1("ssh")).isEmpty())
+ if (KStandardDirs::findExe(TQString::fromLatin1("ssh")).isEmpty())
{
kdError(1511) << "ssh not found\n";
exit(1);
@@ -151,8 +151,8 @@ int main(int argc, char *argv[])
// Read configuration
KConfig *config = KGlobal::config();
- config->setGroup(TQString::tqfromLatin1("Passwords"));
- int timeout = config->readNumEntry(TQString::tqfromLatin1("Timeout"), defTimeout);
+ config->setGroup(TQString::fromLatin1("Passwords"));
+ int timeout = config->readNumEntry(TQString::fromLatin1("Timeout"), defTimeout);
SshProcess proc(host, user);
proc.setStub(stub);
diff --git a/kdessh/sshdlg.cpp b/kdessh/sshdlg.cpp
index 62dcd24..60934b7 100644
--- a/kdessh/sshdlg.cpp
+++ b/kdessh/sshdlg.cpp
@@ -21,10 +21,10 @@ KDEsshDialog::KDEsshDialog(TQCString host, TQCString user, TQCString stub,
m_User = user;
m_Stub = stub;
- setCaption(TQString::tqfromLatin1("%1@%2").tqarg(TQString(m_User)).tqarg(TQString(m_Host)));
+ setCaption(TQString::fromLatin1("%1@%2").tqarg(TQString(m_User)).tqarg(TQString(m_Host)));
// Make the prompt a little more polite :-)
- if (prompt.lower().left(6) == TQString::tqfromLatin1("enter "))
+ if (prompt.lower().left(6) == TQString::fromLatin1("enter "))
prompt.remove(0, 6);
int pos = prompt.find(':');
if (pos != -1)
diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp
index 596cbcb..abec1b8 100644
--- a/kdf/disklist.cpp
+++ b/kdf/disklist.cpp
@@ -243,7 +243,7 @@ void DiskList::receivedDFStdErrOut(KProcess *, char *data, int len )
*/
- TQString tmp = TQString::tqfromLatin1(data, len);
+ TQString tmp = TQString::fromLatin1(data, len);
dfStringErrOut.append(tmp);
}
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index 155e6e2..1520b18 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -104,13 +104,13 @@ int DiskEntry::mount()
{
// FreeBSD's mount(8) is picky: -o _must_ go before
// the device and mountpoint.
- cmdS=TQString::tqfromLatin1("mount -t%t -o%o %d %m");
+ cmdS=TQString::fromLatin1("mount -t%t -o%o %d %m");
}
- cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
- cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
- cmdS.replace(TQString::tqfromLatin1("%t"),fsType());
- cmdS.replace(TQString::tqfromLatin1("%o"),mountOptions());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%t"),fsType());
+ cmdS.replace(TQString::fromLatin1("%o"),mountOptions());
kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
@@ -126,8 +126,8 @@ int DiskEntry::umount()
if (cmdS.isEmpty()) // generate default umount cmd
cmdS="umount %d";
- cmdS.replace(TQString::tqfromLatin1("%d"),deviceName());
- cmdS.replace(TQString::tqfromLatin1("%m"),mountPoint());
+ cmdS.replace(TQString::fromLatin1("%d"),deviceName());
+ cmdS.replace(TQString::fromLatin1("%m"),mountPoint());
kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
int e=sysCall(cmdS);
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index f963a12..45f0ec7 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -48,8 +48,8 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name)
KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),
actionCollection());
setCentralWidget(kdf);
- // kdf->setMinimumSize(kdf->tqsizeHint());
- kdf->resize(kdf->tqsizeHint());
+ // kdf->setMinimumSize(kdf->sizeHint());
+ kdf->resize(kdf->sizeHint());
setupGUI(KMainWindow::Keys | StatusBar | Save | Create);
}
diff --git a/kdf/listview.cpp b/kdf/listview.cpp
index 49021ee..b9274c3 100644
--- a/kdf/listview.cpp
+++ b/kdf/listview.cpp
@@ -20,7 +20,7 @@
//
// 1999-11-28 Espen Sand
// The purpose of this class is:
-// 1) Easily set minimum number of visible items and to adjust the tqsizeHint()
+// 1) Easily set minimum number of visible items and to adjust the sizeHint()
// 2) Provide a pixmap collection
//
@@ -46,20 +46,20 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize )
mVisibleItem = TQMAX( 1, visibleItem );
if( updateSize == true )
{
- TQSize s = tqsizeHint();
- setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
+ TQSize s = sizeHint();
+ setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
lineWidth() * 2, s.height() );
}
}
-TQSize CListView::tqsizeHint( void ) const
+TQSize CListView::sizeHint( void ) const
{
- TQSize s = TQListView::tqsizeHint();
+ TQSize s = TQListView::sizeHint();
int h = fontMetrics().height() + 2*itemMargin();
if( h % 2 > 0 ) { h++; }
- s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
+ s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
return( s );
}
diff --git a/kdf/listview.h b/kdf/listview.h
index 96ae398..873a327 100644
--- a/kdf/listview.h
+++ b/kdf/listview.h
@@ -34,7 +34,7 @@ class CListView : public KListView
CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
void setVisibleItem( int visibleItem, bool updateSize=true );
- virtual TQSize tqsizeHint( void ) const;
+ virtual TQSize sizeHint( void ) const;
const TQPixmap &icon( const TQString &iconName, bool drawBorder );
private:
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 1819760..0eb86ba 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -102,7 +102,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init)
mIconButton = new KIconButton(mGroupBox);
mIconButton->setIconType(KIcon::Small, KIcon::Device);
Q_CHECK_PTR(mIconButton);
- mIconButton->setFixedWidth( mIconButton->tqsizeHint().height() );
+ mIconButton->setFixedWidth( mIconButton->sizeHint().height() );
connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString)));
gl->addWidget( mIconButton, 2, 1 );
diff --git a/kedit/color.ui b/kedit/color.ui
index 2310c57..bec67d9 100644
--- a/kedit/color.ui
+++ b/kedit/color.ui
@@ -29,7 +29,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>111</height>
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index d5bcba5..88ab3aa 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -84,7 +84,7 @@ TopLevel::TopLevel (TQWidget *, const char *name)
setupEditWidget();
if (!initialGeometrySet())
- resize( TQSize(550, 400).expandedTo(tqminimumSizeHint()));
+ resize( TQSize(550, 400).expandedTo(minimumSizeHint()));
setupGUI(ToolBar | Keys | StatusBar | Create);
setAutoSaveSettings();
@@ -341,7 +341,7 @@ void TopLevel::insertDate(){
int line, column;
TQString string;
- TQDate dt = TQDate::tqcurrentDate();
+ TQDate dt = TQDate::currentDate();
string = KGlobal::locale()->formatDate(dt);
eframe->getCursorPosition(&line,&column);
@@ -896,7 +896,7 @@ void TopLevel::statusbar_slot(){
void TopLevel::print()
{
bool aborted = false;
- TQString headerLeft = i18n("Date: %1").tqarg(KGlobal::locale()->formatDate(TQDate::tqcurrentDate(),true));
+ TQString headerLeft = i18n("Date: %1").tqarg(KGlobal::locale()->formatDate(TQDate::currentDate(),true));
TQString headerMid = i18n("File: %1").tqarg(m_caption);
TQString headerRight;
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 32dfc19..e0f998b 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -65,7 +65,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
i18n("Select Encoding..."), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotShowEncCombo() ), TQT_TQOBJECT(this), "encoding");
- mEncoding->setIcon( TQString::tqfromLatin1("charset") );
+ mEncoding->setIcon( TQString::fromLatin1("charset") );
KToolBar *tb = toolBar();
mEncoding->plug( tb, pathComboIndex() - 1 );
@@ -96,7 +96,7 @@ void KTextFileDialog::slotShowEncCombo()
vbox->setSpacing( KDialog::spacingHint() );
encDlg->setMainWidget( vbox );
label = new TQLabel( vbox );
- label->tqsetAlignment( AlignLeft | AlignVCenter );
+ label->setAlignment( AlignLeft | AlignVCenter );
label->setText(i18n("Select encoding for text file: "));
encCombo = new TQComboBox(vbox);
diff --git a/kedit/misc.ui b/kedit/misc.ui
index 76df775..956790d 100644
--- a/kedit/misc.ui
+++ b/kedit/misc.ui
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>101</height>
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index 18851bc..a89d18f 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -288,7 +288,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name)
frame = new TQLabel( this, "NewsWindow" );
frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
- frame->tqsetAlignment(WordBreak|ExpandTabs);
+ frame->setAlignment(WordBreak|ExpandTabs);
TQWhatsThis::add( frame,
i18n("<qt>This is the status window, where error messages are displayed.</qt>") );
@@ -539,7 +539,7 @@ void FloppyData::format(){
formatActions = new KFActionQueue(TQT_TQOBJECT(this));
connect(formatActions,TQT_SIGNAL(status(const TQString &,int)),
- this,TQT_SLOT(formattqStatus(const TQString &,int)));
+ this,TQT_SLOT(formatStatus(const TQString &,int)));
connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)),
this,TQT_SLOT(reset()));
@@ -642,7 +642,7 @@ void FloppyData::format(){
formatActions->exec();
}
-void FloppyData::formattqStatus(const TQString &s,int p)
+void FloppyData::formatStatus(const TQString &s,int p)
{
kdDebug(2002) << "FloppyData::formatStatus: " << s << " : " << p << endl;
if (!s.isEmpty())
diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h
index 30b0519..ead6b71 100644
--- a/kfloppy/floppy.h
+++ b/kfloppy/floppy.h
@@ -75,7 +75,7 @@ public slots:
void format();
void reset();
- void formattqStatus(const TQString &,int);
+ void formatStatus(const TQString &,int);
protected slots:
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 03f6f41..9a972f4 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -358,7 +358,7 @@ void FloppyAction::processStdOut(KProcess *, char *b, int l)
{
Q_UNUSED(b);
Q_UNUSED(l);
- kdDebug(KFAREA) << "stdout:" << TQString::tqfromLatin1(b,l) << endl;
+ kdDebug(KFAREA) << "stdout:" << TQString::fromLatin1(b,l) << endl;
}
void FloppyAction::processStdErr(KProcess *p, char *b, int l)
@@ -390,7 +390,7 @@ FDFormat::FDFormat(TQObject *p) :
doVerify(true)
{
DEBUGSETUP;
- theProcessName = TQString::tqfromLatin1("fdformat");
+ theProcessName = TQString::fromLatin1("fdformat");
setName("FDFormat");
}
@@ -482,7 +482,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
}
else
{
- s = TQString::tqfromLatin1(b,l);
+ s = TQString::fromLatin1(b,l);
if (s.contains("ioctl(FD_FORM)"))
{
emit status (i18n(
@@ -499,7 +499,7 @@ void FDFormat::processStdOut(KProcess *, char *b, int l)
DEBUGS(s);
}
#elif defined(ANY_LINUX)
- s = TQString::tqfromLatin1(b,l);
+ s = TQString::fromLatin1(b,l);
DEBUGS(s);
TQRegExp regexp( "([0-9]+)" );
if ( s.startsWith( "bad data at cyl" ) || ( s.find( "Problem reading cylinder" ) != -1 ) )
@@ -557,7 +557,7 @@ DDZeroOut::DDZeroOut(TQObject *p) :
FloppyAction(p)
{
kdDebug(KFAREA) << (__PRETTY_FUNCTION__) << endl;
- theProcessName = TQString::tqfromLatin1("dd");
+ theProcessName = TQString::fromLatin1("dd");
setName("DD");
}
@@ -720,7 +720,7 @@ void FATFilesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted file system")!=-1) // "/dev/fd0 contains a mounted file system
{
@@ -886,7 +886,7 @@ void Ext2Filesystem::processStdOut(KProcess *, char *b, int l)
#ifdef ANY_BSD
// ### TODO: do some checks
#elif defined(ANY_LINUX)
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted")!=-1) // "/dev/fd0 is mounted; will not make a filesystem here!"
{
@@ -977,7 +977,7 @@ void MinixFilesystem::exec()
void MinixFilesystem::processStdOut(KProcess *, char *b, int l)
{
- TQString s ( TQString::tqfromLatin1( b, l ) );
+ TQString s ( TQString::fromLatin1( b, l ) );
kdDebug(KFAREA) << s << endl;
if (s.find("mounted")!=-1) // "mkfs.minix: /dev/fd0 is mounted; will not make a filesystem here!"
{
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index e774a8f..5dae22e 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -250,7 +250,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
DEBUGSETUP;
#ifdef DEBUG
- TQString o = TQString::tqfromLatin1(b,l);
+ TQString o = TQString::fromLatin1(b,l);
DEBUGS(TQString(" %1").tqarg(o).latin1());
#endif
@@ -283,7 +283,7 @@ void ZipFormat::processResult(KProcess *, char *b, int l)
//
emit setProgress(1);
- // TQString myBuf = TQString::tqfromLatin1(b, l);
+ // TQString myBuf = TQString::fromLatin1(b, l);
// DEBUGS(myBuf.latin1());
}
break;
diff --git a/kgpg/conf_decryption.ui b/kgpg/conf_decryption.ui
index da86512..b604046 100644
--- a/kgpg/conf_decryption.ui
+++ b/kgpg/conf_decryption.ui
@@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>155</height>
diff --git a/kgpg/conf_encryption.ui b/kgpg/conf_encryption.ui
index 7fa0563..2aabb64 100644
--- a/kgpg/conf_encryption.ui
+++ b/kgpg/conf_encryption.ui
@@ -42,7 +42,7 @@
<property name="name">
<cstring>kcfg_AsciiArmor</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>72</height>
diff --git a/kgpg/conf_gpg.ui b/kgpg/conf_gpg.ui
index 1109528..416f242 100644
--- a/kgpg/conf_gpg.ui
+++ b/kgpg/conf_gpg.ui
@@ -103,7 +103,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>190</width>
<height>20</height>
@@ -122,7 +122,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>54</height>
diff --git a/kgpg/conf_misc.ui b/kgpg/conf_misc.ui
index 8c0a43e..9572402 100644
--- a/kgpg/conf_misc.ui
+++ b/kgpg/conf_misc.ui
@@ -53,7 +53,7 @@
<property name="name">
<cstring>kcfg_UseMouseSelection</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -71,7 +71,7 @@
<property name="name">
<cstring>kcfg_RemoteFileWarn</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -107,7 +107,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
@@ -159,7 +159,7 @@ the original file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>71</height>
@@ -220,7 +220,7 @@ the original file.</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>91</height>
diff --git a/kgpg/conf_ui2.ui b/kgpg/conf_ui2.ui
index 74a4a0b..1344d26 100644
--- a/kgpg/conf_ui2.ui
+++ b/kgpg/conf_ui2.ui
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>210</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>140</width>
<height>20</height>
diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp
index 6874813..30a5ca0 100644
--- a/kgpg/detailedconsole.cpp
+++ b/kgpg/detailedconsole.cpp
@@ -42,7 +42,7 @@ KDetailedConsole::KDetailedConsole(TQWidget *parent, const char *name,const TQSt
TQVGroupBox *detailsGroup = new TQVGroupBox( i18n("Details"), page);
(void) new TQLabel(errormessage,detailsGroup);
- //labdetails->setMinimumSize(labdetails->tqsizeHint());
+ //labdetails->setMinimumSize(labdetails->sizeHint());
setDetailsWidget(detailsGroup);
vbox->addWidget(lab1);
diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui
index 438d2b9..fe6d178 100644
--- a/kgpg/groupedit.ui
+++ b/kgpg/groupedit.ui
@@ -127,7 +127,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
diff --git a/kgpg/keyexport.ui b/kgpg/keyexport.ui
index 8389aa3..4daae5b 100644
--- a/kgpg/keyexport.ui
+++ b/kgpg/keyexport.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -54,7 +54,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp
index 70bbff7..26ecebe 100644
--- a/kgpg/keygener.cpp
+++ b/kgpg/keygener.cpp
@@ -64,7 +64,7 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent
keyexp->insertItem(i18n("Weeks"),2);
keyexp->insertItem(i18n("Months"),3);
keyexp->insertItem(i18n("Years"),4);
- keyexp->setMinimumSize(keyexp->tqsizeHint());
+ keyexp->setMinimumSize(keyexp->sizeHint());
connect(keyexp,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activateexp(int)));
(void) new TQLabel(i18n("Key size:"),bgroup1);
@@ -74,17 +74,17 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent
keysize->insertItem("2048");
keysize->insertItem("4096");
keysize->setCurrentItem("1024");
- keysize->setMinimumSize(keysize->tqsizeHint());
+ keysize->setMinimumSize(keysize->sizeHint());
(void) new TQLabel(i18n("Algorithm:"),bgroup1);
keykind = new KComboBox(bgroup1);
keykind->insertItem("DSA & ElGamal");
keykind->insertItem("RSA");
- keykind->setMinimumSize(keykind->tqsizeHint());
+ keykind->setMinimumSize(keykind->sizeHint());
vbox->addWidget(bgroup1);
page->show();
- page->resize(page->tqmaximumSize());
+ page->resize(page->maximumSize());
setMainWidget(page);
}
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index 93aa61f..2e75a4d 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -85,7 +85,7 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi
connect(prop->kCOwnerTrust,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotChangeTrust(int)));
connect(this,TQT_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQT_SLOT(slotSetPhoto(const TQPixmap&)));
- //prop->setMinimumSize(prop->tqsizeHint());
+ //prop->setMinimumSize(prop->sizeHint());
}
void KgpgKeyInfo::slotDisableKey(bool isOn)
@@ -378,14 +378,14 @@ chdate->show();
void KgpgKeyInfo::slotCheckDate(TQDate date)
{
-chdate->enableButtonOK(date>=TQDate::tqcurrentDate ());
+chdate->enableButtonOK(date>=TQDate::currentDate ());
}
void KgpgKeyInfo::slotChangeDate()
{
KgpgInterface *KeyExpirationProcess=new KgpgInterface();
if (kb->isChecked())
- KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::tqcurrentDate(),true);
+ KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,TQDate::currentDate(),true);
else
KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,kdt->date(),false);
connect(KeyExpirationProcess,TQT_SIGNAL(expirationFinished(int)),this,TQT_SLOT(slotInfoExpirationChanged(int)));
@@ -401,7 +401,7 @@ chdate->enableButtonOK(true);
else
{
kdt->setEnabled(true);
-chdate->enableButtonOK(kdt->date()>=TQDate::tqcurrentDate ());
+chdate->enableButtonOK(kdt->date()>=TQDate::currentDate ());
}
}
diff --git a/kgpg/keyproperties.ui b/kgpg/keyproperties.ui
index 485c182..adfe8c1 100644
--- a/kgpg/keyproperties.ui
+++ b/kgpg/keyproperties.ui
@@ -50,13 +50,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>120</width>
<height>140</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>32767</width>
<height>140</height>
diff --git a/kgpg/keyserver.ui b/kgpg/keyserver.ui
index 40c81ec..4087bde 100644
--- a/kgpg/keyserver.ui
+++ b/kgpg/keyserver.ui
@@ -107,7 +107,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -124,7 +124,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -141,7 +141,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>160</width>
<height>20</height>
@@ -214,7 +214,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>250</width>
<height>20</height>
@@ -262,7 +262,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -279,7 +279,7 @@ Allows the user to select the Key Server which will be used to import PGP/GnuPG
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index 5f77590..3f75b79 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -88,7 +88,7 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos
encid->start(KProcess::NotifyOnExit,true);
page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty());
page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty());
-setMinimumSize(tqsizeHint());
+setMinimumSize(sizeHint());
}
@@ -201,7 +201,7 @@ void keyServer::slotSearch()
searchproc->start(KProcess::NotifyOnExit,true);
TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor));
dialogServer->setMainWidget(listpop);
- listpop->setMinimumSize(listpop->tqsizeHint());
+ listpop->setMinimumSize(listpop->sizeHint());
listpop->setMinimumWidth(550);
dialogServer->exec();
}
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index c36be3d..0722f3b 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -250,8 +250,8 @@ void KgpgApp::slotFilePreDec()
page->newFilename->setCaption(i18n("Save File"));
page->checkClipboard->setText(i18n("Editor"));
- page->resize(page->tqminimumSize());
- popn->resize(popn->tqminimumSize());
+ page->resize(page->minimumSize());
+ popn->resize(popn->minimumSize());
if (popn->exec()==TQDialog::Accepted) {
if (page->checkFile->isChecked())
newname=page->newFilename->url();
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index b45240d..dc4f0e9 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -641,7 +641,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p
KLed1=new KLed(TQColor(80,80,80),KLed::Off,KLed::Sunken,KLed::Circular,page,"KLed1");
KLed1->off();
- KLed1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, KLed1->sizePolicy().hasHeightForWidth() ) );
+ KLed1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, KLed1->sizePolicy().hasHeightForWidth() ) );
Layout4->addWidget( KLed1 );
TextLabel1_2 = new TQLabel( page, "TextLabel1_2" );
@@ -653,7 +653,7 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p
MyDialogLayout->addItem( spacer, 3, 0 );
page->show();
- page->resize(page->tqminimumSize());
+ page->resize(page->minimumSize());
setMainWidget(page);
@@ -1079,7 +1079,7 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited)
if (unlimited)
expirationDelay=0;
else
- expirationDelay=TQDate::tqcurrentDate().daysTo(date);
+ expirationDelay=TQDate::currentDate().daysTo(date);
output=TQString();
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings";
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index f85563c..9c12d63 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -215,7 +215,7 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name)
TQObject::connect(editor,TQT_SIGNAL(textChanged()),TQT_TQOBJECT(this),TQT_SLOT(modified()));
boutonbox->tqlayout();
- editor->resize(editor->tqmaximumSize());
+ editor->resize(editor->maximumSize());
vbox->addWidget(editor);
vbox->addWidget(boutonbox);
}
diff --git a/kgpg/kgpgwizard.ui b/kgpg/kgpgwizard.ui
index b826975..5521225 100644
--- a/kgpg/kgpgwizard.ui
+++ b/kgpg/kgpgwizard.ui
@@ -76,7 +76,7 @@ This wizard will first setup some basic configuration options required for KGpg
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -136,7 +136,7 @@ This wizard will first setup some basic configuration options required for KGpg
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>60</height>
@@ -249,7 +249,7 @@ This wizard will first setup some basic configuration options required for KGpg
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -304,7 +304,7 @@ Remember that if you download a file or open one in an editor, parts of the file
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 5f01af7..cb1a166 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -923,7 +923,7 @@ void listKeys::slotAddUid()
addUidWidget->enableButtonOK(false);
AddUid *keyUid=new AddUid();
addUidWidget->setMainWidget(keyUid);
- //keyUid->setMinimumSize(keyUid->tqsizeHint());
+ //keyUid->setMinimumSize(keyUid->sizeHint());
keyUid->setMinimumWidth(300);
connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),TQT_TQOBJECT(this),TQT_SLOT(slotAddUidEnable(const TQString & )));
if (addUidWidget->exec()!=TQDialog::Accepted)
@@ -1415,7 +1415,7 @@ void listKeys::revokeWidget()
keyRevoke->kURLRequester1->setURL(TQDir::homeDirPath()+"/"+keysList2->currentItem()->text(1).section('@',0,0)+".revoke");
keyRevoke->kURLRequester1->setMode(KFile::File);
- keyRevoke->setMinimumSize(keyRevoke->tqsizeHint());
+ keyRevoke->setMinimumSize(keyRevoke->sizeHint());
keyRevoke->show();
keyRevokeWidget->setMainWidget(keyRevoke);
@@ -1817,7 +1817,7 @@ void listKeys::editGroup()
gEdit->groupKeys->setColumnWidthMode(1,TQListView::Manual);
gEdit->groupKeys->setColumnWidthMode(2,TQListView::Manual);
- gEdit->setMinimumSize(gEdit->tqsizeHint());
+ gEdit->setMinimumSize(gEdit->sizeHint());
gEdit->show();
if (dialogGroupEdit->exec()==TQDialog::Accepted)
groupChange();
@@ -2157,7 +2157,7 @@ void listKeys::slotgenkey()
TQLabel *tex=new TQLabel(wid);
TQLabel *tex2=new TQLabel(wid);
- tex->tqsetAlignment(AlignHCenter);
+ tex->setAlignment(AlignHCenter);
tex->setMovie(anim);
tex2->setText(i18n("\nPlease wait..."));
vbox->addWidget(passiveBox);
@@ -2294,7 +2294,7 @@ void listKeys::newKeyDone(KProcess *)
page->LEfinger->setText(newkeyFinger);
page->CBdefault->setChecked(true);
page->show();
- //page->resize(page->tqmaximumSize());
+ //page->resize(page->maximumSize());
keyCreated->setMainWidget(page);
delete pop;
keyCreated->exec();
@@ -2473,8 +2473,8 @@ void listKeys::slotPreImportKey()
dial->setMainWidget(page);
page->newFilename->setCaption(i18n("Open File"));
page->newFilename->setMode(KFile::File);
- page->resize(page->tqminimumSize());
- dial->resize(dial->tqminimumSize());
+ page->resize(page->minimumSize());
+ dial->resize(dial->minimumSize());
if (dial->exec()==TQDialog::Accepted) {
if (page->checkFile->isChecked()) {
diff --git a/kgpg/sourceselect.ui b/kgpg/sourceselect.ui
index 1d0b749..b974eb7 100644
--- a/kgpg/sourceselect.ui
+++ b/kgpg/sourceselect.ui
@@ -20,7 +20,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>350</width>
<height>0</height>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>31</height>
diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 7e7f14c..6f79cad 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -81,7 +81,7 @@ void CDigitLabel::setDotPosition( uint dotPosition )
-TQSize CDigitLabel::tqsizeHint( void ) const
+TQSize CDigitLabel::sizeHint( void ) const
{
int h = fontMetrics().height();
TQSize s( h, h ); // Retangular
@@ -183,9 +183,9 @@ CByteWidget::CByteWidget( TQWidget *parent, const char *name )
{
mDigit[i] = new CDigitLabel( this, 7-i );
mDigit[i]->setLineWidth( 1 );
- mDigit[i]->setFixedSize( mDigit[i]->tqsizeHint()*2 );
+ mDigit[i]->setFixedSize( mDigit[i]->sizeHint()*2 );
mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
- mDigit[i]->tqsetAlignment( AlignCenter );
+ mDigit[i]->setAlignment( AlignCenter );
connect( mDigit[i], TQT_SIGNAL(stepCell(const TQObject *, bool )),
this, TQT_SLOT(stepCell(const TQObject *, bool )));
connect( mDigit[i], TQT_SIGNAL(valueChanged(const TQObject *, uint, bool )),
diff --git a/khexedit/bitswapwidget.h b/khexedit/bitswapwidget.h
index 0dfccbf..d2ec6de 100644
--- a/khexedit/bitswapwidget.h
+++ b/khexedit/bitswapwidget.h
@@ -35,7 +35,7 @@ class CDigitLabel : public TQLabel
CDigitLabel( TQWidget *parent, uint digit = 0, const char *name=0 );
~CDigitLabel( void );
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
inline uint value( void );
signals:
diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc
index 4475604..a560ea8 100644
--- a/khexedit/chartabledialog.cc
+++ b/khexedit/chartabledialog.cc
@@ -69,7 +69,7 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name,
text = i18n("Insert this number of characters:");
TQLabel *label = new TQLabel( text, plainPage() );
- label->setFixedWidth( label->tqsizeHint().width() );
+ label->setFixedWidth( label->sizeHint().width() );
hbox->addWidget( label );
mInputCountSpin = new TQSpinBox( plainPage(), "spin" );
diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index e04bb30..404e402 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -533,7 +533,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
text = i18n("For&mat (replace):");
label = new TQLabel( mReplaceSelector, text, plainPage() );
if( label == 0 ) { return; }
- label->setFixedHeight( label->tqsizeHint().height() );
+ label->setFixedHeight( label->sizeHint().height() );
vbox->addWidget( label );
vbox->addWidget( mReplaceSelector );
@@ -549,7 +549,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal )
label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() );
if( label == 0 ) { return; }
- label->setFixedHeight( label->tqsizeHint().height() );
+ label->setFixedHeight( label->sizeHint().height() );
vbox->addWidget( label );
vbox->addWidget( mReplaceInput );
@@ -846,7 +846,7 @@ void CFilterDialog::makeOperandLayout( void )
mOperandSelector = new TQComboBox( false, page );
if( mOperandSelector == 0 ) { return; }
- mOperandSelector->setFixedHeight( mOperandSelector->tqsizeHint().height());
+ mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height());
mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 );
mOperandSelector->insertStringList( formatStrings() );
connect( mOperandSelector, TQT_SIGNAL(activated(int)),
@@ -891,7 +891,7 @@ void CFilterDialog::makeBitSwapLayout( void )
text = i18n("Swap rule");
TQLabel *label = new TQLabel( text, page );
if( label == 0 ) { return; }
- label->setFixedHeight( label->tqsizeHint().height() );
+ label->setFixedHeight( label->sizeHint().height() );
vbox->addWidget( label );
mByteWidget = new CByteWidget( page );
@@ -902,7 +902,7 @@ void CFilterDialog::makeBitSwapLayout( void )
text = i18n("&Reset");
TQPushButton *resetButton = new TQPushButton( text, page );
- resetButton->setFixedHeight( resetButton->tqsizeHint().height() );
+ resetButton->setFixedHeight( resetButton->sizeHint().height() );
connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) );
hbox->addWidget( resetButton );
diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc
index d5b90e1..63b74c8 100644
--- a/khexedit/exportdialog.cc
+++ b/khexedit/exportdialog.cc
@@ -208,17 +208,17 @@ void CExportDialog::setupDestinationPage( void )
vbox->addSpacing( fontMetrics().lineSpacing() );
TQRadioButton *radio1 = new TQRadioButton( i18n("&Everything"), group );
- radio1->setFixedSize( radio1->tqsizeHint() );
+ radio1->setFixedSize( radio1->sizeHint() );
mDestination.rangeBox->insert( radio1, 0 );
vbox->addWidget( radio1, 0, AlignLeft );
TQRadioButton *radio2 = new TQRadioButton( i18n("&Selection"), group );
- radio2->setFixedSize( radio2->tqsizeHint() );
+ radio2->setFixedSize( radio2->sizeHint() );
mDestination.rangeBox->insert( radio2, 1 );
vbox->addWidget( radio2, 0, AlignLeft );
TQRadioButton *radio3 = new TQRadioButton( i18n("&Range"), group );
- radio3->setFixedSize( radio3->tqsizeHint() );
+ radio3->setFixedSize( radio3->sizeHint() );
mDestination.rangeBox->insert( radio3, 2 );
vbox->addWidget( radio3, 0, AlignLeft );
@@ -264,7 +264,7 @@ void CExportDialog::setupOptionPage( void )
makeCArrayOption();
mOptionStack->raiseWidget( (int)option_text );
- TQSize size = mOptionStack->tqsizeHint();
+ TQSize size = mOptionStack->sizeHint();
size += TQSize(spacingHint()*2, spacingHint()*2);
page->setMinimumSize( size );
}
@@ -462,11 +462,11 @@ void CExportDialog::browserClicked( void )
TQString url;
if( mDestination.formatCombo->currentItem() == option_html )
{
- url = KFileDialog::getExistingDirectory( mWorkDir, tqtopLevelWidget() );
+ url = KFileDialog::getExistingDirectory( mWorkDir, topLevelWidget() );
}
else
{
- url = KFileDialog::getSaveFileName( mWorkDir, "*", tqtopLevelWidget() );
+ url = KFileDialog::getSaveFileName( mWorkDir, "*", topLevelWidget() );
}
if( url.isEmpty() )
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index dcfdd91..dc3f167 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -766,7 +766,7 @@ void CHexBuffer::setDisableCursor( bool disableCursor )
}
-void CHexBuffer::settqCursorShapeModifier( bool alwaysBlock, bool thickInsert )
+void CHexBuffer::setCursorShapeModifier( bool alwaysBlock, bool thickInsert )
{
mCursor.setShapeModifier( alwaysBlock, thickInsert );
setEditMode( mEditMode );
@@ -813,12 +813,12 @@ void CHexBuffer::setEditMode( EEditMode editMode )
-void CHexBuffer::setMaximumSize( uint tqmaximumSize )
+void CHexBuffer::setMaximumSize( uint maximumSize )
{
- if( tqmaximumSize == 0 ) { tqmaximumSize = ~0; }
+ if( maximumSize == 0 ) { maximumSize = ~0; }
- mMaximumSize = tqmaximumSize;
- mFixedSizeMode = tqmaximumSize == (uint)~0 ? false : true;
+ mMaximumSize = maximumSize;
+ mFixedSizeMode = maximumSize == (uint)~0 ? false : true;
mCursor.setFixedSizeMode( mFixedSizeMode );
if( mLayout.offsetVisible == false )
@@ -832,9 +832,9 @@ void CHexBuffer::setMaximumSize( uint tqmaximumSize )
if( mLayout.offsetMode == SDisplayLayout::decimal )
{
printOffset = &CHexBuffer::printDecimalOffset;
- for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 )
+ for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 )
{
- tqmaximumSize = tqmaximumSize / 10;
+ maximumSize = maximumSize / 10;
}
mOffsetIndex = 10 - mOffsetSize;
}
@@ -848,9 +848,9 @@ void CHexBuffer::setMaximumSize( uint tqmaximumSize )
{
printOffset = &CHexBuffer::printHexadecimalSmallOffset;
}
- for( mOffsetSize=0; tqmaximumSize > 0; mOffsetSize += 1 )
+ for( mOffsetSize=0; maximumSize > 0; mOffsetSize += 1 )
{
- tqmaximumSize = tqmaximumSize / 16;
+ maximumSize = maximumSize / 16;
}
if( mOffsetSize > 4 ) { mOffsetSize += 1; } // Space for the ':' sign
mOffsetIndex = 9 - mOffsetSize;
diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h
index 2955af0..862935b 100644
--- a/khexedit/hexbuffer.h
+++ b/khexedit/hexbuffer.h
@@ -1082,7 +1082,7 @@ class CHexBuffer : public TQByteArray
void setNonPrintChar( TQChar nonPrintChar );
void setShowCursor( bool showCursor );
void setDisableCursor( bool disableCursor );
- void settqCursorShapeModifier( bool alwaysBlock, bool thickInsert );
+ void setCursorShapeModifier( bool alwaysBlock, bool thickInsert );
void setEditMode( EEditMode editMode );
void setEditMode( EEditMode editMode, bool alwaysBlock, bool thickInsert );
void setMaximumSize( uint size );
diff --git a/khexedit/hexdrag.cc b/khexedit/hexdrag.cc
index 0347129..1c9e234 100644
--- a/khexedit/hexdrag.cc
+++ b/khexedit/hexdrag.cc
@@ -75,7 +75,7 @@ const char *CHexDrag::format( int i ) const
}
-TQByteArray CHexDrag::tqencodedData( const char *fmt ) const
+TQByteArray CHexDrag::encodedData( const char *fmt ) const
{
if( fmt != 0 )
{
@@ -98,7 +98,7 @@ bool CHexDrag::canDecode( const TQMimeSource *e )
bool CHexDrag::decode( const TQMimeSource *e, TQByteArray &dest )
{
- dest = e->tqencodedData(mediaString);
+ dest = e->encodedData(mediaString);
return( dest.size() == 0 ? false : true );
//
@@ -116,7 +116,7 @@ bool CHexDrag::decode( const TQMimeSource *e, TQByteArray &dest )
#if 0
if( e->provides(mediaString) == true )
{
- dest = e->tqencodedData(mediaString);
+ dest = e->encodedData(mediaString);
return( true );
}
else
diff --git a/khexedit/hexdrag.h b/khexedit/hexdrag.h
index aef2e01..7d4fd26 100644
--- a/khexedit/hexdrag.h
+++ b/khexedit/hexdrag.h
@@ -37,7 +37,7 @@ class CHexDrag : public TQDragObject
void setData( const TQByteArray &data );
const char* format ( int i ) const;
- TQByteArray tqencodedData( const char *fmt ) const;
+ TQByteArray encodedData( const char *fmt ) const;
static bool canDecode( const TQMimeSource *e );
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index 6235e09..5b255d8 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -605,7 +605,7 @@ void CHexEditorWidget::newFile( void )
if( errCode != Err_Success )
{
TQString msg = i18n("Unable to create new document.");
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Operation Failed") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Operation Failed") );
return;
}
@@ -626,7 +626,7 @@ void CHexEditorWidget::newFile( const TQByteArray &data )
void CHexEditorWidget::open()
{
- KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,tqtopLevelWidget() );
+ KURL file = KFileDialog::getOpenURL( mWorkDir, "*" ,topLevelWidget() );
if( file.isEmpty() )
return;
@@ -764,7 +764,7 @@ bool CHexEditorWidget::selectDocument( const TQString &url,
void CHexEditorWidget::insertFile( void )
{
- KFileDialog fdlg(mWorkDir, TQString(), tqtopLevelWidget(), 0, TRUE);
+ KFileDialog fdlg(mWorkDir, TQString(), topLevelWidget(), 0, TRUE);
fdlg.setOperationMode( KFileDialog::Opening );
fdlg.okButton()->setGuiItem( KStdGuiItem::insert() );
fdlg.setCaption(i18n("Insert File"));
@@ -868,7 +868,7 @@ bool CHexEditorWidget::querySave( void )
TQString msg = i18n(""
"The current document has been modified.\n"
"Do you want to save it?" );
- int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
+ int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg, TQString(), KStdGuiItem::save(), KStdGuiItem::discard() );
if( reply == KMessageBox::Yes )
{
return( save() );
@@ -934,7 +934,7 @@ bool CHexEditorWidget::save( void )
"Current document has been changed on disk.\n"
"If you save now, those changes will be lost.\n"
"Proceed?" );
- int reply = KMessageBox::warningYesNoCancel( tqtopLevelWidget(), msg,
+ int reply = KMessageBox::warningYesNoCancel( topLevelWidget(), msg,
i18n("Save"), KStdGuiItem::save(), KStdGuiItem::discard() );
if( reply == KMessageBox::No || reply == KMessageBox::Cancel )
{
@@ -986,7 +986,7 @@ bool CHexEditorWidget::saveAs( void )
TQString msg = i18n(""
"A document with this name already exists.\n"
"Do you want to overwrite it?" );
- int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg,
+ int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg,
i18n("Save As"), i18n("Overwrite") );
if( reply == KMessageBox::Continue )
break;
@@ -1021,7 +1021,7 @@ void CHexEditorWidget::reload( void )
if( mHexView->urlValid() == false )
{
TQString msg = i18n( "The current document does not exist on the disk." );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Reload") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Reload") );
return;
}
@@ -1040,7 +1040,7 @@ void CHexEditorWidget::reload( void )
"If you reload now, the modifications will be lost." );
}
- int reply = KMessageBox::warningContinueCancel(tqtopLevelWidget(),msg,i18n("Reload"), i18n("&Reload"));
+ int reply = KMessageBox::warningContinueCancel(topLevelWidget(),msg,i18n("Reload"), i18n("&Reload"));
if( reply != KMessageBox::Continue )
{
return;
@@ -1070,7 +1070,7 @@ void CHexEditorWidget::print( void )
prt.setFullPage( true ); // I use my own marings
// FIXME: Make a better header for the printingdialog
- if (prt.setup(tqtopLevelWidget(), i18n("Print Hex-Document")))
+ if (prt.setup(topLevelWidget(), i18n("Print Hex-Document")))
{
prt.setTopMarginMM( prt.option("kde-khexedit-topmarginmm").toInt() );
prt.setBottomMarginMM( prt.option("kde-khexedit-bottommarginmm").toInt() );
@@ -1125,7 +1125,7 @@ void CHexEditorWidget::printPostscript( CHexPrinter &printer )
if( errCode != Err_Success )
{
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Print") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Print") );
}
}
@@ -1148,7 +1148,7 @@ bool CHexEditorWidget::confirmPrintPageNumber( CHexPrinter &printer )
"You are about to print %n pages.<br>"
"Proceed?</qt>",
numPageSelected );
- int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), msg,
+ int reply = KMessageBox::warningYesNo( topLevelWidget(), msg,
i18n("Print"), KStdGuiItem::print(), KStdGuiItem::cancel() );
if( reply != KMessageBox::Continue )
{
@@ -1165,7 +1165,7 @@ void CHexEditorWidget::exportDialog( void )
{
if( mExportDialog == 0 )
{
- mExportDialog = new CExportDialog( tqtopLevelWidget(), 0, false );
+ mExportDialog = new CExportDialog( topLevelWidget(), 0, false );
if( mExportDialog == 0 ) { return; }
connect( mExportDialog, TQT_SIGNAL( exportText(const SExportText &)),
this, TQT_SLOT( exportText( const SExportText &)) );
@@ -1191,7 +1191,7 @@ void CHexEditorWidget::exportText( const SExportText &ex )
{
TQString msg = i18n("Unable to export data.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") );
}
}
@@ -1208,7 +1208,7 @@ void CHexEditorWidget::exportHtml( const SExportHtml &ex )
{
TQString msg = i18n("Unable to export data.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") );
}
}
@@ -1225,7 +1225,7 @@ void CHexEditorWidget::exportCArray( const SExportCArray &ex )
{
TQString msg = i18n("Unable to export data.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Export") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Export") );
}
}
@@ -1238,7 +1238,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode )
"The encoding you have selected is not reversible.\n"
"If you revert to the original encoding later, there is no "
"guarantee that the data can be restored to the original state.");
- int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg,
+ int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg,
i18n("Encode"), i18n("&Encode"));
if( reply != KMessageBox::Continue )
{
@@ -1258,7 +1258,7 @@ void CHexEditorWidget::encode( CConversion::EMode mode )
{
TQString msg = i18n("Could not encode data.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encode") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Encode") );
}
}
@@ -1412,7 +1412,7 @@ void CHexEditorWidget::removeAllBookmark( void )
TQString msg = i18n(""
"Deleted bookmarks can not be restored.\n"
"Proceed?" );
- int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg );
+ int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg );
if( reply != KMessageBox::Continue )
{
return;
@@ -1447,7 +1447,7 @@ void CHexEditorWidget::gotoOffset( void )
{
if( mGotoDialog == 0 )
{
- mGotoDialog = new CGotoDialog( tqtopLevelWidget(), 0, false );
+ mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false );
if( mGotoDialog == 0 ) { return; }
connect( mGotoDialog, TQT_SIGNAL(gotoOffset( uint, uint, bool, bool )),
mHexView, TQT_SLOT(gotoOffset( uint, uint, bool, bool )) );
@@ -1465,7 +1465,7 @@ void CHexEditorWidget::find( void )
if( mFindDialog == 0 )
{
- mFindDialog = new CFindDialog( tqtopLevelWidget(), 0, false );
+ mFindDialog = new CFindDialog( topLevelWidget(), 0, false );
if( mFindDialog == 0 ) { return; }
connect( mFindDialog,
TQT_SIGNAL(findData(SSearchControl &, uint, bool)),
@@ -1526,7 +1526,7 @@ void CHexEditorWidget::findData( SSearchControl &sc, uint mode, bool navigator)
if( mode == Find_First )
{
TQString msg = i18n( "Search key not found in document." );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") );
}
}
@@ -1580,7 +1580,7 @@ bool CHexEditorWidget::askWrap( bool fwd, const TQString &header )
"Continue from the end?" );
}
- int reply = KMessageBox::questionYesNo( tqtopLevelWidget(), msg, header, KStdGuiItem::cont(), KStdGuiItem::cancel() );
+ int reply = KMessageBox::questionYesNo( topLevelWidget(), msg, header, KStdGuiItem::cont(), KStdGuiItem::cancel() );
return( reply == KMessageBox::Yes ? true : false );
}
@@ -1594,7 +1594,7 @@ bool CHexEditorWidget::canFind( bool showError )
TQString msg = i18n(""
"Your request can not be processed.\n"
"No search pattern defined." );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Find") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Find") );
}
return( false );
}
@@ -1613,7 +1613,7 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc )
if( mFindNavigatorDialog == 0 )
{
- mFindNavigatorDialog = new CFindNavigatorDialog(tqtopLevelWidget(),0,false);
+ mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false);
if( mFindNavigatorDialog == 0 ) { return; }
connect( mFindNavigatorDialog,
TQT_SIGNAL(findData(SSearchControl &, uint, bool)),
@@ -1636,7 +1636,7 @@ void CHexEditorWidget::replace( void )
if( mReplaceDialog == 0 )
{
- mReplaceDialog = new CReplaceDialog( tqtopLevelWidget(), 0, false );
+ mReplaceDialog = new CReplaceDialog( topLevelWidget(), 0, false );
if( mReplaceDialog == 0 ) { return; }
connect( mReplaceDialog,
TQT_SIGNAL( replaceData( SSearchControl &, uint)),
@@ -1726,7 +1726,7 @@ void CHexEditorWidget::replacePrompt( SSearchControl &sc )
{
if( mReplacePromptDialog == 0 )
{
- mReplacePromptDialog = new CReplacePromptDialog(tqtopLevelWidget(), 0,false);
+ mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), 0,false);
if( mReplacePromptDialog == 0 ) { return; }
connect( mReplacePromptDialog,
TQT_SIGNAL( replaceData( SSearchControl &, uint)),
@@ -1765,14 +1765,14 @@ void CHexEditorWidget::replaceResult( SSearchControl &sc )
{
msg += i18n( "Search key not found in document." );
}
- KMessageBox::information( tqtopLevelWidget(), msg, i18n("Find & Replace"));
+ KMessageBox::information( topLevelWidget(), msg, i18n("Find & Replace"));
}
else
{
const TQString msg = i18n(
"<qt>Operation complete.<br><br>One replacement was made.</qt>",
"<qt>Operation complete.<br><br>%n replacements were made.</qt>", sc.numReplace );
- KMessageBox::information( tqtopLevelWidget(), msg, i18n("Find & Replace"));
+ KMessageBox::information( topLevelWidget(), msg, i18n("Find & Replace"));
}
}
@@ -1781,7 +1781,7 @@ void CHexEditorWidget::insertPattern( void )
{
if( mInsertDialog == 0 )
{
- mInsertDialog = new CInsertDialog( tqtopLevelWidget(), 0, false );
+ mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false );
if( mInsertDialog == 0 ) { return; }
connect( mInsertDialog, TQT_SIGNAL(execute( SInsertData & )),
mHexView, TQT_SLOT(insert( SInsertData & )) );
@@ -1795,7 +1795,7 @@ void CHexEditorWidget::encoding( void )
TQString msg = i18n(""
"Not available yet!\n"
"Define your own encoding" );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Encoding") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Encoding") );
}
@@ -1803,7 +1803,7 @@ void CHexEditorWidget::strings( void )
{
if( mStringDialog == 0 )
{
- mStringDialog = new CStringDialog( tqtopLevelWidget(), 0, false );
+ mStringDialog = new CStringDialog( topLevelWidget(), 0, false );
if( mStringDialog == 0 ) { return; }
connect( mStringDialog, TQT_SIGNAL(markText( uint, uint, bool )),
mHexView, TQT_SLOT(setMark( uint, uint, bool )) );
@@ -1830,7 +1830,7 @@ void CHexEditorWidget::collectStrings( void )
{
TQString msg = i18n("Could not collect strings.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Collect Strings") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Collect Strings") );
}
}
@@ -1842,14 +1842,14 @@ void CHexEditorWidget::recordView( void )
TQString msg = i18n(""
"Not available yet!\n"
"Define a record (structure) and fill it with data from the document." );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Record Viewer") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Record Viewer") );
}
void CHexEditorWidget::filter( void )
{
if( mFilterDialog == 0 )
{
- mFilterDialog = new CFilterDialog( tqtopLevelWidget(), 0, false );
+ mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false );
if( mFilterDialog == 0 ) { return; }
connect( mFilterDialog, TQT_SIGNAL(filterData( SFilterControl & )),
mHexView, TQT_SLOT(filter( SFilterControl & )) );
@@ -1862,7 +1862,7 @@ void CHexEditorWidget::chart( void )
{
if( mCharTableDialog == 0 )
{
- mCharTableDialog = new CCharTableDialog( tqtopLevelWidget(), 0, false );
+ mCharTableDialog = new CCharTableDialog( topLevelWidget(), 0, false );
if( mCharTableDialog == 0 ) { return; }
connect( mCharTableDialog, TQT_SIGNAL(assign( const TQByteArray & )),
mHexView, TQT_SLOT(insert( const TQByteArray & )) );
@@ -1887,7 +1887,7 @@ void CHexEditorWidget::statistics( void )
{
if( mFileInfoDialog == 0 )
{
- mFileInfoDialog = new CFileInfoDialog( tqtopLevelWidget(), 0, false );
+ mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), 0, false );
if( mFileInfoDialog == 0 ) { return; }
connect( mFileInfoDialog, TQT_SIGNAL(collectStatistic(SStatisticControl &)),
TQT_SLOT(collectStatistics(SStatisticControl &)));
@@ -1916,7 +1916,7 @@ void CHexEditorWidget::collectStatistics( SStatisticControl &sc )
TQString msg = i18n("Could not collect document statistics.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg,
+ KMessageBox::sorry( topLevelWidget(), msg,
i18n("Collect Document Statistics") );
}
@@ -1927,7 +1927,7 @@ void CHexEditorWidget::options( void )
{
if( mOptionDialog == 0 )
{
- mOptionDialog = new COptionDialog( tqtopLevelWidget(), 0, false );
+ mOptionDialog = new COptionDialog( topLevelWidget(), 0, false );
if( mOptionDialog == 0 ) { return; }
connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)),
@@ -1959,7 +1959,7 @@ void CHexEditorWidget::favorites( void )
TQString msg = i18n(""
"Not available yet!\n"
"Save or retrive your favorite tqlayout" );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Profiles") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Profiles") );
}
@@ -1979,7 +1979,7 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert )
if( !url.isValid() )
{
TQString msg = i18n("Malformed URL\n%1").tqarg( url.url() );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read URL") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Read URL") );
return( Err_IllegalArgument );
}
@@ -2013,7 +2013,7 @@ void CHexEditorWidget::writeURL( TQString &url )
{
mHexView->setModified( modified );
TQString msg = i18n("Could not save remote file.");
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
}
}
}
@@ -2050,21 +2050,21 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url,
if( info.exists() == false )
{
const TQString msg = i18n("The specified file does not exist.\n%1").tqarg( diskPath );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
return( false );
}
if( info.isDir() == true )
{
const TQString msg = i18n("You have specified a folder.\n%1").tqarg( diskPath );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
return( false );
}
if( info.isReadable() == false )
{
const TQString msg = i18n("You do not have read permission to this file.\n%1").tqarg( diskPath );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
return( false );
}
@@ -2072,7 +2072,7 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url,
if( file.open( IO_ReadOnly | IO_Raw ) == false )
{
const TQString msg = i18n("An error occurred while trying to open the file.\n%1").tqarg( diskPath );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Read") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Read") );
return( false );
}
@@ -2102,7 +2102,7 @@ bool CHexEditorWidget::readFile( const TQString &diskPath, const TQString &url,
TQString header = insert == true ? i18n("Insert") : i18n("Read");
TQString msg = i18n("Could not read file.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg, header );
+ KMessageBox::sorry( topLevelWidget(), msg, header );
}
file.close();
@@ -2120,14 +2120,14 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath )
if( info.isDir() == true )
{
TQString msg = i18n("You have specified a folder.");
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
return( false );
}
if( info.isWritable() == false )
{
TQString msg = i18n("You do not have write permission.");
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
return( false );
}
}
@@ -2136,7 +2136,7 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath )
if( file.open( IO_WriteOnly | IO_Raw | IO_Truncate ) == false )
{
TQString msg = i18n("An error occurred while trying to open the file.");
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
return( false );
}
@@ -2149,7 +2149,7 @@ bool CHexEditorWidget::writeFile( const TQString &diskPath )
{
TQString msg = i18n("Could not write data to disk.\n");
msg += hexError( errCode );
- KMessageBox::sorry( tqtopLevelWidget(), msg, i18n("Write Failure") );
+ KMessageBox::sorry( topLevelWidget(), msg, i18n("Write Failure") );
}
file.close();
@@ -2231,7 +2231,7 @@ bool CHexEditorWidget::createBuffer( void )
{
TQString msg = i18n( "Can not create text buffer.\n" );
msg += hexError( Err_NoMemory );
- KMessageBox::error( tqtopLevelWidget(), msg, i18n("Loading Failed" ) );
+ KMessageBox::error( topLevelWidget(), msg, i18n("Loading Failed" ) );
return( false );
}
@@ -2418,7 +2418,7 @@ int CHexEditorWidget::progressParse( const SProgressData &pd )
}
- int reply = KMessageBox::warningYesNo( tqtopLevelWidget(), msg, header, KStdGuiItem::cancel(), KStdGuiItem::cont() );
+ int reply = KMessageBox::warningYesNo( topLevelWidget(), msg, header, KStdGuiItem::cancel(), KStdGuiItem::cont() );
mProgressStop = false;
return( reply == KMessageBox::Yes ? Err_Stop : Err_Success );
}
@@ -2431,7 +2431,7 @@ bool CHexEditorWidget::busy( bool showWarning )
{
TQString msg = i18n("Could not finish operation.\n");
msg += hexError( Err_Busy );
- KMessageBox::sorry( tqtopLevelWidget(), msg );
+ KMessageBox::sorry( topLevelWidget(), msg );
}
return( mProgressBusy );
diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc
index 0059c0a..e5c5da6 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -129,16 +129,16 @@ void CHexManagerWidget::setConversionVisibility( EConversionPosition position )
TQRect rect = tqgeometry();
TQPoint p;
- p.setX(point.x() + rect.width()/2 - mConverter->tqminimumSize().width()/2);
- p.setY(point.y() + rect.height()/2 - mConverter->tqminimumSize().height()/2);
- mConverter->resize( mConverter->tqminimumSize() );
+ p.setX(point.x() + rect.width()/2 - mConverter->minimumSize().width()/2);
+ p.setY(point.y() + rect.height()/2 - mConverter->minimumSize().height()/2);
+ mConverter->resize( mConverter->minimumSize() );
mConverter->reparent( 0, WStyle_Customize | WStyle_DialogBorder, p, true );
mConverter->setCaption(kapp->makeStdCaption(i18n("Conversion")));
}
else
{
mConversionPosition = Embed;
- uint utilHeight = mConverter->tqminimumSize().height();
+ uint utilHeight = mConverter->minimumSize().height();
TQPoint p( 0, height() - utilHeight );
mConverter->reparent( this, 0, p, true );
}
@@ -250,7 +250,7 @@ int CHexManagerWidget::preferredWidth( void )
int w = mEditor->defaultTextWidth();
if( mConversionPosition == Embed )
{
- int converterWidth = mConverter->tqsizeHint().width();
+ int converterWidth = mConverter->sizeHint().width();
w = TQMAX( w, converterWidth );
}
return( w );
diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc
index 48a6a08..a2c0cd9 100644
--- a/khexedit/hextoolwidget.cc
+++ b/khexedit/hextoolwidget.cc
@@ -64,30 +64,30 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
for( int i=0; i<4; i++ )
{
TQLabel *Label = new TQLabel( msg1[i], this );
- Label->tqsetAlignment( AlignRight|AlignVCenter );
+ Label->setAlignment( AlignRight|AlignVCenter );
ValuesBox->addWidget( Label, i, 0 );
mText1[i] = new TQLineEdit( this );
mText1[i]->setReadOnly( true );
- mText1[i]->tqsetAlignment( AlignRight );
+ mText1[i]->setAlignment( AlignRight );
ValuesBox->addWidget( mText1[i], i, 1 );
Label = new TQLabel( msg2[i], this );
- Label->tqsetAlignment( AlignRight|AlignVCenter );
+ Label->setAlignment( AlignRight|AlignVCenter );
ValuesBox->addWidget( Label, i, 3 );
mText2[i] = new TQLineEdit( this );
mText2[i]->setReadOnly( true );
- mText2[i]->tqsetAlignment( AlignRight );
+ mText2[i]->setAlignment( AlignRight );
ValuesBox->addWidget( mText2[i], i, 4 );
Label = new TQLabel( msg3[i], this );
- Label->tqsetAlignment( AlignRight|AlignVCenter );
+ Label->setAlignment( AlignRight|AlignVCenter );
mUtilBox->addWidget( Label, i, 1 );
mText3[i] = new TQLineEdit( this );
mText3[i]->setReadOnly( true );
- mText3[i]->tqsetAlignment( AlignRight );
+ mText3[i]->setAlignment( AlignRight );
mUtilBox->addWidget( mText3[i], i, 2 );
}
@@ -95,7 +95,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
text = i18n("Show little endian decoding");
mCheckIntelFormat = new TQCheckBox( text, this );
- mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->tqsizeHint() );
+ mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->sizeHint() );
connect( mCheckIntelFormat, TQT_SIGNAL(clicked()), this, TQT_SLOT(intelFormat()) );
SettingsBox->addWidget( mCheckIntelFormat, 0, AlignVCenter );
mCheckIntelFormat->setChecked( // default value to please endian system users
@@ -109,7 +109,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
text = i18n("Show unsigned as hexadecimal");
mCheckHexadecimal = new TQCheckBox( text, this );
- mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->tqsizeHint() );
+ mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->sizeHint() );
connect( mCheckHexadecimal, TQT_SIGNAL(clicked()), this, TQT_SLOT(unsignedFormat()) );
SettingsBox->addWidget( mCheckHexadecimal, 0, AlignVCenter );
@@ -120,7 +120,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
// Variable bitwidth. Based on Craig Graham's work.
//
TQLabel *bitLabel = new TQLabel( i18n("Stream length:"), this );
- bitLabel->tqsetAlignment( AlignRight|AlignVCenter );
+ bitLabel->setAlignment( AlignRight|AlignVCenter );
mUtilBox->addWidget( bitLabel, 4, 1 );
mBitCombo = new TQComboBox( false, this );
@@ -132,7 +132,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
text += i==0 ? i18n("Bit Window") : i18n("Bits Window");
mBitCombo->insertItem( text );
}
- mBitCombo->setMinimumSize( mBitCombo->tqsizeHint() );
+ mBitCombo->setMinimumSize( mBitCombo->sizeHint() );
connect( mBitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bitWidthChanged(int)));
mUtilBox->addWidget( mBitCombo, 4, 2 );
@@ -147,7 +147,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name )
mCursorState.valid = false;
mViewHexCaps = true;
- setMinimumSize( tqsizeHint() );
+ setMinimumSize( sizeHint() );
show();
}
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 555e0cc..0ac3ab8 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -739,7 +739,7 @@ void CHexViewWidget::setCursor( const SDisplayCursor &cursor,
bool /*updateDisplay*/ )
{
mCursor = cursor;
- mHexBuffer->settqCursorShapeModifier( cursor.alwaysBlockShape,
+ mHexBuffer->setCursorShapeModifier( cursor.alwaysBlockShape,
cursor.thickInsertShape );
setupCursorTimer();
redrawFromOffset( mHexBuffer->cursorOffset(), false );
@@ -1103,7 +1103,7 @@ int CHexViewWidget::bookmarkMenu( const TQString &title )
popup->insertItem( text, i );
}
- TQSize s(popup->tqsizeHint());
+ TQSize s(popup->sizeHint());
TQPoint center( (width()-s.width())/2, (height()-s.height())/2 );
int position = popup->exec( mapToGlobal(center) );
delete popup;
diff --git a/khexedit/lib/codecs/kebcdic1047charcodec.cpp b/khexedit/lib/codecs/kebcdic1047charcodec.cpp
index 2e91035..48986b2 100644
--- a/khexedit/lib/codecs/kebcdic1047charcodec.cpp
+++ b/khexedit/lib/codecs/kebcdic1047charcodec.cpp
@@ -119,6 +119,6 @@ const TQString& KEBCDIC1047CharCodec::name() const
const TQString& KEBCDIC1047CharCodec::codecName()
{
- static const TQString Name( TQString::tqfromLatin1(KEBCDIC1047CharCodecName) );
+ static const TQString Name( TQString::fromLatin1(KEBCDIC1047CharCodecName) );
return Name;
}
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index f5bcc65..b45c76d 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -127,7 +127,7 @@ const TQStringList &KTextCharCodec::codecNames()
bool Found = true;
TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found );
if( Found && is8Bit(Codec) )
- CodecNames.append( TQString::tqfromLatin1(Codec->name()) );
+ CodecNames.append( TQString::fromLatin1(Codec->name()) );
}
}
@@ -150,7 +150,7 @@ TQString KTextCharCodec::nameOfEncoding( KEncoding C )
if( N != 0 )
{
- TQString CodeName = TQString::tqfromLatin1( N );
+ TQString CodeName = TQString::fromLatin1( N );
}
return Codec;
}
@@ -186,10 +186,10 @@ const TQStringList &KTextCharCodec::codecNames()
for( unsigned int i=0; i<NoOfEncodings; ++i )
{
bool Found = true;
- TQString Name = TQString::tqfromLatin1( EncodingNames[i].Name );
+ TQString Name = TQString::fromLatin1( EncodingNames[i].Name );
TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found );
if( Found )
- CodecNames.append( TQString::tqfromLatin1(Codec->name()) );
+ CodecNames.append( TQString::fromLatin1(Codec->name()) );
}
}
@@ -231,6 +231,6 @@ KHEChar KTextCharCodec::decode( char Byte ) const
const TQString& KTextCharCodec::name() const
{
if( Name.isNull() )
- Name = TQString::tqfromLatin1( Codec->name() );
+ Name = TQString::fromLatin1( Codec->name() );
return Name;
}
diff --git a/khexedit/lib/kbordercolumn.cpp b/khexedit/lib/kbordercolumn.cpp
index 170f972..4a22919 100644
--- a/khexedit/lib/kbordercolumn.cpp
+++ b/khexedit/lib/kbordercolumn.cpp
@@ -49,8 +49,8 @@ void KBorderColumn::paintLine( TQPainter *P )
if( Middle )
{
- int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View );
- P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() );
+ int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+ P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
P->drawLine( LineX, 0, LineX, LineHeight-1 ) ;
}
}
@@ -75,8 +75,8 @@ void KBorderColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
KPixelX LX = x() + LineX;
if( Middle && Xs.includes(LX) )
{
- int GridColor = View->tqstyle().tqstyleHint( TQStyle::SH_Table_GridLineColor, View );
- P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->tqcolorGroup().mid() );
+ int GridColor = View->tqstyle().styleHint( TQStyle::SH_Table_GridLineColor, View );
+ P->setPen( GridColor != -1 ? (TQRgb)GridColor : View->colorGroup().mid() );
P->drawLine( LX, Ys.start(), LX, Ys.end() ) ;
}
}
diff --git a/khexedit/lib/kbuffercolumn.cpp b/khexedit/lib/kbuffercolumn.cpp
index 1d26bf0..fb2cfb9 100644
--- a/khexedit/lib/kbuffercolumn.cpp
+++ b/khexedit/lib/kbuffercolumn.cpp
@@ -395,7 +395,7 @@ void KBufferColumn::paintLine( TQPainter *P, int Line ) // TODO: could be remove
void KBufferColumn::paintPositions( TQPainter *P, int Line, KSection Pos )
{
- const TQColorGroup &CG = View->tqcolorGroup();
+ const TQColorGroup &CG = View->colorGroup();
// clear background
unsigned int BlankFlag = (Pos.start()!=0?StartsBefore:0) | (Pos.end()!=LastPos?EndsLater:0);
@@ -501,7 +501,7 @@ void KBufferColumn::paintPlain( TQPainter *P, KSection Positions, int Index )
void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index, int Flag )
{
- const TQColorGroup &CG = View->tqcolorGroup();
+ const TQColorGroup &CG = View->colorGroup();
paintRange( P, CG.highlight(), Positions, Flag );
@@ -524,7 +524,7 @@ void KBufferColumn::paintSelection( TQPainter *P, KSection Positions, int Index,
void KBufferColumn::paintMarking( TQPainter *P, KSection Positions, int Index, int Flag )
{
- const TQColorGroup &CG = View->tqcolorGroup();
+ const TQColorGroup &CG = View->colorGroup();
paintRange( P, CG.text(), Positions, Flag );
@@ -581,7 +581,7 @@ void KBufferColumn::paintByte( TQPainter *P, int Index )
char Byte = ( Index > -1 ) ? Buffer->datum( Index ) : EmptyByte;
KHEChar B = Codec->decode( Byte );
- const TQColorGroup &CG = View->tqcolorGroup();
+ const TQColorGroup &CG = View->colorGroup();
TQColor Color = CG.text();
TQBrush Brush( CG.base(), TQt::SolidPattern );
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index c9cc54a..3809b61 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -135,7 +135,7 @@ const char *KBufferDrag::format( int i ) const
}
-TQByteArray KBufferDrag::tqencodedData( const char *Format ) const
+TQByteArray KBufferDrag::encodedData( const char *Format ) const
{
if( Format != 0 )
{
@@ -224,12 +224,12 @@ bool KBufferDrag::canDecode( const TQMimeSource* Source )
bool KBufferDrag::decode( const TQMimeSource* Source, TQByteArray &Dest )
{
-// Dest = Source->tqencodedData( MediaString );
+// Dest = Source->encodedData( MediaString );
// return Dest.size() != 0;
bool CanDecode = Source->provides( OctetStream );
if( CanDecode )
- Dest = Source->tqencodedData( OctetStream );
+ Dest = Source->encodedData( OctetStream );
return CanDecode;
}
diff --git a/khexedit/lib/kbufferdrag.h b/khexedit/lib/kbufferdrag.h
index effd9a2..3af0ebd 100644
--- a/khexedit/lib/kbufferdrag.h
+++ b/khexedit/lib/kbufferdrag.h
@@ -52,7 +52,7 @@ class KBufferDrag : public TQDragObject
public: // TQDragObject API
virtual const char *format( int i ) const;
- virtual TQByteArray tqencodedData( const char* ) const;
+ virtual TQByteArray encodedData( const char* ) const;
public:
virtual void setData( const TQByteArray &);
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index 01d7602..1e59d2f 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -548,17 +548,17 @@ void KHexEdit::toggleOffsetColumn( bool Visible )
}
-TQSize KHexEdit::tqsizeHint() const
+TQSize KHexEdit::sizeHint() const
{
return TQSize( totalWidth(), totalHeight() );
}
-TQSize KHexEdit::tqminimumSizeHint() const
+TQSize KHexEdit::minimumSizeHint() const
{
// TODO: better minimal width (visibility!)
return TQSize( OffsetColumn->visibleWidth()+FirstBorderColumn->visibleWidth()+SecondBorderColumn->visibleWidth()+valueColumn().byteWidth()+charColumn().byteWidth(),
- lineHeight() + noOfLines()>1? tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent):0 );
+ lineHeight() + noOfLines()>1? tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent):0 );
}
@@ -598,7 +598,7 @@ int KHexEdit::fittingBytesPerLine( const TQSize &NewSize ) const
// check influence of dis-/appearing of the vertical scrollbar
bool VerticalScrollbarIsVisible = verticalScrollBar()->isVisible();
- KPixelX ScrollbarExtent = tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
+ KPixelX ScrollbarExtent = tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent );//verticalScrollBar()->width();
KPixelX AvailableWidth = FullWidth;
if( VerticalScrollbarIsVisible )
@@ -1192,11 +1192,11 @@ bool KHexEdit::eventFilter( TQObject *O, TQEvent *E )
// if( O == this && E->type() == TQEvent::PaletteChange )
// {
-// TQColor old( viewport()->tqcolorGroup().color(TQColorGroup::Text) );
+// TQColor old( viewport()->colorGroup().color(TQColorGroup::Text) );
//
-// if( old != tqcolorGroup().color(TQColorGroup::Text) )
+// if( old != colorGroup().color(TQColorGroup::Text) )
// {
-// TQColor c( tqcolorGroup().color(TQColorGroup::Text) );
+// TQColor c( colorGroup().color(TQColorGroup::Text) );
// doc->setMinimumWidth( -1 );
// doc->setDefaultFormat( doc->formatCollection()->defaultFormat()->font(), c );
// lastFormatted = doc->firstParagraph();
diff --git a/khexedit/lib/khexedit.h b/khexedit/lib/khexedit.h
index 00a25d6..b974542 100644
--- a/khexedit/lib/khexedit.h
+++ b/khexedit/lib/khexedit.h
@@ -130,8 +130,8 @@ class KHEXEDIT_EXPORT KHexEdit : public KColumnsView
// void focusOutEvent( TQFocusEvent *FocusEvent );
virtual bool eventFilter( TQObject *O, TQEvent *E );
- virtual TQSize tqsizeHint() const;
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize sizeHint() const;
+ virtual TQSize minimumSizeHint() const;
public: // value access
diff --git a/khexedit/lib/koffsetcolumn.cpp b/khexedit/lib/koffsetcolumn.cpp
index c2be15a..43897b1 100644
--- a/khexedit/lib/koffsetcolumn.cpp
+++ b/khexedit/lib/koffsetcolumn.cpp
@@ -42,7 +42,7 @@ KOffsetColumn::~KOffsetColumn()
void KOffsetColumn::paintLine( TQPainter *P, int Line )
{
- const TQColor &ButtonColor = View->tqcolorGroup().button();
+ const TQColor &ButtonColor = View->colorGroup().button();
P->fillRect( 0,0,width(),LineHeight, TQBrush(ButtonColor,TQt::SolidPattern) );
printFunction()( CodedOffset,FirstLineOffset+Delta*Line );
@@ -68,7 +68,7 @@ void KOffsetColumn::paintEmptyColumn( TQPainter *P, KPixelXs Xs, KPixelYs Ys )
{
Xs.restrictTo( XSpan );
- const TQColor &ButtonColor = View->tqcolorGroup().button();
+ const TQColor &ButtonColor = View->colorGroup().button();
P->fillRect( Xs.start(), Ys.start(), Xs.width(), Ys.width(), TQBrush(ButtonColor,TQt::SolidPattern) );
}
diff --git a/khexedit/lib/kvaluecolumn.cpp b/khexedit/lib/kvaluecolumn.cpp
index beb706a..645dc89 100644
--- a/khexedit/lib/kvaluecolumn.cpp
+++ b/khexedit/lib/kvaluecolumn.cpp
@@ -105,7 +105,7 @@ void KValueColumn::paintEditedByte( TQPainter *P, char Byte, const TQString &Edi
{
KHEChar B = Codec->decode( Byte );
- const TQColorGroup &CG = View->tqcolorGroup();
+ const TQColorGroup &CG = View->colorGroup();
P->fillRect( 0,0,ByteWidth,LineHeight, TQBrush(colorForChar(B),TQt::SolidPattern) );
diff --git a/khexedit/listview.cc b/khexedit/listview.cc
index 3217cac..63f18d8 100644
--- a/khexedit/listview.cc
+++ b/khexedit/listview.cc
@@ -35,20 +35,20 @@ void CListView::setVisibleItem( int visibleItem, bool updateSize )
mVisibleItem = TQMAX( 1, visibleItem );
if( updateSize == true )
{
- TQSize s = tqsizeHint();
- setMinimumSize( s.width() + verticalScrollBar()->tqsizeHint().width() +
+ TQSize s = sizeHint();
+ setMinimumSize( s.width() + verticalScrollBar()->sizeHint().width() +
lineWidth() * 2, s.height() );
}
}
-TQSize CListView::tqsizeHint( void ) const
+TQSize CListView::sizeHint( void ) const
{
- TQSize s = TQListView::tqsizeHint();
+ TQSize s = TQListView::sizeHint();
int h = fontMetrics().height() + 2*itemMargin();
if( h % 2 > 0 ) { h++; }
- s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->tqsizeHint().height());
+ s.setHeight( h*mVisibleItem + lineWidth()*2 + header()->sizeHint().height());
return( s );
}
#include "listview.moc"
diff --git a/khexedit/listview.h b/khexedit/listview.h
index 975f3da..b9182bf 100644
--- a/khexedit/listview.h
+++ b/khexedit/listview.h
@@ -32,7 +32,7 @@ class CListView : public KListView
CListView( TQWidget *parent=0, const char *name=0, int visibleItem=10 );
void setVisibleItem( int visibleItem, bool updateSize=true );
- virtual TQSize tqsizeHint( void ) const;
+ virtual TQSize sizeHint( void ) const;
private:
int mVisibleItem;
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index a754e72..8709df4 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -439,7 +439,7 @@ void COptionDialog::setupFilePage( void )
modeList.append( i18n("Most Recent Document") );
modeList.append( i18n("All Recent Documents") );
mFile.openCombo->insertStringList( modeList );
- mFile.openCombo->setMinimumWidth( mFile.openCombo->tqsizeHint().width() );
+ mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() );
connect( mFile.openCombo, TQT_SIGNAL(activated(int)),
this, TQT_SLOT( slotChanged()));
diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc
index cc01c8a..2677ac4 100644
--- a/khexedit/printdialogpage.cc
+++ b/khexedit/printdialogpage.cc
@@ -78,14 +78,14 @@ void LayoutDialogPage::setupLayoutPage( void )
{
mLayout.marginSpin[i] = new TQSpinBox( group );
mLayout.marginSpin[i]->setFixedHeight(
- mLayout.marginSpin[i]->tqsizeHint().height() );
+ mLayout.marginSpin[i]->sizeHint().height() );
mLayout.marginSpin[i]->setMinimumWidth(
mLayout.marginSpin[i]->fontMetrics().width("M")*10 );
mLayout.marginSpin[i]->setRange( 0, INT_MAX );
TQLabel *label = new TQLabel( mLayout.marginSpin[i], name[i], group );
- label->setFixedHeight( mLayout.marginSpin[i]->tqsizeHint().height() );
- label->setFixedWidth( label->tqsizeHint().width() );
+ label->setFixedHeight( mLayout.marginSpin[i]->sizeHint().height() );
+ label->setFixedWidth( label->sizeHint().width() );
if( i < 2 )
{
@@ -101,7 +101,7 @@ void LayoutDialogPage::setupLayoutPage( void )
text = i18n("Draw h&eader above text");
mLayout.headerCheck = new TQCheckBox( text, this );
- mLayout.headerCheck->setFixedSize( mLayout.headerCheck->tqsizeHint() );
+ mLayout.headerCheck->setFixedSize( mLayout.headerCheck->sizeHint() );
connect( mLayout.headerCheck, TQT_SIGNAL( toggled(bool)),
TQT_SLOT( slotDrawHeader(bool)));
topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft );
@@ -135,16 +135,16 @@ void LayoutDialogPage::setupLayoutPage( void )
{
mLayout.headerCombo[i] = new TQComboBox( false, this );
mLayout.headerCombo[i]->setFixedHeight(
- mLayout.headerCombo[i]->tqsizeHint().height() );
+ mLayout.headerCombo[i]->sizeHint().height() );
mLayout.headerCombo[i]->setMinimumWidth(
mLayout.headerCombo[i]->fontMetrics().width("M")*10 );
mLayout.headerLabel[i] = new TQLabel( mLayout.headerCombo[i], name[i],
this );
mLayout.headerLabel[i]->setFixedHeight(
- mLayout.headerLabel[i]->tqsizeHint().height() );
+ mLayout.headerLabel[i]->sizeHint().height() );
mLayout.headerLabel[i]->setFixedWidth(
- mLayout.headerLabel[i]->tqsizeHint().width() );
+ mLayout.headerLabel[i]->sizeHint().width() );
if( i<3 )
{
@@ -163,7 +163,7 @@ void LayoutDialogPage::setupLayoutPage( void )
text = i18n("Draw &footer below text");
mLayout.footerCheck = new TQCheckBox( text, this );
- mLayout.footerCheck->setFixedSize( mLayout.footerCheck->tqsizeHint() );
+ mLayout.footerCheck->setFixedSize( mLayout.footerCheck->sizeHint() );
connect( mLayout.footerCheck, TQT_SIGNAL( toggled(bool)),
TQT_SLOT( slotDrawFooter(bool)));
topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft );
@@ -181,16 +181,16 @@ void LayoutDialogPage::setupLayoutPage( void )
{
mLayout.footerCombo[i] = new TQComboBox( false, this );
mLayout.footerCombo[i]->setFixedHeight(
- mLayout.footerCombo[i]->tqsizeHint().height() );
+ mLayout.footerCombo[i]->sizeHint().height() );
mLayout.footerCombo[i]->setMinimumWidth(
mLayout.footerCombo[i]->fontMetrics().width("M")*10 );
mLayout.footerLabel[i] = new TQLabel( mLayout.footerCombo[i], name[i],
this );
mLayout.footerLabel[i]->setFixedHeight(
- mLayout.footerLabel[i]->tqsizeHint().height() );
+ mLayout.footerLabel[i]->sizeHint().height() );
mLayout.footerLabel[i]->setFixedWidth(
- mLayout.footerLabel[i]->tqsizeHint().width() );
+ mLayout.footerLabel[i]->sizeHint().width() );
if( i<3 )
{
diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc
index 3122980..23449b5 100644
--- a/khexedit/searchbar.cc
+++ b/khexedit/searchbar.cc
@@ -74,7 +74,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f )
mFindButton->setAutoDefault(false);
connect( mFindButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(start()) );
connect(mInputEdit,TQT_SIGNAL(returnPressed()),mFindButton,TQT_SLOT(animateClick()));
- mFindButton->setFixedHeight( mTypeCombo->tqsizeHint().height() );
+ mFindButton->setFixedHeight( mTypeCombo->sizeHint().height() );
mBackwards = new TQCheckBox( i18n("Backwards"), this );
mIgnoreCase = new TQCheckBox( i18n("Ignore case"), this );
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index ca1e918..493f002 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -176,7 +176,7 @@ bool CStatusBarProgress::textEnabled( void ) const
return( mTextEnabled );
}
-TQSize CStatusBarProgress::tqsizeHint( void ) const
+TQSize CStatusBarProgress::sizeHint( void ) const
{
TQSize s( size() );
diff --git a/khexedit/statusbarprogress.h b/khexedit/statusbarprogress.h
index f477055..531c9aa 100644
--- a/khexedit/statusbarprogress.h
+++ b/khexedit/statusbarprogress.h
@@ -115,7 +115,7 @@ class CStatusBarProgress : public TQFrame, public TQRangeControl
* Returns the recommended width for vertical progress bars or
* the recommended height for vertical progress bars
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index 351a35d..d31bb7f 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -545,7 +545,7 @@ KHexEdit *KHexEdit::newWindow( void )
{
TQString msg = i18n( "Can not create new window.\n" );
msg += hexError( Err_NoMemory );
- KMessageBox::error( tqtopLevelWidget(), msg );
+ KMessageBox::error( topLevelWidget(), msg );
return(0);
}
hexEdit->show();
@@ -582,7 +582,7 @@ void KHexEdit::closeProgram( void )
TQString msg = i18n(""
"There are windows with unsaved modified documents. "
"If you quit now, these modifications will be lost.");
- int reply = KMessageBox::warningContinueCancel( tqtopLevelWidget(), msg, TQString(), KStdGuiItem::quit() );
+ int reply = KMessageBox::warningContinueCancel( topLevelWidget(), msg, TQString(), KStdGuiItem::quit() );
if( reply == KMessageBox::Continue )
{
break;
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 2feb47a..90d4de3 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -72,7 +72,7 @@ KJotsMain::KJotsMain(const char* name)
// the subject list
subjectList = new KListView(splitter, "subjectList");
subjectList->setRootIsDecorated(true);
- subjectList->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
+ subjectList->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding));
subjectList->setMinimumWidth(subjectList->fontMetrics().maxWidth() * 10 + 5);
subjectList->addColumn(i18n("Pages"));
subjectList->setFullWidth(true);
@@ -101,7 +101,7 @@ KJotsMain::KJotsMain(const char* name)
TQVBoxLayout *bookGrid = new TQVBoxLayout(f_main, KDialog::marginHint(), KDialog::spacingHint());
bookGrid->addWidget(splitter, 0, 0);
bookGrid->setMargin(0);
- splitter->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
+ splitter->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, 2, 1));
// create actions
actions[ACTION_NEXT_BOOK] = new KAction(i18n("Next Book"), TQString(), CTRL + Key_D, TQT_TQOBJECT(this),
@@ -316,7 +316,7 @@ void KJotsMain::deleteBook()
return;
TQString msg = i18n("<qt>Are you sure you want to delete the <strong>%1</strong> book?</qt>");
- int result = KMessageBox::warningContinueCancel(tqtopLevelWidget(), msg.tqarg(b->subject()), i18n("Delete Book"),KStdGuiItem::del());
+ int result = KMessageBox::warningContinueCancel(topLevelWidget(), msg.tqarg(b->subject()), i18n("Delete Book"),KStdGuiItem::del());
if (result!=KMessageBox::Continue)
return;
@@ -358,7 +358,7 @@ void KJotsMain::deleteEntry()
KJotsPage* cur = currentPage();
if (!cur ||
- KMessageBox::warningContinueCancel(tqtopLevelWidget(),
+ KMessageBox::warningContinueCancel(topLevelWidget(),
i18n("<qt>Are you sure you want to delete the <strong>%1</strong> page?</qt>")
.tqarg(cur->subject()),
i18n("Delete Page"),KStdGuiItem::del()) != KMessageBox::Continue)
@@ -573,7 +573,7 @@ void KJotsMain::slotQuit()
void KJotsMain::insertDate()
{
- me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(), true) + " ");
+ me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
}
void KJotsMain::updateMenu()
diff --git a/kjots/confpagemisc.ui b/kjots/confpagemisc.ui
index 4a45efb..f717a48 100644
--- a/kjots/confpagemisc.ui
+++ b/kjots/confpagemisc.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -83,7 +83,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -100,7 +100,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 44c1822..a74637f 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -63,7 +63,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
TQLabel *tmp_label = new TQLabel( i18n("This panel provides information about your system's ACPI implementation "
"and lets you have access to some of the extra features provided by ACPI"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
tmp_label = new TQLabel( i18n("NOTE: the Linux ACPI implementation is still a 'work in progress'. "
@@ -73,12 +73,12 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
"You should test these features very gingerly - save all your work, check them "
"on and try a suspend/standby/hibernate from the popup menu on the battery icon "
"in the panel if it fails to come back successfully uncheck the box again."), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
tmp_label = new TQLabel( i18n("Some changes made on this page may require you to quit the laptop panel "
"and start it again to take effect"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
bool can_enable = laptop_portable::has_acpi(1); // is helper ready
@@ -132,7 +132,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name)
"/proc/acpi/sleep writeable by anyone every time your system boots "
"or use the button below to make the KDE ACPI helper application "
"set-uid root"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
ll = new TQHBoxLayout();
TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index 3869457..3070f7d 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -63,7 +63,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
TQLabel *tmp_label = new TQLabel( i18n("This panel lets you configure your APM system and lets "
"you have access to some of the extra features provided by it"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
tmp_label = new TQLabel( i18n("NOTE: some APM implementations have buggy suspend/standby "
@@ -71,12 +71,12 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
"all your work, check them on and try a suspend/standby from "
"the popup menu on the battery icon in the panel if it fails to come "
"back successfully uncheck the box again."), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
tmp_label = new TQLabel( i18n("Some changes made on this page may require you to quit the laptop panel "
"and start it again to take effect"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
bool can_enable = laptop_portable::has_apm(1); // is helper ready
@@ -101,7 +101,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
"/proc/apm writeable by anyone every time your system boots "
"or use the button below to make the %1 application "
"set-uid root").tqarg(apm_name), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
TQHBoxLayout *ll = new TQHBoxLayout(top_layout);
TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this);
@@ -114,7 +114,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
tmp_label = new TQLabel( i18n("Your system seems to have 'Software Suspend' installed, this can "
"be used to hibernate or 'suspend to disk' your system if you want "
"to use this for hibernation check the box below"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
enableSoftwareSuspendHibernate = new TQCheckBox( i18n("Enable software suspend for hibernate"), this );
top_layout->addWidget( enableSoftwareSuspendHibernate );
@@ -126,7 +126,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name)
"Suspend utility - KDE provides a utility to do this, if you "
"wish to use it you must make it set-uid root, the button "
"below will do this for you"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
ll = new TQHBoxLayout(this);
TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this);
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index b00fbc4..79d5de6 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -273,7 +273,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name)
"or power switch on your laptop is pressed. Some laptops may already "
"automatically do things like this, if you cannot disable them in your BIOS "
"you probably should not enable anything in this panel."), this);
- explain->tqsetAlignment( TQt::WordBreak );
+ explain->setAlignment( TQt::WordBreak );
top_layout->addWidget(explain);
top_layout->addStretch(1);
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 7c948b7..0232d2b 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -202,7 +202,7 @@ laptop_dock::invokeBrightness()
brightness_slider->setMinimumHeight(40);
brightness_slider->setMinimumWidth(15);
connect(brightness_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(invokeBrightnessSlider(int)));
- brightness_widget->resize(brightness_widget->tqsizeHint());
+ brightness_widget->resize(brightness_widget->sizeHint());
} else {
brightness_slider->setValue(255-brightness);
}
diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp
index 3a9b67a..bb18a53 100644
--- a/klaptopdaemon/kpcmciainfo.cpp
+++ b/klaptopdaemon/kpcmciainfo.cpp
@@ -57,14 +57,14 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name)
prepareCards();
- _mainTab->resize(KDialog::tqsizeHint());
- resize(KDialog::tqsizeHint());
+ _mainTab->resize(KDialog::sizeHint());
+ resize(KDialog::sizeHint());
connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updateCard(int)));
_sb = new KStatusBar(this);
_sb->insertItem(i18n("Ready."), 0, 1, true);
- _sb->resize(KDialog::tqsizeHint());
+ _sb->resize(KDialog::sizeHint());
_mainGrid->addMultiCellWidget(_sb, 8, 8, 0, 4);
_mainGrid->setRowStretch(8, 0);
@@ -91,7 +91,7 @@ void KPCMCIAInfo::showTab(int num) {
}
-void KPCMCIAInfo::slotResettqStatus() {
+void KPCMCIAInfo::slotResetStatus() {
_sb->changeItem(i18n("Ready."), 0);
}
@@ -99,12 +99,12 @@ void KPCMCIAInfo::slotResettqStatus() {
void KPCMCIAInfo::statusNotice(const TQString& text, int life) {
_sb->changeItem(text, 0);
if (life > 0)
- TQTimer::singleShot(life, this, TQT_SLOT(slotResettqStatus()));
+ TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus()));
}
-void KPCMCIAInfo::slotTabSettqStatus(const TQString& text) {
+void KPCMCIAInfo::slotTabSetStatus(const TQString& text) {
statusNotice(text);
}
@@ -134,8 +134,8 @@ void KPCMCIAInfo::prepareCards() {
TQString tabname = i18n("Card Slot %1");
KPCMCIAInfoPage *tp = new KPCMCIAInfoPage(_pcmcia->getCard(i), _mainTab);
connect(this, TQT_SIGNAL(updateNow()), tp, TQT_SLOT(update()));
- connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSettqStatus(const TQString&)));
- tp->resize(_mainTab->tqsizeHint());
+ connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSetStatus(const TQString&)));
+ tp->resize(_mainTab->sizeHint());
_mainTab->addTab(tp, tabname.tqarg(i+1));
_pages.insert(i, tp);
}
@@ -233,13 +233,13 @@ void KPCMCIAInfoPage::update() {
if (_card) {
TQString tmp;
_card_name->setText(_card->name());
- _card_name->resize(_card_name->tqsizeHint());
+ _card_name->resize(_card_name->sizeHint());
tmp = i18n("Card type: %1 ");
_card_type->setText(tmp.tqarg(_card->type()));
- _card_type->resize(_card_type->tqsizeHint());
+ _card_type->resize(_card_type->sizeHint());
tmp = i18n("Driver: %1");
_card_driver->setText(tmp.tqarg(_card->driver()));
- _card_driver->resize(_card_driver->tqsizeHint());
+ _card_driver->resize(_card_driver->sizeHint());
tmp = i18n("IRQ: %1%2");
TQString tmp2;
switch (_card->intType()) {
@@ -258,31 +258,31 @@ void KPCMCIAInfoPage::update() {
if (_card->irq() <= 0)
_card_irq->setText(tmp.tqarg(i18n("none")).tqarg(""));
else _card_irq->setText(tmp.tqarg(_card->irq()).tqarg(tmp2));
- _card_irq->resize(_card_irq->tqsizeHint());
+ _card_irq->resize(_card_irq->sizeHint());
tmp = i18n("I/O port(s): %1");
if (_card->ports().isEmpty())
_card_io->setText(tmp.tqarg(i18n("none")));
else _card_io->setText(tmp.tqarg(_card->ports()));
- _card_io->resize(_card_io->tqsizeHint());
+ _card_io->resize(_card_io->sizeHint());
tmp = i18n("Bus: %1 bit %2");
if (_card->busWidth() == 0)
_card_bus->setText(i18n("Bus: unknown"));
else _card_bus->setText(tmp.tqarg(_card->busWidth()).tqarg(_card->busWidth() == 16 ? i18n("PC Card") : i18n("Cardbus")));
- _card_bus->resize(_card_bus->tqsizeHint());
+ _card_bus->resize(_card_bus->sizeHint());
tmp = i18n("Device: %1");
_card_dev->setText(tmp.tqarg(_card->device()));
- _card_dev->resize(_card_dev->tqsizeHint());
+ _card_dev->resize(_card_dev->sizeHint());
tmp = i18n("Power: +%1V");
_card_vcc->setText(tmp.tqarg(_card->vcc()/10));
- _card_vcc->resize(_card_vcc->tqsizeHint());
+ _card_vcc->resize(_card_vcc->sizeHint());
tmp = i18n("Programming power: +%1V, +%2V");
_card_vpp->setText(tmp.tqarg(_card->vpp()/10).tqarg(_card->vpp2()/10));
- _card_vpp->resize(_card_vpp->tqsizeHint());
+ _card_vpp->resize(_card_vpp->sizeHint());
tmp = i18n("Configuration base: 0x%1");
if (_card->configBase() == 0)
_card_cfgbase->setText(i18n("Configuration base: none"));
else _card_cfgbase->setText(tmp.tqarg(_card->configBase(), -1, 16));
- _card_cfgbase->resize(_card_cfgbase->tqsizeHint());
+ _card_cfgbase->resize(_card_cfgbase->sizeHint());
if (!(_card->status() & (CARD_STATUS_READY|CARD_STATUS_SUSPEND))) {
_card_ej_ins->setText(i18n("&Insert"));
diff --git a/klaptopdaemon/kpcmciainfo.h b/klaptopdaemon/kpcmciainfo.h
index 20bc16e..458219b 100644
--- a/klaptopdaemon/kpcmciainfo.h
+++ b/klaptopdaemon/kpcmciainfo.h
@@ -52,8 +52,8 @@ public slots:
void slotClose();
void update();
void updateCard(int num);
- void slotResettqStatus();
- void slotTabSettqStatus(const TQString& text);
+ void slotResetStatus();
+ void slotTabSetStatus(const TQString& text);
signals:
void updateNow();
diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index 3d9dfcd..499577b 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/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 = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- tqsetAlignment( TQt::WordBreak );
+ setAlignment( TQt::WordBreak );
setText(text);
}
KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
: TQLabel ( parent, name ) {
m_defaultWidth = TQMIN(400, KGlobalSettings::desktopGeometry(this).width()*2/5);
- tqsetAlignment( TQt::WordBreak );
+ setAlignment( TQt::WordBreak );
}
void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
}
-TQSize KRichTextLabel::tqminimumSizeHint() const
+TQSize KRichTextLabel::minimumSizeHint() const
{
TQString qt_text = qrichtextify( text() );
int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
return TQSize(pref_width, rt.height());
}
-TQSize KRichTextLabel::tqsizeHint() const
+TQSize KRichTextLabel::sizeHint() const
{
- return tqminimumSizeHint();
+ return minimumSizeHint();
}
void KRichTextLabel::setText( const TQString &text ) {
diff --git a/klaptopdaemon/krichtextlabel.h b/klaptopdaemon/krichtextlabel.h
index 53a60ce..9e7cd8a 100644
--- a/klaptopdaemon/krichtextlabel.h
+++ b/klaptopdaemon/krichtextlabel.h
@@ -46,8 +46,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/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 36faefa..2f774d0 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -102,7 +102,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj)
sony_disp = 0;
connect(this, TQT_SIGNAL(signal_checkBattery()), TQT_SLOT(checkBatteryNow()));
- //hasAudio = (audioServer.servertqStatus() == 0) ? true : false;
+ //hasAudio = (audioServer.serverStatus() == 0) ? true : false;
// FIXME: make these configurable. Some system definitely don't
// use /var/run/stab
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index a2f4ba8..28328be 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -84,7 +84,7 @@ PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name)
TQString s1 = LAPTOP_VERSION;
TQString s2 = i18n("Version: ")+s1;
TQLabel* vers = new TQLabel(s2, this);
- vers->setMinimumSize(vers->tqsizeHint());
+ vers->setMinimumSize(vers->sizeHint());
v1->addWidget(vers, 0);
top_layout->activate();
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index fce096e..6c131dc 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -305,13 +305,13 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name)
"it works as a sort of extreme screen saver. You can configure different "
"timeouts and types of behavior depending on whether or not your laptop is "
"plugged in to the mains supply."), this );
- explain->tqsetAlignment( TQt::WordBreak );
+ explain->setAlignment( TQt::WordBreak );
top_layout->addWidget(explain);
if (can_standby) {
TQLabel* explain3 = new TQLabel(i18n("Different laptops may respond to 'standby' in different ways - in many "
"it is only a temporary state and may not be useful for you."), this);
- explain3->tqsetAlignment( TQt::WordBreak );
+ explain3->setAlignment( TQt::WordBreak );
top_layout->addWidget(explain3, 0, TQt::AlignLeft);
}
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index b16ad1a..4b0d9c5 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -205,12 +205,12 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name)
TQLabel *tmp_label = new TQLabel(i18n("This panel allows you to set default values for system attributes "
"so that they change when the laptop is plugged in to the wall or "
"running on batteries."), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
tmp_label = new TQLabel(i18n("You can also set options for these values that will be set by low battery "
"conditions, or system inactivity in the other panels"), this );
- tmp_label->tqsetAlignment( TQt::WordBreak );
+ tmp_label->setAlignment( TQt::WordBreak );
top_layout->addWidget( tmp_label );
top_layout->addStretch(1);
top_layout->addWidget( new TQLabel( i18n("Version: %1").tqarg(LAPTOP_VERSION), this), 0, TQt::AlignRight );
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 84d8501..7fb7ddc 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -164,7 +164,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
if (can_brightness) {
checkBrightness = new TQCheckBox(i18n("Panel b&rightness"), this);
- checkBrightness->setMinimumSize(checkBrightness->tqsizeHint());
+ checkBrightness->setMinimumSize(checkBrightness->sizeHint());
TQToolTip::add( checkBrightness, i18n( "If enabled the back panel brightness will change" ) );
grid->addWidget(checkBrightness, curRow, 0);
connect(checkBrightness, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(brightness_changed(bool)));
@@ -240,19 +240,19 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
if (can_standby) {
checkStandby = new TQRadioButton(i18n("Standb&y"), b);
TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) );
- checkStandby->setMinimumSize(checkStandby->tqsizeHint());
+ checkStandby->setMinimumSize(checkStandby->sizeHint());
connect(checkStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
}
if (can_suspend) {
checkSuspend = new TQRadioButton(i18n("&Suspend"), b);
TQToolTip::add( checkSuspend, i18n( "Move the system into the suspend state - also known as 'save-to-ram'" ) );
- checkSuspend->setMinimumSize(checkSuspend->tqsizeHint());
+ checkSuspend->setMinimumSize(checkSuspend->sizeHint());
connect(checkSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
}
if (can_hibernate) {
checkHibernate = new TQRadioButton(i18n("H&ibernate"), b);
TQToolTip::add( checkHibernate, i18n( "Move the system into the hibernate state - also known as 'save-to-disk'" ) );
- checkHibernate->setMinimumSize(checkHibernate->tqsizeHint());
+ checkHibernate->setMinimumSize(checkHibernate->sizeHint());
connect(checkHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
}
// setup the logout option
@@ -276,7 +276,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name)
} else {
explain = new TQLabel(i18n("This panel controls how and when you receive warnings that your battery power is about to run out"), this);
}
- explain->tqsetAlignment( TQt::WordBreak );
+ explain->setAlignment( TQt::WordBreak );
grid->addMultiCellWidget(explain, curRow, curRow, 0, 1);
++curRow;
diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cc
index 25b2242..630b175 100644
--- a/klaptopdaemon/xautolock.cc
+++ b/klaptopdaemon/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/klaptopdaemon/xautolock_engine.c b/klaptopdaemon/xautolock_engine.c
index bbce54e..62f968a 100644
--- a/klaptopdaemon/xautolock_engine.c
+++ b/klaptopdaemon/xautolock_engine.c
@@ -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);
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index 0624c1e..e5d9f67 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -156,7 +156,7 @@ void KVaioModule::timeout()
bool bat1Avail = false, bat2Avail = false, acConnected = false;
int bat1Remaining = 0, bat1Max = 0, bat2Remaining = 0, bat2Max = 0;
- if(mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max,
+ if(mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max,
bat2Avail, bat2Remaining, bat2Max,
acConnected) )
{
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 3f52ae9..ff97087 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -163,7 +163,7 @@ void KVaio::slotVaioEvent(int event)
case SONYPI_EVENT_BACK_PRESSED:
if (mShowPowerStatusOnBackButton)
{
- showBatterytqStatus (true);
+ showBatteryStatus (true);
}
break;
default:
@@ -306,7 +306,7 @@ void KVaio::loadConfiguration(KConfig *k)
mReportUnknownEvents =
k->readBoolEntry("Report_Unknown_Events", false);
- mReportPowertqStatus =
+ mReportPowerStatus =
k->readBoolEntry("PeriodicallyReportPowerStatus", false);
mShowPowerStatusOnBackButton =
k->readBoolEntry("PowerStatusOnBackButton", true);
@@ -315,7 +315,7 @@ void KVaio::loadConfiguration(KConfig *k)
<< " mReportUnknownEvents: "
<< mReportUnknownEvents << endl
<< " mReportPowerStatus: "
- << mReportPowertqStatus << endl
+ << mReportPowerStatus << endl
<< "mShowPowerStatusOnBackButton: "
<< mShowPowerStatusOnBackButton << endl;
}
@@ -327,31 +327,31 @@ const KVaioDriverInterface* KVaio::driver()
void KVaio::slotTimeout ()
{
- showBatterytqStatus ();
+ showBatteryStatus ();
mTimer->start (4000, true);
}
-bool KVaio::showBatterytqStatus ( bool force )
+bool KVaio::showBatteryStatus ( bool force )
{
static bool acConnectedCache = false;
static int previousChargeCache = -1;
bool bat1Avail = false, bat2Avail = false, acConnected = false;
int bat1Remaining = 0, bat1Max = 0, bat2Remaining = 0, bat2Max = 0;
bool displayBatteryMsg = false;
- bool displayACtqStatus = false;
+ bool displayACStatus = false;
TQString text, acMsg;
TQTextStream stream(text, IO_WriteOnly);
// -----
- // only display on startup if mReportPowertqStatus is true:
- if (mReportPowertqStatus==false || !force)
+ // only display on startup if mReportPowerStatus is true:
+ if (mReportPowerStatus==false || !force)
{
return true;
}
// query all necessary information:
- (void) mDriver->getBatterytqStatus(bat1Avail, bat1Remaining, bat1Max,
+ (void) mDriver->getBatteryStatus(bat1Avail, bat1Remaining, bat1Max,
bat2Avail, bat2Remaining, bat2Max,
acConnected);
@@ -364,7 +364,7 @@ bool KVaio::showBatterytqStatus ( bool force )
if (acConnectedCache != acConnected || force)
{
- displayACtqStatus = true;
+ displayACStatus = true;
acConnectedCache = acConnected;
}
@@ -379,10 +379,10 @@ bool KVaio::showBatterytqStatus ( bool force )
}
// ----- prepare text messages
- if (displayACtqStatus || displayBatteryMsg)
+ if (displayACStatus || displayBatteryMsg)
{
- if (displayACtqStatus)
+ if (displayACStatus)
{
acMsg = acConnected ? i18n ("AC Connected") : i18n ("AC Disconnected");
}
@@ -410,7 +410,7 @@ bool KVaio::showBatterytqStatus ( bool force )
};
// show a message if the battery status changed by more then 10% or on startup
- if (displayACtqStatus)
+ if (displayACStatus)
{
stream << endl << acMsg;
}
diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h
index c012c66..ba2bf98 100644
--- a/kmilo/kmilo_kvaio/kvaio.h
+++ b/kmilo/kmilo_kvaio/kvaio.h
@@ -74,7 +74,7 @@ protected:
bool isKMiloDAvailable();
bool showTextMsg(const TQString& msg);
bool showProgressMsg(const TQString& msg, int progress);
- bool showBatterytqStatus ( bool force = false);
+ bool showBatteryStatus ( bool force = false);
protected slots:
void slotVaioEvent(int);
void slotTimeout();
@@ -106,7 +106,7 @@ private:
int m_BrightnessStep;
bool mReportUnknownEvents;
- bool mReportPowertqStatus;
+ bool mReportPowerStatus;
bool mShowPowerStatusOnBackButton;
TQTimer *mTimer;
};
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
index 3aa8e4f..088ae51 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp
@@ -162,7 +162,7 @@ void KVaioDriverInterface::setBrightness(int value)
}
}
-bool KVaioDriverInterface::getBatterytqStatus(
+bool KVaioDriverInterface::getBatteryStatus(
bool& bat1Avail, int& bat1Remaining, int& bat1Max,
bool& bat2Avail, int& bat2Remaining, int& bat2Max,
bool& acConnected)
diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.h b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
index 2cf7fee..2d051c2 100644
--- a/kmilo/kmilo_kvaio/kvaiodriverinterface.h
+++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.h
@@ -43,7 +43,7 @@ public:
255. Returns -1 if the setting cannot be retrieved. */
int brightness();
/** Get the battery status. */
- bool getBatterytqStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max,
+ bool getBatteryStatus(bool& bat1Avail, int& bat1Remaining, int& bat1Max,
bool& bat2Avail, int& bat2Remaining, int& bat2Max,
bool& acConnected);
public slots:
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index 7271ea3..22c0d88 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -102,8 +102,8 @@ void DefaultSkin::show() {
#else
TQRect r = TQApplication::desktop()->tqgeometry();
#endif
- // _label->resize(_label->tqminimumSizeHint());
- // _widget->resize(_label->tqminimumSizeHint());
+ // _label->resize(_label->minimumSizeHint());
+ // _widget->resize(_label->minimumSizeHint());
_widget->move(r.center() -
TQPoint(_widget->width()/2, _widget->height()/2));
_widget->show();
diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
index f81ea07..22bc14f 100644
--- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp
+++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp
@@ -71,7 +71,7 @@ int indexWindow::exec(const TQPoint & /*start*/, int /*width*/)
// 23 Feb. 2003 11:28 -- Jesper K. Pedersen
/*
// calculate the height of all the elements together.
- // I need to do it this way, as tqsizeHint doesn't report the correct size
+ // I need to do it this way, as sizeHint doesn't report the correct size
// and itemHeight doesn't neither.
int elm_h = lb->item(0)->height(lb) * lb->count();
elm_h += 2*lb->frameWidth();
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
index 6e82e85..3dcab67 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistbox-multivisible.cpp
@@ -94,9 +94,9 @@ void KMultiFormListBoxMultiVisible::updateClipperContent()
// calculate the required size.
for (TQWidget *child = elms->first(); child; child=elms->next()) {
- maxWidth = TQMAX(maxWidth, child->tqsizeHint().width());
+ maxWidth = TQMAX(maxWidth, child->sizeHint().width());
if (strcmp(child->name(), "seperator") != 0) {
- totalHeight += child->tqsizeHint().height();
+ totalHeight += child->sizeHint().height();
count++;
}
else {
@@ -116,7 +116,7 @@ void KMultiFormListBoxMultiVisible::updateClipperContent()
for (TQWidget *child2 = elms->first(); child2; child2=elms->next()) {
int h;
if ( strcmp(child2->name(),"seperator") != 0) {
- h = child2->tqsizeHint().height();
+ h = child2->sizeHint().height();
h += extra;
}
else {
diff --git a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
index b4bf36c..90d4e35 100644
--- a/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
+++ b/kregexpeditor/KMultiFormListBox/kmultiformlistboxentry.h
@@ -60,7 +60,7 @@ public:
// This function must return a string representing the KMultiFormListBox. This is
// used when showing the fast-search menu available from the `Idx' button.
- virtual TQString idxString() { return TQString::tqfromLatin1(""); }
+ virtual TQString idxString() { return TQString::fromLatin1(""); }
public slots:
void acceptIndexButton();
diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
index 42d411b..e21d2aa 100644
--- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
+++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
@@ -117,61 +117,61 @@ KWidgetStreamer::KWidgetStreamer ()
// TQCheckBox
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("checked") << TQString::tqfromLatin1("tristate");
- _map.insert(TQString::tqfromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("checked") << TQString::fromLatin1("tristate");
+ _map.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), l);
// TQComboBox
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("editable") << TQString::tqfromLatin1("currentItem")
- << TQString::tqfromLatin1("maxCount") << TQString::tqfromLatin1("insertionPolicy")
- << TQString::tqfromLatin1("autoCompletion");
- _map.insert(TQString::tqfromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("editable") << TQString::fromLatin1("currentItem")
+ << TQString::fromLatin1("maxCount") << TQString::fromLatin1("insertionPolicy")
+ << TQString::fromLatin1("autoCompletion");
+ _map.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), l);
// TQDial
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("tracking") << TQString::tqfromLatin1("wrapping")
- << TQString::tqfromLatin1("value");
- _map.insert(TQString::tqfromLatin1(TQDIAL_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("tracking") << TQString::fromLatin1("wrapping")
+ << TQString::fromLatin1("value");
+ _map.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), l);
// TQLCDNumber
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("numDigits") << TQString::tqfromLatin1("mode")
- << TQString::tqfromLatin1("segmentStyle") << TQString::tqfromLatin1("value");
- _map.insert(TQString::tqfromLatin1(TQLCDNUMBER_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("numDigits") << TQString::fromLatin1("mode")
+ << TQString::fromLatin1("segmentStyle") << TQString::fromLatin1("value");
+ _map.insert(TQString::fromLatin1(TQLCDNUMBER_OBJECT_NAME_STRING), l);
// TQLineEdit
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("text") << TQString::tqfromLatin1("maxLength")
- << TQString::tqfromLatin1("echoMode") << TQString::tqfromLatin1("tqalignment");
- _map.insert(TQString::tqfromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("text") << TQString::fromLatin1("maxLength")
+ << TQString::fromLatin1("echoMode") << TQString::fromLatin1("tqalignment");
+ _map.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), l);
// TQMultiLineEdit
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("text")
- << TQString::tqfromLatin1("tqalignment");
- _map.insert(TQString::tqfromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("text")
+ << TQString::fromLatin1("tqalignment");
+ _map.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l);
// TQRadioButton
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("checked");
- _map.insert(TQString::tqfromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("checked");
+ _map.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), l);
// TQSlider
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("value");
- _map.insert(TQString::tqfromLatin1(TQSLIDER_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("value");
+ _map.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), l);
// TQSpinBox
l.clear();
- l << TQString::tqfromLatin1("enabled")
- << TQString::tqfromLatin1("value");
- _map.insert(TQString::tqfromLatin1(TQSPINBOX_OBJECT_NAME_STRING), l);
+ l << TQString::fromLatin1("enabled")
+ << TQString::fromLatin1("value");
+ _map.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), l);
}
diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp
index 25befe5..a616310 100644
--- a/kregexpeditor/altnwidget.cpp
+++ b/kregexpeditor/altnwidget.cpp
@@ -81,7 +81,7 @@ void AltnWidget::addNewConcChild(DragAccepter *accepter, ConcWidget *child)
}
-TQSize AltnWidget::tqsizeHint() const
+TQSize AltnWidget::sizeHint() const
{
TQPtrListIterator<RegExpWidget> it(_tqchildren);
// Skip the first child, as we only need half of the size of the first and the
@@ -93,7 +93,7 @@ TQSize AltnWidget::tqsizeHint() const
_tqchildrenHeight = 0;
for ( ; *it ; ++it) {
- TQSize thisChildSize = (*it)->tqsizeHint();
+ TQSize thisChildSize = (*it)->sizeHint();
_tqchildrenWidth = TQMAX(_tqchildrenWidth, thisChildSize.width());
_tqchildrenHeight += thisChildSize.height();
}
@@ -118,7 +118,7 @@ void AltnWidget::paintEvent( TQPaintEvent *e)
dynamic_cast<DragAccepter*>(_tqchildren.at(_tqchildren.count()-1)) ) );
int offset = 0;
- TQSize mySize = tqsizeHint();
+ TQSize mySize = sizeHint();
TQPainter painter(this);
drawPossibleSelection( painter, mySize );
@@ -144,7 +144,7 @@ void AltnWidget::paintEvent( TQPaintEvent *e)
RegExpWidget* child = _tqchildren.at(i);
- TQSize childSize = child->tqsizeHint();
+ TQSize childSize = child->sizeHint();
TQSize curChildSize = child->size();
//-------------------------------------- place the child
diff --git a/kregexpeditor/altnwidget.h b/kregexpeditor/altnwidget.h
index 519eba5..8404712 100644
--- a/kregexpeditor/altnwidget.h
+++ b/kregexpeditor/altnwidget.h
@@ -34,7 +34,7 @@ public:
AltnWidget( AltnRegExp* regexp, RegExpEditorWindow* editorWindow,
TQWidget* parent, const char* name = 0);
virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual RegExp* regExp() const;
virtual void applyRegExpToSelection( RegExpType type );
virtual RegExpType type() const { return ALTN; }
diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp
index 855f6d1..3b7032e 100644
--- a/kregexpeditor/auxbuttons.cpp
+++ b/kregexpeditor/auxbuttons.cpp
@@ -38,44 +38,44 @@ AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0)
TQBoxLayout* tqlayout = boxLayout();
_undo = new TQToolButton( this );
- _undo->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("undo") ) );
+ _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("undo") ) );
tqlayout->addWidget( _undo );
connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) );
TQToolTip::add( _undo, i18n( "Undo" ) );
_redo = new TQToolButton( this );
- _redo->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("redo") ) );
+ _redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("redo") ) );
tqlayout->addWidget( _redo );
connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) );
TQToolTip::add( _redo, i18n( "Redo" ) );
_cut = new TQToolButton( this );
- _cut->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("editcut") ) );
+ _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcut") ) );
tqlayout->addWidget( _cut );
connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) );
TQToolTip::add( _cut, i18n( "Cut" ) );
_copy = new TQToolButton( this );
- _copy->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("editcopy") ) );
+ _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editcopy") ) );
tqlayout->addWidget( _copy );
connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) );
TQToolTip::add( _copy, i18n( "Copy" ) );
_paste = new TQToolButton( this );
- _paste->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("editpaste")) );
+ _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("editpaste")) );
tqlayout->addWidget( _paste );
connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) );
TQToolTip::add( _paste, i18n( "Paste" ) );
_save = new TQToolButton( this );
- _save->setIconSet( Util::getSystemIconSet(TQString::tqfromLatin1("filesave")) );
+ _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("filesave")) );
tqlayout->addWidget( _save );
connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) );
TQToolTip::add( _save, i18n( "Save" ) );
TQToolButton* button = new TQToolButton(this);
- button->setPixmap( Util::getSystemIcon( TQString::tqfromLatin1("contexthelp") ) );
+ button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) );
tqlayout->addWidget( button );
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis()));
diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp
index 227f605..7f64d56 100644
--- a/kregexpeditor/characterswidget.cpp
+++ b/kregexpeditor/characterswidget.cpp
@@ -60,7 +60,7 @@ CharactersWidget::~CharactersWidget()
}
-TQSize CharactersWidget::tqsizeHint() const
+TQSize CharactersWidget::sizeHint() const
{
TQFontMetrics metrics = fontMetrics();
_textSize = HackCalculateFontSize(metrics, title());
@@ -78,7 +78,7 @@ TQSize CharactersWidget::tqsizeHint() const
void CharactersWidget::paintEvent(TQPaintEvent *e)
{
- TQSize mySize = tqsizeHint();
+ TQSize mySize = sizeHint();
TQPainter painter(this);
drawPossibleSelection( painter, mySize );
@@ -118,7 +118,7 @@ RegExp* CharactersWidget::regExp() const
TQString CharactersWidget::text() const
{
- TQString res = TQString::tqfromLatin1("");
+ TQString res = TQString::fromLatin1("");
if (_regexp->wordChar())
res += i18n("- A word character\n");
@@ -186,8 +186,8 @@ int CharactersWidget::edit()
TQApplication::restoreOverrideCursor();
}
- _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->tqsizeHint().width()/2,
- _configWindow->tqsizeHint().height()/2));
+ _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->sizeHint().width()/2,
+ _configWindow->sizeHint().height()/2));
int ret = _configWindow->exec(_regexp );
if ( ret == TQDialog::Accepted ) {
_editorWindow->updateContent( 0 );
diff --git a/kregexpeditor/characterswidget.h b/kregexpeditor/characterswidget.h
index ccc8852..576e6f1 100644
--- a/kregexpeditor/characterswidget.h
+++ b/kregexpeditor/characterswidget.h
@@ -46,7 +46,7 @@ public:
CharactersWidget( TextRangeRegExp* regexp, RegExpEditorWindow* editorWindow,
TQWidget* parent, const char* name = 0 );
~CharactersWidget();
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual RegExp* regExp() const;
virtual RegExpType type() const { return CHARSET; }
virtual RegExpWidget* findWidgetToEdit( TQPoint globalPos );
diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp
index 5f60475..32e2a79 100644
--- a/kregexpeditor/charselector.cpp
+++ b/kregexpeditor/charselector.cpp
@@ -60,7 +60,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name )
items << i18n("Normal Character")
<< i18n("Unicode Char in Hex.")
<< i18n("Unicode Char in Oct.")
- << TQString::tqfromLatin1("----")
+ << TQString::fromLatin1("----")
<< i18n("The Bell Character (\\a)")
<< i18n("The Form Feed Character (\\f)")
<< i18n("The Line Feed Character (\\n)")
@@ -169,17 +169,17 @@ TQString CharSelector::text() const
case 3: // The seperator
break;
case 4:
- return TQString::tqfromLatin1("\\a");
+ return TQString::fromLatin1("\\a");
case 5:
- return TQString::tqfromLatin1("\\f");
+ return TQString::fromLatin1("\\f");
case 6:
- return TQString::tqfromLatin1("\\n");
+ return TQString::fromLatin1("\\n");
case 7:
- return TQString::tqfromLatin1("\\r");
+ return TQString::fromLatin1("\\r");
case 8:
- return TQString::tqfromLatin1("\\t");
+ return TQString::fromLatin1("\\t");
case 9:
- return TQString::tqfromLatin1("\\v");
+ return TQString::fromLatin1("\\v");
}
return TQString();
}
diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp
index c43dcbb..044ec85 100644
--- a/kregexpeditor/compoundwidget.cpp
+++ b/kregexpeditor/compoundwidget.cpp
@@ -135,10 +135,10 @@ void CompoundWidget::init( )
_backRefId = -1;
}
-TQSize CompoundWidget::tqsizeHint() const
+TQSize CompoundWidget::sizeHint() const
{
TQFontMetrics metrics = fontMetrics();
- _childSize = _child->tqsizeHint();
+ _childSize = _child->sizeHint();
_textSize = metrics.size( 0, _content->title() );
int width, height;
@@ -164,7 +164,7 @@ TQSize CompoundWidget::tqsizeHint() const
void CompoundWidget::paintEvent( TQPaintEvent *e )
{
- TQSize mySize = tqsizeHint();
+ TQSize mySize = sizeHint();
TQPainter painter(this);
drawPossibleSelection( painter, mySize);
@@ -220,8 +220,8 @@ void CompoundWidget::paintEvent( TQPaintEvent *e )
}
else {
TQSize curSize = _child->size();
- TQSize newSize = TQSize( TQMAX( _child->tqsizeHint().width(), mySize.width()-2*pw),
- _child->tqsizeHint().height());
+ TQSize newSize = TQSize( TQMAX( _child->sizeHint().width(), mySize.width()-2*pw),
+ _child->sizeHint().height());
_child->move( pw, childY );
if ( curSize != newSize ) {
@@ -296,8 +296,8 @@ bool CompoundWidget::updateSelection( bool parentSelected )
int CompoundWidget::edit()
{
- _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->tqsizeHint().width()/2,
- _configWindow->tqsizeHint().height()/2) );
+ _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->sizeHint().width()/2,
+ _configWindow->sizeHint().height()/2) );
TQDataStream stream( _backup, IO_WriteOnly );
KWidgetStreamer streamer;
streamer.toStream( TQT_TQOBJECT(_content), stream );
diff --git a/kregexpeditor/compoundwidget.h b/kregexpeditor/compoundwidget.h
index 047f942..ad16de8 100644
--- a/kregexpeditor/compoundwidget.h
+++ b/kregexpeditor/compoundwidget.h
@@ -69,7 +69,7 @@ public:
TQWidget* parent, const char* name = 0);
virtual bool updateSelection( bool parentSelected );
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual RegExp* regExp() const;
virtual RegExpType type() const { return COMPOUND; }
virtual int edit();
diff --git a/kregexpeditor/concwidget.cpp b/kregexpeditor/concwidget.cpp
index 16690be..53f7f1d 100644
--- a/kregexpeditor/concwidget.cpp
+++ b/kregexpeditor/concwidget.cpp
@@ -78,14 +78,14 @@ void ConcWidget::init()
}
-TQSize ConcWidget::tqsizeHint() const
+TQSize ConcWidget::sizeHint() const
{
int tqchildrenWidth = 0;
int tqchildrenHeight = 0;
TQPtrListIterator<RegExpWidget> it(_tqchildren);
for ( ; *it; ++it) {
- TQSize thisChildSize = (*it)->tqsizeHint();
+ TQSize thisChildSize = (*it)->sizeHint();
tqchildrenWidth += thisChildSize.width();
tqchildrenHeight = TQMAX(tqchildrenHeight, thisChildSize.height());
}
@@ -106,7 +106,7 @@ void ConcWidget::paintEvent( TQPaintEvent *e)
_tqchildren.at(0)->setGeometry( 0, 0, size().width(), size().height() );
}
else {
- TQSize myReqSize = tqsizeHint();
+ TQSize myReqSize = sizeHint();
TQSize mySize(TQMAX(myReqSize.width(), size().width()),
TQMAX(myReqSize.height(), size().height()));
@@ -131,12 +131,12 @@ void ConcWidget::paintEvent( TQPaintEvent *e)
continue;
RegExpWidget* child = _tqchildren.at(i);
- TQSize childSize = child->tqsizeHint();
+ TQSize childSize = child->sizeHint();
TQSize curChildSize = child->size();
//----------------------------- first place the accepter
int x = offset;
- int w = accepter->tqsizeHint().width();
+ int w = accepter->sizeHint().width();
if ( i == 1 ) w+= extra;
int h = TQMAX( lastHeight, childSize.height() );
int y = (mySize.height() - h)/2;
@@ -180,7 +180,7 @@ void ConcWidget::paintEvent( TQPaintEvent *e)
// dynamic_cast is ASSERTed at top
int x = offset;
int h = lastHeight;
- int w = accepter->tqsizeHint().width() + extra;
+ int w = accepter->sizeHint().width() + extra;
int y = (mySize.height()-h)/2;
accepter->setGeometry( x, y, w, h );
}
@@ -240,7 +240,7 @@ bool ConcWidget::updateSelection(bool parentSelected)
++it; // Skip past the first DragAccepter
for ( ; *it; it +=2 ) {
if ( (*it)->isSelected() ) {
- _maxSelectedHeight = TQMAX( _maxSelectedHeight, (*it)->tqsizeHint().height() );
+ _maxSelectedHeight = TQMAX( _maxSelectedHeight, (*it)->sizeHint().height() );
}
}
diff --git a/kregexpeditor/concwidget.h b/kregexpeditor/concwidget.h
index bff85a7..b5dbf48 100644
--- a/kregexpeditor/concwidget.h
+++ b/kregexpeditor/concwidget.h
@@ -40,7 +40,7 @@ public:
TQWidget* parent, const char* name = 0);
void init();
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual RegExp* regExp() const;
virtual bool updateSelection(bool parentSelected);
virtual bool isSelected() const;
diff --git a/kregexpeditor/drag.cpp b/kregexpeditor/drag.cpp
index 9c2b1ca..e17973c 100644
--- a/kregexpeditor/drag.cpp
+++ b/kregexpeditor/drag.cpp
@@ -39,7 +39,7 @@ bool RegExpWidgetDrag::canDecode( TQDragMoveEvent* event )
RegExpWidget* RegExpWidgetDrag::decode(TQDropEvent* event, RegExpEditorWindow* window,
TQWidget* parent)
{
- TQByteArray payload = event->tqencodedData("KRegExpEditor/widgetdrag" );
+ TQByteArray payload = event->encodedData("KRegExpEditor/widgetdrag" );
TQTextStream stream( payload, IO_ReadOnly );
TQString str = stream.read();
RegExp* regexp = WidgetFactory::createRegExp( str );
@@ -58,7 +58,7 @@ const char * RegExpWidgetDrag::format ( int i ) const
return 0;
}
-TQByteArray RegExpWidgetDrag::tqencodedData ( const char* format ) const
+TQByteArray RegExpWidgetDrag::encodedData ( const char* format ) const
{
TQByteArray data;
TQTextStream stream( data, IO_WriteOnly );
diff --git a/kregexpeditor/drag.h b/kregexpeditor/drag.h
index 699d1e8..e32b02e 100644
--- a/kregexpeditor/drag.h
+++ b/kregexpeditor/drag.h
@@ -34,7 +34,7 @@ public:
RegExpWidgetDrag( RegExp* regexp , TQWidget* dragSource);
~RegExpWidgetDrag();
virtual const char * format ( int i = 0 ) const;
- virtual TQByteArray tqencodedData ( const char * ) const;
+ virtual TQByteArray encodedData ( const char * ) const;
static bool canDecode(TQDragMoveEvent* event);
static RegExpWidget* decode(TQDropEvent* event, RegExpEditorWindow* window,
TQWidget* parent);
diff --git a/kregexpeditor/dragaccepter.cpp b/kregexpeditor/dragaccepter.cpp
index 6bd049e..f336dbd 100644
--- a/kregexpeditor/dragaccepter.cpp
+++ b/kregexpeditor/dragaccepter.cpp
@@ -28,7 +28,7 @@ DragAccepter::DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *paren
setAcceptDrops(TRUE);
}
-TQSize DragAccepter::tqsizeHint() const
+TQSize DragAccepter::sizeHint() const
{
return TQSize(10,10);
}
@@ -100,7 +100,7 @@ void DragAccepter::mouseReleaseEvent( TQMouseEvent* event )
void DragAccepter::dragEnterEvent(TQDragEnterEvent *event)
{
- bool selfDrag = ( event->source() && event->source()->tqtopLevelWidget() == tqtopLevelWidget() && _isSelected );
+ bool selfDrag = ( event->source() && event->source()->topLevelWidget() == topLevelWidget() && _isSelected );
event->accept(RegExpWidgetDrag::canDecode( event ) && !selfDrag );
}
@@ -124,7 +124,7 @@ void DragAccepter::dropEvent(TQDropEvent *event)
w->update();
_editorWindow->updateContent( this );
- bool selfDrag = ( event->source() && event->source()->tqtopLevelWidget() == tqtopLevelWidget() );
+ bool selfDrag = ( event->source() && event->source()->topLevelWidget() == topLevelWidget() );
if ( ! selfDrag )
_editorWindow->clearSelection( true );
else {
diff --git a/kregexpeditor/dragaccepter.h b/kregexpeditor/dragaccepter.h
index a3737d9..c9c6fd8 100644
--- a/kregexpeditor/dragaccepter.h
+++ b/kregexpeditor/dragaccepter.h
@@ -32,7 +32,7 @@ class DragAccepter :public RegExpWidget
public:
DragAccepter(RegExpEditorWindow* editorWindow, RegExpWidget *parent,
const char *name = 0);
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
virtual RegExp* regExp() const;
virtual RegExpType type() const { return DRAGACCEPTER; }
void setDrawLine( bool drawLine ) { _drawLine = drawLine; }
diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp
index 8e3cc20..a21cb21 100644
--- a/kregexpeditor/editorwindow.cpp
+++ b/kregexpeditor/editorwindow.cpp
@@ -236,9 +236,9 @@ void RegExpEditorWindow::updateContent( TQWidget* focusChild)
emit contentChanged( p );
}
-TQSize RegExpEditorWindow::tqsizeHint() const
+TQSize RegExpEditorWindow::sizeHint() const
{
- return _top->tqsizeHint();
+ return _top->sizeHint();
}
void RegExpEditorWindow::paintEvent( TQPaintEvent* event )
@@ -298,7 +298,7 @@ void RegExpEditorWindow::cutCopyAux( TQPoint pos )
void RegExpEditorWindow::slotStartPasteAction()
{
- TQByteArray data = tqApp->tqclipboard()->data()->tqencodedData( "KRegExpEditor/widgetdrag" );
+ TQByteArray data = tqApp->tqclipboard()->data()->encodedData( "KRegExpEditor/widgetdrag" );
TQTextStream stream( data, IO_ReadOnly );
TQString str = stream.read();
@@ -431,7 +431,7 @@ void RegExpEditorWindow::updateCursorUnderPoint()
{
RegExpWidget* widget = _top->widgetUnderPoint( TQCursor::pos(), false );
if ( widget )
- widget->updatetqCursorShape();
+ widget->updateCursorShape();
}
void RegExpEditorWindow::emitVerifyRegExp()
diff --git a/kregexpeditor/editorwindow.h b/kregexpeditor/editorwindow.h
index 58377c6..c8899a6 100644
--- a/kregexpeditor/editorwindow.h
+++ b/kregexpeditor/editorwindow.h
@@ -110,7 +110,7 @@ public:
*/
void showRMBMenu( bool enableCutCopy );
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
diff --git a/kregexpeditor/emacsregexpconverter.cpp b/kregexpeditor/emacsregexpconverter.cpp
index 0d0f6d4..5cfa54d 100644
--- a/kregexpeditor/emacsregexpconverter.cpp
+++ b/kregexpeditor/emacsregexpconverter.cpp
@@ -43,7 +43,7 @@ TQString EmacsRegExpConverter::toString( AltnRegExp* regexp, bool markSelection
RegExpList list = regexp->tqchildren();
for ( RegExpListIt it(list); *it; ++it ) {
if ( !first ) {
- res += TQString::tqfromLatin1("\\|");
+ res += TQString::fromLatin1("\\|");
}
first = false;
res += toStr( *it, markSelection );
@@ -61,8 +61,8 @@ TQString EmacsRegExpConverter::toString( ConcRegExp* regexp, bool markSelection
TQString startPar = TQString::fromLocal8Bit("");
TQString endPar = TQString::fromLocal8Bit("");
if ( (*it)->precedence() < regexp->precedence() ) {
- startPar = TQString::tqfromLatin1( "\\(" );
- endPar = TQString::tqfromLatin1( "\\)" );
+ startPar = TQString::fromLatin1( "\\(" );
+ endPar = TQString::fromLatin1( "\\)" );
}
res += startPar + toStr( *it, markSelection ) + endPar;
@@ -112,7 +112,7 @@ TQString EmacsRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSel
// Now insert the ranges.
TQPtrList<StringPair> ranges = regexp->range();
for ( TQPtrListIterator<StringPair> it(ranges); *it; ++it ) {
- txt.append((*it)->first()+ TQString::tqfromLatin1("-")+ (*it)->second());
+ txt.append((*it)->first()+ TQString::fromLatin1("-")+ (*it)->second());
}
// Ok, its time to build each part of the regexp, here comes the rule:
@@ -122,20 +122,20 @@ TQString EmacsRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSel
// finally if '^' is one of the characters, then it must not be the first
// one!
- TQString res = TQString::tqfromLatin1("[");
+ TQString res = TQString::fromLatin1("[");
if ( regexp->negate() )
- res.append(TQString::tqfromLatin1("^"));
+ res.append(TQString::fromLatin1("^"));
// a ']' must be the first character in teh range.
if ( foundParenthesis ) {
- res.append(TQString::tqfromLatin1("]"));
+ res.append(TQString::fromLatin1("]"));
}
// a '-' must be the first character ( only coming after a ']')
if ( foundDash ) {
- res.append(TQString::tqfromLatin1("-"));
+ res.append(TQString::fromLatin1("-"));
}
res += txt;
@@ -153,7 +153,7 @@ TQString EmacsRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSel
res.append( TQChar( '^' ) );
}
- res.append(TQString::tqfromLatin1("]"));
+ res.append(TQString::fromLatin1("]"));
return res;
}
@@ -165,7 +165,7 @@ TQString EmacsRegExpConverter::toString( CompoundRegExp* regexp, bool markSelect
TQString EmacsRegExpConverter::toString( DotRegExp* /*regexp*/, bool /*markSelection*/ )
{
- return TQString::tqfromLatin1( "." );
+ return TQString::fromLatin1( "." );
}
TQString EmacsRegExpConverter::toString( PositionRegExp* regexp, bool /*markSelection*/ )
@@ -173,18 +173,18 @@ TQString EmacsRegExpConverter::toString( PositionRegExp* regexp, bool /*markSele
static bool haveWarned = false;
switch ( regexp->position()) {
case PositionRegExp::BEGLINE:
- return TQString::tqfromLatin1("^");
+ return TQString::fromLatin1("^");
case PositionRegExp::ENDLINE:
- return TQString::tqfromLatin1("$");
+ return TQString::fromLatin1("$");
case PositionRegExp::WORDBOUNDARY:
case PositionRegExp::NONWORDBOUNDARY:
if ( ! haveWarned ) {
KMessageBox::sorry( 0, i18n( "Word boundary and non word boundary is not supported in Emacs syntax" ) );
haveWarned = true;
- return TQString::tqfromLatin1("");
+ return TQString::fromLatin1("");
}
}
- return TQString::tqfromLatin1("");
+ return TQString::fromLatin1("");
}
TQString EmacsRegExpConverter::toString( RepeatRegExp* regexp, bool markSelection )
@@ -195,8 +195,8 @@ TQString EmacsRegExpConverter::toString( RepeatRegExp* regexp, bool markSelectio
TQString endPar;
if ( child->precedence() < regexp->precedence() ) {
- startPar = TQString::tqfromLatin1( "\\(" );
- endPar = TQString::tqfromLatin1( "\\)" );
+ startPar = TQString::fromLatin1( "\\(" );
+ endPar = TQString::fromLatin1( "\\)" );
}
if (regexp->min() == 0 && regexp->max() == -1) {
@@ -209,17 +209,17 @@ TQString EmacsRegExpConverter::toString( RepeatRegExp* regexp, bool markSelectio
return startPar + cText + endPar + TQString::fromLocal8Bit("+");
}
else {
- TQString res = TQString::tqfromLatin1("");
+ TQString res = TQString::fromLatin1("");
for ( int i = 0; i < regexp->min(); ++i ) {
- res += TQString::tqfromLatin1( "\\(" ) + cText + TQString::tqfromLatin1( "\\)" );
+ res += TQString::fromLatin1( "\\(" ) + cText + TQString::fromLatin1( "\\)" );
}
if ( regexp->max() != -1 ) {
for ( int i = regexp->min(); i < regexp->max(); ++i ) {
- res += TQString::tqfromLatin1("\\(") + cText + TQString::tqfromLatin1("\\)?");
+ res += TQString::fromLatin1("\\(") + cText + TQString::fromLatin1("\\)?");
}
}
else
- res += TQString::tqfromLatin1("+");
+ res += TQString::fromLatin1("+");
return res;
}
@@ -244,7 +244,7 @@ TQString EmacsRegExpConverter::toString( TextRegExp* regexp, bool /*markSelectio
TQString EmacsRegExpConverter::name()
{
- return TQString::tqfromLatin1( "Emacs" );
+ return TQString::fromLatin1( "Emacs" );
}
int EmacsRegExpConverter::features()
diff --git a/kregexpeditor/errormap.cpp b/kregexpeditor/errormap.cpp
index 41a8c00..65ca557 100644
--- a/kregexpeditor/errormap.cpp
+++ b/kregexpeditor/errormap.cpp
@@ -47,7 +47,7 @@ void ErrorMap::lineStartError()
{
if ( ! _prevLineStartError ) {
KMessageBox::information( 0, i18n("Your regular expression is invalid, due to something preceding a 'line start'."),
- i18n("Regular Expression Error"), TQString::tqfromLatin1("KRegExpEditorLineStartError") );
+ i18n("Regular Expression Error"), TQString::fromLatin1("KRegExpEditorLineStartError") );
}
_lineStartError = true;
}
@@ -56,7 +56,7 @@ void ErrorMap::lineEndError()
{
if ( !_prevLineEndError ) {
KMessageBox::information( 0, i18n("Your regular expression is invalid, due to something following a 'line end'."),
- i18n("Regular Expression Error"), TQString::tqfromLatin1("KRegExpEditorLineEndError") );
+ i18n("Regular Expression Error"), TQString::fromLatin1("KRegExpEditorLineEndError") );
}
_lineEndError = true;
}
@@ -66,7 +66,7 @@ void ErrorMap::lookAheadError()
{
if ( !_prevLookAHeadError ) {
KMessageBox::information( 0, i18n("Your regular expression is invalid. 'Look Ahead' regular expression must be the last sub expression."),
- i18n("Regular Expression Error"), TQString::tqfromLatin1("KRegExpEditorLookAHeadError") );
+ i18n("Regular Expression Error"), TQString::fromLatin1("KRegExpEditorLookAHeadError") );
}
_lookAHeadError = true;
}
diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cc
index 8a7b5bf..9a842b6 100644
--- a/kregexpeditor/gen_qregexpparser.cc
+++ b/kregexpeditor/gen_qregexpparser.cc
@@ -1049,7 +1049,7 @@ yyreduce:
yyval.regexp = new AltnRegExp( false );
dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( yyvsp[-1].regexp );
}
- dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::tqfromLatin1("") ) );
+ dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) );
}
break;
@@ -1057,7 +1057,7 @@ yyreduce:
#line 107 "qregexpparser.y"
{
yyval.regexp = new AltnRegExp( false );
- dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::tqfromLatin1("") ) );
+ dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( new TextRegExp( false, TQString::fromLatin1("") ) );
dynamic_cast<AltnRegExp*>( yyval.regexp )->addRegExp( yyvsp[0].regexp );
}
break;
diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp
index 42d473e..bd192e2 100644
--- a/kregexpeditor/infopage.cpp
+++ b/kregexpeditor/infopage.cpp
@@ -28,7 +28,7 @@ InfoPage::InfoPage( TQWidget* parent, const char* name )
:KTextBrowser( parent, name )
{
TQString txt =
- TQString::tqfromLatin1( "<qt>" ) +
+ TQString::fromLatin1( "<qt>" ) +
i18n( "Translators, feel free to add yourself in the text below, asking for a postcard ;-), "
"also feel free to add a section saying <h2>Translators</h2>. "
"Kind regards, and thanks for your work - Jesper.",
@@ -58,14 +58,14 @@ InfoPage::InfoPage( TQWidget* parent, const char* name )
"<h2>Author</h2>"
"<a href=\"http://www.blackie.dk/\">Jesper K. Pedersen</a> &lt;<a href=\"mailto:blackie@kde.org\">blackie@kde.org</a>&gt;")
- + TQString::tqfromLatin1( "</qt>" );
+ + TQString::fromLatin1( "</qt>" );
setText( txt );
}
void InfoPage::setSource ( const TQString& name )
{
#ifdef TQT_ONLY
- mimeSourceFactory()->setFilePath( TQStringList() << TQString::tqfromLatin1("manual/"));
+ mimeSourceFactory()->setFilePath( TQStringList() << TQString::fromLatin1("manual/"));
TQString nm = name;
if ( nm.endsWith("/") )
nm = nm.left( nm.length()-1);
diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp
index 95c0f25..1a2e371 100644
--- a/kregexpeditor/kregexpeditorgui.cpp
+++ b/kregexpeditor/kregexpeditorgui.cpp
@@ -117,16 +117,16 @@ void KRegExpEditorGUIDialog::doSomething( TQString method, void* arguments )
void KRegExpEditorGUI::doSomething( TQString method, void* arguments )
{
- if ( method == TQString::tqfromLatin1( "setCaseSensitive" ) ) {
+ if ( method == TQString::fromLatin1( "setCaseSensitive" ) ) {
_editor->setCaseSensitive( (bool) arguments );
}
- else if ( method == TQString::tqfromLatin1("setMinimal") ) {
+ else if ( method == TQString::fromLatin1("setMinimal") ) {
_editor->setMinimal( (bool) arguments );
}
- else if ( method == TQString::tqfromLatin1("setSyntax") ) {
+ else if ( method == TQString::fromLatin1("setSyntax") ) {
_editor->setSyntax( *((TQString*) arguments) );
}
- else if ( method == TQString::tqfromLatin1("setAllowNonTQtSyntax") ) {
+ else if ( method == TQString::fromLatin1("setAllowNonTQtSyntax") ) {
_editor->setAllowNonTQtSyntax( (bool) arguments );
}
else {
diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp
index 5d9df7a..c74531e 100644
--- a/kregexpeditor/kregexpeditorprivate.cpp
+++ b/kregexpeditor/kregexpeditorprivate.cpp
@@ -158,7 +158,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
TQLabel* label = new TQLabel( i18n("ASCII syntax:"), this );
tqlayout->addWidget( label );
clearButton = new TQToolButton( this );
- const TQString icon( TQString::tqfromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
+ const TQString icon( TQString::fromLatin1( TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase" ) );
TQIconSet clearIcon = SmallIconSet( icon );
clearButton->setIconSet( clearIcon );
tqlayout->addWidget( clearButton );
@@ -174,7 +174,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
#ifdef TQT_ONLY
TQPixmap pix( "icons/error.png" );
#else
- TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar );
+ TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/error.png") ), KIcon::Toolbar );
#endif
_error = new TQLabel( this );
_error->setPixmap( pix );
@@ -196,7 +196,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name)
accel->connectItem( accel->insertItem( CTRL+Key_Z ), this, TQT_SLOT( slotUndo() ) );
accel->connectItem( accel->insertItem( CTRL+Key_R ), this, TQT_SLOT( slotRedo() ) );
- setSyntax( TQString::tqfromLatin1( "TQt" ) );
+ setSyntax( TQString::fromLatin1( "TQt" ) );
}
TQString KRegExpEditorPrivate::regexp()
diff --git a/kregexpeditor/limitedcharlineedit.cpp b/kregexpeditor/limitedcharlineedit.cpp
index 59a6309..5e494d8 100644
--- a/kregexpeditor/limitedcharlineedit.cpp
+++ b/kregexpeditor/limitedcharlineedit.cpp
@@ -67,7 +67,7 @@ LimitedCharLineEdit::LimitedCharLineEdit( Mode mode, TQWidget* parent, const cha
_count = 4;
setMaxLength( _count );
- setFixedSize( fontMetrics().width('A')*5+5, tqsizeHint().height());
+ setFixedSize( fontMetrics().width('A')*5+5, sizeHint().height());
setValidator( new Validator( mode, this ) );
}
diff --git a/kregexpeditor/lookaheadwidget.cpp b/kregexpeditor/lookaheadwidget.cpp
index c5dc700..5ae0b9d 100644
--- a/kregexpeditor/lookaheadwidget.cpp
+++ b/kregexpeditor/lookaheadwidget.cpp
@@ -60,13 +60,13 @@ RegExp* LookAheadWidget::regExp() const
_child->regExp() );
}
-TQSize LookAheadWidget::tqsizeHint() const
+TQSize LookAheadWidget::sizeHint() const
{
- // TODO: Merge with RepeatWidget::tqsizeHint
+ // TODO: Merge with RepeatWidget::sizeHint
TQFontMetrics metrics = fontMetrics();
_textSize = metrics.size( 0, _text );
- _childSize = _child->tqsizeHint();
+ _childSize = _child->sizeHint();
int height = _textSize.height() + bdSize + _childSize.height() + bdSize + 2*pw;
int width = 2 * pw + TQMAX(_childSize.width(), 4*bdSize + _textSize.width());
@@ -76,7 +76,7 @@ TQSize LookAheadWidget::tqsizeHint() const
void LookAheadWidget::paintEvent( TQPaintEvent *e )
{
// TODO: Merge with RepeatWidget::paintEvent
- TQSize mySize = tqsizeHint();
+ TQSize mySize = sizeHint();
TQPainter painter(this);
drawPossibleSelection( painter, mySize );
diff --git a/kregexpeditor/lookaheadwidget.h b/kregexpeditor/lookaheadwidget.h
index 302090a..36c4e42 100644
--- a/kregexpeditor/lookaheadwidget.h
+++ b/kregexpeditor/lookaheadwidget.h
@@ -32,7 +32,7 @@ public:
virtual RegExp* regExp() const;
virtual RegExpType type() const { return _tp; }
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual RegExpWidget* findWidgetToEdit( TQPoint globalPos );
diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp
index 58c569d..47c323c 100644
--- a/kregexpeditor/main.cpp
+++ b/kregexpeditor/main.cpp
@@ -47,7 +47,7 @@ int main( int argc, char* argv[] )
TQVBoxLayout* lay = new TQVBoxLayout( top, 6 );
KRegExpEditorGUI* iface = new KRegExpEditorGUI( top, "_editor", TQStringList() );
- iface->doSomething( TQString::tqfromLatin1("setAllowNonTQtSyntax"), (bool*) true );
+ iface->doSomething( TQString::fromLatin1("setAllowNonTQtSyntax"), (bool*) true );
lay->addWidget( iface );
TQHBoxLayout* lay2 = new TQHBoxLayout( lay, 6 );
diff --git a/kregexpeditor/multicontainerwidget.cpp b/kregexpeditor/multicontainerwidget.cpp
index d8bef97..7f72e04 100644
--- a/kregexpeditor/multicontainerwidget.cpp
+++ b/kregexpeditor/multicontainerwidget.cpp
@@ -261,5 +261,5 @@ void MultiContainerWidget::updateCursorRecursively()
for ( TQPtrListIterator<RegExpWidget> it(_tqchildren); *it ; ++it ) {
(*it)->updateCursorRecursively();
}
- updatetqCursorShape();
+ updateCursorShape();
}
diff --git a/kregexpeditor/myfontmetrics.cpp b/kregexpeditor/myfontmetrics.cpp
index 38eb7dd..05b4ef3 100644
--- a/kregexpeditor/myfontmetrics.cpp
+++ b/kregexpeditor/myfontmetrics.cpp
@@ -19,7 +19,7 @@
TQSize HackCalculateFontSize(TQFontMetrics fm, TQString str )
{
- TQStringList list = TQStringList::split( TQString::tqfromLatin1("\n"), str );
+ TQStringList list = TQStringList::split( TQString::fromLatin1("\n"), str );
int maxWidth = 0;
int height = 0;
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
diff --git a/kregexpeditor/qregexpparser.y b/kregexpeditor/qregexpparser.y
index 6e9dc5e..75eeaa2 100644
--- a/kregexpeditor/qregexpparser.y
+++ b/kregexpeditor/qregexpparser.y
@@ -102,11 +102,11 @@ expression : expression TOK_Bar term {
$<regexp>$ = new AltnRegExp( false );
dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( $<regexp>1 );
}
- dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::tqfromLatin1("") ) );
+ dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) );
}
| TOK_Bar term {
$<regexp>$ = new AltnRegExp( false );
- dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::tqfromLatin1("") ) );
+ dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( new TextRegExp( false, QString::fromLatin1("") ) );
dynamic_cast<AltnRegExp*>( $<regexp>$ )->addRegExp( $<regexp>2 );
}
| TOK_Bar { $<regexp>$ = new AltnRegExp( false ); }
diff --git a/kregexpeditor/qtregexpconverter.cpp b/kregexpeditor/qtregexpconverter.cpp
index 72f9290..ab37244 100644
--- a/kregexpeditor/qtregexpconverter.cpp
+++ b/kregexpeditor/qtregexpconverter.cpp
@@ -51,11 +51,11 @@ TQString TQtRegExpConverter::toString( AltnRegExp* regexp, bool markSelection )
RegExpList list = regexp->tqchildren();
for ( RegExpListIt it(list); *it; ++it ) {
if ( !first ) {
- res += TQString::tqfromLatin1( "|" );
+ res += TQString::fromLatin1( "|" );
}
first = false;
if ( markSelection && !regexp->isSelected() && (*it)->isSelected() ) {
- res += TQString::tqfromLatin1("(") + toStr( *it, markSelection ) + TQString::tqfromLatin1(")");
+ res += TQString::fromLatin1("(") + toStr( *it, markSelection ) + TQString::fromLatin1(")");
}
else {
res += toStr( *it, markSelection );
@@ -77,25 +77,25 @@ TQString TQtRegExpConverter::toString( ConcRegExp* regexp, bool markSelection )
if ( markSelection )
startPar = TQString::fromLocal8Bit("(?:");
else
- startPar = TQString::tqfromLatin1( "(" );
- endPar = TQString::tqfromLatin1( ")" );
+ startPar = TQString::fromLatin1( "(" );
+ endPar = TQString::fromLatin1( ")" );
}
// Note these two have different tests! They are activated in each their iteration of the loop.
if ( markSelection && !childSelected && !regexp->isSelected() && (*it)->isSelected() ) {
- res += TQString::tqfromLatin1("(");
+ res += TQString::fromLatin1("(");
childSelected = true;
}
if ( markSelection && childSelected && !regexp->isSelected() && !(*it)->isSelected() ) {
- res += TQString::tqfromLatin1(")");
+ res += TQString::fromLatin1(")");
childSelected= false;
}
res += startPar + toStr( *it, markSelection ) + endPar;
}
if ( markSelection && childSelected && !regexp->isSelected() ) {
- res += TQString::tqfromLatin1(")");
+ res += TQString::fromLatin1(")");
}
return res;
}
@@ -103,9 +103,9 @@ TQString TQtRegExpConverter::toString( ConcRegExp* regexp, bool markSelection )
TQString TQtRegExpConverter::toString( LookAheadRegExp* regexp, bool markSelection )
{
if ( regexp->lookAheadType() == LookAheadRegExp::POSITIVE )
- return TQString::tqfromLatin1( "(?=" ) + toStr( regexp->child(), markSelection ) + TQString::fromLocal8Bit( ")" );
+ return TQString::fromLatin1( "(?=" ) + toStr( regexp->child(), markSelection ) + TQString::fromLocal8Bit( ")" );
else
- return TQString::tqfromLatin1( "(?!" ) + toStr( regexp->child(), markSelection ) + TQString::fromLocal8Bit( ")" );
+ return TQString::fromLatin1( "(?!" ) + toStr( regexp->child(), markSelection ) + TQString::fromLocal8Bit( ")" );
}
TQString TQtRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSelection*/ )
@@ -137,7 +137,7 @@ TQString TQtRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSelec
// Now insert the ranges.
TQPtrList<StringPair> ranges = regexp->range();
for ( TQPtrListIterator<StringPair> it(ranges); *it; ++it ) {
- txt.append((*it)->first()+ TQString::tqfromLatin1("-")+ (*it)->second());
+ txt.append((*it)->first()+ TQString::fromLatin1("-")+ (*it)->second());
}
// Ok, its time to build each part of the regexp, here comes the rule:
@@ -147,20 +147,20 @@ TQString TQtRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSelec
// finally if '^' is one of the characters, then it must not be the first
// one!
- TQString res = TQString::tqfromLatin1("[");
+ TQString res = TQString::fromLatin1("[");
if ( regexp->negate() )
- res.append(TQString::tqfromLatin1("^"));
+ res.append(TQString::fromLatin1("^"));
// a ']' must be the first character in teh range.
if ( foundParenthesis ) {
- res.append(TQString::tqfromLatin1("]"));
+ res.append(TQString::fromLatin1("]"));
}
// a '-' must be the first character ( only coming after a ']')
if ( foundDash ) {
- res.append(TQString::tqfromLatin1("-"));
+ res.append(TQString::fromLatin1("-"));
}
res += txt;
@@ -184,7 +184,7 @@ TQString TQtRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSelec
res.append( TQChar( '^' ) );
}
- res.append(TQString::tqfromLatin1("]"));
+ res.append(TQString::fromLatin1("]"));
return res;
}
@@ -192,30 +192,30 @@ TQString TQtRegExpConverter::toString( TextRangeRegExp* regexp, bool /*markSelec
TQString TQtRegExpConverter::toString( CompoundRegExp* regexp, bool markSelection )
{
if ( markSelection && !regexp->isSelected() && regexp->child()->isSelected() )
- return TQString::tqfromLatin1( "(" ) + toStr( regexp->child(), markSelection ) + TQString::tqfromLatin1( ")" );
+ return TQString::fromLatin1( "(" ) + toStr( regexp->child(), markSelection ) + TQString::fromLatin1( ")" );
else
return toStr( regexp->child(), markSelection );
}
TQString TQtRegExpConverter::toString( DotRegExp* /*regexp*/, bool /*markSelection*/ )
{
- return TQString::tqfromLatin1( "." );
+ return TQString::fromLatin1( "." );
}
TQString TQtRegExpConverter::toString( PositionRegExp* regexp, bool /*markSelection*/ )
{
switch (regexp->position()) {
case PositionRegExp::BEGLINE:
- return TQString::tqfromLatin1("^");
+ return TQString::fromLatin1("^");
case PositionRegExp::ENDLINE:
- return TQString::tqfromLatin1("$");
+ return TQString::fromLatin1("$");
case PositionRegExp::WORDBOUNDARY:
- return TQString::tqfromLatin1("\\b");
+ return TQString::fromLatin1("\\b");
case PositionRegExp::NONWORDBOUNDARY:
- return TQString::tqfromLatin1("\\B");
+ return TQString::fromLatin1("\\B");
}
Q_ASSERT( false );
- return TQString::tqfromLatin1("");
+ return TQString::fromLatin1("");
}
TQString TQtRegExpConverter::toString( RepeatRegExp* regexp, bool markSelection )
@@ -227,17 +227,17 @@ TQString TQtRegExpConverter::toString( RepeatRegExp* regexp, bool markSelection
if ( markSelection ) {
if ( !regexp->isSelected() && child->isSelected()) {
- startPar = TQString::tqfromLatin1( "(" );
- endPar = TQString::tqfromLatin1( ")" );
+ startPar = TQString::fromLatin1( "(" );
+ endPar = TQString::fromLatin1( ")" );
}
else if ( child->precedence() < regexp->precedence() ) {
- startPar = TQString::tqfromLatin1( "(?:" );
- endPar = TQString::tqfromLatin1( ")" );
+ startPar = TQString::fromLatin1( "(?:" );
+ endPar = TQString::fromLatin1( ")" );
}
}
else if ( child->precedence() < regexp->precedence() ) {
- startPar = TQString::tqfromLatin1( "(" );
- endPar = TQString::tqfromLatin1( ")" );
+ startPar = TQString::fromLatin1( "(" );
+ endPar = TQString::fromLatin1( ")" );
}
if ( regexp->min() == 0 && regexp->max() == -1) {
@@ -285,7 +285,7 @@ TQString TQtRegExpConverter::toString( TextRegExp* regexp, bool /*markSelection*
TQString TQtRegExpConverter::name()
{
- return TQString::tqfromLatin1( "TQt" );
+ return TQString::fromLatin1( "TQt" );
}
int TQtRegExpConverter::features()
diff --git a/kregexpeditor/regexp.cpp b/kregexpeditor/regexp.cpp
index cb94e84..11a8788 100644
--- a/kregexpeditor/regexp.cpp
+++ b/kregexpeditor/regexp.cpp
@@ -68,7 +68,7 @@ RegExp* RegExp::readRegExp( TQDomElement top, const TQString& version )
TQString RegExp::toXmlString() const
{
TQDomDocument doc;
- doc.setContent( TQString::tqfromLatin1( "<RegularExpression/>" ) );
+ doc.setContent( TQString::fromLatin1( "<RegularExpression/>" ) );
TQDomNode top = doc.documentElement();
top.toElement().setAttribute(TQString::fromLocal8Bit("version"), KRegExpEditorGUI::version);
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index abbfb38..0456816 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -53,7 +53,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name )
TQPixmap pix;
pix.convertFromImage( qembed_findImage( "select" ) );
#else
- TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar );
+ TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/select.png") ), KIcon::Toolbar );
#endif
_selectBut->setPixmap( pix );
@@ -156,10 +156,10 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri
{
#ifdef TQT_ONLY
TQPixmap pix;
- pix.convertFromImage( qembed_findImage( TQString::tqfromLatin1( name ) ) );
+ pix.convertFromImage( qembed_findImage( TQString::fromLatin1( name ) ) );
#else
- TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/")+TQString::tqfromLatin1(name) +
- TQString::tqfromLatin1(".png") ), KIcon::Toolbar );
+ TQPixmap pix = KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/")+TQString::fromLatin1(name) +
+ TQString::fromLatin1(".png") ), KIcon::Toolbar );
#endif
DoubleClickButton* but = new DoubleClickButton( pix, this, "RegExpButtons::but");
diff --git a/kregexpeditor/regexpconverter.cpp b/kregexpeditor/regexpconverter.cpp
index 951f0d7..2678591 100644
--- a/kregexpeditor/regexpconverter.cpp
+++ b/kregexpeditor/regexpconverter.cpp
@@ -53,7 +53,7 @@ TQString RegExpConverter::toStr( RegExp* regexp, bool markSelection )
case RegExp::TEXTRANGE: return toString( static_cast<TextRangeRegExp*>( regexp ), markSelection );
}
qWarning("We shouldn't get here!");
- return TQString::tqfromLatin1( "" );
+ return TQString::fromLatin1( "" );
}
diff --git a/kregexpeditor/regexpwidget.cpp b/kregexpeditor/regexpwidget.cpp
index c164c51..d6179b4 100644
--- a/kregexpeditor/regexpwidget.cpp
+++ b/kregexpeditor/regexpwidget.cpp
@@ -164,10 +164,10 @@ TQRect RegExpWidget::selectionRect() const
void RegExpWidget::enterEvent( TQEvent * )
{
- updatetqCursorShape();
+ updateCursorShape();
}
-void RegExpWidget::updatetqCursorShape()
+void RegExpWidget::updateCursorShape()
{
TQCursor cursor;
@@ -191,7 +191,7 @@ void RegExpWidget::updatetqCursorShape()
void RegExpWidget::updateCursorRecursively()
{
- updatetqCursorShape();
+ updateCursorShape();
}
diff --git a/kregexpeditor/regexpwidget.h b/kregexpeditor/regexpwidget.h
index 2fd455a..699f13f 100644
--- a/kregexpeditor/regexpwidget.h
+++ b/kregexpeditor/regexpwidget.h
@@ -148,7 +148,7 @@ public:
@li accept cursor for insert/paste
@li reject cursor for insert/paste
*/
- void updatetqCursorShape();
+ void updateCursorShape();
virtual void updateCursorRecursively();
diff --git a/kregexpeditor/repeatregexp.cpp b/kregexpeditor/repeatregexp.cpp
index 3a03e90..6b855f2 100644
--- a/kregexpeditor/repeatregexp.cpp
+++ b/kregexpeditor/repeatregexp.cpp
@@ -58,7 +58,7 @@ bool RepeatRegExp::load( TQDomElement top, const TQString& version )
if ( !ok ) {
KMessageBox::sorry( 0, i18n("<p>Value for attribute <b>%1</b> was not an integer for element "
"<b>%2</b></p><p>It contained the value <b>%3</b></p>")
- .tqarg(TQString::tqfromLatin1("lower")).tqarg(TQString::tqfromLatin1("Repeat")).tqarg(lower),
+ .tqarg(TQString::fromLatin1("lower")).tqarg(TQString::fromLatin1("Repeat")).tqarg(lower),
i18n("Error While Loading From XML File") ) ;
_lower = 0;
}
@@ -66,7 +66,7 @@ bool RepeatRegExp::load( TQDomElement top, const TQString& version )
if ( !ok ) {
KMessageBox::sorry( 0, i18n("<p>Value for attribute <b>%1</b> was not an integer for element "
"<b>%2</b></p><p>It contained the value <b>%3</b></p>")
- .tqarg(TQString::tqfromLatin1("upper")).tqarg(TQString::tqfromLatin1("Repeat")).tqarg(upper),
+ .tqarg(TQString::fromLatin1("upper")).tqarg(TQString::fromLatin1("Repeat")).tqarg(upper),
i18n("Error While Loading From XML File") ) ;
_upper = -1;
}
diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp
index 86f87f9..0d086c7 100644
--- a/kregexpeditor/repeatwidget.cpp
+++ b/kregexpeditor/repeatwidget.cpp
@@ -85,13 +85,13 @@ void RepeatWidget::init()
}
-TQSize RepeatWidget::tqsizeHint() const
+TQSize RepeatWidget::sizeHint() const
{
- // TODO: Merge with LookAheadWidget::tqsizeHint
+ // TODO: Merge with LookAheadWidget::sizeHint
TQFontMetrics metrics = fontMetrics();
_textSize = metrics.size( 0, _content->text() );
- _childSize = _child->tqsizeHint();
+ _childSize = _child->sizeHint();
int height = _textSize.height() + bdSize + _childSize.height() + bdSize + 2*pw;
int width = 2 * pw + TQMAX(_childSize.width(), 4*bdSize + _textSize.width());
@@ -101,7 +101,7 @@ TQSize RepeatWidget::tqsizeHint() const
void RepeatWidget::paintEvent( TQPaintEvent *e )
{
// TODO: Merge with LookAheadWidget::paintEvent
- TQSize mySize = tqsizeHint();
+ TQSize mySize = sizeHint();
TQPainter painter(this);
drawPossibleSelection( painter, mySize );
@@ -157,8 +157,8 @@ void RepeatWidget::slotConfigCanceled()
int RepeatWidget::edit()
{
- _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->tqsizeHint().width()/2,
- _configWindow->tqsizeHint().height()/2) );
+ _configWindow->move(TQCursor::pos() - TQPoint(_configWindow->sizeHint().width()/2,
+ _configWindow->sizeHint().height()/2) );
TQDataStream stream( _backup, IO_WriteOnly );
KWidgetStreamer streamer;
streamer.toStream( TQT_TQOBJECT(_content), stream );
diff --git a/kregexpeditor/repeatwidget.h b/kregexpeditor/repeatwidget.h
index 8911461..98ea6ee 100644
--- a/kregexpeditor/repeatwidget.h
+++ b/kregexpeditor/repeatwidget.h
@@ -80,7 +80,7 @@ public:
RepeatWidget( RepeatRegExp* regexp, RegExpEditorWindow* editorWindow,
TQWidget* parent, const char* name = 0);
void init();
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual RegExp* regExp() const;
virtual RegExpType type() const { return REPEAT; }
virtual int edit();
diff --git a/kregexpeditor/scrollededitorwindow.cpp b/kregexpeditor/scrollededitorwindow.cpp
index b14261c..07e8bf0 100644
--- a/kregexpeditor/scrollededitorwindow.cpp
+++ b/kregexpeditor/scrollededitorwindow.cpp
@@ -106,7 +106,7 @@ void RegExpScrolledEditorWindow::resizeEvent( TQResizeEvent *event )
void RegExpScrolledEditorWindow::slotUpdateContentSize( TQPoint focusPoint )
{
- TQSize childSize = _editorWindow->tqsizeHint();
+ TQSize childSize = _editorWindow->sizeHint();
TQSize vpSize = _scrollView->viewportSize(10,10);
bool change = false;
diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp
index ac42c83..25f0a00 100644
--- a/kregexpeditor/selectablelineedit.cpp
+++ b/kregexpeditor/selectablelineedit.cpp
@@ -43,13 +43,13 @@ void SelectableLineEdit::setSelected( bool selected )
tqrepaint();
}
-TQSize SelectableLineEdit::tqsizeHint() const
+TQSize SelectableLineEdit::sizeHint() const
{
int frameWidth = frame() ? 8 : 4; // from TQLineEdit source
TQFontMetrics metrics = fontMetrics();
int actualSize = metrics.width( text() );
int charWidth = metrics.maxWidth();
- int height = TQLineEdit::tqsizeHint().height();
+ int height = TQLineEdit::sizeHint().height();
int width;
if ( hasFocus() )
diff --git a/kregexpeditor/selectablelineedit.h b/kregexpeditor/selectablelineedit.h
index 7fb7ad7..79522b3 100644
--- a/kregexpeditor/selectablelineedit.h
+++ b/kregexpeditor/selectablelineedit.h
@@ -39,7 +39,7 @@ Q_OBJECT
public:
SelectableLineEdit( RegExpWidget* owner, TQWidget* parent = 0, const char* name = 0);
void setSelected( bool selected );
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
protected slots:
void slotKeyPressed();
diff --git a/kregexpeditor/singlecontainerwidget.cpp b/kregexpeditor/singlecontainerwidget.cpp
index 2413236..27035af 100644
--- a/kregexpeditor/singlecontainerwidget.cpp
+++ b/kregexpeditor/singlecontainerwidget.cpp
@@ -126,7 +126,7 @@ void SingleContainerWidget::updateAll()
void SingleContainerWidget::updateCursorRecursively()
{
_child->updateCursorRecursively();
- updatetqCursorShape();
+ updateCursorShape();
}
diff --git a/kregexpeditor/test-without-dl/main.cpp b/kregexpeditor/test-without-dl/main.cpp
index 76e2fbe..0094b4a 100644
--- a/kregexpeditor/test-without-dl/main.cpp
+++ b/kregexpeditor/test-without-dl/main.cpp
@@ -50,9 +50,9 @@ int main( int argc, char* argv[] )
tqApp->installEventFilter( new ShootABug() );
KRegExpEditorGUIDialog* iface = new KRegExpEditorGUIDialog( 0, "_editor", TQStringList() );
- iface->setRegExp( TQString::tqfromLatin1( "#include" ) );
+ iface->setRegExp( TQString::fromLatin1( "#include" ) );
iface->doSomething( "setMinimal", (void*) false );
- iface->doSomething( "setSyntax", (void*) new TQString( TQString::tqfromLatin1( "Emacs" ) ) );
+ iface->doSomething( "setSyntax", (void*) new TQString( TQString::fromLatin1( "Emacs" ) ) );
iface->doSomething( "setShowSyntaxCombo", (bool*) true );
TQFile file("/packages/kde-src/tdeutils/kregexpeditor/test/main.cpp");
diff --git a/kregexpeditor/textregexp.cpp b/kregexpeditor/textregexp.cpp
index d53d916..c31f9ac 100644
--- a/kregexpeditor/textregexp.cpp
+++ b/kregexpeditor/textregexp.cpp
@@ -62,7 +62,7 @@ bool TextRegExp::load( TQDomElement top, const TQString& /*version*/)
_text = txtNode.data();
}
else {
- _text = TQString::tqfromLatin1( "" );
+ _text = TQString::fromLatin1( "" );
}
return true;
diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp
index 99a77e1..9c58e66 100644
--- a/kregexpeditor/textwidget.cpp
+++ b/kregexpeditor/textwidget.cpp
@@ -66,9 +66,9 @@ void TextWidget::slotUpdate()
_editorWindow->updateContent( this );
}
-TQSize TextWidget::tqsizeHint() const
+TQSize TextWidget::sizeHint() const
{
- return _edit->tqsizeHint();
+ return _edit->sizeHint();
}
void TextWidget::paintEvent( TQPaintEvent *e)
diff --git a/kregexpeditor/textwidget.h b/kregexpeditor/textwidget.h
index 71ccf9b..ac1c069 100644
--- a/kregexpeditor/textwidget.h
+++ b/kregexpeditor/textwidget.h
@@ -37,7 +37,7 @@ public:
const char *name = 0);
TextWidget( TextRegExp* regexp, RegExpEditorWindow* editorWindow,
TQWidget* parent, const char* name = 0);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
virtual RegExp* regExp() const;
virtual RegExpType type() const { return TEXT; }
virtual void updateAll();
diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp
index 85dc96e..385ea69 100644
--- a/kregexpeditor/userdefinedregexps.cpp
+++ b/kregexpeditor/userdefinedregexps.cpp
@@ -68,7 +68,7 @@ void UserDefinedRegExps::slotPopulateUserRegexps()
#ifdef TQT_ONLY
TQStringList dirs;
- dirs << TQString::tqfromLatin1( "predefined" );
+ dirs << TQString::fromLatin1( "predefined" );
#else
TQStringList dirs = KGlobal::dirs()->findDirs( "data", TQString::fromLocal8Bit("kregexpeditor/predefined/") );
#endif
@@ -88,7 +88,7 @@ void UserDefinedRegExps::slotPopulateUserRegexps()
void UserDefinedRegExps::createItems( const TQString& _title, const TQString& dir, bool usersRegExp )
{
TQString title = _title;
- if (_title == TQString::tqfromLatin1("general"))
+ if (_title == TQString::fromLatin1("general"))
title = i18n("General");
TQListViewItem* lvItem = new TQListViewItem( _userDefined, title );
@@ -256,7 +256,7 @@ void WidgetWinItem::setName( const TQString& nm )
TQString WidgetWinItem::path()
{
#ifdef TQT_ONLY
- return TQString::tqfromLatin1( "predefined" );
+ return TQString::fromLatin1( "predefined" );
#else
return locateLocal("data", TQString::fromLocal8Bit("KRegExpEditor/"));
#endif
diff --git a/kregexpeditor/util.cpp b/kregexpeditor/util.cpp
index b6cf4c6..a57f99c 100644
--- a/kregexpeditor/util.cpp
+++ b/kregexpeditor/util.cpp
@@ -26,7 +26,7 @@ TQPixmap Util::getKRegExpEditorIcon( const TQString& name )
pix.convertFromImage( qembed_findImage(name) );
return pix;
#else
- return KGlobal::iconLoader()->loadIcon(locate("data", TQString::tqfromLatin1("kregexpeditor/pics/") +name ),
+ return KGlobal::iconLoader()->loadIcon(locate("data", TQString::fromLatin1("kregexpeditor/pics/") +name ),
KIcon::Toolbar );
#endif
}
diff --git a/kregexpeditor/verifier.cpp b/kregexpeditor/verifier.cpp
index 18e1be3..2b6649b 100644
--- a/kregexpeditor/verifier.cpp
+++ b/kregexpeditor/verifier.cpp
@@ -97,7 +97,7 @@ void Verifier::setMinimal( bool b )
//
// void Verifier::gotoNum( int which )
// {
-// TQString anchor = TQString::tqfromLatin1("match%1").tqarg(which);
+// TQString anchor = TQString::fromLatin1("match%1").tqarg(which);
// scrollToAnchor( anchor );
// _current = which;
// emit currentChanged( _current );
diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp
index 675d3e6..e36e934 100644
--- a/kregexpeditor/verifybuttons.cpp
+++ b/kregexpeditor/verifybuttons.cpp
@@ -45,7 +45,7 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
TQBoxLayout* tqlayout = boxLayout();
_verify = new TQToolButton(this);
- TQIconSet icon = Util::getSystemIconSet( TQString::tqfromLatin1("spellcheck"));
+ TQIconSet icon = Util::getSystemIconSet( TQString::fromLatin1("spellcheck"));
_verify->setIconSet( icon );
TQToolTip::add( _verify, i18n( "Verify regular expression" ) );
TQWhatsThis::add( _verify, i18n("Shows what part of the regular expression is being matched in the <i>verifier window</i>."
@@ -54,35 +54,35 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name )
connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) );
TQToolButton* button = new TQToolButton(this);
- button->setPixmap( Util::getSystemIcon( TQString::tqfromLatin1("fileopen")) );
+ button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("fileopen")) );
tqlayout->addWidget( button );
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText()));
TQToolTip::add( button, i18n("Load text in the verifier window") );
button = new TQToolButton(this);
- button->setPixmap( Util::getSystemIcon( TQString::tqfromLatin1("package_settings")) );
+ button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) );
tqlayout->addWidget( button );
connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure()));
TQToolTip::add( button, i18n("Settings") );
// It is currently not possible to ask for the paragraph being highlighted, thefore scrolling to next/prev match
// do not work. Enable this when they work.
- // _first = new TQToolButton( TQString::tqfromLatin1("<<"), this);
+ // _first = new TQToolButton( TQString::fromLatin1("<<"), this);
// tqlayout->addWidget( _first );
// connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst()));
// _first->setFixedWidth( 25 );
//
- // _prev = new TQToolButton(TQString::tqfromLatin1("<"), this);
+ // _prev = new TQToolButton(TQString::fromLatin1("<"), this);
// tqlayout->addWidget( _prev );
// connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev()));
// _prev->setFixedWidth( 20 );
//
- // _next = new TQToolButton(TQString::tqfromLatin1(">"), this);
+ // _next = new TQToolButton(TQString::fromLatin1(">"), this);
// tqlayout->addWidget( _next );
// connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext()));
// _next->setFixedWidth( 20 );
//
- // _last = new TQToolButton(TQString::tqfromLatin1(">>"), this);
+ // _last = new TQToolButton(TQString::fromLatin1(">>"), this);
// tqlayout->addWidget( _last );
// connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast()));
// _last->setFixedWidth( 25 );
@@ -179,7 +179,7 @@ void VerifyButtons::setMatchCount( int /*count*/ )
// currently this is not possible due to limitation in TQSyntaxHighlighter
/*
if ( count == -1 )
- _matches->setText( TQString::tqfromLatin1("-") );
+ _matches->setText( TQString::fromLatin1("-") );
else
_matches->setText( TQString::number( count ) );
*/
diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp
index 9f167b2..a5866d6 100644
--- a/kregexpeditor/widgetfactory.cpp
+++ b/kregexpeditor/widgetfactory.cpp
@@ -191,14 +191,14 @@ RegExp* WidgetFactory::createRegExp( TQString str )
// Read the RegularExpression element, and extract the version.
TQDomElement top = doc.documentElement();
if (! (top.tagName() == TQString::fromLocal8Bit("RegularExpression")) ) {
- KMessageBox::sorry( 0, i18n("<p>XML file did not contain a <b>%1</b> tag.</p>").tqarg(TQString::tqfromLatin1("RegularExpression")),
+ KMessageBox::sorry( 0, i18n("<p>XML file did not contain a <b>%1</b> tag.</p>").tqarg(TQString::fromLatin1("RegularExpression")),
i18n("Error While Loading From XML File") ) ;
}
TQString version = top.attribute( TQString::fromLocal8Bit("version"), KRegExpEditorGUI::version );
TQDomNode child = top.firstChild();
if ( ! child.isElement() ) {
KMessageBox::sorry( 0, i18n("<p>Error while reading XML file. The element just below the tag "
- "<b>%1</b> was not an element.</p>").tqarg(TQString::tqfromLatin1("RegularExpression")),
+ "<b>%1</b> was not an element.</p>").tqarg(TQString::fromLatin1("RegularExpression")),
i18n("Error While Loading From XML File") ) ;
}
diff --git a/kregexpeditor/zerowidgets.cpp b/kregexpeditor/zerowidgets.cpp
index eaf1aaf..7d98609 100644
--- a/kregexpeditor/zerowidgets.cpp
+++ b/kregexpeditor/zerowidgets.cpp
@@ -42,7 +42,7 @@ void ZeroWidget::addNewChild(DragAccepter *, RegExpWidget *)
qFatal("No tqchildren should be added to this widget!");
}
-TQSize ZeroWidget::tqsizeHint() const
+TQSize ZeroWidget::sizeHint() const
{
TQFontMetrics metrics = fontMetrics();
_textSize = HackCalculateFontSize( metrics, _text );
@@ -54,7 +54,7 @@ TQSize ZeroWidget::tqsizeHint() const
void ZeroWidget::paintEvent( TQPaintEvent *e)
{
// So what is my Size?
- TQSize mySize = tqsizeHint();
+ TQSize mySize = sizeHint();
TQPainter painter(this);
drawPossibleSelection( painter, mySize);
diff --git a/kregexpeditor/zerowidgets.h b/kregexpeditor/zerowidgets.h
index 780f426..04dd5c7 100644
--- a/kregexpeditor/zerowidgets.h
+++ b/kregexpeditor/zerowidgets.h
@@ -30,7 +30,7 @@ public:
ZeroWidget(TQString text, RegExpEditorWindow* editorWindow, TQWidget *parent,
const char *name = 0);
virtual void addNewChild(DragAccepter *accepter, RegExpWidget *child);
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
protected:
virtual void paintEvent( TQPaintEvent *e );
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index 3727b1f..0e89bc1 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -61,7 +61,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name)
m_sizeHSpin->setValue(40);
m_sizeHSpin->setMinValue(40);
m_sizeHSpin->setMaxValue(200);
- m_sizeHSpin->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+ m_sizeHSpin->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
TQSizePolicy::Fixed));
sizeBoxLayout->addWidget(m_sizeHSpin, 0, 1);
@@ -77,7 +77,7 @@ KSim::GeneralPrefs::GeneralPrefs(TQWidget *parent, const char *name)
m_sizeWSpin->setValue(58);
m_sizeWSpin->setMinValue(58);
m_sizeWSpin->setMaxValue(200);
- m_sizeWSpin->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+ m_sizeWSpin->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
TQSizePolicy::Fixed));
sizeBoxLayout->addWidget(m_sizeWSpin, 1, 1);
@@ -168,7 +168,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
m_uptimeCombo = new KComboBox(true, this);
m_uptimeCombo->setDuplicatesEnabled(false);
- m_uptimeCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+ m_uptimeCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Fixed));
m_uptimeCombo->insertItem(i18n("%hh:%mm:%ss"));
m_uptimeCombo->insertItem(i18n("%dd %h:%m"));
@@ -214,7 +214,7 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name)
m_uptimeBox->tqlayout()->setSpacing(0);
m_uptimeBox->tqlayout()->setMargin(0);
m_boxLayout = new TQVBoxLayout(m_uptimeBox->tqlayout());
- m_boxLayout->tqsetAlignment(TQt::AlignTop);
+ m_boxLayout->setAlignment(TQt::AlignTop);
m_boxLayout->setSpacing(6);
m_boxLayout->setMargin(11);
@@ -305,7 +305,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
m_memCombo = new KComboBox(true, this);
m_memCombo->setDuplicatesEnabled(false);
- m_memCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+ m_memCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Fixed));
//m_memCombo->insertItem(i18n("%tM - %fM free"));
//m_memCombo->insertItem(i18n("%tM - %uM used"));
@@ -350,7 +350,7 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name)
m_memBox->tqlayout()->setSpacing(0);
m_memBox->tqlayout()->setMargin(0);
m_boxLayout = new TQVBoxLayout(m_memBox->tqlayout());
- m_boxLayout->tqsetAlignment(TQt::AlignTop);
+ m_boxLayout->setAlignment(TQt::AlignTop);
m_boxLayout->setSpacing(6);
m_boxLayout->setMargin(11);
@@ -458,7 +458,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
m_swapCombo = new KComboBox(true, this);
m_swapCombo->setDuplicatesEnabled(false);
- m_swapCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+ m_swapCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Fixed));
//m_swapCombo->insertItem(i18n("%tM - %fM free"));
//m_swapCombo->insertItem(i18n("%tM - %uM used"));
@@ -499,7 +499,7 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name)
m_swapBox->tqlayout()->setSpacing(0);
m_swapBox->tqlayout()->setMargin(0);
m_boxLayout = new TQVBoxLayout(m_swapBox->tqlayout());
- m_boxLayout->tqsetAlignment(TQt::AlignTop);
+ m_boxLayout->setAlignment(TQt::AlignTop);
m_boxLayout->setSpacing(6);
m_boxLayout->setMargin(11);
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index 2e2587e..8a2b643 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -75,9 +75,9 @@ KSim::PanelExtension::~PanelExtension()
delete m_dcopClient;
}
-TQSize KSim::PanelExtension::tqsizeHint(Position p, TQSize maxSize) const
+TQSize KSim::PanelExtension::sizeHint(Position p, TQSize maxSize) const
{
- return m_view->tqsizeHint(p, maxSize);
+ return m_view->sizeHint(p, maxSize);
}
void KSim::PanelExtension::resizeEvent(TQResizeEvent *)
diff --git a/ksim/ksim.h b/ksim/ksim.h
index 2c1a4f5..5451b83 100644
--- a/ksim/ksim.h
+++ b/ksim/ksim.h
@@ -42,7 +42,7 @@ namespace KSim
~PanelExtension();
- TQSize tqsizeHint( Position, TQSize maxSize ) const;
+ TQSize sizeHint( Position, TQSize maxSize ) const;
void resizeEvent(TQResizeEvent *);
Position preferedPosition() const;
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 6813aeb..49e4608 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -86,7 +86,7 @@ void KSim::Sysinfo::clockUptimeUpdate()
// only update the date when necessary
if (m_dateLabel) {
if (updateDate) {
- m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()));
+ m_dateLabel->setText(KGlobal::locale()->formatDate(TQDate::currentDate()));
updateDate = false;
}
}
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 1e93816..af53876 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -183,8 +183,8 @@ KSim::Config *KSim::MainView::config() const
void KSim::MainView::makeDirs()
{
TQString homeDir = locateLocal("data", "ksim");
- TQString themeDir = homeDir + TQString::tqfromLatin1("/themes");
- TQString monitorDir = homeDir + TQString::tqfromLatin1("/monitors");
+ TQString themeDir = homeDir + TQString::fromLatin1("/themes");
+ TQString monitorDir = homeDir + TQString::fromLatin1("/monitors");
// return true if the dirs already exist
if (TQFile::exists(themeDir) && TQFile::exists(monitorDir))
@@ -217,7 +217,7 @@ void KSim::MainView::maskMainView()
!m_rightFrame->background()->mask() ||
!m_bottomFrame->background()->mask())
{
- tqtopLevelWidget()->clearMask();
+ topLevelWidget()->clearMask();
return;
}
@@ -229,13 +229,13 @@ void KSim::MainView::maskMainView()
TQSize insideSize(m_pluginLayout->tqgeometry().size());
// make a cleared bigrect where we can put our pixmap masks on
- TQBitmap bigBitmap(tqtopLevelWidget()->size(), true);
+ TQBitmap bigBitmap(topLevelWidget()->size(), true);
// better return if our bitmap is null so we can avoid crashes
if (bigBitmap.isNull())
return;
- TQPoint ofs = mapTo(tqtopLevelWidget(), TQPoint(0,0));
+ TQPoint ofs = mapTo(topLevelWidget(), TQPoint(0,0));
int ofsX = ofs.x();
int ofsY = ofs.y();
@@ -254,7 +254,7 @@ void KSim::MainView::maskMainView()
bottomPixmap);
painter.end();
- tqtopLevelWidget()->setMask(bigBitmap);
+ topLevelWidget()->setMask(bigBitmap);
}
void KSim::MainView::reparseConfig(bool emitReload,
@@ -430,7 +430,7 @@ void KSim::MainView::destroyPref()
}
}
-TQSize KSim::MainView::tqsizeHint(KPanelExtension::Position p, TQSize) const
+TQSize KSim::MainView::sizeHint(KPanelExtension::Position p, TQSize) const
{
int width = 0;
int height = 0;
@@ -439,7 +439,7 @@ TQSize KSim::MainView::tqsizeHint(KPanelExtension::Position p, TQSize) const
for( TQLayoutIterator it = m_pluginLayout->iterator();
(child = it.current()) != 0; ++it)
{
- TQSize sz = child->tqminimumSize();
+ TQSize sz = child->minimumSize();
if ((p == KPanelExtension::Right) || (p == KPanelExtension::Left))
{
width = TQMAX(width, sz.width());
diff --git a/ksim/ksimview.h b/ksim/ksimview.h
index 7aaacf1..6bbb989 100644
--- a/ksim/ksimview.h
+++ b/ksim/ksimview.h
@@ -63,7 +63,7 @@ namespace KSim
KSim::Config *config() const;
void makeDirs();
- TQSize tqsizeHint(KPanelExtension::Position, TQSize maxSize) const;
+ TQSize sizeHint(KPanelExtension::Position, TQSize maxSize) const;
void positionChange(Qt::Orientation);
k_dcop:
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index ca555a4..388b9ea 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -251,7 +251,7 @@ void KSim::Chart::buildPixmaps()
void KSim::Chart::configureObject(bool repaintWidget)
{
- TQSize oldSize = tqsizeHint();
+ TQSize oldSize = sizeHint();
KSim::Config::config()->setGroup("Misc");
d->size = KSim::Config::config()->readSizeEntry("GraphSize");
@@ -264,10 +264,10 @@ void KSim::Chart::configureObject(bool repaintWidget)
}
// Update our tqgeometry if we need to let any
- // tqlayout know about our tqsizeHint() change
- if (oldSize != tqsizeHint()) {
+ // tqlayout know about our sizeHint() change
+ if (oldSize != sizeHint()) {
// Using resize() here seems to be needed
- resize(tqsizeHint());
+ resize(sizeHint());
updateGeometry();
}
@@ -279,14 +279,14 @@ void KSim::Chart::configureObject(bool repaintWidget)
update();
}
-TQSize KSim::Chart::tqsizeHint() const
+TQSize KSim::Chart::sizeHint() const
{
return d->size;
}
-TQSize KSim::Chart::tqminimumSizeHint() const
+TQSize KSim::Chart::minimumSizeHint() const
{
- return tqsizeHint();
+ return sizeHint();
}
void KSim::Chart::resizeEvent(TQResizeEvent *re)
@@ -608,7 +608,7 @@ void KSim::Chart::init(bool krell, int maxValue, const TQString &title)
{
setConfigString("StyleChart");
setThemeConfigOnly(false);
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
+ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed));
d = new Private;
KSim::Config::config()->setGroup("Misc");
diff --git a/ksim/library/chart.h b/ksim/library/chart.h
index cd658c0..6f8cfeb 100644
--- a/ksim/library/chart.h
+++ b/ksim/library/chart.h
@@ -109,11 +109,11 @@ namespace KSim
/**
* reimplemented for internal reasons
*/
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
/**
* reimplemented for internal reasons
*/
- TQSize tqminimumSizeHint() const;
+ TQSize minimumSizeHint() const;
void disableAutomaticUpdates();
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 0b9ed18..32a18d8 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -88,7 +88,7 @@ void KSim::Label::configureObject(bool repaintWidget)
d->meterImage.load(image);
KSim::ThemeLoader::self().reColourImage(d->meterImage);
d->background = d->meterImage.smoothScale(size());
- TQSize oldSize = tqsizeHint();
+ TQSize oldSize = sizeHint();
setConfigValues();
relayoutLabel(oldSize, repaintWidget);
@@ -99,7 +99,7 @@ void KSim::Label::setPixmap(const TQPixmap &pixmap)
if (pixmap.serialNumber() == d->sidePixmap.serialNumber())
return;
- TQSize oldSize = tqsizeHint();
+ TQSize oldSize = sizeHint();
d->sidePixmap = pixmap;
relayoutLabel(oldSize);
@@ -110,7 +110,7 @@ const TQPixmap &KSim::Label::pixmap() const
return d->sidePixmap;
}
-TQSize KSim::Label::tqsizeHint() const
+TQSize KSim::Label::sizeHint() const
{
int width = fontMetrics().size(SingleLine, text()).width();
if (!pixmap().isNull())
@@ -123,9 +123,9 @@ TQSize KSim::Label::tqsizeHint() const
return TQSize(width, height);
}
-TQSize KSim::Label::tqminimumSizeHint() const
+TQSize KSim::Label::minimumSizeHint() const
{
- return tqsizeHint();
+ return sizeHint();
}
void KSim::Label::clear()
@@ -138,7 +138,7 @@ void KSim::Label::setText(const TQString &text)
if (text == d->text)
return; // If the text is the same, no need to tqrepaint etc
- TQSize oldSize = tqsizeHint();
+ TQSize oldSize = sizeHint();
// set the text of our widget and tqrepaint
d->text = text;
relayoutLabel(oldSize);
@@ -232,7 +232,7 @@ void KSim::Label::drawText(TQPainter *painter, const TQRect &rect,
if (!pixmap().isNull())
location.setX(pixmap().width() + 5);
- tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), true,
+ tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true,
0, text, -1, &color);
}
@@ -242,7 +242,7 @@ void KSim::Label::drawPixmap(TQPainter *painter, const TQRect &rect,
TQRect location(rect);
location.setWidth(pixmap.width());
- tqstyle().drawItem(painter, location, AlignCenter, tqcolorGroup(), true,
+ tqstyle().drawItem(painter, location, AlignCenter, colorGroup(), true,
pixmap.isNull() ? 0 : &pixmap, TQString());
}
@@ -268,7 +268,7 @@ const TQRect &KSim::Label::shadowLocation() const
void KSim::Label::setThemePixmap(const TQString &image)
{
- TQSize oldSize = tqsizeHint();
+ TQSize oldSize = sizeHint();
d->meterImage.reset();
d->meterImage.load(image);
KSim::ThemeLoader::self().reColourImage(d->meterImage);
@@ -278,7 +278,7 @@ void KSim::Label::setThemePixmap(const TQString &image)
void KSim::Label::relayoutLabel(const TQSize &old, bool tqrepaint)
{
- if (tqsizeHint() != old) {
+ if (sizeHint() != old) {
updateGeometry();
}
@@ -294,7 +294,7 @@ void KSim::Label::initWidget(int type)
// try to reduce flicker as much as possible
setBackgroundMode(NoBackground);
- tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
+ setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed));
configureObject();
diff --git a/ksim/library/label.h b/ksim/library/label.h
index f20d8df..8ae9b64 100644
--- a/ksim/library/label.h
+++ b/ksim/library/label.h
@@ -108,11 +108,11 @@ namespace KSim
/**
* reimplemented for internal reasons
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
/**
* reimplemented for internal reasons
*/
- virtual TQSize tqminimumSizeHint() const;
+ virtual TQSize minimumSizeHint() const;
public slots:
/**
diff --git a/ksim/library/led.cpp b/ksim/library/led.cpp
index 3fa8d7f..a20a1d1 100644
--- a/ksim/library/led.cpp
+++ b/ksim/library/led.cpp
@@ -234,9 +234,9 @@ void KSim::LedLabel::configureObject(bool reapaintWidget)
update();
}
-TQSize KSim::LedLabel::tqsizeHint() const
+TQSize KSim::LedLabel::sizeHint() const
{
- TQSize hint(Progress::tqsizeHint());
+ TQSize hint(Progress::sizeHint());
if (d->sendLed.height() > hint.height())
hint.setHeight(d->sendLed.height());
diff --git a/ksim/library/led.h b/ksim/library/led.h
index 5c5e615..bdb26f4 100644
--- a/ksim/library/led.h
+++ b/ksim/library/led.h
@@ -150,7 +150,7 @@ namespace KSim
/**
* reimplemented for internal reasons
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
/**
diff --git a/ksim/library/progress.cpp b/ksim/library/progress.cpp
index e37cff1..82ae16e 100644
--- a/ksim/library/progress.cpp
+++ b/ksim/library/progress.cpp
@@ -124,9 +124,9 @@ void KSim::Progress::configureObject(bool repaintWidget)
update();
}
-TQSize KSim::Progress::tqsizeHint() const
+TQSize KSim::Progress::sizeHint() const
{
- TQSize hint(Label::tqsizeHint());
+ TQSize hint(Label::sizeHint());
if (d->meterPixmap.height() > hint.height())
hint.setHeight(d->meterPixmap.height());
@@ -186,7 +186,7 @@ void KSim::Progress::setOrigin(const TQRect &origin)
void KSim::Progress::setMeterPixmap(const TQPixmap &pixmap)
{
- TQSize oldSize = tqsizeHint();
+ TQSize oldSize = sizeHint();
d->meterPixmap = pixmap;
relayoutLabel(oldSize);
}
diff --git a/ksim/library/progress.h b/ksim/library/progress.h
index 0e30986..415c9fa 100644
--- a/ksim/library/progress.h
+++ b/ksim/library/progress.h
@@ -122,7 +122,7 @@ namespace KSim
/**
* reimplemented for internal reasons
*/
- virtual TQSize tqsizeHint() const;
+ virtual TQSize sizeHint() const;
public slots:
/**
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index 3fced29..a453af2 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -691,7 +691,7 @@ TQString KSim::Theme::readColourEntry(const TQString &itemType,
{
TQString color = readEntry(itemType, entry);
if (color.isEmpty())
- color = TQString::tqfromLatin1("#ffffff #ffffff");
+ color = TQString::fromLatin1("#ffffff #ffffff");
return TQStringList::split(' ', color)[row];
}
@@ -927,7 +927,7 @@ void KSim::ThemeLoader::reload()
if (m_theme.d)
m_theme.d->globalReader = d->globalReader;
- TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString();
+ TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString();
m_theme.reparse(currentUrl(), fileName, currentAlternative());
}
@@ -1036,7 +1036,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
{
TQString homePath = TQDir::current().path();
homePath = locateLocal( "data", "ksim" )
- + TQString::tqfromLatin1( "/themes" )
+ + TQString::fromLatin1( "/themes" )
+ homePath.right( homePath.length()
- homePath.findRev( TQRegExp( "\\/" ),
homePath.length() ) );
@@ -1072,7 +1072,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
// go through the meters array and move the files to the correct dir/filename
TQStringList::Iterator meter;
for (meter = meters.begin(); meter != meters.end(); ++meter) {
- TQString bgMeter = TQString::tqfromLatin1("bg_meter_");
+ TQString bgMeter = TQString::fromLatin1("bg_meter_");
if (TQFile::exists(bgMeter + (*meter) + altString + "." + (*format))) {
if (KStandardDirs::makeDir(url + (*meter)))
directory.rename(bgMeter + (*meter) + altString + "." + (*format),
@@ -1083,7 +1083,7 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
// go through the panels array and move the files to the correct dir/filename
TQStringList::ConstIterator panel;
for (panel = panels.begin(); panel != panels.end(); ++panel) {
- TQString bgPanel = TQString::tqfromLatin1("bg_panel_");
+ TQString bgPanel = TQString::fromLatin1("bg_panel_");
if (TQFile::exists(bgPanel + (*panel) + altString + "." + (*format))) {
if (KStandardDirs::makeDir(url + (*panel)))
directory.rename(bgPanel + (*panel) + altString + "." + (*format),
@@ -1092,13 +1092,13 @@ void KSim::ThemeLoader::parseDir(const TQString &url, int alt)
}
// fix stupid themes that have a bg_panel image in the host dir
- TQString tempFile = TQString::tqfromLatin1("host/bg_panel");
+ TQString tempFile = TQString::fromLatin1("host/bg_panel");
if (TQFile::exists(tempFile + altString + "." + (*format)))
directory.rename(tempFile + altString + "." + (*format), "host/bg_meter"
+ altString + "." + (*format));
// move decal_net_leds* to the net folder to be more consistant
- tempFile = TQString::tqfromLatin1("decal_net_leds");
+ tempFile = TQString::fromLatin1("decal_net_leds");
if (TQFile::exists(tempFile + altString + "." + (*format))) {
if (KStandardDirs::makeDir(url + "net"))
directory.rename(tempFile + altString + "." + (*format),
@@ -1159,7 +1159,7 @@ int KSim::ThemeLoader::currentAlternative()
TQString KSim::ThemeLoader::alternativeAsString(int alt)
{
int alternative = (alt == -1 ? currentAlternative() : alt);
- return (alternative == 0 ? TQString() : TQString::tqfromLatin1("_")
+ return (alternative == 0 ? TQString() : TQString::fromLatin1("_")
+ TQString::number(alternative));
}
@@ -1225,7 +1225,7 @@ KSim::ThemeLoader::ThemeLoader()
m_theme.create(d->fileNames, d->imageTypes, d->globalReader);
- TQString fileName = TQString::tqfromLatin1("gkrellmrc") + alternativeAsString();
+ TQString fileName = TQString::fromLatin1("gkrellmrc") + alternativeAsString();
m_theme.init(currentUrl(), fileName, currentAlternative());
reColourItems();
diff --git a/ksim/library/themetypes.h b/ksim/library/themetypes.h
index 82b7aa3..9ca4bb4 100644
--- a/ksim/library/themetypes.h
+++ b/ksim/library/themetypes.h
@@ -74,7 +74,7 @@ namespace KSim
TQString returnString;
returnString.setLatin1(typeNames[type]);
- return incSlash ? returnString + TQString::tqfromLatin1("/") : returnString;
+ return incSlash ? returnString + TQString::fromLatin1("/") : returnString;
}
}
}
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 39bbffd..2f05e7c 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -397,7 +397,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name)
m_legendBox->tqlayout()->setMargin(0);
m_legendLayout = new TQVBoxLayout(m_legendBox->tqlayout());
- m_legendLayout->tqsetAlignment(TQt::AlignTop);
+ m_legendLayout->setAlignment(TQt::AlignTop);
m_legendLayout->setSpacing(6);
m_legendLayout->setMargin(11);
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index c91f173..69c1219 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -414,19 +414,19 @@ TQString DiskView::diskName( int major, int minor ) const
switch ( major )
{
case IDE0_MAJOR:
- returnValue.prepend(TQString::tqfromLatin1("hda"));
+ returnValue.prepend(TQString::fromLatin1("hda"));
break;
case IDE1_MAJOR:
- returnValue.prepend(TQString::tqfromLatin1("hdc"));
+ returnValue.prepend(TQString::fromLatin1("hdc"));
break;
case IDE3_MAJOR:
- returnValue.prepend(TQString::tqfromLatin1("hde"));
+ returnValue.prepend(TQString::fromLatin1("hde"));
break;
case SCSI_DISK0_MAJOR:
- returnValue.prepend(TQString::tqfromLatin1("sda"));
+ returnValue.prepend(TQString::fromLatin1("sda"));
break;
case SCSI_GENERIC_MAJOR:
- returnValue.prepend(TQString::tqfromLatin1("sg0"));
+ returnValue.prepend(TQString::fromLatin1("sg0"));
break;
}
diff --git a/ksim/monitors/filesystem/filesystemstats.cpp b/ksim/monitors/filesystem/filesystemstats.cpp
index fa215fc..1aa156d 100644
--- a/ksim/monitors/filesystem/filesystemstats.cpp
+++ b/ksim/monitors/filesystem/filesystemstats.cpp
@@ -184,7 +184,7 @@ FilesystemStats::List FilesystemStats::readEntries()
#endif
#ifdef USE_FAILSAFE
- TQFile file( TQString::tqfromLatin1( _PATH_MOUNTED ) );
+ TQFile file( TQString::fromLatin1( _PATH_MOUNTED ) );
if ( !file.open( IO_ReadOnly ) )
return list;
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index fb04470..3df1917 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -188,11 +188,11 @@ void FilesystemWidget::processExited(KProcess *)
TQStringList::Iterator it;
for (it = errorList.begin(); it != errorList.end(); ++it) {
- message += TQString::tqfromLatin1("<li>%1</li>")
+ message += TQString::fromLatin1("<li>%1</li>")
.tqarg((*it).replace(TQRegExp("[u]?mount: "), TQString()));
}
- message += TQString::tqfromLatin1("</ul></qt>");
+ message += TQString::fromLatin1("</ul></qt>");
KMessageBox::sorry(0, message);
}
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 6b8c928..1ffe5a8 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -71,7 +71,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
m_intervalLabel = new TQLabel(this);
m_intervalLabel->setText( i18n("Update interval:"));
- m_intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+ m_intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
TQSizePolicy::Fixed));
m_mainLayout->addMultiCellWidget(m_intervalLabel, 3, 3, 0, 0);
@@ -82,7 +82,7 @@ FsystemConfig::FsystemConfig(KSim::PluginObject *parent, const char *name)
TQLabel *intervalLabel = new TQLabel(this);
intervalLabel->setText(i18n("seconds"));
- intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+ intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
TQSizePolicy::Fixed));
m_mainLayout->addMultiCellWidget(intervalLabel, 3, 3, 2, 2);
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index cabbf5a..45251db 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -126,7 +126,7 @@ void SensorBase::update()
m_sensorList.append(SensorInfo(currentSensor++, label,
TQString::fromUtf8(name), TQString::fromUtf8(chip->prefix),
- chipset, sensorType(TQString::tqfromLatin1(name))));
+ chipset, sensorType(TQString::fromLatin1(name))));
}
}
}
@@ -134,13 +134,13 @@ void SensorBase::update()
if (m_hasNVControl) {
int temp = 0;
if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_GPU_CORE_TEMPERATURE, &temp)) {
- TQString name = TQString::tqfromLatin1("GPU Temp");
+ TQString name = TQString::fromLatin1("GPU Temp");
m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp),
name, TQString(), TQString(), sensorType(name)));
}
if (XNVCTRLQueryAttribute(qt_xdisplay(), qt_xscreen(), 0 /* not used? */, NV_CTRL_AMBIENT_TEMPERATURE, &temp)) {
- TQString name = TQString::tqfromLatin1("GPU Ambient Temp");
+ TQString name = TQString::fromLatin1("GPU Ambient Temp");
m_sensorList.append(SensorInfo(currentSensor++, TQString::number(temp),
name, TQString(), TQString(), sensorType(name)));
}
@@ -217,9 +217,9 @@ TQString SensorBase::sensorType(const TQString &name)
if (name.findRev("temp", -1, false) != -1)
if (SensorBase::fahrenheit())
- return TQString::tqfromLatin1("°F");
+ return TQString::fromLatin1("°F");
else
- return TQString::tqfromLatin1("°C");
+ return TQString::fromLatin1("°C");
if (name.findRev(TQRegExp("[^\\+]?[^\\-]?V$")) != -1)
return i18n("Volt", "V");
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 1f1cf10..95e65e5 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -86,7 +86,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
m_updateLabel = new TQLabel(this);
m_updateLabel->setText(i18n("Update interval:"));
- m_updateLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+ m_updateLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
TQSizePolicy::Fixed));
m_layout->addMultiCellWidget(m_updateLabel, 4, 4, 0, 0);
@@ -95,7 +95,7 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name)
TQLabel *intervalLabel = new TQLabel(this);
intervalLabel->setText(i18n("seconds"));
- intervalLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+ intervalLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
TQSizePolicy::Fixed));
m_layout->addMultiCellWidget(intervalLabel, 4, 4, 2, 2);
}
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index c470a2c..997f9b2 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -65,7 +65,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
m_generalLayout->addMultiCellWidget(m_deviceLabel, 0, 0, 0, 0);
m_deviceCombo = new KComboBox(true, m_generalTab);
- m_deviceCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
+ m_deviceCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred,
TQSizePolicy::Fixed));
m_deviceCombo->setFocus();
m_deviceCombo->setDuplicatesEnabled(false);
@@ -89,7 +89,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name)
m_timerBox->tqlayout()->setSpacing(0);
m_timerBox->tqlayout()->setMargin(0);
m_timerBoxLayout = new TQVBoxLayout(m_timerBox->tqlayout());
- m_timerBoxLayout->tqsetAlignment(TQt::AlignTop);
+ m_timerBoxLayout->setAlignment(TQt::AlignTop);
m_timerBoxLayout->setSpacing(6);
m_timerBoxLayout->setMargin(11);
diff --git a/ksim/monitors/snmp/browsedialogbase.ui b/ksim/monitors/snmp/browsedialogbase.ui
index b79fc80..9bfae99 100644
--- a/ksim/monitors/snmp/browsedialogbase.ui
+++ b/ksim/monitors/snmp/browsedialogbase.ui
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -205,7 +205,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
diff --git a/ksim/monitors/snmp/configwidget.ui b/ksim/monitors/snmp/configwidget.ui
index 608dc8f..69b94db 100644
--- a/ksim/monitors/snmp/configwidget.ui
+++ b/ksim/monitors/snmp/configwidget.ui
@@ -102,7 +102,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -156,7 +156,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>121</width>
<height>20</height>
diff --git a/ksim/monitors/snmp/hostdialogbase.ui b/ksim/monitors/snmp/hostdialogbase.ui
index d3da054..12fe8ab 100644
--- a/ksim/monitors/snmp/hostdialogbase.ui
+++ b/ksim/monitors/snmp/hostdialogbase.ui
@@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
@@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>41</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>160</width>
<height>20</height>
@@ -253,7 +253,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>71</width>
<height>20</height>
@@ -309,7 +309,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -359,7 +359,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>351</width>
<height>20</height>
@@ -408,7 +408,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp
index 1bcbb0b..6ab85b6 100644
--- a/ksim/monitors/snmp/monitorconfig.cpp
+++ b/ksim/monitors/snmp/monitorconfig.cpp
@@ -117,8 +117,8 @@ TQString KSim::Snmp::monitorDisplayTypeToString( MonitorConfig::DisplayType type
{
switch ( type )
{
- case MonitorConfig::Label: return TQString::tqfromLatin1( "Label" );
- case MonitorConfig::Chart: return TQString::tqfromLatin1( "Chart" );
+ case MonitorConfig::Label: return TQString::fromLatin1( "Label" );
+ case MonitorConfig::Chart: return TQString::fromLatin1( "Chart" );
default: assert( false );
};
return TQString();
diff --git a/ksim/monitors/snmp/monitordialogbase.ui b/ksim/monitors/snmp/monitordialogbase.ui
index 5f9fb53..e466c66 100644
--- a/ksim/monitors/snmp/monitordialogbase.ui
+++ b/ksim/monitors/snmp/monitordialogbase.ui
@@ -163,7 +163,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>141</width>
<height>20</height>
@@ -205,7 +205,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>271</width>
<height>20</height>
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>244</width>
<height>20</height>
@@ -246,7 +246,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>210</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>
@@ -335,7 +335,7 @@
<cstring>status</cstring>
</property>
<property name="text">
- <string>blehtqStatus</string>
+ <string>blehStatus</string>
</property>
</widget>
<widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="4">
diff --git a/ksim/monitors/snmp/proberesultdialogbase.ui b/ksim/monitors/snmp/proberesultdialogbase.ui
index c3df9bd..dcdbd2a 100644
--- a/ksim/monitors/snmp/proberesultdialogbase.ui
+++ b/ksim/monitors/snmp/proberesultdialogbase.ui
@@ -84,7 +84,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/ksim/monitors/snmp/snmp.cpp b/ksim/monitors/snmp/snmp.cpp
index d79c596..ae04b67 100644
--- a/ksim/monitors/snmp/snmp.cpp
+++ b/ksim/monitors/snmp/snmp.cpp
@@ -57,7 +57,7 @@ static TQStringList allStrings( const EnumStringMapInfo *array )
{
TQStringList result;
for ( uint i = 0; array[ i ].stringValue; ++i )
- result << TQString::tqfromLatin1( array[ i ].stringValue );
+ result << TQString::fromLatin1( array[ i ].stringValue );
return result;
}
@@ -65,7 +65,7 @@ static TQString enumToString( const EnumStringMapInfo *array, int value )
{
for ( uint i = 0; array[ i ].stringValue; ++i )
if ( array[ i ].enumValue == value )
- return TQString::tqfromLatin1( array[ i ].stringValue );
+ return TQString::fromLatin1( array[ i ].stringValue );
assert( false );
return TQString();
@@ -76,7 +76,7 @@ static int stringToEnum( const EnumStringMapInfo *array, TQString string, bool *
string = string.lower();
uint i;
for ( i = 0; array[ i ].stringValue; ++i )
- if ( TQString::tqfromLatin1( array[ i ].stringValue ).lower() == string ) {
+ if ( TQString::fromLatin1( array[ i ].stringValue ).lower() == string ) {
if ( ok ) *ok = true;
return array[ i ].enumValue;
}
@@ -291,9 +291,9 @@ int KSim::Snmp::sessionErrorCode( netsnmp_session &session )
static TQString messageForErrorCode( int errorCode )
{
if ( errorCode >= SNMPERR_MAX && errorCode <= SNMPERR_GENERR )
- return TQString::tqfromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) );
+ return TQString::fromLatin1( SnmpLib::self()->snmp_api_errstring( errorCode ) );
if ( errorCode >= SNMP_ERR_NOERROR && errorCode <= MAX_SNMP_ERR )
- return TQString::tqfromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) );
+ return TQString::fromLatin1( SnmpLib::self()->snmp_errstring( errorCode ) );
return TQString();
}
diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp
index 2803aec..667613a 100644
--- a/ksim/monitors/snmp/value.cpp
+++ b/ksim/monitors/snmp/value.cpp
@@ -294,9 +294,9 @@ TQString Value::toString( int conversionFlags ) const
case Value::TimeTicks: return formatTimeTicks( toTimeTicks(), conversionFlags );
// not using i18n here, because it may be called from within a worker thread, and I'm
// not sure it makes sense to translate it anyway
- case Value::NoSuchObject: return TQString::tqfromLatin1( "No Such Object" );
- case Value::NoSuchInstance: return TQString::tqfromLatin1( "No Such Instance" );
- case Value::EndOfMIBView: return TQString::tqfromLatin1( "End Of MIB View" );
+ case Value::NoSuchObject: return TQString::fromLatin1( "No Such Object" );
+ case Value::NoSuchInstance: return TQString::fromLatin1( "No Such Instance" );
+ case Value::EndOfMIBView: return TQString::fromLatin1( "End Of MIB View" );
case Value::Invalid:
case Value::Null: return TQString();
}
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index afabec5..aaa726d 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -67,16 +67,16 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_label = new TQLabel(this);
m_label->setText(i18n("GKrellm theme support. To use"
" gkrellm themes just untar the themes into the folder below"));
- m_label->tqsetAlignment(TQLabel::WordBreak |
+ m_label->setAlignment(TQLabel::WordBreak |
TQLabel::AlignVCenter | TQLabel::AlignLeft);
m_themeLayout->addMultiCellWidget(m_label, 0, 0, 0, 4);
TQString themeDir(locateLocal("data", "ksim"));
- themeDir += TQString::tqfromLatin1("/themes");
+ themeDir += TQString::fromLatin1("/themes");
m_urlLabel = new KURLLabel(this);
m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder"));
- m_urlLabel->setURL(TQString::tqfromLatin1("file://") + themeDir);
+ m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir);
connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)),
this, TQT_SLOT(openURL(const TQString &)));
m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4);
@@ -85,13 +85,13 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_themeLayout->addMultiCellWidget(m_line, 2, 2, 0, 4);
m_authorLabel = new TQLabel(this);
- m_authorLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
+ m_authorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed,
TQSizePolicy::Minimum));
m_authorLabel->setText(i18n("Author:"));
m_themeLayout->addMultiCellWidget(m_authorLabel, 3, 3, 0, 0);
m_authLabel = new KSqueezedTextLabel(this);
- m_authLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+ m_authLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Minimum));
m_authLabel->setText(i18n("None"));
m_themeLayout->addMultiCellWidget(m_authLabel, 3, 3, 1, 4);
@@ -105,7 +105,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_alternateLabel = new TQLabel(this);
m_alternateLabel->setText(i18n("Alternate themes:"));
- m_alternateLabel->tqsetAlignment(AlignVCenter | AlignRight);
+ m_alternateLabel->setAlignment(AlignVCenter | AlignRight);
m_themeLayout->addMultiCellWidget(m_alternateLabel, 5, 5, 0, 1);
m_altTheme = new KIntSpinBox(this);
@@ -113,8 +113,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_fontLabel = new TQLabel(this);
m_fontLabel->setText(i18n("Font:"));
- m_fontLabel->tqsetAlignment(AlignVCenter | AlignRight);
- m_fontLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
+ m_fontLabel->setAlignment(AlignVCenter | AlignRight);
+ m_fontLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,
TQSizePolicy::Fixed));
m_themeLayout->addMultiCellWidget(m_fontLabel, 5, 5, 3, 3);
@@ -124,7 +124,7 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name)
m_fontsCombo->insertItem(i18n("Large"));
m_fontsCombo->insertItem(i18n("Custom"));
m_fontsCombo->insertItem(i18n("Default"));
- m_fontsCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
+ m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,
TQSizePolicy::Fixed));
connect(m_fontsCombo, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(showFontDialog(int)));
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index a387d87..4911154 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -59,7 +59,7 @@ public:
KTimerJob *job() { return m_job; };
- void settqStatus( bool error ) {
+ void setStatus( bool error ) {
m_error = error;
update();
}
@@ -239,7 +239,7 @@ void KTimerPref::jobChanged( KTimerJob *job )
void KTimerPref::jobFinished( KTimerJob *job, bool error )
{
KTimerJobItem *item = static_cast<KTimerJobItem*>(job->user());
- item->settqStatus( error );
+ item->setStatus( error );
m_list->triggerUpdate();
}
diff --git a/ktimer/prefwidget.ui b/ktimer/prefwidget.ui
index 766d39b..1989ba4 100644
--- a/ktimer/prefwidget.ui
+++ b/ktimer/prefwidget.ui
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp
index c031b35..328e0d5 100644
--- a/kwallet/allyourbase.cpp
+++ b/kwallet/allyourbase.cpp
@@ -263,7 +263,7 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList<TQIconDragItem>& lst
TQDataStream *ds = 0L;
if (e->provides("application/x-kwallet-folder")) {
- TQByteArray edata = e->tqencodedData("application/x-kwallet-folder");
+ TQByteArray edata = e->encodedData("application/x-kwallet-folder");
if (!edata.isEmpty()) {
ds = new TQDataStream(edata, IO_ReadOnly);
}
@@ -407,7 +407,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
return;
}
isEntry = true;
- TQByteArray data = e->tqencodedData("application/x-kwallet-entry");
+ TQByteArray data = e->encodedData("application/x-kwallet-entry");
if (data.isEmpty()) {
e->ignore();
return;
@@ -420,7 +420,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
return;
}
isEntry = false;
- TQByteArray data = e->tqencodedData("application/x-kwallet-folder");
+ TQByteArray data = e->encodedData("application/x-kwallet-folder");
if (data.isEmpty()) {
e->ignore();
return;
@@ -589,11 +589,11 @@ class KWalletIconDrag : public TQIconDrag {
return 0L;
}
- TQByteArray tqencodedData(const char *mime) const {
+ TQByteArray encodedData(const char *mime) const {
TQByteArray a;
TQCString mimetype(mime);
if (mimetype == "application/x-qiconlist") {
- return TQIconDrag::tqencodedData(mime);
+ return TQIconDrag::encodedData(mime);
} else if (mimetype == "text/uri-list") {
TQCString s = _urls.join("\r\n").latin1();
if (_urls.count() > 0) {
@@ -638,7 +638,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueList<TQIconDragIt
return;
}
- TQByteArray edata = e->tqencodedData("text/uri-list");
+ TQByteArray edata = e->encodedData("text/uri-list");
TQCString urls = edata.data();
TQStringList ul = TQStringList::split("\r\n", urls);
diff --git a/kwallet/kbetterthankdialogbase.ui b/kwallet/kbetterthankdialogbase.ui
index 0b421c7..fa407c9 100644
--- a/kwallet/kbetterthankdialogbase.ui
+++ b/kwallet/kbetterthankdialogbase.ui
@@ -37,7 +37,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>21</height>
diff --git a/kwallet/konfigurator/walletconfigwidget.ui b/kwallet/konfigurator/walletconfigwidget.ui
index eaf5cf2..99bc45a 100644
--- a/kwallet/konfigurator/walletconfigwidget.ui
+++ b/kwallet/konfigurator/walletconfigwidget.ui
@@ -133,7 +133,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="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -281,7 +281,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -319,7 +319,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>16</height>
@@ -415,7 +415,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>369</width>
<height>21</height>
diff --git a/kwallet/kwmapeditor.cpp b/kwallet/kwmapeditor.cpp
index d5a9722..061c09e 100644
--- a/kwallet/kwmapeditor.cpp
+++ b/kwallet/kwmapeditor.cpp
@@ -142,7 +142,7 @@ class InlineEditor : public TQTextEdit {
protected:
virtual void focusOutEvent(TQFocusEvent* fe) {
if (fe->reason() == TQFocusEvent::Popup) {
- TQWidget *focusW = tqApp->tqfocusWidget();
+ TQWidget *focusW = tqApp->focusWidget();
if (focusW && focusW == popup) {
return;
}
diff --git a/kwallet/walletwidget.ui b/kwallet/walletwidget.ui
index dbe761e..fad3875 100644
--- a/kwallet/walletwidget.ui
+++ b/kwallet/walletwidget.ui
@@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>227</width>
<height>21</height>
@@ -222,7 +222,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>271</width>
<height>20</height>
@@ -282,7 +282,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>41</height>
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>41</height>
@@ -316,7 +316,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>41</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>21</height>
@@ -366,7 +366,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>236</width>
<height>21</height>
@@ -383,7 +383,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>358</height>
diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp
index 56c9d31..ca5e6e6 100644
--- a/superkaramba/src/datesensor.cpp
+++ b/superkaramba/src/datesensor.cpp
@@ -20,7 +20,7 @@ DateSensor::~DateSensor()
void DateSensor::update()
{
- TQDateTime qdt = TQDateTime::tqcurrentDateTime();
+ TQDateTime qdt = TQDateTime::currentDateTime();
TQString format;
SensorParams *sp;
Meter *meter;
@@ -90,8 +90,8 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev)
connect(cal, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted()));
TQPoint c = (TQPoint(ev->x(), ev->y()));
- int w = cal->tqsizeHint().width();
- int h = cal->tqsizeHint().height();
+ int w = cal->sizeHint().width();
+ int h = cal->sizeHint().height();
// make calendar fully visible
TQRect deskR = TQApplication::desktop()->screenGeometry(TQApplication::desktop()->screenNumber(c));
diff --git a/superkaramba/src/input.cpp b/superkaramba/src/input.cpp
index 63290cc..2769ed2 100644
--- a/superkaramba/src/input.cpp
+++ b/superkaramba/src/input.cpp
@@ -131,7 +131,7 @@ void Input::setFontColor(TQColor fontColor)
TQColor Input::getFontColor() const
{
- const TQColorGroup &color = edit->tqcolorGroup();
+ const TQColorGroup &color = edit->colorGroup();
return color.text();
}
@@ -144,7 +144,7 @@ void Input::setSelectionColor(TQColor selectionColor)
TQColor Input::getSelectionColor() const
{
- const TQColorGroup &color = edit->tqcolorGroup();
+ const TQColorGroup &color = edit->colorGroup();
return color.highlight();
}
@@ -157,7 +157,7 @@ void Input::setSelectedTextColor(TQColor selectedTextColor)
TQColor Input::getSelectedTextColor() const
{
- const TQColorGroup &color = edit->tqcolorGroup();
+ const TQColorGroup &color = edit->colorGroup();
return color.highlightedText();
}
diff --git a/superkaramba/src/input_python.cpp b/superkaramba/src/input_python.cpp
index 82ed00f..fb451bd 100644
--- a/superkaramba/src/input_python.cpp
+++ b/superkaramba/src/input_python.cpp
@@ -346,7 +346,7 @@ PyObject* py_getInputFocus(PyObject *, PyObject *args)
// FocusWidget() returns the currently focused line edit,
// but unfortunately we need an 'Input' object here.
//
- TQWidget *obj = ((karamba*)widget)->tqfocusWidget();
+ TQWidget *obj = ((karamba*)widget)->focusWidget();
if(obj->isA(TQLINEEDIT_OBJECT_NAME_STRING)) // SKLineEdit is no TQ_Object, but TQLineEdit can only be here as a SKLineEdit
return Py_BuildValue((char*)"l", ((SKLineEdit*)obj)->getInput());
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index 90c58c0..da5d1c9 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -622,7 +622,7 @@ bool karamba::parseConfig()
TQColor("white")));
defaultTextField->setFont(lineParser.getString("FONT", "Helvetica"));
defaultTextField->setFontSize(lineParser.getInt("FONTSIZE", 12));
- defaultTextField->tqsetAlignment(lineParser.getString("ALIGN",
+ defaultTextField->setAlignment(lineParser.getString("ALIGN",
"LEFT"));
defaultTextField->setFixedPitch(lineParser.getBoolean("FIXEDPITCH",
false));
@@ -647,7 +647,7 @@ bool karamba::parseConfig()
tmpText->setFont(lineParser.getString("FONT", defTxt.getFont()));
tmpText->setFontSize(lineParser.getInt("FONTSIZE",
defTxt.getFontSize()));
- tmpText->tqsetAlignment(lineParser.getString("ALIGN",
+ tmpText->setAlignment(lineParser.getString("ALIGN",
defTxt.getAlignmentAsString()));
tmpText->setFixedPitch(lineParser.getInt("FIXEDPITCH",
defTxt.getFixedPitch()));
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 87f6e60..f3231b2 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -76,7 +76,7 @@ TQString KarambaApplication::getMainKaramba()
bool KarambaApplication::themeExists(TQString pretty_name)
{
- TQWidgetList *list = TQApplication::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it( *list ); // iterate over the widgets
TQWidget * w;
while ( (w=it.current()) != 0 ) // for each widget...
diff --git a/superkaramba/src/karambainterface.cpp b/superkaramba/src/karambainterface.cpp
index 659370a..5d33f68 100644
--- a/superkaramba/src/karambainterface.cpp
+++ b/superkaramba/src/karambainterface.cpp
@@ -24,7 +24,7 @@ KarambaIface::~KarambaIface()
karamba* KarambaIface::getKaramba(TQString name)
{
- TQWidgetList *list = TQApplication::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it(*list); // iterate over the widgets
TQWidget* w;
karamba* result = 0;
@@ -49,7 +49,7 @@ karamba* KarambaIface::getKaramba(TQString name)
ThemesDlg* KarambaIface::getThemeWnd()
{
- TQWidgetList *list = TQApplication::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it( *list ); // iterate over the widgets
TQWidget* w;
ThemesDlg* result = 0;
diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp
index 74ce4ed..a6cd2c3 100644
--- a/superkaramba/src/karambasessionmanaged.cpp
+++ b/superkaramba/src/karambasessionmanaged.cpp
@@ -34,7 +34,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&)
TQString openThemes="";
- TQWidgetList *list = TQApplication::tqallWidgets();
+ TQWidgetList *list = TQApplication::allWidgets();
TQWidgetListIt it( *list ); // iterate over the widgets
TQWidget * w;
while ( (w=it.current()) != 0 ) // for each widget...
diff --git a/superkaramba/src/richtextlabel.cpp b/superkaramba/src/richtextlabel.cpp
index 5044161..999fe0f 100644
--- a/superkaramba/src/richtextlabel.cpp
+++ b/superkaramba/src/richtextlabel.cpp
@@ -17,7 +17,7 @@ RichTextLabel::RichTextLabel(karamba* k) :
Meter(k, 0, 0, 100, 100),
text(0),
source(""),
- colorGrp(k->tqcolorGroup()),
+ colorGrp(k->colorGroup()),
underlineLinks(false)
{
originalSize = TQSize(0, 0);
@@ -27,7 +27,7 @@ RichTextLabel::RichTextLabel(karamba* k, int x, int y, int w, int h) :
Meter(k, x, y, w, h),
text(0),
source(""),
- colorGrp(k->tqcolorGroup()),
+ colorGrp(k->colorGroup()),
underlineLinks(false)
{
kdDebug() << k_funcinfo << x << ", " << y << ", " << w << ", " << h << endl;
diff --git a/superkaramba/src/textfield.cpp b/superkaramba/src/textfield.cpp
index a3be722..2c10659 100644
--- a/superkaramba/src/textfield.cpp
+++ b/superkaramba/src/textfield.cpp
@@ -18,7 +18,7 @@ TextField::TextField( )
setColor(TQColor(192, 192, 192));
setBGColor(TQColor(0, 0, 0));
setFont("Helvetica");
- tqsetAlignment(TQt::AlignLeft);
+ setAlignment(TQt::AlignLeft);
setFixedPitch(false);
setShadow(0);
}
@@ -35,7 +35,7 @@ TextField::TextField( const TextField& def )
setBGColor(def.getBGColor());
setFont( def.getFont() );
- tqsetAlignment( def.getAlignment() );
+ setAlignment( def.getAlignment() );
setFixedPitch( def.getFixedPitch() );
setShadow( def.getShadow() );
}
@@ -51,7 +51,7 @@ TextField& TextField::operator=(const TextField& rhs)
setBGColor(rhs.getBGColor());
setFont( rhs.getFont() );
- tqsetAlignment( rhs.getAlignment() );
+ setAlignment( rhs.getAlignment() );
setFixedPitch( rhs.getFixedPitch() );
setShadow( rhs.getShadow() );
@@ -102,7 +102,7 @@ int TextField::getFontSize() const
return font.pointSize();
}
-void TextField::tqsetAlignment( const TQString &align )
+void TextField::setAlignment( const TQString &align )
{
TQString a = align.upper();
if( a == "LEFT" || a.isEmpty() )
@@ -113,7 +113,7 @@ void TextField::tqsetAlignment( const TQString &align )
tqalignment = TQt::AlignHCenter;
}
-void TextField::tqsetAlignment( int af )
+void TextField::setAlignment( int af )
{
tqalignment = af;
}
diff --git a/superkaramba/src/textfield.h b/superkaramba/src/textfield.h
index 34f17c3..111f053 100644
--- a/superkaramba/src/textfield.h
+++ b/superkaramba/src/textfield.h
@@ -31,8 +31,8 @@ public:
void setColor(TQColor clr);
void setBGColor(TQColor clr);
void setFont( const TQString& );
- void tqsetAlignment( int );
- void tqsetAlignment( const TQString& );
+ void setAlignment( int );
+ void setAlignment( const TQString& );
void setFixedPitch( bool );
void setShadow( int );
diff --git a/superkaramba/src/textlabel.cpp b/superkaramba/src/textlabel.cpp
index 0cf8891..a33ea97 100644
--- a/superkaramba/src/textlabel.cpp
+++ b/superkaramba/src/textlabel.cpp
@@ -131,7 +131,7 @@ int TextLabel::getFontSize() const
return font.pixelSize();
}
-void TextLabel::tqsetAlignment( TQString align )
+void TextLabel::setAlignment( TQString align )
{
TQString a = align.upper();
if( a == "LEFT" || a.isEmpty() )
diff --git a/superkaramba/src/textlabel.h b/superkaramba/src/textlabel.h
index b29c44e..b3579e1 100644
--- a/superkaramba/src/textlabel.h
+++ b/superkaramba/src/textlabel.h
@@ -40,7 +40,7 @@ public:
void setFontSize( int );
void setBGColor(TQColor clr);
void setFont( TQString );
- void tqsetAlignment( TQString );
+ void setAlignment( TQString );
void setFixedPitch( bool );
void setShadow( int );
void mUpdate( TQPainter * );
diff --git a/superkaramba/src/textlabel_python.cpp b/superkaramba/src/textlabel_python.cpp
index e7d2498..3cf6e3e 100644
--- a/superkaramba/src/textlabel_python.cpp
+++ b/superkaramba/src/textlabel_python.cpp
@@ -206,7 +206,7 @@ PyObject* py_setTextAlign(PyObject *, PyObject *args)
return NULL;
if (!checkKarambaAndMeter(widget, textSensor, "TextLabel"))
return NULL;
- ((TextLabel*)textSensor)->tqsetAlignment( text );
+ ((TextLabel*)textSensor)->setAlignment( text );
return Py_BuildValue((char*)"l", 1);
}
diff --git a/superkaramba/src/themes_layout.ui b/superkaramba/src/themes_layout.ui
index b3ee3a1..9fa108d 100644
--- a/superkaramba/src/themes_layout.ui
+++ b/superkaramba/src/themes_layout.ui
@@ -12,7 +12,7 @@
<height>517</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -111,7 +111,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -122,7 +122,7 @@
<property name="name">
<cstring>buttonAddToDesktop</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
@@ -139,7 +139,7 @@
<property name="name">
<cstring>buttonClose</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index f7749cc..f483a04 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -220,9 +220,9 @@ void ThemesDlg::getNewStuff()
KConfig* config = KGlobal::config();
config->setGroup("KNewStuff");
config->writePathEntry("ProvidersUrl",
- TQString::tqfromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
+ TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml"));
config->sync();
- m_newStufftqStatus = config->entryMap("KNewStuffStatus").keys();
+ m_newStuffStatus = config->entryMap("KNewStuffStatus").keys();
//This check is b/c KNewStuff will download, throw an error,
//and still have the entry in the config that it was successful
configSanityCheck();
@@ -304,8 +304,8 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file)
KConfig* config = KGlobal::config();
TQStringList keys = config->entryMap("KNewStuffStatus").keys();
- for(TQStringList::Iterator it = m_newStufftqStatus.begin();
- it != m_newStufftqStatus.end(); ++it)
+ for(TQStringList::Iterator it = m_newStuffStatus.begin();
+ it != m_newStuffStatus.end(); ++it)
{
keys.remove(*it);
}
@@ -477,7 +477,7 @@ void ThemesDlg::uninstall()
tableThemes->removeItem( twPtr );
}
#ifdef HAVE_KNEWSTUFF
- // Remove theme from KNewStufftqStatus
+ // Remove theme from KNewStuffStatus
KConfig* config = KGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(tempPath);
@@ -507,7 +507,7 @@ void ThemesDlg::uninstall()
}
tableThemes->removeItem(w);
#ifdef HAVE_KNEWSTUFF
- // Remove theme from KNewStufftqStatus
+ // Remove theme from KNewStuffStatus
KConfig* config = KGlobal::config();
config->setGroup("KNewStuffNames");
TQString name = config->readEntry(theme.path());
diff --git a/superkaramba/src/themesdlg.h b/superkaramba/src/themesdlg.h
index bf4fab5..b75c820 100644
--- a/superkaramba/src/themesdlg.h
+++ b/superkaramba/src/themesdlg.h
@@ -74,7 +74,7 @@ class ThemesDlg : public ThemesLayout
#ifdef HAVE_KNEWSTUFF
private:
SKNewStuff *mNewStuff;
- TQStringList m_newStufftqStatus;
+ TQStringList m_newStuffStatus;
#endif
};
diff --git a/superkaramba/src/themewidget_layout.ui b/superkaramba/src/themewidget_layout.ui
index 5ab1b70..0159820 100644
--- a/superkaramba/src/themewidget_layout.ui
+++ b/superkaramba/src/themewidget_layout.ui
@@ -35,7 +35,7 @@
<property name="name">
<cstring>icon</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>76</width>
<height>0</height>
@@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>40</width>
<height>20</height>